thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-11-14 09:06:41 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #323 from KqesaR/master

Browse source 
Clean many labels of scripts of gyms
This commit is contained in:
Daniel Harding 2021-05-31 15:42:41 -05:00 committed by GitHub
parent f9ae7b1240 a448ac897d
commit c5bb400e08
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 547 additions and 543 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
scripts/CeladonGym.asm
View file

@ -22,7 +22,7 @@ CeladonGym_Script:
.LeaderName: .LeaderName:
db "ERIKA@" db "ERIKA@"
CeladonGymText_48943: CeladonGymResetScripts:
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld [wCeladonGymCurScript], a ld [wCeladonGymCurScript], a
@ -33,16 +33,16 @@ CeladonGym_ScriptPointers:
dw CheckFightingMapTrainers dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle dw EndTrainerBattle
dw CeladonGymScript3 dw CeladonGymErikaPostBattle
CeladonGymScript3: CeladonGymErikaPostBattle:
ld a, [wIsInBattle] ld a, [wIsInBattle]
cp $ff cp $ff
jp z, CeladonGymText_48943 jp z, CeladonGymResetScripts
ld a, $f0 ld a, $f0
ld [wJoyIgnore], a ld [wJoyIgnore], a
CeladonGymText_48963: CeladonGymReceiveTM21:
ld a, $9 ld a, $9
ldh [hSpriteIndexOrTextID], a ldh [hSpriteIndexOrTextID], a
call DisplayTextID call DisplayTextID
@ -68,19 +68,19 @@ CeladonGymText_48963:
; deactivate gym trainers ; deactivate gym trainers
SetEventRange EVENT_BEAT_CELADON_GYM_TRAINER_0, EVENT_BEAT_CELADON_GYM_TRAINER_6 SetEventRange EVENT_BEAT_CELADON_GYM_TRAINER_0, EVENT_BEAT_CELADON_GYM_TRAINER_6
jp CeladonGymText_48943 jp CeladonGymResetScripts
CeladonGym_TextPointers: CeladonGym_TextPointers:
dw CeladonGymText1 dw ErikaText
dw CeladonGymText2 dw CeladonGymTrainerText1
dw CeladonGymText3 dw CeladonGymTrainerText2
dw CeladonGymText4 dw CeladonGymTrainerText3
dw CeladonGymText5 dw CeladonGymTrainerText4
dw CeladonGymText6 dw CeladonGymTrainerText5
dw CeladonGymText7 dw CeladonGymTrainerText6
dw CeladonGymText8 dw CeladonGymTrainerText7
dw CeladonGymText9 dw ErikaRainbowBadgeInfoText
dw TM21Text dw ReceivedTM21Text
dw TM21NoRoomText dw TM21NoRoomText
CeladonGymTrainerHeaders: CeladonGymTrainerHeaders:
@ -101,27 +101,27 @@ CeladonGymTrainerHeader6:
trainer EVENT_BEAT_CELADON_GYM_TRAINER_6, 3, CeladonGymBattleText8, CeladonGymEndBattleText8, CeladonGymAfterBattleText8 trainer EVENT_BEAT_CELADON_GYM_TRAINER_6, 3, CeladonGymBattleText8, CeladonGymEndBattleText8, CeladonGymAfterBattleText8
db -1 ; end db -1 ; end
CeladonGymText1: ErikaText:
text_asm text_asm
CheckEvent EVENT_BEAT_ERIKA CheckEvent EVENT_BEAT_ERIKA
jr z, .beginBattle jr z, .beforeBeat
CheckEventReuseA EVENT_GOT_TM21 CheckEventReuseA EVENT_GOT_TM21
jr nz, .afterVictory jr nz, .afterBeat
call z, CeladonGymText_48963 call z, CeladonGymReceiveTM21
call DisableWaitingAfterTextDisplay call DisableWaitingAfterTextDisplay
jr .done jr .done
.afterVictory .afterBeat
ld hl, CeladonGymText_48a68 ld hl, ErikaPostBattleAdviceText
call PrintText call PrintText
jr .done jr .done
.beginBattle .beforeBeat
ld hl, CeladonGymText_48a5e ld hl, ErikaPreBattleText
call PrintText call PrintText
ld hl, wd72d ld hl, wd72d
set 6, [hl] set 6, [hl]
set 7, [hl] set 7, [hl]
ld hl, CeladonGymText_48a63 ld hl, ReceivedRainbowBadgeText
ld de, CeladonGymText_48a63 ld de, ReceivedRainbowBadgeText
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
ldh a, [hSpriteIndex] ldh a, [hSpriteIndex]
ld [wSpriteIndex], a ld [wSpriteIndex], a
@ -135,23 +135,23 @@ CeladonGymText1:
.done .done
jp TextScriptEnd jp TextScriptEnd
CeladonGymText_48a5e: ErikaPreBattleText:
text_far _CeladonGymText_48a5e text_far _ErikaPreBattleText
text_end text_end
CeladonGymText_48a63: ReceivedRainbowBadgeText:
text_far _CeladonGymText_48a63 text_far _ReceivedRainbowBadgeText
text_end text_end
CeladonGymText_48a68: ErikaPostBattleAdviceText:
text_far _CeladonGymText_48a68 text_far _ErikaPostBattleAdviceText
text_end text_end
CeladonGymText9: ErikaRainbowBadgeInfoText:
text_far _CeladonGymText9 text_far _ErikaRainbowBadgeInfoText
text_end text_end
TM21Text: ReceivedTM21Text:
text_far _ReceivedTM21Text text_far _ReceivedTM21Text
sound_get_item_1 sound_get_item_1
text_far _TM21ExplanationText text_far _TM21ExplanationText
@ -161,7 +161,7 @@ TM21NoRoomText:
text_far _TM21NoRoomText text_far _TM21NoRoomText
text_end text_end
CeladonGymText2: CeladonGymTrainerText1:
text_asm text_asm
ld hl, CeladonGymTrainerHeader0 ld hl, CeladonGymTrainerHeader0
call TalkToTrainer call TalkToTrainer
@ -179,7 +179,7 @@ CeladonGymAfterBattleText2:
text_far _CeladonGymAfterBattleText2 text_far _CeladonGymAfterBattleText2
text_end text_end
CeladonGymText3: CeladonGymTrainerText2:
text_asm text_asm
ld hl, CeladonGymTrainerHeader1 ld hl, CeladonGymTrainerHeader1
call TalkToTrainer call TalkToTrainer
@ -197,7 +197,7 @@ CeladonGymAfterBattleText3:
text_far _CeladonGymAfterBattleText3 text_far _CeladonGymAfterBattleText3
text_end text_end
CeladonGymText4: CeladonGymTrainerText3:
text_asm text_asm
ld hl, CeladonGymTrainerHeader2 ld hl, CeladonGymTrainerHeader2
call TalkToTrainer call TalkToTrainer
@ -215,7 +215,7 @@ CeladonGymAfterBattleText4:
text_far _CeladonGymAfterBattleText4 text_far _CeladonGymAfterBattleText4
text_end text_end
CeladonGymText5: CeladonGymTrainerText4:
text_asm text_asm
ld hl, CeladonGymTrainerHeader3 ld hl, CeladonGymTrainerHeader3
call TalkToTrainer call TalkToTrainer
@ -233,7 +233,7 @@ CeladonGymAfterBattleText5:
text_far _CeladonGymAfterBattleText5 text_far _CeladonGymAfterBattleText5
text_end text_end
CeladonGymText6: CeladonGymTrainerText5:
text_asm text_asm
ld hl, CeladonGymTrainerHeader4 ld hl, CeladonGymTrainerHeader4
call TalkToTrainer call TalkToTrainer
@ -251,7 +251,7 @@ CeladonGymAfterBattleText6:
text_far _CeladonGymAfterBattleText6 text_far _CeladonGymAfterBattleText6
text_end text_end
CeladonGymText7: CeladonGymTrainerText6:
text_asm text_asm
ld hl, CeladonGymTrainerHeader5 ld hl, CeladonGymTrainerHeader5
call TalkToTrainer call TalkToTrainer
@ -269,7 +269,7 @@ CeladonGymAfterBattleText7:
text_far _CeladonGymAfterBattleText7 text_far _CeladonGymAfterBattleText7
text_end text_end
CeladonGymText8: CeladonGymTrainerText7:
text_asm text_asm
ld hl, CeladonGymTrainerHeader6 ld hl, CeladonGymTrainerHeader6
call TalkToTrainer call TalkToTrainer

94
scripts/CeruleanGym.asm
View file

