Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed BattleTower-Labels

Browse Source
This commit is contained in:
JimB16
2015-08-24 19:35:05 +02:00
parent 157e5fd4b8
commit 4cd118b149
4 changed files with 68 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
maps/BattleTower1F.asm
View File

@@ -41,10 +41,10 @@ UnknownScript_0x9e3d3:
MapBattleTower1FSignpost0Script:
loadfont
writetext UnknownText_0x9ed3c
writetext Text_ReadBattleTowerRules
yesorno
iffalse UnknownScript_0x9e3e0
writetext UnknownText_0x9ed72
writetext Text_BattleTowerRules
closetext
UnknownScript_0x9e3e0:
loadmovesprites
@@ -55,12 +55,12 @@ ReceptionistScript_0x9e3e2:
special Function170687
if_equal $3, BattleTowerBattleRoomScript_0x9f4e4
loadfont
writetext UnknownText_0x9e5ab
writetext Text_BattleTowerWelcomesYou
keeptextopen
writebyte $0
special Function170687
if_not_equal $0, Script_Menu_ChallengeExplanationCancel
jump UnknownScript_0x9e49e
jump Script_BattleTowerIntroductionYesNo
Script_Menu_ChallengeExplanationCancel: ; 0x9e3fc
writetext Text_WantToGoIntoABattleRoom
@@ -121,7 +121,7 @@ UnknownScript_0x9e47a:
special Function170687
writebyte $1b
special Function170687
if_equal $12, UnknownScript_0x9e498
if_equal $12, Script_YourPackIsStuffedFull
itemtotext $0, $1
giveitem $ff, $5
writetext UnknownText_0x9eb7e
@@ -130,25 +130,25 @@ UnknownScript_0x9e47a:
loadmovesprites
end
UnknownScript_0x9e498:
writetext UnknownText_0x9eb94
Script_YourPackIsStuffedFull: ; 0x9e498
writetext Text_YourPackIsStuffedFull
closetext
loadmovesprites
end
UnknownScript_0x9e49e:
writetext UnknownText_0x9ec3d
Script_BattleTowerIntroductionYesNo: ; 0x9e49e
writetext Text_WouldYouLikeToHearAboutTheBattleTower
yesorno
iffalse UnknownScript_0x9e4a8
UnknownScript_0x9e4a5:
writetext UnknownText_0x9e886
writetext Text_BattleTowerIntroduction_2
UnknownScript_0x9e4a8:
writebyte $1
special Function170687
jump Script_Menu_ChallengeExplanationCancel
UnknownScript_0x9e4b0:
writetext UnknownText_0x9ec09
writetext Text_WeHopeToServeYouAgain
closetext
loadmovesprites
end
@@ -175,9 +175,9 @@ UnknownScript_0x9e4be:
special Function1700ba
if_equal $a, Script_Menu_ChallengeExplanationCancel
if_not_equal $0, UnknownScript_0x9e550
writetext UnknownText_0x9e9eb
writetext Text_ReceivedAListOfLeadersOnTheHonorRoll
spriteface $2, LEFT
writetext UnknownText_0x9ea1b
writetext Text_PleaseConfirmOnThisMonitor
closetext
spriteface $2, DOWN
loadmovesprites
@@ -186,10 +186,10 @@ UnknownScript_0x9e4be:
UnknownScript_0x9e4ea:
writebyte $18
special Function170687
if_not_equal $0, UnknownScript_0x9e542
if_not_equal $0, Script_APkmnLevelExceeds
writebyte $19
special Function170687
if_not_equal $0, UnknownScript_0x9e549
if_not_equal $0, Script_MayNotEnterABattleRoomUnderL70
special SpecialCheckForBattleTowerRules
if_not_equal $0, Script_CloseText
writebyte $5
@@ -223,13 +223,13 @@ UnknownScript_0x9e53b:
closetext
jump UnknownScript_0x9e4b0
UnknownScript_0x9e542:
writetext UnknownText_0x9f1e5
Script_APkmnLevelExceeds: ; 0x9e542
writetext Text_APkmnLevelExceeds
closetext
jump Script_Menu_ChallengeExplanationCancel
UnknownScript_0x9e549:
writetext UnknownText_0x9f217
Script_MayNotEnterABattleRoomUnderL70: ; 0x9e549
writetext Text_MayNotEnterABattleRoomUnderL70
closetext
jump Script_Menu_ChallengeExplanationCancel
@@ -247,20 +247,20 @@ UnknownScript_0x9e555:
YoungsterScript_0x9e55d:
faceplayer
loadfont
writetext UnknownText_0x9f264
writetext Text_BattleTowerYoungster
closetext
loadmovesprites
spriteface $3, RIGHT
end
CooltrainerFScript_0x9e568:
jumptextfaceplayer UnknownText_0x9f2a4
jumptextfaceplayer Text_BattleTowerCooltrainerF
BugCatcherScript_0x9e56b:
jumptextfaceplayer UnknownText_0x9f35b
jumptextfaceplayer Text_BattleTowerBugCatcher
GrannyScript_0x9e56e:
jumptextfaceplayer UnknownText_0x9f2e3
jumptextfaceplayer Text_BattleTowerGranny
MovementData_0x9e571:
step_up
@@ -346,7 +346,7 @@ MovementData_0x9e5a9:
turn_head_right
step_end
UnknownText_0x9e5ab:
Text_BattleTowerWelcomesYou: ; 0x9e5ab
text "BATTLE TOWER"
line "welcomes you!"
@@ -364,7 +364,7 @@ Text_RightThisWayToYourBattleRoom: ; 0x9e60a
line "your BATTLE ROOM."
done
UnknownText_0x9e62f:
Text_BattleTowerIntroduction_1: ; 0x9e62f
text "BATTLE TOWER is a"
line "facility made for"
cont "#MON battles."
@@ -424,7 +424,7 @@ UnknownText_0x9e62f:
para ""
done
UnknownText_0x9e886:
Text_BattleTowerIntroduction_2: ; 0x9e886
text "BATTLE TOWER is a"
line "facility made for"
cont "#MON battles."
@@ -460,7 +460,7 @@ UnknownText_0x9e886:
para ""
done
UnknownText_0x9e9eb:
Text_ReceivedAListOfLeadersOnTheHonorRoll: ; 0x9e9eb
text "Received a list of"
line "LEADERS on the"
cont "HONOR ROLL."
@@ -468,12 +468,12 @@ UnknownText_0x9e9eb:
para ""
done
UnknownText_0x9ea1b:
Text_PleaseConfirmOnThisMonitor: ; 0x9ea1b
text "Please confirm on"
line "this monitor."
done
UnknownText_0x9ea3c:
Text_ThankYou: ; 0x9ea3c
text "Thank you!"
para ""
@@ -531,7 +531,7 @@ UnknownText_0x9eb7e:
text_waitbutton
db "@"
UnknownText_0x9eb94:
Text_YourPackIsStuffedFull: ; 0x9eb94
text "Oops, your PACK is"
line "stuffed full."
@@ -539,24 +539,24 @@ UnknownText_0x9eb94:
line "and come back."
done
UnknownText_0x9ebd6:
Text_YourRegistrationIsComplete: ; 0x9ebd6
text "Your registration"
line "is complete."
para "Please come again!"
done
UnknownText_0x9ec09:
Text_WeHopeToServeYouAgain: ; 0x9ec09
text "We hope to serve"
line "you again."
done
UnknownText_0x9ec26:
Text_PleaseStepThisWay: ; 0x9ec26
text "Please step this"
line "way."
done
UnknownText_0x9ec3d: ; 0x9ec3d
Text_WouldYouLikeToHearAboutTheBattleTower: ; 0x9ec3d
text "Would you like to"
line "hear about the"
cont "BATTLE TOWER?"
@@ -582,19 +582,19 @@ UnknownText_0x9ecb0:
cont "deleted. OK?"
done
UnknownText_0x9ed1e:
Text_CheckTheLeaderHonorRoll: ; 0x9ed1e
text "Check the LEADER"
line "HONOR ROLL?"
done
UnknownText_0x9ed3c:
Text_ReadBattleTowerRules: ; 0x9ed3c
text "BATTLE TOWER rules"
line "are written here."
para "Read the rules?"
done
UnknownText_0x9ed72:
Text_BattleTowerRules: ; 0x9ed72
text "Three #MON may"
line "enter battles."
@@ -626,13 +626,13 @@ UnknownText_0x9ee18:
line "invalid."
done
UnknownText_0x9ee92:
Text_YourPkmnWillBeHealedToFullHealth: ; 0x9ee92
text "Your #MON will"
line "be healed to full"
cont "health."
done
UnknownText_0x9eebc:
Text_NextUpOpponentNo: ; 0x9eebc
text "Next up, opponent"
line "no.@"
text_from_ram StringBuffer3
@@ -655,7 +655,7 @@ Text_SaveBeforeEnteringBattleRoom: ; 0x9ef1f
line "be saved."
done
UnknownText_0x9ef5e:
Text_SaveAndEndTheSession: ; 0x9ef5e
text "SAVE and end the"
line "session?"
done
@@ -668,7 +668,7 @@ UnknownText_0x9ef79:
line "the previous ROOM."
done
UnknownText_0x9efbf:
Text_CancelYourBattleRoomChallenge: ; 0x9efbf
text "Cancel your BATTLE"
line "ROOM challenge?"
done
@@ -730,7 +730,7 @@ UnknownText_0x9f151:
cont "challenge."
done
UnknownText_0x9f1e5:
Text_APkmnLevelExceeds: ; 0x9f1e5
text "One or more of"
line "your #MON's"
cont "levels exceeds @"
@@ -738,7 +738,7 @@ UnknownText_0x9f1e5:
text "."
done
UnknownText_0x9f217:
Text_MayNotEnterABattleRoomUnderL70: ; 0x9f217
text_from_ram wcd49
text " may not"
line "enter a BATTLE"
@@ -750,7 +750,7 @@ UnknownText_0x9f217:
text "."
done
UnknownText_0x9f264:
Text_BattleTowerYoungster: ; 0x9f264
text "Destroyed by the"
line "first opponent in"
@@ -758,7 +758,7 @@ UnknownText_0x9f264:
line "I'm no good…"
done
UnknownText_0x9f2a4:
Text_BattleTowerCooltrainerF: ; 0x9f2a4
text "There are lots of"
line "BATTLE ROOMS, but"
@@ -766,7 +766,7 @@ UnknownText_0x9f2a4:
line "them all!"
done
UnknownText_0x9f2e3:
Text_BattleTowerGranny: ; 0x9f2e3
text "It's a grueling"
line "task, not being"
@@ -780,7 +780,7 @@ UnknownText_0x9f2e3:
line "winning battles."
done
UnknownText_0x9f35b:
Text_BattleTowerBugCatcher: ; 0x9f35b
text "I'm trying to see"
line "how far I can go"

