changed BattleTower-Labels

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

View File

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

View File

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

View File

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

View File

@ -425,19 +425,29 @@ Function17d1f1: ; 17d1f1
ret ret
; 17d224 ; 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 Special_Menu_ChallengeExplanationCancel: ; 17d224
ld a, [ScriptVar] ld a, [ScriptVar]
and a and a
jr nz, .asm_17d234 jr nz, .asm_17d234
ld a, $4 ld a, $4
ld [ScriptVar], a ld [ScriptVar], a
ld hl, MenuDataHeader_17d26a ld hl, MenuDataHeader_17d26a ; Japanese Menu, where you can choose 'News' as an option
jr .asm_17d23c jr .asm_17d23c
.asm_17d234 .asm_17d234
ld a, $4 ld a, $4
ld [ScriptVar], a ld [ScriptVar], a
ld hl, MenuDataHeader_17d28f ld hl, MenuDataHeader_ChallengeExplanationCancel ; English Menu
.asm_17d23c .asm_17d23c
call LoadMenuDataHeader call LoadMenuDataHeader
@ -488,14 +498,14 @@ MenuData2_17d272: ; 17d272
db "やめる@" db "やめる@"
; 17d28f ; 17d28f
MenuDataHeader_17d28f: ; 17d28f MenuDataHeader_ChallengeExplanationCancel: ; 17d28f
db $40 ; flags db $40 ; flags
db 0, 0 ; start coords db 0, 0 ; start coords
db 7, 14 ; end coords db 7, 14 ; end coords
dw MenuData2_17d297 dw MenuData2_ChallengeExplanationCancel
db 1 ; default option db 1 ; default option
MenuData2_17d297: ; 17d297 MenuData2_ChallengeExplanationCancel: ; 17d297
db $a0 ; flags db $a0 ; flags
db 3 db 3
db "Challenge@" db "Challenge@"