@ -22,7 +22,7 @@ CeruleanGym_Script:
.LeaderName: .LeaderName:
db "MISTY@" db "MISTY@"
CeruleanGymScript_5c6ed: CeruleanGymResetScripts:
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld [wCeruleanGymCurScript], a ld [wCeruleanGymCurScript], a
@ -33,16 +33,16 @@ CeruleanGym_ScriptPointers:
dw CheckFightingMapTrainers dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle dw EndTrainerBattle
dw CeruleanGymScript3 dw CeruleanGymMistyPostBattle
CeruleanGymScript3: CeruleanGymMistyPostBattle:
ld a, [wIsInBattle] ld a, [wIsInBattle]
cp $ff cp $ff
jp z, CeruleanGymScript_5c6ed jp z, CeruleanGymResetScripts
ld a, $f0 ld a, $f0
ld [wJoyIgnore], a ld [wJoyIgnore], a
CeruleanGymScript_5c70d: CeruleanGymReceiveTM11:
ld a, $5 ld a, $5
ldh [hSpriteIndexOrTextID], a ldh [hSpriteIndexOrTextID], a
call DisplayTextID call DisplayTextID
@ -68,16 +68,16 @@ CeruleanGymScript_5c70d:
; deactivate gym trainers ; deactivate gym trainers
SetEvents EVENT_BEAT_CERULEAN_GYM_TRAINER_0, EVENT_BEAT_CERULEAN_GYM_TRAINER_1 SetEvents EVENT_BEAT_CERULEAN_GYM_TRAINER_0, EVENT_BEAT_CERULEAN_GYM_TRAINER_1
jp CeruleanGymScript_5c6ed jp CeruleanGymResetScripts
CeruleanGym_TextPointers: CeruleanGym_TextPointers:
dw CeruleanGymText1 dw MistyText
dw CeruleanGymText2 dw CeruleanGymTrainerText1
dw CeruleanGymText3 dw CeruleanGymTrainerText2
dw CeruleanGymText4 dw CeruleanGymGuideText
dw CeruleanGymText5 dw MistyCascadeBadgeInfoText
dw CeruleanGymText6 dw ReceivedTM11Text
dw CeruleanGymText7 dw TM11NoRoomText
CeruleanGymTrainerHeaders: CeruleanGymTrainerHeaders:
def_trainers 2 def_trainers 2
@ -87,27 +87,27 @@ CeruleanGymTrainerHeader1:
trainer EVENT_BEAT_CERULEAN_GYM_TRAINER_1, 3, CeruleanGymBattleText2, CeruleanGymEndBattleText2, CeruleanGymAfterBattleText2 trainer EVENT_BEAT_CERULEAN_GYM_TRAINER_1, 3, CeruleanGymBattleText2, CeruleanGymEndBattleText2, CeruleanGymAfterBattleText2
db -1 ; end db -1 ; end
CeruleanGymText1: MistyText:
text_asm text_asm
CheckEvent EVENT_BEAT_MISTY CheckEvent EVENT_BEAT_MISTY
jr z, .beginBattle jr z, .beforeBeat
CheckEventReuseA EVENT_GOT_TM11 CheckEventReuseA EVENT_GOT_TM11
jr nz, .afterVictory jr nz, .afterBeat
call z, CeruleanGymScript_5c70d call z, CeruleanGymReceiveTM11
call DisableWaitingAfterTextDisplay call DisableWaitingAfterTextDisplay
jr .done jr .done
.afterVictory .afterBeat
ld hl, CeruleanGymText_5c7c3 ld hl, TM11ExplanationText
call PrintText call PrintText
jr .done jr .done
.beginBattle .beforeBeat
ld hl, CeruleanGymText_5c7be ld hl, MistyPreBattleText
call PrintText call PrintText
ld hl, wd72d ld hl, wd72d
set 6, [hl] set 6, [hl]
set 7, [hl] set 7, [hl]
ld hl, CeruleanGymText_5c7d8 ld hl, ReceivedCascadeBadgeText
ld de, CeruleanGymText_5c7d8 ld de, ReceivedCascadeBadgeText
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
ldh a, [hSpriteIndex] ldh a, [hSpriteIndex]
ld [wSpriteIndex], a ld [wSpriteIndex], a
@ -122,34 +122,34 @@ CeruleanGymText1:
.done .done
jp TextScriptEnd jp TextScriptEnd
CeruleanGymText_5c7be: MistyPreBattleText:
text_far _CeruleanGymText_5c7be text_far _MistyPreBattleText
text_end text_end
CeruleanGymText_5c7c3: TM11ExplanationText:
text_far _CeruleanGymText_5c7c3 text_far _TM11ExplanationText
text_end text_end
CeruleanGymText5: MistyCascadeBadgeInfoText:
text_far _CeruleanGymText_5c7c8 text_far _MistyCascadeBadgeInfoText
text_end text_end
CeruleanGymText6: ReceivedTM11Text:
text_far _ReceivedTM11Text text_far _ReceivedTM11Text
sound_get_item_1 sound_get_item_1
text_end text_end
CeruleanGymText7: TM11NoRoomText:
text_far _CeruleanGymText_5c7d3 text_far _TM11NoRoomText
text_end text_end
CeruleanGymText_5c7d8: ReceivedCascadeBadgeText:
text_far _CeruleanGymText_5c7d8 text_far _ReceivedCascadeBadgeText
sound_get_key_item ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded sound_get_key_item ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded
text_promptbutton text_promptbutton
text_end text_end
CeruleanGymText2: CeruleanGymTrainerText1:
text_asm text_asm
ld hl, CeruleanGymTrainerHeader0 ld hl, CeruleanGymTrainerHeader0
call TalkToTrainer call TalkToTrainer
@ -167,7 +167,7 @@ CeruleanGymAfterBattleText1:
text_far _CeruleanGymAfterBattleText1 text_far _CeruleanGymAfterBattleText1
text_end text_end
CeruleanGymText3: CeruleanGymTrainerText2:
text_asm text_asm
ld hl, CeruleanGymTrainerHeader1 ld hl, CeruleanGymTrainerHeader1
call TalkToTrainer call TalkToTrainer
@ -185,23 +185,23 @@ CeruleanGymAfterBattleText2:
text_far _CeruleanGymAfterBattleText2 text_far _CeruleanGymAfterBattleText2
text_end text_end
CeruleanGymText4: CeruleanGymGuideText:
text_asm text_asm
CheckEvent EVENT_BEAT_MISTY CheckEvent EVENT_BEAT_MISTY
jr nz, .asm_5c821 jr nz, .afterBeat
ld hl, CeruleanGymText_5c82a ld hl, CeruleanGymGuidePreBattleText
call PrintText call PrintText
jr .asm_5c827 jr .done
.asm_5c821 .afterBeat
ld hl, CeruleanGymText_5c82f ld hl, CeruleanGymGuidePostBattleText
call PrintText call PrintText
.asm_5c827 .done
jp TextScriptEnd jp TextScriptEnd
CeruleanGymText_5c82a: CeruleanGymGuidePreBattleText:
text_far _CeruleanGymText_5c82a text_far _CeruleanGymGuidePreBattleText
text_end text_end
CeruleanGymText_5c82f: CeruleanGymGuidePostBattleText:
text_far _CeruleanGymText_5c82f text_far _CeruleanGymGuidePostBattleText
text_end text_end

299
scripts/CinnabarGym.asm
View file