10
maps/BattleTowerBattleRoom.asm
View File

@@ -42,7 +42,7 @@ UnknownScript_0x9f425:
applymovement $3, MovementData_0x9e59c
applymovement PLAYER, MovementData_0x9e5a7
loadfont
writetext UnknownText_0x9ee92
writetext Text_YourPkmnWillBeHealedToFullHealth
closetext
loadmovesprites
playmusic MUSIC_HEAL
@@ -52,7 +52,7 @@ UnknownScript_0x9f425:
special FadeInBGMap
special RestartMapMusic
loadfont
writetext UnknownText_0x9eebc
writetext Text_NextUpOpponentNo
yesorno
iffalse UnknownScript_0x9f483
UnknownScript_0x9f477:
@@ -62,7 +62,7 @@ UnknownScript_0x9f477:
jump UnknownScript_0x9f425
UnknownScript_0x9f483:
writetext UnknownText_0x9ef5e
writetext Text_SaveAndEndTheSession
yesorno
iffalse UnknownScript_0x9f4a3
writebyte $7
@@ -76,7 +76,7 @@ UnknownScript_0x9f483:
special FadeBlackBGMap
special Reset
UnknownScript_0x9f4a3:
writetext UnknownText_0x9efbf
writetext Text_CancelYourBattleRoomChallenge
yesorno
iffalse UnknownScript_0x9f477
writebyte $4
@@ -126,7 +126,7 @@ UnknownScript_0x9f4f7:
special Function170687
loadfont
writetext UnknownText_0x9ea49
writetext UnknownText_0x9ec09
writetext Text_WeHopeToServeYouAgain
closetext
loadmovesprites
end