@ -1,11 +1,11 @@
CinnabarGym_Script: CinnabarGym_Script:
call CinnabarGymScript_75759 call CinnabarGymSetMapAndTiles
call EnableAutoTextBoxDrawing call EnableAutoTextBoxDrawing
ld hl, CinnabarGym_ScriptPointers ld hl, CinnabarGym_ScriptPointers
ld a, [wCinnabarGymCurScript] ld a, [wCinnabarGymCurScript]
jp CallFunctionInTable jp CallFunctionInTable
CinnabarGymScript_75759: CinnabarGymSetMapAndTiles:
ld hl, wCurrentMapScriptFlags ld hl, wCurrentMapScriptFlags
bit 6, [hl] bit 6, [hl]
res 6, [hl] res 6, [hl]
@ -29,7 +29,7 @@ CinnabarGymScript_75759:
.LeaderName: .LeaderName:
db "BLAINE@" db "BLAINE@"
CinnabarGymScript_75792: CinnabarGymResetScripts:
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld [wCinnabarGymCurScript], a ld [wCinnabarGymCurScript], a
@ -37,7 +37,7 @@ CinnabarGymScript_75792:
ld [wOpponentAfterWrongAnswer], a ld [wOpponentAfterWrongAnswer], a
ret ret
CinnabarGymScript_757a0: CinnabarGymSetTrainerHeader:
ldh a, [hSpriteIndexOrTextID] ldh a, [hSpriteIndexOrTextID]
ld [wTrainerHeaderFlagBit], a ld [wTrainerHeaderFlagBit], a
ret ret
@ -46,7 +46,7 @@ CinnabarGym_ScriptPointers:
dw CinnabarGymScript0 dw CinnabarGymScript0
dw CinnabarGymScript1 dw CinnabarGymScript1
dw CinnabarGymScript2 dw CinnabarGymScript2
dw CinnabarGymScript3 dw CinnabarGymBlainePostBattle
CinnabarGymScript0: CinnabarGymScript0:
ld a, [wOpponentAfterWrongAnswer] ld a, [wOpponentAfterWrongAnswer]
@ -57,25 +57,25 @@ CinnabarGymScript0:
jr nz, .asm_757c3 jr nz, .asm_757c3
ld a, PLAYER_DIR_DOWN ld a, PLAYER_DIR_DOWN
ld [wPlayerMovingDirection], a ld [wPlayerMovingDirection], a
ld de, MovementData_757d7 ld de, MovementNpcToLeftAndUp
jr .asm_757cb jr .MoveSprite
.asm_757c3 .asm_757c3
ld de, MovementData_757da ld de, MovementNpcToLeft
ld a, PLAYER_DIR_RIGHT ld a, PLAYER_DIR_RIGHT
ld [wPlayerMovingDirection], a ld [wPlayerMovingDirection], a
.asm_757cb .MoveSprite
call MoveSprite call MoveSprite
ld a, $1 ld a, $1
ld [wCinnabarGymCurScript], a ld [wCinnabarGymCurScript], a
ld [wCurMapScript], a ld [wCurMapScript], a
ret ret
MovementData_757d7: MovementNpcToLeftAndUp:
db NPC_MOVEMENT_LEFT db NPC_MOVEMENT_LEFT
db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP
db -1 ; end db -1 ; end
MovementData_757da: MovementNpcToLeft:
db NPC_MOVEMENT_LEFT db NPC_MOVEMENT_LEFT
db -1 ; end db -1 ; end
@ -96,7 +96,7 @@ CinnabarGymFlagAction:
CinnabarGymScript2: CinnabarGymScript2:
ld a, [wIsInBattle] ld a, [wIsInBattle]
cp $ff cp $ff
jp z, CinnabarGymScript_75792 jp z, CinnabarGymResetScripts
ld a, [wTrainerHeaderFlagBit] ld a, [wTrainerHeaderFlagBit]
ldh [hGymGateIndex], a ldh [hGymGateIndex], a
AdjustEventBit EVENT_BEAT_CINNABAR_GYM_TRAINER_0, 2 AdjustEventBit EVENT_BEAT_CINNABAR_GYM_TRAINER_0, 2
@ -135,13 +135,14 @@ CinnabarGymScript2:
ld [wCurMapScript], a ld [wCurMapScript], a
ret ret
CinnabarGymScript3: CinnabarGymBlainePostBattle:
ld a, [wIsInBattle] ld a, [wIsInBattle]
cp $ff cp $ff
jp z, CinnabarGymScript_75792 jp z, CinnabarGymResetScripts
ld a, $f0 ld a, $f0
ld [wJoyIgnore], a ld [wJoyIgnore], a
CinnabarGymScript3_75857: ; fallthrough
CinnabarGymReceiveTM38:
ld a, $a ld a, $a
ldh [hSpriteIndexOrTextID], a ldh [hSpriteIndexOrTextID], a
call DisplayTextID call DisplayTextID
@ -170,19 +171,19 @@ CinnabarGymScript3_75857:
ld hl, wCurrentMapScriptFlags ld hl, wCurrentMapScriptFlags
set 5, [hl] set 5, [hl]
jp CinnabarGymScript_75792 jp CinnabarGymResetScripts
CinnabarGym_TextPointers: CinnabarGym_TextPointers:
dw CinnabarGymText1 dw BlaineText
dw CinnabarGymText2 dw CinnabarGymTrainerText1
dw CinnabarGymText3 dw CinnabarGymTrainerText2
dw CinnabarGymText4 dw CinnabarGymTrainerText3
dw CinnabarGymText5 dw CinnabarGymTrainerText4
dw CinnabarGymText6 dw CinnabarGymTrainerText5
dw CinnabarGymText7 dw CinnabarGymTrainerText6
dw CinnabarGymText8 dw CinnabarGymTrainerText7
dw CinnabarGymText9 dw CinnabarGymGuideText
dw BlaineBadgeText dw BlaineVolcanoBadgeInfoText
dw ReceivedTM38Text dw ReceivedTM38Text
dw TM38NoRoomText dw TM38NoRoomText
@ -206,45 +207,45 @@ CinnabarGymScript_758b7:
ld [wCurMapScript], a ld [wCurMapScript], a
jp TextScriptEnd jp TextScriptEnd
CinnabarGymText1: BlaineText:
text_asm text_asm
CheckEvent EVENT_BEAT_BLAINE CheckEvent EVENT_BEAT_BLAINE
jr z, .beginBattle jr z, .beforeBeat
CheckEventReuseA EVENT_GOT_TM38 CheckEventReuseA EVENT_GOT_TM38
jr nz, .afterVictory jr nz, .afterBeat
call z, CinnabarGymScript3_75857 call z, CinnabarGymReceiveTM38
call DisableWaitingAfterTextDisplay call DisableWaitingAfterTextDisplay
jp TextScriptEnd jp TextScriptEnd
.afterVictory .afterBeat
ld hl, BlaineFireBlastText ld hl, BlainePostBattleAdviceText
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
.beginBattle .beforeBeat
ld hl, BlaineBattleText ld hl, BlainePreBattleText
call PrintText call PrintText
ld hl, BlaineEndBattleText ld hl, ReceivedVolcanoBadgeText
ld de, BlaineEndBattleText ld de, ReceivedVolcanoBadgeText
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
ld a, $7 ld a, $7
ld [wGymLeaderNo], a ld [wGymLeaderNo], a
jp CinnabarGymScript_758b7 jp CinnabarGymScript_758b7
BlaineBattleText: BlainePreBattleText:
text_far _BlaineBattleText text_far _BlainePreBattleText
text_end text_end
BlaineEndBattleText: ReceivedVolcanoBadgeText:
text_far _BlaineEndBattleText text_far _ReceivedVolcanoBadgeText
sound_get_key_item ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded sound_get_key_item ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded
text_waitbutton text_waitbutton
text_end text_end
BlaineFireBlastText: BlainePostBattleAdviceText:
text_far _BlaineFireBlastText text_far _BlainePostBattleAdviceText
text_end text_end
BlaineBadgeText: BlaineVolcanoBadgeInfoText:
text_far _BlaineBadgeText text_far _BlaineVolcanoBadgeInfoText
text_end text_end
ReceivedTM38Text: ReceivedTM38Text:
@ -257,218 +258,218 @@ TM38NoRoomText:
text_far _TM38NoRoomText text_far _TM38NoRoomText
text_end text_end
CinnabarGymText2: CinnabarGymTrainerText1:
text_asm text_asm
call CinnabarGymScript_757a0 call CinnabarGymSetTrainerHeader
CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_0 CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_0
jr nz, .asm_46bb4 jr nz, .asm_46bb4
ld hl, CinnabarGymText_7595f ld hl, CinnabarGymBattleText2
call PrintText call PrintText
ld hl, CinnabarGymText_75964 ld hl, CinnabarGymEndBattleText2
ld de, CinnabarGymText_75964 ld de, CinnabarGymEndBattleText2
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
jp CinnabarGymScript_758b7 jp CinnabarGymScript_758b7
.asm_46bb4 .asm_46bb4
ld hl, CinnabarGymText_75969 ld hl, CinnabarGymAfterBattleText2
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
CinnabarGymText_7595f: CinnabarGymBattleText2:
text_far _CinnabarGymText_7595f text_far _CinnabarGymBattleText2
text_end text_end
CinnabarGymText_75964: CinnabarGymEndBattleText2:
text_far _CinnabarGymText_75964 text_far _CinnabarGymEndBattleText2
text_end text_end
CinnabarGymText_75969: CinnabarGymAfterBattleText2:
text_far _CinnabarGymText_75969 text_far _CinnabarGymAfterBattleText2
text_end text_end
CinnabarGymText3: CinnabarGymTrainerText2:
text_asm text_asm
call CinnabarGymScript_757a0 call CinnabarGymSetTrainerHeader
CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_1 CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_1
jr nz, .asm_4b406 jr nz, .asm_4b406
ld hl, CinnabarGymText_75994 ld hl, CinnabarGymBattleText1
call PrintText call PrintText
ld hl, CinnabarGymText_75999 ld hl, CinnabarGymEndBattleText1
ld de, CinnabarGymText_75999 ld de, CinnabarGymEndBattleText1
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
jp CinnabarGymScript_758b7 jp CinnabarGymScript_758b7
.asm_4b406 .asm_4b406
ld hl, CinnabarGymText_7599e ld hl, CinnabarGymAfterBattleText1
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
CinnabarGymText_75994: CinnabarGymBattleText1:
text_far _CinnabarGymText_75994 text_far _CinnabarGymBattleText1
text_end text_end
CinnabarGymText_75999: CinnabarGymEndBattleText1:
text_far _CinnabarGymText_75999 text_far _CinnabarGymEndBattleText1
text_end text_end
CinnabarGymText_7599e: CinnabarGymAfterBattleText1:
text_far _CinnabarGymText_7599e text_far _CinnabarGymAfterBattleText1
text_end text_end
CinnabarGymText4: CinnabarGymTrainerText3:
text_asm text_asm
call CinnabarGymScript_757a0 call CinnabarGymSetTrainerHeader
CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_2 CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_2
jr nz, .asm_c0673 jr nz, .afterBeat
ld hl, CinnabarGymText_759c9 ld hl, CinnabarGymBattleText3
call PrintText call PrintText
ld hl, CinnabarGymText_759ce ld hl, CinnabarGymEndBattleText3
ld de, CinnabarGymText_759ce ld de, CinnabarGymEndBattleText3
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
jp CinnabarGymScript_758b7 jp CinnabarGymScript_758b7
.asm_c0673 .afterBeat
ld hl, CinnabarGymText_759d3 ld hl, CinnabarGymAfterBattleText3
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
CinnabarGymText_759c9: CinnabarGymBattleText3:
text_far _CinnabarGymText_759c9 text_far _CinnabarGymBattleText3
text_end text_end
CinnabarGymText_759ce: CinnabarGymEndBattleText3:
text_far _CinnabarGymText_759ce text_far _CinnabarGymEndBattleText3
text_end text_end
CinnabarGymText_759d3: CinnabarGymAfterBattleText3:
text_far _CinnabarGymText_759d3 text_far _CinnabarGymAfterBattleText3
text_end text_end
CinnabarGymText5: CinnabarGymTrainerText4:
text_asm text_asm
call CinnabarGymScript_757a0 call CinnabarGymSetTrainerHeader
CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_3 CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_3
jr nz, .asm_5cfd7 jr nz, .afterBeat
ld hl, CinnabarGymText_759fe ld hl, CinnabarGymBattleText4
call PrintText call PrintText
ld hl, CinnabarGymText_75a03 ld hl, CinnabarGymEndBattleText4
ld de, CinnabarGymText_75a03 ld de, CinnabarGymEndBattleText4
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
jp CinnabarGymScript_758b7 jp CinnabarGymScript_758b7
.asm_5cfd7 .afterBeat
ld hl, CinnabarGymText_75a08 ld hl, CinnabarGymAfterBattleText4
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
CinnabarGymText_759fe: CinnabarGymBattleText4:
text_far _CinnabarGymText_759fe text_far _CinnabarGymBattleText4
text_end text_end
CinnabarGymText_75a03: CinnabarGymEndBattleText4:
text_far _CinnabarGymText_75a03 text_far _CinnabarGymEndBattleText4
text_end text_end
CinnabarGymText_75a08: CinnabarGymAfterBattleText4:
text_far _CinnabarGymText_75a08 text_far _CinnabarGymAfterBattleText4
text_end text_end
CinnabarGymText6: CinnabarGymTrainerText5:
text_asm text_asm
call CinnabarGymScript_757a0 call CinnabarGymSetTrainerHeader
CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_4 CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_4
jr nz, .asm_776b4 jr nz, .afterBeat
ld hl, CinnabarGymText_75a33 ld hl, CinnabarGymBattleText5
call PrintText call PrintText
ld hl, CinnabarGymText_75a38 ld hl, CinnabarGymEndBattleText5
ld de, CinnabarGymText_75a38 ld de, CinnabarGymEndBattleText5
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
jp CinnabarGymScript_758b7 jp CinnabarGymScript_758b7
.asm_776b4 .afterBeat
ld hl, CinnabarGymText_75a3d ld hl, CinnabarGymAfterBattleText5
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
CinnabarGymText_75a33: CinnabarGymBattleText5:
text_far _CinnabarGymText_75a33 text_far _CinnabarGymBattleText5
text_end text_end
CinnabarGymText_75a38: CinnabarGymEndBattleText5:
text_far _CinnabarGymText_75a38 text_far _CinnabarGymEndBattleText5
text_end text_end
CinnabarGymText_75a3d: CinnabarGymAfterBattleText5:
text_far _CinnabarGymText_75a3d text_far _CinnabarGymAfterBattleText5
text_end text_end
CinnabarGymText7: CinnabarGymTrainerText6:
text_asm text_asm
call CinnabarGymScript_757a0 call CinnabarGymSetTrainerHeader
CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_5 CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_5
jr nz, .asm_2f755 jr nz, .afterBeat
ld hl, CinnabarGymText_75a68 ld hl, CinnabarGymBattleText6
call PrintText call PrintText
ld hl, CinnabarGymText_75a6d ld hl, CinnabarGymEndBattleText6
ld de, CinnabarGymText_75a6d ld de, CinnabarGymEndBattleText6
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
jp CinnabarGymScript_758b7 jp CinnabarGymScript_758b7
.asm_2f755 .afterBeat
ld hl, CinnabarGymText_75a72 ld hl, CinnabarGymAfterBattleText6
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
CinnabarGymText_75a68: CinnabarGymBattleText6:
text_far _CinnabarGymText_75a68 text_far _CinnabarGymBattleText6
text_end text_end
CinnabarGymText_75a6d: CinnabarGymEndBattleText6:
text_far _CinnabarGymText_75a6d text_far _CinnabarGymEndBattleText6
text_end text_end
CinnabarGymText_75a72: CinnabarGymAfterBattleText6:
text_far _CinnabarGymText_75a72 text_far _CinnabarGymAfterBattleText6
text_end text_end
CinnabarGymText8: CinnabarGymTrainerText7:
text_asm text_asm
call CinnabarGymScript_757a0 call CinnabarGymSetTrainerHeader
CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_6 CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_6
jr nz, .asm_d87be jr nz, .afterBeat
ld hl, CinnabarGymText_75a9d ld hl, CinnabarGymBattleText7
call PrintText call PrintText
ld hl, CinnabarGymText_75aa2 ld hl, CinnabarGymEndBattleText7
ld de, CinnabarGymText_75aa2 ld de, CinnabarGymEndBattleText7
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
jp CinnabarGymScript_758b7 jp CinnabarGymScript_758b7
.asm_d87be .afterBeat
ld hl, CinnabarGymText_75aa7 ld hl, CinnabarGymAfterBattleText7
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
CinnabarGymText_75a9d: CinnabarGymBattleText7:
text_far _CinnabarGymText_75a9d text_far _CinnabarGymBattleText7
text_end text_end
CinnabarGymText_75aa2: CinnabarGymEndBattleText7:
text_far _CinnabarGymText_75aa2 text_far _CinnabarGymEndBattleText7
text_end text_end
CinnabarGymText_75aa7: CinnabarGymAfterBattleText7:
text_far _CinnabarGymText_75aa7 text_far _CinnabarGymAfterBattleText7
text_end text_end
CinnabarGymText9: CinnabarGymGuideText:
text_asm text_asm
CheckEvent EVENT_BEAT_BLAINE CheckEvent EVENT_BEAT_BLAINE
jr nz, .asm_627d9 jr nz, .afterBeat
ld hl, CinnabarGymText_75ac2 ld hl, CinnabarGymGuidePreBattleText
jr .asm_0b11d jr .done
.asm_627d9 .afterBeat
ld hl, CinnabarGymText_75ac7 ld hl, CinnabarGymGuidePostBattleText
.asm_0b11d .done
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
CinnabarGymText_75ac2: CinnabarGymGuidePreBattleText:
text_far _CinnabarGymText_75ac2 text_far _CinnabarGymGuidePreBattleText
text_end text_end
CinnabarGymText_75ac7: CinnabarGymGuidePostBattleText:
text_far _CinnabarGymText_75ac7 text_far _CinnabarGymGuidePostBattleText
text_end text_end

99
scripts/FuchsiaGym.asm
View file

@ -24,7 +24,7 @@ FuchsiaGym_Script:
.LeaderName: .LeaderName:
db "KOGA@" db "KOGA@"
FuchsiaGymScript_75477: FuchsiaGymResetScripts:
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld [wFuchsiaGymCurScript], a ld [wFuchsiaGymCurScript], a
@ -35,15 +35,16 @@ FuchsiaGym_ScriptPointers:
dw CheckFightingMapTrainers dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle dw EndTrainerBattle
dw FuchsiaGymScript3 dw FuchsiaGymKogaPostBattle
FuchsiaGymScript3: FuchsiaGymKogaPostBattle:
ld a, [wIsInBattle] ld a, [wIsInBattle]
cp $ff cp $ff
jp z, FuchsiaGymScript_75477 jp z, FuchsiaGymResetScripts
ld a, $f0 ld a, $f0
ld [wJoyIgnore], a ld [wJoyIgnore], a
FuchsiaGymScript3_75497: ; fallthrough
FuchsiaGymReceiveTM06:
ld a, $9 ld a, $9
ldh [hSpriteIndexOrTextID], a ldh [hSpriteIndexOrTextID], a
call DisplayTextID call DisplayTextID
@ -69,20 +70,20 @@ FuchsiaGymScript3_75497:
; deactivate gym trainers ; deactivate gym trainers
SetEventRange EVENT_BEAT_FUCHSIA_GYM_TRAINER_0, EVENT_BEAT_FUCHSIA_GYM_TRAINER_5 SetEventRange EVENT_BEAT_FUCHSIA_GYM_TRAINER_0, EVENT_BEAT_FUCHSIA_GYM_TRAINER_5
jp FuchsiaGymScript_75477 jp FuchsiaGymResetScripts
FuchsiaGym_TextPointers: FuchsiaGym_TextPointers:
dw FuchsiaGymText1 dw KogaText
dw FuchsiaGymText2 dw FuchsiaGymTrainerText1
dw FuchsiaGymText3 dw FuchsiaGymTrainerText2
dw FuchsiaGymText4 dw FuchsiaGymTrainerText3
dw FuchsiaGymText5 dw FuchsiaGymTrainerText4
dw FuchsiaGymText6 dw FuchsiaGymTrainerText5
dw FuchsiaGymText7 dw FuchsiaGymTrainerText6
dw FuchsiaGymText8 dw FuchsiaGymGuideText
dw FuchsiaGymText9 dw KogaSoulBadgeInfoText
dw FuchsiaGymText10 dw ReceivedTM06Text
dw FuchsiaGymText11 dw TM06NoRoomText
FuchsiaGymTrainerHeaders: FuchsiaGymTrainerHeaders:
def_trainers 2 def_trainers 2
@ -100,27 +101,27 @@ FuchsiaGymTrainerHeader5:
trainer EVENT_BEAT_FUCHSIA_GYM_TRAINER_5, 2, FuchsiaGymBattleText6, FuchsiaGymEndBattleText6, FuchsiaGymAfterBattleText6 trainer EVENT_BEAT_FUCHSIA_GYM_TRAINER_5, 2, FuchsiaGymBattleText6, FuchsiaGymEndBattleText6, FuchsiaGymAfterBattleText6
db -1 ; end db -1 ; end
FuchsiaGymText1: KogaText:
text_asm text_asm
CheckEvent EVENT_BEAT_KOGA CheckEvent EVENT_BEAT_KOGA
jr z, .beginBattle jr z, .beforeBeat
CheckEventReuseA EVENT_GOT_TM06 CheckEventReuseA EVENT_GOT_TM06
jr nz, .afterVictory jr nz, .afterBeat
call z, FuchsiaGymScript3_75497 call z, FuchsiaGymReceiveTM06
call DisableWaitingAfterTextDisplay call DisableWaitingAfterTextDisplay
jr .done jr .done
.afterVictory .afterBeat
ld hl, KogaExplainToxicText ld hl, KogaPostBattleAdviceText
call PrintText call PrintText
jr .done jr .done
.beginBattle .beforeBeat
ld hl, KogaBeforeBattleText ld hl, KogaBeforeBattleText
call PrintText call PrintText
ld hl, wd72d ld hl, wd72d
set 6, [hl] set 6, [hl]
set 7, [hl] set 7, [hl]
ld hl, KogaAfterBattleText ld hl, ReceivedSoulBadgeText
ld de, KogaAfterBattleText ld de, ReceivedSoulBadgeText
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
ldh a, [hSpriteIndex] ldh a, [hSpriteIndex]
ld [wSpriteIndex], a ld [wSpriteIndex], a
@ -139,19 +140,19 @@ KogaBeforeBattleText:
text_far _KogaBeforeBattleText text_far _KogaBeforeBattleText
text_end text_end
KogaAfterBattleText: ReceivedSoulBadgeText:
text_far _KogaAfterBattleText text_far _ReceivedSoulBadgeText
text_end text_end
KogaExplainToxicText: KogaPostBattleAdviceText:
text_far _KogaExplainToxicText text_far _KogaPostBattleAdviceText
text_end text_end
FuchsiaGymText9: KogaSoulBadgeInfoText:
text_far _FuchsiaGymText9 text_far _KogaSoulBadgeInfoText
text_end text_end
FuchsiaGymText10: ReceivedTM06Text:
text_far _ReceivedTM06Text text_far _ReceivedTM06Text
sound_get_key_item sound_get_key_item
@ -159,11 +160,11 @@ TM06ExplanationText:
text_far _TM06ExplanationText text_far _TM06ExplanationText
text_end text_end
FuchsiaGymText11: TM06NoRoomText:
text_far _TM06NoRoomText text_far _TM06NoRoomText
text_end text_end
FuchsiaGymText2: FuchsiaGymTrainerText1:
text_asm text_asm
ld hl, FuchsiaGymTrainerHeader0 ld hl, FuchsiaGymTrainerHeader0
call TalkToTrainer call TalkToTrainer
@ -181,7 +182,7 @@ FuchsiaGymAfterBattleText1:
text_far _FuchsiaGymAfterBattleText1 text_far _FuchsiaGymAfterBattleText1
text_end text_end
FuchsiaGymText3: FuchsiaGymTrainerText2:
text_asm text_asm
ld hl, FuchsiaGymTrainerHeader1 ld hl, FuchsiaGymTrainerHeader1
call TalkToTrainer call TalkToTrainer
@ -199,7 +200,7 @@ FuchsiaGymAfterBattleText2:
text_far _FuchsiaGymAfterBattleText2 text_far _FuchsiaGymAfterBattleText2
text_end text_end
FuchsiaGymText4: FuchsiaGymTrainerText3:
text_asm text_asm
ld hl, FuchsiaGymTrainerHeader2 ld hl, FuchsiaGymTrainerHeader2
call TalkToTrainer call TalkToTrainer
@ -217,7 +218,7 @@ FuchsiaGymAfterBattleText3:
text_far _FuchsiaGymAfterBattleText3 text_far _FuchsiaGymAfterBattleText3
text_end text_end
FuchsiaGymText5: FuchsiaGymTrainerText4:
text_asm text_asm
ld hl, FuchsiaGymTrainerHeader3 ld hl, FuchsiaGymTrainerHeader3
call TalkToTrainer call TalkToTrainer
@ -235,7 +236,7 @@ FuchsiaGymAfterBattleText4:
text_far _FuchsiaGymAfterBattleText4 text_far _FuchsiaGymAfterBattleText4
text_end text_end
FuchsiaGymText6: FuchsiaGymTrainerText5:
text_asm text_asm
ld hl, FuchsiaGymTrainerHeader4 ld hl, FuchsiaGymTrainerHeader4
call TalkToTrainer call TalkToTrainer
@ -253,7 +254,7 @@ FuchsiaGymAfterBattleText5:
text_far _FuchsiaGymAfterBattleText5 text_far _FuchsiaGymAfterBattleText5
text_end text_end
FuchsiaGymText7: FuchsiaGymTrainerText6:
text_asm text_asm
ld hl, FuchsiaGymTrainerHeader5 ld hl, FuchsiaGymTrainerHeader5
call TalkToTrainer call TalkToTrainer
@ -271,20 +272,20 @@ FuchsiaGymAfterBattleText6:
text_far _FuchsiaGymAfterBattleText6 text_far _FuchsiaGymAfterBattleText6
text_end text_end
FuchsiaGymText8: FuchsiaGymGuideText:
text_asm text_asm
CheckEvent EVENT_BEAT_KOGA CheckEvent EVENT_BEAT_KOGA
ld hl, FuchsiaGymText_75653 ld hl, FuchsiaGymGuidePostBattleText
jr nz, .asm_50671 jr nz, .afterBeat
ld hl, FuchsiaGymText_7564e ld hl, FuchsiaGymGuidePreBattleText
.asm_50671 .afterBeat
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
FuchsiaGymText_7564e: FuchsiaGymGuidePreBattleText:
text_far _FuchsiaGymText_7564e text_far _FuchsiaGymGuidePreBattleText
text_end text_end
FuchsiaGymText_75653: FuchsiaGymGuidePostBattleText:
text_far _FuchsiaGymText_75653 text_far _FuchsiaGymGuidePostBattleText
text_end text_end

111
scripts/PewterGym.asm
View file