2
maps/BattleTowerHallway.asm
View File

@@ -67,7 +67,7 @@ UnknownScript_0x9f618:
UnknownScript_0x9f61f:
faceperson PLAYER, $2
loadfont
writetext UnknownText_0x9ec26
writetext Text_PleaseStepThisWay
closetext
loadmovesprites
stopfollow

20
misc/mobile_5f.asm
View File

@@ -425,19 +425,29 @@ Function17d1f1: ; 17d1f1
ret
; 17d224
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Parameter: [ScriptVar] = 0..1
;
; if [ScriptVar] == 0
; Show japanese menu options
; - News - News - ??? - Cancel
; if [ScriptVar] == 1
; Show BattleTower-Menu with 3 options in english language
; - Challenge - Explanation - Cancel
Special_Menu_ChallengeExplanationCancel: ; 17d224
ld a, [ScriptVar]
and a
jr nz, .asm_17d234
ld a, $4
ld [ScriptVar], a
ld hl, MenuDataHeader_17d26a
ld hl, MenuDataHeader_17d26a ; Japanese Menu, where you can choose 'News' as an option
jr .asm_17d23c
.asm_17d234
ld a, $4
ld [ScriptVar], a
ld hl, MenuDataHeader_17d28f
ld hl, MenuDataHeader_ChallengeExplanationCancel ; English Menu
.asm_17d23c
call LoadMenuDataHeader
@@ -488,14 +498,14 @@ MenuData2_17d272: ; 17d272
db "やめる@"
; 17d28f
MenuDataHeader_17d28f: ; 17d28f
MenuDataHeader_ChallengeExplanationCancel: ; 17d28f
db $40 ; flags
db 0, 0 ; start coords
db 7, 14 ; end coords
dw MenuData2_17d297
dw MenuData2_ChallengeExplanationCancel
db 1 ; default option
MenuData2_17d297: ; 17d297
MenuData2_ChallengeExplanationCancel: ; 17d297
db $a0 ; flags
db 3
db "Challenge@"