@ -22,7 +22,7 @@ PewterGym_Script:
.LeaderName: .LeaderName:
db "BROCK@" db "BROCK@"
PewterGymScript_5c3bf: PewterGymResetScripts:
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld [wPewterGymCurScript], a ld [wPewterGymCurScript], a
@ -33,15 +33,16 @@ PewterGym_ScriptPointers:
dw CheckFightingMapTrainers dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle dw EndTrainerBattle
dw PewterGymScript3 dw PewterGymBrockPostBattle
PewterGymScript3: PewterGymBrockPostBattle:
ld a, [wIsInBattle] ld a, [wIsInBattle]
cp $ff cp $ff
jp z, PewterGymScript_5c3bf jp z, PewterGymResetScripts
ld a, $f0 ld a, $f0
ld [wJoyIgnore], a ld [wJoyIgnore], a
PewterGymScript_5c3df: ; fallthrough
PewterGymScriptReceiveTM34:
ld a, $4 ld a, $4
ldh [hSpriteIndexOrTextID], a ldh [hSpriteIndexOrTextID], a
call DisplayTextID call DisplayTextID
@ -76,15 +77,15 @@ PewterGymScript_5c3df:
; deactivate gym trainers ; deactivate gym trainers
SetEvent EVENT_BEAT_PEWTER_GYM_TRAINER_0 SetEvent EVENT_BEAT_PEWTER_GYM_TRAINER_0
jp PewterGymScript_5c3bf jp PewterGymResetScripts
PewterGym_TextPointers: PewterGym_TextPointers:
dw PewterGymText1 dw BrockText
dw PewterGymText2 dw PewterGymTrainerText1
dw PewterGymText3 dw PewterGymGuideText
dw PewterGymText4 dw BeforeReceivedTM34Text
dw PewterGymText5 dw ReceivedTM34Text
dw PewterGymText6 dw TM34NoRoomText
PewterGymTrainerHeaders: PewterGymTrainerHeaders:
def_trainers 2 def_trainers 2
@ -92,27 +93,27 @@ PewterGymTrainerHeader0:
trainer EVENT_BEAT_PEWTER_GYM_TRAINER_0, 5, PewterGymBattleText1, PewterGymEndBattleText1, PewterGymAfterBattleText1 trainer EVENT_BEAT_PEWTER_GYM_TRAINER_0, 5, PewterGymBattleText1, PewterGymEndBattleText1, PewterGymAfterBattleText1
db -1 ; end db -1 ; end
PewterGymText1: BrockText:
text_asm text_asm
CheckEvent EVENT_BEAT_BROCK CheckEvent EVENT_BEAT_BROCK
jr z, .beginBattle jr z, .beforeBeat
CheckEventReuseA EVENT_GOT_TM34 CheckEventReuseA EVENT_GOT_TM34
jr nz, .gymVictory jr nz, .afterBeat
call z, PewterGymScript_5c3df call z, PewterGymScriptReceiveTM34
call DisableWaitingAfterTextDisplay call DisableWaitingAfterTextDisplay
jr .done jr .done
.gymVictory .afterBeat
ld hl, PewterGymText_5c4a3 ld hl, BrockPostBattleAdviceText
call PrintText call PrintText
jr .done jr .done
.beginBattle .beforeBeat
ld hl, PewterGymText_5c49e ld hl, BrockPreBattleText
call PrintText call PrintText
ld hl, wd72d ld hl, wd72d
set 6, [hl] set 6, [hl]
set 7, [hl] set 7, [hl]
ld hl, PewterGymText_5c4bc ld hl, ReceivedBoulderBadgeText
ld de, PewterGymText_5c4bc ld de, ReceivedBoulderBadgeText
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
ldh a, [hSpriteIndex] ldh a, [hSpriteIndex]
ld [wSpriteIndex], a ld [wSpriteIndex], a
@ -128,35 +129,35 @@ PewterGymText1:
.done .done
jp TextScriptEnd jp TextScriptEnd
PewterGymText_5c49e: BrockPreBattleText:
text_far _PewterGymText_5c49e text_far _BrockPreBattleText
text_end text_end
PewterGymText_5c4a3: BrockPostBattleAdviceText:
text_far _PewterGymText_5c4a3 text_far _BrockPostBattleAdviceText
text_end text_end
PewterGymText4: BeforeReceivedTM34Text:
text_far _TM34PreReceiveText text_far _BeforeReceivedTM34Text
text_end text_end
PewterGymText5: ReceivedTM34Text:
text_far _ReceivedTM34Text text_far _ReceivedTM34Text
sound_get_item_1 sound_get_item_1
text_far _TM34ExplanationText text_far _TM34ExplanationText
text_end text_end
PewterGymText6: TM34NoRoomText:
text_far _TM34NoRoomText text_far _TM34NoRoomText
text_end text_end
PewterGymText_5c4bc: ReceivedBoulderBadgeText:
text_far _PewterGymText_5c4bc text_far _ReceivedBoulderBadgeText
sound_level_up ; probably supposed to play SFX_GET_ITEM_1 but the wrong music bank is loaded sound_level_up ; probably supposed to play SFX_GET_ITEM_1 but the wrong music bank is loaded
text_far _PewterGymText_5c4c1 text_far _BrockBoulerBadgeInfoText ; Text to tell that the flash technique can be used
text_end text_end
PewterGymText2: PewterGymTrainerText1:
text_asm text_asm
ld hl, PewterGymTrainerHeader0 ld hl, PewterGymTrainerHeader0
call TalkToTrainer call TalkToTrainer
@ -174,49 +175,49 @@ PewterGymAfterBattleText1:
text_far _PewterGymAfterBattleText1 text_far _PewterGymAfterBattleText1
text_end text_end
PewterGymText3: PewterGymGuideText:
text_asm text_asm
ld a, [wBeatGymFlags] ld a, [wBeatGymFlags]
bit BIT_BOULDERBADGE, a bit BIT_BOULDERBADGE, a
jr nz, .asm_5c50c jr nz, .afterBeat
ld hl, PewterGymText_5c515 ld hl, PewterGymGuidePreAdviceText
call PrintText call PrintText
call YesNoChoice call YesNoChoice
ld a, [wCurrentMenuItem] ld a, [wCurrentMenuItem]
and a and a
jr nz, .asm_5c4fe jr nz, .PewterGymGuideBeginAdviceText
ld hl, PewterGymText_5c51a ld hl, PewterGymGuideBeginAdviceText
call PrintText call PrintText
jr .asm_5c504 jr .PewterGymGuideAdviceText
.asm_5c4fe .PewterGymGuideBeginAdviceText
ld hl, PewterGymText_5c524 ld hl, PewterGymText_5c524
call PrintText call PrintText
.asm_5c504 .PewterGymGuideAdviceText
ld hl, PewterGymText_5c51f ld hl, PewterGymGuideAdviceText
call PrintText call PrintText
jr .asm_5c512 jr .done
.asm_5c50c .afterBeat
ld hl, PewterGymText_5c529 ld hl, PewterGymGuidePostBattleText
call PrintText call PrintText
.asm_5c512 .done
jp TextScriptEnd jp TextScriptEnd
PewterGymText_5c515: PewterGymGuidePreAdviceText:
text_far _PewterGymText_5c515 text_far _PewterGymGuidePreAdviceText
text_end text_end
PewterGymText_5c51a: PewterGymGuideBeginAdviceText:
text_far _PewterGymText_5c51a text_far _PewterGymGuideBeginAdviceText
text_end text_end
PewterGymText_5c51f: PewterGymGuideAdviceText:
text_far _PewterGymText_5c51f text_far _PewterGymGuideAdviceText
text_end text_end
PewterGymText_5c524: PewterGymText_5c524:
text_far _PewterGymText_5c524 text_far _PewterGymText_5c524
text_end text_end
PewterGymText_5c529: PewterGymGuidePostBattleText:
text_far _PewterGymText_5c529 text_far _PewterGymGuidePostBattleText
text_end text_end

114
scripts/SaffronGym.asm
View file

@ -22,7 +22,7 @@ SaffronGym_Script:
.LeaderName: .LeaderName:
db "SABRINA@" db "SABRINA@"
SaffronGymText_5d048: SaffronGymResetScripts:
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld [wSaffronGymCurScript], a ld [wSaffronGymCurScript], a
@ -33,16 +33,16 @@ SaffronGym_ScriptPointers:
dw CheckFightingMapTrainers dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle dw EndTrainerBattle
dw SaffronGymScript3 dw SaffronGymSabrinaPostBattle
SaffronGymScript3: SaffronGymSabrinaPostBattle:
ld a, [wIsInBattle] ld a, [wIsInBattle]
cp $ff cp $ff
jp z, SaffronGymText_5d048 jp z, SaffronGymResetScripts
ld a, $f0 ld a, $f0
ld [wJoyIgnore], a ld [wJoyIgnore], a
SaffronGymText_5d068: SaffronGymReceiveTM46:
ld a, $a ld a, $a
ldh [hSpriteIndexOrTextID], a ldh [hSpriteIndexOrTextID], a
call DisplayTextID call DisplayTextID
@ -68,21 +68,21 @@ SaffronGymText_5d068:
; deactivate gym trainers ; deactivate gym trainers
SetEventRange EVENT_BEAT_SAFFRON_GYM_TRAINER_0, EVENT_BEAT_SAFFRON_GYM_TRAINER_6 SetEventRange EVENT_BEAT_SAFFRON_GYM_TRAINER_0, EVENT_BEAT_SAFFRON_GYM_TRAINER_6
jp SaffronGymText_5d048 jp SaffronGymResetScripts
SaffronGym_TextPointers: SaffronGym_TextPointers:
dw SaffronGymText1 dw SabrinaText
dw SaffronGymText2 dw SaffronGymTrainerText1
dw SaffronGymText3 dw SaffronGymTrainerText2
dw SaffronGymText4 dw SaffronGymTrainerText3
dw SaffronGymText5 dw SaffronGymTrainerText4
dw SaffronGymText6 dw SaffronGymTrainerText5
dw SaffronGymText7 dw SaffronGymTrainerText6
dw SaffronGymText8 dw SaffronGymTrainerText7
dw SaffronGymText9 dw SaffronGymGuideText
dw SaffronGymText10 dw KogaMarshBadgeInfoText
dw SaffronGymText11 dw ReceivedTM46Text
dw SaffronGymText12 dw TM46NoRoomText
SaffronGymTrainerHeaders: SaffronGymTrainerHeaders:
def_trainers 2 def_trainers 2
@ -102,27 +102,27 @@ SaffronGymTrainerHeader6:
trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_6, 3, SaffronGymBattleText7, SaffronGymEndBattleText7, SaffronGymAfterBattleText7 trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_6, 3, SaffronGymBattleText7, SaffronGymEndBattleText7, SaffronGymAfterBattleText7
db -1 ; end db -1 ; end
SaffronGymText1: SabrinaText:
text_asm text_asm
CheckEvent EVENT_BEAT_SABRINA CheckEvent EVENT_BEAT_SABRINA
jr z, .beginBattle jr z, .beforeBeat
CheckEventReuseA EVENT_GOT_TM46 CheckEventReuseA EVENT_GOT_TM46
jr nz, .afterVictory jr nz, .afterBeat
call z, SaffronGymText_5d068 call z, SaffronGymReceiveTM46
call DisableWaitingAfterTextDisplay call DisableWaitingAfterTextDisplay
jr .done jr .done
.afterVictory .afterBeat
ld hl, SaffronGymText_5d16e ld hl, SabrinaPostBattleAdviceText
call PrintText call PrintText
jr .done jr .done
.beginBattle .beforeBeat
ld hl, SaffronGymText_5d162 ld hl, SabrinaPreBattleText
call PrintText call PrintText
ld hl, wd72d ld hl, wd72d
set 6, [hl] set 6, [hl]
set 7, [hl] set 7, [hl]
ld hl, SaffronGymText_5d167 ld hl, ReceivedMarshBadgeText
ld de, SaffronGymText_5d167 ld de, ReceivedMarshBadgeText
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
ldh a, [hSpriteIndex] ldh a, [hSpriteIndex]
ld [wSpriteIndex], a ld [wSpriteIndex], a
@ -135,95 +135,95 @@ SaffronGymText1:
.done .done
jp TextScriptEnd jp TextScriptEnd
SaffronGymText_5d162: SabrinaPreBattleText:
text_far _SaffronGymText_5d162 text_far _SabrinaPreBattleText
text_end text_end
SaffronGymText_5d167: ReceivedMarshBadgeText:
text_far _SaffronGymText_5d167 text_far _ReceivedMarshBadgeText
sound_get_key_item ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded sound_get_key_item ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded
text_promptbutton text_promptbutton
text_end text_end
SaffronGymText_5d16e: SabrinaPostBattleAdviceText:
text_far _SaffronGymText_5d16e text_far _SabrinaPostBattleAdviceText
text_end text_end
SaffronGymText10: KogaMarshBadgeInfoText:
text_far _SaffronGymText_5d173 text_far _KogaMarshBadgeInfoText
text_end text_end
SaffronGymText11: ReceivedTM46Text:
text_far ReceivedTM46Text text_far _ReceivedTM46Text
sound_get_item_1 sound_get_item_1
text_far _TM46ExplanationText text_far _TM46ExplanationText
text_end text_end
SaffronGymText12: TM46NoRoomText:
text_far _TM46NoRoomText text_far _TM46NoRoomText
text_end text_end
SaffronGymText2: SaffronGymTrainerText1:
text_asm text_asm
ld hl, SaffronGymTrainerHeader0 ld hl, SaffronGymTrainerHeader0
call TalkToTrainer call TalkToTrainer
jp TextScriptEnd jp TextScriptEnd
SaffronGymText3: SaffronGymTrainerText2:
text_asm text_asm
ld hl, SaffronGymTrainerHeader1 ld hl, SaffronGymTrainerHeader1
call TalkToTrainer call TalkToTrainer
jp TextScriptEnd jp TextScriptEnd
SaffronGymText4: SaffronGymTrainerText3:
text_asm text_asm
ld hl, SaffronGymTrainerHeader2 ld hl, SaffronGymTrainerHeader2
call TalkToTrainer call TalkToTrainer
jp TextScriptEnd jp TextScriptEnd
SaffronGymText5: SaffronGymTrainerText4:
text_asm text_asm
ld hl, SaffronGymTrainerHeader3 ld hl, SaffronGymTrainerHeader3
call TalkToTrainer call TalkToTrainer
jp TextScriptEnd jp TextScriptEnd
SaffronGymText6: SaffronGymTrainerText5:
text_asm text_asm
ld hl, SaffronGymTrainerHeader4 ld hl, SaffronGymTrainerHeader4
call TalkToTrainer call TalkToTrainer
jp TextScriptEnd jp TextScriptEnd
SaffronGymText7: SaffronGymTrainerText6:
text_asm text_asm
ld hl, SaffronGymTrainerHeader5 ld hl, SaffronGymTrainerHeader5
call TalkToTrainer call TalkToTrainer
jp TextScriptEnd jp TextScriptEnd
SaffronGymText8: SaffronGymTrainerText7:
text_asm text_asm
ld hl, SaffronGymTrainerHeader6 ld hl, SaffronGymTrainerHeader6
call TalkToTrainer call TalkToTrainer
jp TextScriptEnd jp TextScriptEnd
SaffronGymText9: SaffronGymGuideText:
text_asm text_asm
CheckEvent EVENT_BEAT_SABRINA CheckEvent EVENT_BEAT_SABRINA
jr nz, .asm_5d1dd jr nz, .afterBeat
ld hl, SaffronGymText_5d1e6 ld hl, SaffronGymGuidePreBattleText
call PrintText call PrintText
jr .asm_5d1e3 jr .done
.asm_5d1dd .afterBeat
ld hl, SaffronGymText_5d1eb ld hl, SaffronGymGuidePostBattleText
call PrintText call PrintText
.asm_5d1e3 .done
jp TextScriptEnd jp TextScriptEnd
SaffronGymText_5d1e6: SaffronGymGuidePreBattleText:
text_far _SaffronGymText_5d1e6 text_far _SaffronGymGuidePreBattleText
text_end text_end
SaffronGymText_5d1eb: SaffronGymGuidePostBattleText:
text_far _SaffronGymText_5d1eb text_far _SaffronGymGuidePostBattleText
text_end text_end
SaffronGymBattleText1: SaffronGymBattleText1:

30
scripts/VermilionGym.asm
View file

@ -94,8 +94,8 @@ VermilionGym_TextPointers:
dw VermilionGymTrainerText1 dw VermilionGymTrainerText1
dw VermilionGymTrainerText2 dw VermilionGymTrainerText2
dw VermilionGymTrainerText3 dw VermilionGymTrainerText3
dw VermilionGymFanText dw VermilionGymGuideText
dw LTSurgeThunderbadgeInfoText dw LTSurgeThunderBadgeInfoText
dw ReceivedTM24Text dw ReceivedTM24Text
dw TM24NoRoomText dw TM24NoRoomText
@ -128,8 +128,8 @@ LTSurgeText:
ld hl, wd72d ld hl, wd72d
set 6, [hl] set 6, [hl]
set 7, [hl] set 7, [hl]
ld hl, ReceivedThunderbadgeText ld hl, ReceivedThunderBadgeText
ld de, ReceivedThunderbadgeText ld de, ReceivedThunderBadgeText
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
ldh a, [hSpriteIndex] ldh a, [hSpriteIndex]
ld [wSpriteIndex], a ld [wSpriteIndex], a
@ -153,8 +153,8 @@ LTSurgePostBattleAdviceText:
text_far _LTSurgePostBattleAdviceText text_far _LTSurgePostBattleAdviceText
text_end text_end
LTSurgeThunderbadgeInfoText: LTSurgeThunderBadgeInfoText:
text_far _LTSurgeThunderbadgeInfoText text_far _LTSurgeThunderBadgeInfoText
text_end text_end
ReceivedTM24Text: ReceivedTM24Text:
@ -167,8 +167,8 @@ TM24NoRoomText:
text_far _TM24NoRoomText text_far _TM24NoRoomText
text_end text_end
ReceivedThunderbadgeText: ReceivedThunderBadgeText:
text_far _ReceivedThunderbadgeText text_far _ReceivedThunderBadgeText
text_end text_end
VermilionGymTrainerText1: VermilionGymTrainerText1:
@ -225,24 +225,24 @@ VermilionGymAfterBattleText3:
text_far _VermilionGymAfterBattleText3 text_far _VermilionGymAfterBattleText3
text_end text_end
VermilionGymFanText: VermilionGymGuideText:
text_asm text_asm
ld a, [wBeatGymFlags] ld a, [wBeatGymFlags]
bit BIT_THUNDERBADGE, a bit BIT_THUNDERBADGE, a
jr nz, .afterBeat jr nz, .afterBeat
ld hl, VermilionGymFanPreBattleText ld hl, VermilionGymGuidePreBattleText
call PrintText call PrintText
jr .done jr .done
.afterBeat .afterBeat
ld hl, VermilionGymFanPostBattleText ld hl, VermilionGymGuidePostBattleText
call PrintText call PrintText
.done .done
jp TextScriptEnd jp TextScriptEnd
VermilionGymFanPreBattleText: VermilionGymGuidePreBattleText:
text_far _VermilionGymFanPreBattleText text_far _VermilionGymGuidePreBattleText
text_end text_end
VermilionGymFanPostBattleText: VermilionGymGuidePostBattleText:
text_far _VermilionGymFanPostBattleText text_far _VermilionGymGuidePostBattleText
text_end text_end

121
scripts/ViridianGym.asm
View file

@ -16,7 +16,7 @@ ViridianGym_Script:
.LeaderName: .LeaderName:
db "GIOVANNI@" db "GIOVANNI@"
ViridianGymScript_748d6: ViridianGymResetScripts:
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld [wViridianGymCurScript], a ld [wViridianGymCurScript], a
@ -27,7 +27,7 @@ ViridianGym_ScriptPointers:
dw ViridianGymScript0 dw ViridianGymScript0
dw DisplayEnemyTrainerTextAndStartBattle dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle dw EndTrainerBattle
dw ViridianGymScript3 dw ViridianGymGiovanniPostBattle
dw ViridianGymScript4 dw ViridianGymScript4
ViridianGymScript0: ViridianGymScript0:
@ -116,7 +116,7 @@ ViridianGymArrowMovement12:
ViridianGymScript4: ViridianGymScript4:
ld a, [wSimulatedJoypadStatesIndex] ld a, [wSimulatedJoypadStatesIndex]
and a and a
jr nz, .asm_74980 jr nz, .ViridianGymLoadSpinnerArrow
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld hl, wd736 ld hl, wd736
@ -124,16 +124,17 @@ ViridianGymScript4:
ld a, $0 ld a, $0
ld [wCurMapScript], a ld [wCurMapScript], a
ret ret
.asm_74980 .ViridianGymLoadSpinnerArrow
farjp LoadSpinnerArrowTiles farjp LoadSpinnerArrowTiles
ViridianGymScript3: ViridianGymGiovanniPostBattle:
ld a, [wIsInBattle] ld a, [wIsInBattle]
cp $ff cp $ff
jp z, ViridianGymScript_748d6 jp z, ViridianGymResetScripts
ld a, $f0 ld a, $f0
ld [wJoyIgnore], a ld [wJoyIgnore], a
ViridianGymScript3_74995: ; fallthrough
ViridianGymReceiveTM27:
ld a, $c ld a, $c
ldh [hSpriteIndexOrTextID], a ldh [hSpriteIndexOrTextID], a
call DisplayTextID call DisplayTextID
@ -163,23 +164,23 @@ ViridianGymScript3_74995:
ld [wMissableObjectIndex], a ld [wMissableObjectIndex], a
predef ShowObject predef ShowObject
SetEvents EVENT_2ND_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE SetEvents EVENT_2ND_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE
jp ViridianGymScript_748d6 jp ViridianGymResetScripts
ViridianGym_TextPointers: ViridianGym_TextPointers:
dw ViridianGymText1 dw GiovanniText
dw ViridianGymText2 dw ViridianGymTrainerText1
dw ViridianGymText3 dw ViridianGymTrainerText2
dw ViridianGymText4 dw ViridianGymTrainerText3
dw ViridianGymText5 dw ViridianGymTrainerText4
dw ViridianGymText6 dw ViridianGymTrainerText5
dw ViridianGymText7 dw ViridianGymTrainerText6
dw ViridianGymText8 dw ViridianGymTrainerText7
dw ViridianGymText9 dw ViridianGymTrainerText8
dw ViridianGymText10 dw ViridianGymGuideText
dw PickUpItemText dw PickUpItemText
dw ViridianGymText12 dw GiovanniEarthBadgeInfoText
dw ViridianGymText13 dw ReceivedTM27Text
dw ViridianGymText14 dw TM27NoRoomText
ViridianGymTrainerHeaders: ViridianGymTrainerHeaders:
def_trainers 2 def_trainers 2
@ -201,19 +202,19 @@ ViridianGymTrainerHeader7:
trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7, 4, ViridianGymBattleText8, ViridianGymEndBattleText8, ViridianGymAfterBattleText8 trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7, 4, ViridianGymBattleText8, ViridianGymEndBattleText8, ViridianGymAfterBattleText8
db -1 ; end db -1 ; end
ViridianGymText1: GiovanniText:
text_asm text_asm
CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI
jr z, .beginBattle jr z, .beforeBeat
CheckEventReuseA EVENT_GOT_TM27 CheckEventReuseA EVENT_GOT_TM27
jr nz, .afterVictory jr nz, .afterBeat
call z, ViridianGymScript3_74995 call z, ViridianGymReceiveTM27
call DisableWaitingAfterTextDisplay call DisableWaitingAfterTextDisplay
jr .done jr .done
.afterVictory .afterBeat
ld a, $1 ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, ViridianGymText_74ad9 ld hl, GiovanniPostBattleAdviceText
call PrintText call PrintText
call GBFadeOutToBlack call GBFadeOutToBlack
ld a, HS_VIRIDIAN_GYM_GIOVANNI ld a, HS_VIRIDIAN_GYM_GIOVANNI
@ -223,14 +224,14 @@ ViridianGymText1:
call Delay3 call Delay3
call GBFadeInFromBlack call GBFadeInFromBlack
jr .done jr .done
.beginBattle .beforeBeat
ld hl, ViridianGymText_74ace ld hl, GiovanniPreBattleText
call PrintText call PrintText
ld hl, wd72d ld hl, wd72d
set 6, [hl] set 6, [hl]
set 7, [hl] set 7, [hl]
ld hl, ViridianGymText_74ad3 ld hl, ReceivedEarthBadgeText
ld de, ViridianGymText_74ad3 ld de, ReceivedEarthBadgeText
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
ldh a, [hSpriteIndex] ldh a, [hSpriteIndex]
ld [wSpriteIndex], a ld [wSpriteIndex], a
@ -243,25 +244,25 @@ ViridianGymText1:
.done .done
jp TextScriptEnd jp TextScriptEnd
ViridianGymText_74ace: GiovanniPreBattleText:
text_far _ViridianGymText_74ace text_far _GiovanniPreBattleText
text_end text_end
ViridianGymText_74ad3: ReceivedEarthBadgeText:
text_far _ViridianGymText_74ad3 text_far _ReceivedEarthBadgeText
sound_level_up ; probably supposed to play SFX_GET_ITEM_1 but the wrong music bank is loaded sound_level_up ; probably supposed to play SFX_GET_ITEM_1 but the wrong music bank is loaded
text_end text_end
ViridianGymText_74ad9: GiovanniPostBattleAdviceText:
text_far _ViridianGymText_74ad9 text_far _GiovanniPostBattleAdviceText
text_waitbutton text_waitbutton
text_end text_end
ViridianGymText12: GiovanniEarthBadgeInfoText:
text_far _ViridianGymText12 text_far _GiovanniEarthBadgeInfoText
text_end text_end
ViridianGymText13: ReceivedTM27Text:
text_far _ReceivedTM27Text text_far _ReceivedTM27Text
sound_get_item_1 sound_get_item_1
@ -269,11 +270,11 @@ TM27ExplanationText:
text_far _TM27ExplanationText text_far _TM27ExplanationText
text_end text_end
ViridianGymText14: TM27NoRoomText:
text_far _TM27NoRoomText text_far _TM27NoRoomText
text_end text_end
ViridianGymText2: ViridianGymTrainerText1:
text_asm text_asm
ld hl, ViridianGymTrainerHeader0 ld hl, ViridianGymTrainerHeader0
call TalkToTrainer call TalkToTrainer
@ -291,7 +292,7 @@ ViridianGymAfterBattleText1:
text_far _ViridianGymAfterBattleText1 text_far _ViridianGymAfterBattleText1
text_end text_end
ViridianGymText3: ViridianGymTrainerText2:
text_asm text_asm
ld hl, ViridianGymTrainerHeader1 ld hl, ViridianGymTrainerHeader1
call TalkToTrainer call TalkToTrainer
@ -309,7 +310,7 @@ ViridianGymAfterBattleText2:
text_far _ViridianGymAfterBattleText2 text_far _ViridianGymAfterBattleText2
text_end text_end
ViridianGymText4: ViridianGymTrainerText3:
text_asm text_asm
ld hl, ViridianGymTrainerHeader2 ld hl, ViridianGymTrainerHeader2
call TalkToTrainer call TalkToTrainer
@ -327,7 +328,7 @@ ViridianGymAfterBattleText3:
text_far _ViridianGymAfterBattleText3 text_far _ViridianGymAfterBattleText3
text_end text_end
ViridianGymText5: ViridianGymTrainerText4:
text_asm text_asm
ld hl, ViridianGymTrainerHeader3 ld hl, ViridianGymTrainerHeader3
call TalkToTrainer call TalkToTrainer
@ -345,7 +346,7 @@ ViridianGymAfterBattleText4:
text_far _ViridianGymAfterBattleText4 text_far _ViridianGymAfterBattleText4
text_end text_end
ViridianGymText6: ViridianGymTrainerText5:
text_asm text_asm
ld hl, ViridianGymTrainerHeader4 ld hl, ViridianGymTrainerHeader4
call TalkToTrainer call TalkToTrainer
@ -363,7 +364,7 @@ ViridianGymAfterBattleText5:
text_far _ViridianGymAfterBattleText5 text_far _ViridianGymAfterBattleText5
text_end text_end
ViridianGymText7: ViridianGymTrainerText6:
text_asm text_asm
ld hl, ViridianGymTrainerHeader5 ld hl, ViridianGymTrainerHeader5
call TalkToTrainer call TalkToTrainer
@ -381,7 +382,7 @@ ViridianGymAfterBattleText6:
text_far _ViridianGymAfterBattleText6 text_far _ViridianGymAfterBattleText6
text_end text_end
ViridianGymText8: ViridianGymTrainerText7:
text_asm text_asm
ld hl, ViridianGymTrainerHeader6 ld hl, ViridianGymTrainerHeader6
call TalkToTrainer call TalkToTrainer
@ -399,7 +400,7 @@ ViridianGymAfterBattleText7:
text_far _ViridianGymAfterBattleText7 text_far _ViridianGymAfterBattleText7
text_end text_end
ViridianGymText9: ViridianGymTrainerText8:
text_asm text_asm
ld hl, ViridianGymTrainerHeader7 ld hl, ViridianGymTrainerHeader7
call TalkToTrainer call TalkToTrainer
@ -417,23 +418,23 @@ ViridianGymAfterBattleText8:
text_far _ViridianGymAfterBattleText8 text_far _ViridianGymAfterBattleText8
text_end text_end
ViridianGymText10: ViridianGymGuideText:
text_asm text_asm
CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI
jr nz, .asm_1abd1 jr nz, .afterBeat
ld hl, ViridianGymText_74bd4 ld hl, ViridianGymGuidePreBattleText
call PrintText call PrintText
jr .asm_6064d jr .done
.asm_1abd1 .afterBeat
ld hl, ViridianGymText_74bd9 ld hl, ViridianGymGuidePostBattleText
call PrintText call PrintText
.asm_6064d .done
jp TextScriptEnd jp TextScriptEnd
ViridianGymText_74bd4: ViridianGymGuidePreBattleText:
text_far _ViridianGymText_74bd4 text_far _ViridianGymGuidePreBattleText
text_end text_end
ViridianGymText_74bd9: ViridianGymGuidePostBattleText:
text_far _ViridianGymText_74bd9 text_far _ViridianGymGuidePostBattleText
text_end text_end

8
text/CeladonGym.asm
View file

@ -1,4 +1,4 @@
_CeladonGymText_48a5e:: _ErikaPreBattleText::
text "Hello. Lovely" text "Hello. Lovely"
line "weather isn't it?" line "weather isn't it?"
cont "It's so pleasant." cont "It's so pleasant."
@ -25,7 +25,7 @@ _CeladonGymText_48a5e::
line "shall not lose." line "shall not lose."
done done
_CeladonGymText_48a63:: _ReceivedRainbowBadgeText::
text "Oh!" text "Oh!"
line "I concede defeat." line "I concede defeat."
@ -36,7 +36,7 @@ _CeladonGymText_48a63::
line "the RAINBOWBADGE." line "the RAINBOWBADGE."
prompt prompt
_CeladonGymText_48a68:: _ErikaPostBattleAdviceText::
text "You are cataloging" text "You are cataloging"
line "#MON? I must" line "#MON? I must"
cont "say I'm impressed." cont "say I'm impressed."
@ -47,7 +47,7 @@ _CeladonGymText_48a68::
cont "unattractive." cont "unattractive."
done done
_CeladonGymText9:: _ErikaRainbowBadgeInfoText::
text "The RAINBOWBADGE" text "The RAINBOWBADGE"
line "will make #MON" line "will make #MON"
cont "up to L50 obey." cont "up to L50 obey."

14
text/CeruleanGym.asm
View file

@ -1,4 +1,4 @@
_CeruleanGymText_5c7be:: _MistyPreBattleText::
text "Hi, you're a new" text "Hi, you're a new"
line "face!" line "face!"
@ -17,7 +17,7 @@ _CeruleanGymText_5c7be::
cont "#MON!" cont "#MON!"
done done
_CeruleanGymText_5c7c3:: _TM11ExplanationText::
text "TM11 teaches" text "TM11 teaches"
line "BUBBLEBEAM!" line "BUBBLEBEAM!"
@ -25,7 +25,7 @@ _CeruleanGymText_5c7c3::
line "aquatic #MON!" line "aquatic #MON!"
done done
_CeruleanGymText_5c7c8:: _MistyCascadeBadgeInfoText::
text "The CASCADEBADGE" text "The CASCADEBADGE"
line "makes all #MON" line "makes all #MON"
cont "up to L30 obey!" cont "up to L30 obey!"
@ -50,12 +50,12 @@ _ReceivedTM11Text::
line "TM11!@" line "TM11!@"
text_end text_end
_CeruleanGymText_5c7d3:: _TM11NoRoomText::
text "You better make" text "You better make"
line "room for this!" line "room for this!"
done done
_CeruleanGymText_5c7d8:: _ReceivedCascadeBadgeText::
text "Wow!" text "Wow!"
line "You're too much!" line "You're too much!"
@ -105,7 +105,7 @@ _CeruleanGymAfterBattleText2::
line "someone like you!" line "someone like you!"
done done
_CeruleanGymText_5c82a:: _CeruleanGymGuidePreBattleText::
text "Yo! Champ in" text "Yo! Champ in"
line "making!" line "making!"
@ -123,7 +123,7 @@ _CeruleanGymText_5c82a::
line "electricity!" line "electricity!"
done done
_CeruleanGymText_5c82f:: _CeruleanGymGuidePostBattleText::
text "You beat MISTY!" text "You beat MISTY!"
line "What'd I tell ya?" line "What'd I tell ya?"

54
text/CinnabarGym.asm
View file

@ -1,4 +1,4 @@
_BlaineBattleText:: _BlainePreBattleText::
text "Hah!" text "Hah!"
para "I am BLAINE! I" para "I am BLAINE! I"
@ -13,7 +13,7 @@ _BlaineBattleText::
line "have BURN HEAL!" line "have BURN HEAL!"
done done
_BlaineEndBattleText:: _ReceivedVolcanoBadgeText::
text "I have" text "I have"
line "burnt out!" line "burnt out!"
@ -21,7 +21,7 @@ _BlaineEndBattleText::
line "the VOLCANOBADGE!@" line "the VOLCANOBADGE!@"
text_end text_end
_BlaineFireBlastText:: _BlainePostBattleAdviceText::
text "FIRE BLAST is the" text "FIRE BLAST is the"
line "ultimate fire" line "ultimate fire"
cont "technique!" cont "technique!"
@ -30,7 +30,7 @@ _BlaineFireBlastText::
line "water #MON!" line "water #MON!"
done done
_BlaineBadgeText:: _BlaineVolcanoBadgeInfoText::
text "Hah!" text "Hah!"
para "The VOLCANOBADGE" para "The VOLCANOBADGE"
@ -68,18 +68,18 @@ _TM38NoRoomText::
line "gift!" line "gift!"
done done
_CinnabarGymText_7595f:: _CinnabarGymBattleText2::
text "Do you know how" text "Do you know how"
line "hot #MON fire" line "hot #MON fire"
cont "breath can get?" cont "breath can get?"
done done
_CinnabarGymText_75964:: _CinnabarGymEndBattleText2::
text "Yow!" text "Yow!"
line "Hot, hot, hot!" line "Hot, hot, hot!"
prompt prompt
_CinnabarGymText_75969:: _CinnabarGymAfterBattleText2::
text "Fire, or to be" text "Fire, or to be"
line "more precise," line "more precise,"
cont "combustion..." cont "combustion..."
@ -88,66 +88,66 @@ _CinnabarGymText_75969::
line "blah..." line "blah..."
done done
_CinnabarGymText_75994:: _CinnabarGymBattleText1::
text "I was a thief, but" text "I was a thief, but"
line "I became straight" line "I became straight"
cont "as a trainer!" cont "as a trainer!"
done done
_CinnabarGymText_75999:: _CinnabarGymEndBattleText1::
text "I" text "I"
line "surrender!" line "surrender!"
prompt prompt
_CinnabarGymText_7599e:: _CinnabarGymAfterBattleText1::
text "I can't help" text "I can't help"
line "stealing other" line "stealing other"
cont "people's #MON!" cont "people's #MON!"
done done
_CinnabarGymText_759c9:: _CinnabarGymBattleText3::
text "You can't win!" text "You can't win!"
line "I have studied" line "I have studied"
cont "#MON totally!" cont "#MON totally!"
done done
_CinnabarGymText_759ce:: _CinnabarGymEndBattleText3::
text "Waah!" text "Waah!"
line "My studies!" line "My studies!"
prompt prompt
_CinnabarGymText_759d3:: _CinnabarGymAfterBattleText3::
text "My theories are" text "My theories are"
line "too complicated" line "too complicated"
cont "for you!" cont "for you!"
done done
_CinnabarGymText_759fe:: _CinnabarGymBattleText4::
text "I just like using" text "I just like using"
line "fire #MON!" line "fire #MON!"
done done
_CinnabarGymText_75a03:: _CinnabarGymEndBattleText4::
text "Too hot" text "Too hot"
line "to handle!" line "to handle!"
prompt prompt
_CinnabarGymText_75a08:: _CinnabarGymAfterBattleText4::
text "I wish there was" text "I wish there was"
line "a thief #MON!" line "a thief #MON!"
cont "I'd use that!" cont "I'd use that!"
done done
_CinnabarGymText_75a33:: _CinnabarGymBattleText5::
text "I know why BLAINE" text "I know why BLAINE"
line "became a trainer!" line "became a trainer!"
done done
_CinnabarGymText_75a38:: _CinnabarGymEndBattleText5::
text "Ow!" text "Ow!"
prompt prompt
_CinnabarGymText_75a3d:: _CinnabarGymAfterBattleText5::
text "BLAINE was lost" text "BLAINE was lost"
line "in the mountains" line "in the mountains"
cont "when a fiery bird" cont "when a fiery bird"
@ -158,40 +158,40 @@ _CinnabarGymText_75a3d::
cont "his way down!" cont "his way down!"
done done
_CinnabarGymText_75a68:: _CinnabarGymBattleText6::
text "I've been to many" text "I've been to many"
line "GYMs, but this is" line "GYMs, but this is"
cont "my favorite!" cont "my favorite!"
done done
_CinnabarGymText_75a6d:: _CinnabarGymEndBattleText6::
text "Yowza!" text "Yowza!"
line "Too hot!" line "Too hot!"
prompt prompt
_CinnabarGymText_75a72:: _CinnabarGymAfterBattleText6::
text "Us fire #MON" text "Us fire #MON"
line "fans like PONYTA" line "fans like PONYTA"
cont "and NINETALES!" cont "and NINETALES!"
done done
_CinnabarGymText_75a9d:: _CinnabarGymBattleText7::
text "Fire is weak" text "Fire is weak"
line "against H2O!" line "against H2O!"
done done
_CinnabarGymText_75aa2:: _CinnabarGymEndBattleText7::
text "Oh!" text "Oh!"
line "Snuffed out!" line "Snuffed out!"
prompt prompt
_CinnabarGymText_75aa7:: _CinnabarGymAfterBattleText7::
text "Water beats fire!" text "Water beats fire!"
line "But, fire melts" line "But, fire melts"
cont "ice #MON!" cont "ice #MON!"
done done
_CinnabarGymText_75ac2:: _CinnabarGymGuidePreBattleText::
text "Yo! Champ in" text "Yo! Champ in"
line "making!" line "making!"
@ -206,7 +206,7 @@ _CinnabarGymText_75ac2::
line "some BURN HEALs!" line "some BURN HEALs!"
done done
_CinnabarGymText_75ac7:: _CinnabarGymGuidePostBattleText::
text "<PLAYER>! You beat" text "<PLAYER>! You beat"
line "that fire brand!" line "that fire brand!"
done done

2
text/FuchsiaGym.asm
View file

@ -16,7 +16,7 @@ _KogaBeforeBattleText::
cont "techniques!" cont "techniques!"
done done
_KogaAfterBattleText:: _ReceivedSoulBadgeText::
text "Humph!" text "Humph!"
line "You have proven" line "You have proven"
cont "your worth!" cont "your worth!"

8
text/FuchsiaGym_2.asm
View file

@ -1,4 +1,4 @@
_KogaExplainToxicText:: _KogaPostBattleAdviceText::
text "When afflicted by" text "When afflicted by"
line "TOXIC, #MON" line "TOXIC, #MON"
cont "suffer more and" cont "suffer more and"
@ -9,7 +9,7 @@ _KogaExplainToxicText::
line "terrorize foes!" line "terrorize foes!"
done done
_FuchsiaGymText9:: _KogaSoulBadgeInfoText::
text "Now that you have" text "Now that you have"
line "the SOULBADGE," line "the SOULBADGE,"
cont "the DEFENSE of" cont "the DEFENSE of"
@ -170,7 +170,7 @@ _FuchsiaGymAfterBattleText6::
cont "choose?" cont "choose?"
done done
_FuchsiaGymText_7564e:: _FuchsiaGymGuidePreBattleText::
text "Yo! Champ in" text "Yo! Champ in"
line "making!" line "making!"
@ -187,7 +187,7 @@ _FuchsiaGymText_7564e::
cont "to reach him!" cont "to reach him!"
done done
_FuchsiaGymText_75653:: _FuchsiaGymGuidePostBattleText::
text "It's amazing how" text "It's amazing how"
line "ninja can terrify" line "ninja can terrify"
cont "even now!" cont "even now!"

2
text/PewterGym.asm
View file

@ -1,4 +1,4 @@
_PewterGymText_5c49e:: _BrockPreBattleText::
text "I'm BROCK!" text "I'm BROCK!"
line "I'm PEWTER's GYM" line "I'm PEWTER's GYM"
cont "LEADER!" cont "LEADER!"

16
text/PewterGym_2.asm
View file

@ -1,4 +1,4 @@
_PewterGymText_5c4a3:: _BrockPostBattleAdviceText::
text "There are all" text "There are all"
line "kinds of trainers" line "kinds of trainers"
cont "in the world!" cont "in the world!"
@ -12,7 +12,7 @@ _PewterGymText_5c4a3::
cont "your abilities!" cont "your abilities!"
done done
_TM34PreReceiveText:: _BeforeReceivedTM34Text::
text "Wait! Take this" text "Wait! Take this"
line "with you!" line "with you!"
done done
@ -51,7 +51,7 @@ _TM34NoRoomText::
line "room for this!" line "room for this!"
done done
_PewterGymText_5c4bc:: _ReceivedBoulderBadgeText::
text "I took" text "I took"
line "you for granted." line "you for granted."
@ -63,7 +63,7 @@ _PewterGymText_5c4bc::
line "the BOULDERBADGE!@" line "the BOULDERBADGE!@"
text_end text_end
_PewterGymText_5c4c1:: _BrockBoulerBadgeInfoText::
text_start text_start
para "That's an official" para "That's an official"
@ -102,7 +102,7 @@ _PewterGymAfterBattleText1::
cont "as BROCK!" cont "as BROCK!"
done done
_PewterGymText_5c515:: _PewterGymGuidePreAdviceText::
text "Hiya! I can tell" text "Hiya! I can tell"
line "you have what it" line "you have what it"
cont "takes to become a" cont "takes to become a"
@ -116,12 +116,12 @@ _PewterGymText_5c515::
line "to the top!" line "to the top!"
done done
_PewterGymText_5c51a:: _PewterGymGuideBeginAdviceText::
text "All right! Let's" text "All right! Let's"
line "get happening!" line "get happening!"
prompt prompt
_PewterGymText_5c51f:: _PewterGymGuideAdviceText::
text "The 1st #MON" text "The 1st #MON"
line "out in a match is" line "out in a match is"
cont "at the top of the" cont "at the top of the"
@ -139,7 +139,7 @@ _PewterGymText_5c524::
cont "get happening!" cont "get happening!"
prompt prompt
_PewterGymText_5c529:: _PewterGymGuidePostBattleText::
text "Just as I thought!" text "Just as I thought!"
line "You're #MON" line "You're #MON"
cont "champ material!" cont "champ material!"

14
text/SaffronGym.asm
View file

@ -1,4 +1,4 @@
_SaffronGymText_5d162:: _SabrinaPreBattleText::
text "I had a vision of" text "I had a vision of"
line "your arrival!" line "your arrival!"
@ -16,7 +16,7 @@ _SaffronGymText_5d162::
cont "you my powers!" cont "you my powers!"
done done
_SaffronGymText_5d167:: _ReceivedMarshBadgeText::
text "I'm" text "I'm"
line "shocked!" line "shocked!"
cont "But, a loss is a" cont "But, a loss is a"
@ -30,14 +30,14 @@ _SaffronGymText_5d167::
line "MARSHBADGE!@" line "MARSHBADGE!@"
text_end text_end
_SaffronGymText_5d16e:: _SabrinaPostBattleAdviceText::
text "Everyone has" text "Everyone has"
line "psychic power!" line "psychic power!"
cont "People just don't" cont "People just don't"
cont "realize it!" cont "realize it!"
done done
_SaffronGymText_5d173:: _KogaMarshBadgeInfoText::
text "The MARSHBADGE" text "The MARSHBADGE"
line "makes #MON up" line "makes #MON up"
cont "to L70 obey you!" cont "to L70 obey you!"
@ -55,7 +55,7 @@ _SaffronGymText_5d173::
line "this TM with you!" line "this TM with you!"
done done
ReceivedTM46Text:: _ReceivedTM46Text::
text "<PLAYER> received" text "<PLAYER> received"
line "TM46!@" line "TM46!@"
text_end text_end
@ -74,7 +74,7 @@ _TM46NoRoomText::
line "of other items!" line "of other items!"
done done
_SaffronGymText_5d1e6:: _SaffronGymGuidePreBattleText::
text "Yo! Champ in" text "Yo! Champ in"
line "making!" line "making!"
@ -91,7 +91,7 @@ _SaffronGymText_5d1e6::
cont "even aim a punch!" cont "even aim a punch!"
done done
_SaffronGymText_5d1eb:: _SaffronGymGuidePostBattleText::
text "Psychic power," text "Psychic power,"
line "huh?" line "huh?"

8
text/VermilionGym_2.asm
View file

@ -10,7 +10,7 @@ _LTSurgePostBattleAdviceText::
cont "type #MON!" cont "type #MON!"
done done
_LTSurgeThunderbadgeInfoText:: _LTSurgeThunderBadgeInfoText::
text "The THUNDERBADGE" text "The THUNDERBADGE"
line "cranks up your" line "cranks up your"
cont "#MON's SPEED!" cont "#MON's SPEED!"
@ -45,7 +45,7 @@ _TM24NoRoomText::
line "in your pack!" line "in your pack!"
done done
_ReceivedThunderbadgeText:: _ReceivedThunderBadgeText::
text "Whoa!" text "Whoa!"
para "You're the real" para "You're the real"
@ -113,7 +113,7 @@ _VermilionGymAfterBattleText3::
cont "next to it!" cont "next to it!"
done done
_VermilionGymFanPreBattleText:: _VermilionGymGuidePreBattleText::
text "Yo! Champ in" text "Yo! Champ in"
line "making!" line "making!"
@ -139,7 +139,7 @@ _VermilionGymFanPreBattleText::
cont "get to him!" cont "get to him!"
done done
_VermilionGymFanPostBattleText:: _VermilionGymGuidePostBattleText::
text "Whew! That match" text "Whew! That match"
line "was electric!" line "was electric!"
done done

12
text/ViridianGym.asm
View file

@ -1,4 +1,4 @@
_ViridianGymText_74ace:: _GiovanniPreBattleText::
text "Fwahahaha! This is" text "Fwahahaha! This is"
line "my hideout!" line "my hideout!"
@ -18,7 +18,7 @@ _ViridianGymText_74ace::
cont "greatest trainer!" cont "greatest trainer!"
done done
_ViridianGymText_74ad3:: _ReceivedEarthBadgeText::
text "Ha!" text "Ha!"
line "That was a truly" line "That was a truly"
cont "intense fight!" cont "intense fight!"
@ -27,7 +27,7 @@ _ViridianGymText_74ad3::
cont "the EARTHBADGE!@" cont "the EARTHBADGE!@"
text_end text_end
_ViridianGymText_74ad9:: _GiovanniPostBattleAdviceText::
text "Having lost, I" text "Having lost, I"
line "cannot face my" line "cannot face my"
cont "underlings!" cont "underlings!"
@ -43,7 +43,7 @@ _ViridianGymText_74ad9::
cont "Farewell!@" cont "Farewell!@"
text_end text_end
_ViridianGymText12:: _GiovanniEarthBadgeInfoText::
text "The EARTHBADGE" text "The EARTHBADGE"
line "makes #MON of" line "makes #MON of"
cont "any level obey!" cont "any level obey!"
@ -215,7 +215,7 @@ _ViridianGymAfterBattleText8::
cont "our GYM LEADER!" cont "our GYM LEADER!"
done done
_ViridianGymText_74bd4:: _ViridianGymGuidePreBattleText::
text "Yo! Champ in" text "Yo! Champ in"
line "making!" line "making!"
@ -233,7 +233,7 @@ _ViridianGymText_74bd4::
cont "#MON!" cont "#MON!"
done done
_ViridianGymText_74bd9:: _ViridianGymGuidePostBattleText::
text "Blow me away!" text "Blow me away!"
line "GIOVANNI was the" line "GIOVANNI was the"
cont "GYM LEADER here?" cont "GYM LEADER here?"