diff --git a/scripts/CeladonGym.asm b/scripts/CeladonGym.asm index 30e4fa357e..2ffa1995cb 100644 --- a/scripts/CeladonGym.asm +++ b/scripts/CeladonGym.asm @@ -22,7 +22,7 @@ CeladonGym_Script: .LeaderName: db "ERIKA@" -CeladonGymText_48943: +CeladonGymResetScripts: xor a ld [wJoyIgnore], a ld [wCeladonGymCurScript], a @@ -33,16 +33,16 @@ CeladonGym_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle - dw CeladonGymScript3 + dw CeladonGymErikaPostBattle -CeladonGymScript3: +CeladonGymErikaPostBattle: ld a, [wIsInBattle] cp $ff - jp z, CeladonGymText_48943 + jp z, CeladonGymResetScripts ld a, $f0 ld [wJoyIgnore], a -CeladonGymText_48963: +CeladonGymReceiveTM21: ld a, $9 ldh [hSpriteIndexOrTextID], a call DisplayTextID @@ -68,19 +68,19 @@ CeladonGymText_48963: ; deactivate gym trainers SetEventRange EVENT_BEAT_CELADON_GYM_TRAINER_0, EVENT_BEAT_CELADON_GYM_TRAINER_6 - jp CeladonGymText_48943 + jp CeladonGymResetScripts CeladonGym_TextPointers: - dw CeladonGymText1 - dw CeladonGymText2 - dw CeladonGymText3 - dw CeladonGymText4 - dw CeladonGymText5 - dw CeladonGymText6 - dw CeladonGymText7 - dw CeladonGymText8 - dw CeladonGymText9 - dw TM21Text + dw ErikaText + dw CeladonGymTrainerText1 + dw CeladonGymTrainerText2 + dw CeladonGymTrainerText3 + dw CeladonGymTrainerText4 + dw CeladonGymTrainerText5 + dw CeladonGymTrainerText6 + dw CeladonGymTrainerText7 + dw ErikaRainbowBadgeInfoText + dw ReceivedTM21Text dw TM21NoRoomText CeladonGymTrainerHeaders: @@ -101,27 +101,27 @@ CeladonGymTrainerHeader6: trainer EVENT_BEAT_CELADON_GYM_TRAINER_6, 3, CeladonGymBattleText8, CeladonGymEndBattleText8, CeladonGymAfterBattleText8 db -1 ; end -CeladonGymText1: +ErikaText: text_asm CheckEvent EVENT_BEAT_ERIKA - jr z, .beginBattle + jr z, .beforeBeat CheckEventReuseA EVENT_GOT_TM21 - jr nz, .afterVictory - call z, CeladonGymText_48963 + jr nz, .afterBeat + call z, CeladonGymReceiveTM21 call DisableWaitingAfterTextDisplay jr .done -.afterVictory - ld hl, CeladonGymText_48a68 +.afterBeat + ld hl, ErikaPostBattleAdviceText call PrintText jr .done -.beginBattle - ld hl, CeladonGymText_48a5e +.beforeBeat + ld hl, ErikaPreBattleText call PrintText ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, CeladonGymText_48a63 - ld de, CeladonGymText_48a63 + ld hl, ReceivedRainbowBadgeText + ld de, ReceivedRainbowBadgeText call SaveEndBattleTextPointers ldh a, [hSpriteIndex] ld [wSpriteIndex], a @@ -135,23 +135,23 @@ CeladonGymText1: .done jp TextScriptEnd -CeladonGymText_48a5e: - text_far _CeladonGymText_48a5e +ErikaPreBattleText: + text_far _ErikaPreBattleText text_end -CeladonGymText_48a63: - text_far _CeladonGymText_48a63 +ReceivedRainbowBadgeText: + text_far _ReceivedRainbowBadgeText text_end -CeladonGymText_48a68: - text_far _CeladonGymText_48a68 +ErikaPostBattleAdviceText: + text_far _ErikaPostBattleAdviceText text_end -CeladonGymText9: - text_far _CeladonGymText9 +ErikaRainbowBadgeInfoText: + text_far _ErikaRainbowBadgeInfoText text_end -TM21Text: +ReceivedTM21Text: text_far _ReceivedTM21Text sound_get_item_1 text_far _TM21ExplanationText @@ -161,7 +161,7 @@ TM21NoRoomText: text_far _TM21NoRoomText text_end -CeladonGymText2: +CeladonGymTrainerText1: text_asm ld hl, CeladonGymTrainerHeader0 call TalkToTrainer @@ -179,7 +179,7 @@ CeladonGymAfterBattleText2: text_far _CeladonGymAfterBattleText2 text_end -CeladonGymText3: +CeladonGymTrainerText2: text_asm ld hl, CeladonGymTrainerHeader1 call TalkToTrainer @@ -197,7 +197,7 @@ CeladonGymAfterBattleText3: text_far _CeladonGymAfterBattleText3 text_end -CeladonGymText4: +CeladonGymTrainerText3: text_asm ld hl, CeladonGymTrainerHeader2 call TalkToTrainer @@ -215,7 +215,7 @@ CeladonGymAfterBattleText4: text_far _CeladonGymAfterBattleText4 text_end -CeladonGymText5: +CeladonGymTrainerText4: text_asm ld hl, CeladonGymTrainerHeader3 call TalkToTrainer @@ -233,7 +233,7 @@ CeladonGymAfterBattleText5: text_far _CeladonGymAfterBattleText5 text_end -CeladonGymText6: +CeladonGymTrainerText5: text_asm ld hl, CeladonGymTrainerHeader4 call TalkToTrainer @@ -251,7 +251,7 @@ CeladonGymAfterBattleText6: text_far _CeladonGymAfterBattleText6 text_end -CeladonGymText7: +CeladonGymTrainerText6: text_asm ld hl, CeladonGymTrainerHeader5 call TalkToTrainer @@ -269,7 +269,7 @@ CeladonGymAfterBattleText7: text_far _CeladonGymAfterBattleText7 text_end -CeladonGymText8: +CeladonGymTrainerText7: text_asm ld hl, CeladonGymTrainerHeader6 call TalkToTrainer diff --git a/scripts/CeruleanGym.asm b/scripts/CeruleanGym.asm index 1421974808..798716e3de 100644 --- a/scripts/CeruleanGym.asm +++ b/scripts/CeruleanGym.asm @@ -22,7 +22,7 @@ CeruleanGym_Script: .LeaderName: db "MISTY@" -CeruleanGymScript_5c6ed: +CeruleanGymResetScripts: xor a ld [wJoyIgnore], a ld [wCeruleanGymCurScript], a @@ -33,16 +33,16 @@ CeruleanGym_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle - dw CeruleanGymScript3 + dw CeruleanGymMistyPostBattle -CeruleanGymScript3: +CeruleanGymMistyPostBattle: ld a, [wIsInBattle] cp $ff - jp z, CeruleanGymScript_5c6ed + jp z, CeruleanGymResetScripts ld a, $f0 ld [wJoyIgnore], a -CeruleanGymScript_5c70d: +CeruleanGymReceiveTM11: ld a, $5 ldh [hSpriteIndexOrTextID], a call DisplayTextID @@ -68,16 +68,16 @@ CeruleanGymScript_5c70d: ; deactivate gym trainers SetEvents EVENT_BEAT_CERULEAN_GYM_TRAINER_0, EVENT_BEAT_CERULEAN_GYM_TRAINER_1 - jp CeruleanGymScript_5c6ed + jp CeruleanGymResetScripts CeruleanGym_TextPointers: - dw CeruleanGymText1 - dw CeruleanGymText2 - dw CeruleanGymText3 - dw CeruleanGymText4 - dw CeruleanGymText5 - dw CeruleanGymText6 - dw CeruleanGymText7 + dw MistyText + dw CeruleanGymTrainerText1 + dw CeruleanGymTrainerText2 + dw CeruleanGymGuideText + dw MistyCascadeBadgeInfoText + dw ReceivedTM11Text + dw TM11NoRoomText CeruleanGymTrainerHeaders: def_trainers 2 @@ -87,27 +87,27 @@ CeruleanGymTrainerHeader1: trainer EVENT_BEAT_CERULEAN_GYM_TRAINER_1, 3, CeruleanGymBattleText2, CeruleanGymEndBattleText2, CeruleanGymAfterBattleText2 db -1 ; end -CeruleanGymText1: +MistyText: text_asm CheckEvent EVENT_BEAT_MISTY - jr z, .beginBattle + jr z, .beforeBeat CheckEventReuseA EVENT_GOT_TM11 - jr nz, .afterVictory - call z, CeruleanGymScript_5c70d + jr nz, .afterBeat + call z, CeruleanGymReceiveTM11 call DisableWaitingAfterTextDisplay jr .done -.afterVictory - ld hl, CeruleanGymText_5c7c3 +.afterBeat + ld hl, TM11ExplanationText call PrintText jr .done -.beginBattle - ld hl, CeruleanGymText_5c7be +.beforeBeat + ld hl, MistyPreBattleText call PrintText ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, CeruleanGymText_5c7d8 - ld de, CeruleanGymText_5c7d8 + ld hl, ReceivedCascadeBadgeText + ld de, ReceivedCascadeBadgeText call SaveEndBattleTextPointers ldh a, [hSpriteIndex] ld [wSpriteIndex], a @@ -122,34 +122,34 @@ CeruleanGymText1: .done jp TextScriptEnd -CeruleanGymText_5c7be: - text_far _CeruleanGymText_5c7be +MistyPreBattleText: + text_far _MistyPreBattleText text_end -CeruleanGymText_5c7c3: - text_far _CeruleanGymText_5c7c3 +TM11ExplanationText: + text_far _TM11ExplanationText text_end -CeruleanGymText5: - text_far _CeruleanGymText_5c7c8 +MistyCascadeBadgeInfoText: + text_far _MistyCascadeBadgeInfoText text_end -CeruleanGymText6: +ReceivedTM11Text: text_far _ReceivedTM11Text sound_get_item_1 text_end -CeruleanGymText7: - text_far _CeruleanGymText_5c7d3 +TM11NoRoomText: + text_far _TM11NoRoomText text_end -CeruleanGymText_5c7d8: - text_far _CeruleanGymText_5c7d8 +ReceivedCascadeBadgeText: + text_far _ReceivedCascadeBadgeText sound_get_key_item ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded text_promptbutton text_end -CeruleanGymText2: +CeruleanGymTrainerText1: text_asm ld hl, CeruleanGymTrainerHeader0 call TalkToTrainer @@ -167,7 +167,7 @@ CeruleanGymAfterBattleText1: text_far _CeruleanGymAfterBattleText1 text_end -CeruleanGymText3: +CeruleanGymTrainerText2: text_asm ld hl, CeruleanGymTrainerHeader1 call TalkToTrainer @@ -185,23 +185,23 @@ CeruleanGymAfterBattleText2: text_far _CeruleanGymAfterBattleText2 text_end -CeruleanGymText4: +CeruleanGymGuideText: text_asm CheckEvent EVENT_BEAT_MISTY - jr nz, .asm_5c821 - ld hl, CeruleanGymText_5c82a + jr nz, .afterBeat + ld hl, CeruleanGymGuidePreBattleText call PrintText - jr .asm_5c827 -.asm_5c821 - ld hl, CeruleanGymText_5c82f + jr .done +.afterBeat + ld hl, CeruleanGymGuidePostBattleText call PrintText -.asm_5c827 +.done jp TextScriptEnd -CeruleanGymText_5c82a: - text_far _CeruleanGymText_5c82a +CeruleanGymGuidePreBattleText: + text_far _CeruleanGymGuidePreBattleText text_end -CeruleanGymText_5c82f: - text_far _CeruleanGymText_5c82f +CeruleanGymGuidePostBattleText: + text_far _CeruleanGymGuidePostBattleText text_end diff --git a/scripts/CinnabarGym.asm b/scripts/CinnabarGym.asm index 5703bb1ddd..370a875f38 100644 --- a/scripts/CinnabarGym.asm +++ b/scripts/CinnabarGym.asm @@ -1,11 +1,11 @@ CinnabarGym_Script: - call CinnabarGymScript_75759 + call CinnabarGymSetMapAndTiles call EnableAutoTextBoxDrawing ld hl, CinnabarGym_ScriptPointers ld a, [wCinnabarGymCurScript] jp CallFunctionInTable -CinnabarGymScript_75759: +CinnabarGymSetMapAndTiles: ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] @@ -29,7 +29,7 @@ CinnabarGymScript_75759: .LeaderName: db "BLAINE@" -CinnabarGymScript_75792: +CinnabarGymResetScripts: xor a ld [wJoyIgnore], a ld [wCinnabarGymCurScript], a @@ -37,7 +37,7 @@ CinnabarGymScript_75792: ld [wOpponentAfterWrongAnswer], a ret -CinnabarGymScript_757a0: +CinnabarGymSetTrainerHeader: ldh a, [hSpriteIndexOrTextID] ld [wTrainerHeaderFlagBit], a ret @@ -46,7 +46,7 @@ CinnabarGym_ScriptPointers: dw CinnabarGymScript0 dw CinnabarGymScript1 dw CinnabarGymScript2 - dw CinnabarGymScript3 + dw CinnabarGymBlainePostBattle CinnabarGymScript0: ld a, [wOpponentAfterWrongAnswer] @@ -57,25 +57,25 @@ CinnabarGymScript0: jr nz, .asm_757c3 ld a, PLAYER_DIR_DOWN ld [wPlayerMovingDirection], a - ld de, MovementData_757d7 - jr .asm_757cb + ld de, MovementNpcToLeftAndUp + jr .MoveSprite .asm_757c3 - ld de, MovementData_757da + ld de, MovementNpcToLeft ld a, PLAYER_DIR_RIGHT ld [wPlayerMovingDirection], a -.asm_757cb +.MoveSprite call MoveSprite ld a, $1 ld [wCinnabarGymCurScript], a ld [wCurMapScript], a ret -MovementData_757d7: +MovementNpcToLeftAndUp: db NPC_MOVEMENT_LEFT db NPC_MOVEMENT_UP db -1 ; end -MovementData_757da: +MovementNpcToLeft: db NPC_MOVEMENT_LEFT db -1 ; end @@ -96,7 +96,7 @@ CinnabarGymFlagAction: CinnabarGymScript2: ld a, [wIsInBattle] cp $ff - jp z, CinnabarGymScript_75792 + jp z, CinnabarGymResetScripts ld a, [wTrainerHeaderFlagBit] ldh [hGymGateIndex], a AdjustEventBit EVENT_BEAT_CINNABAR_GYM_TRAINER_0, 2 @@ -135,13 +135,14 @@ CinnabarGymScript2: ld [wCurMapScript], a ret -CinnabarGymScript3: +CinnabarGymBlainePostBattle: ld a, [wIsInBattle] cp $ff - jp z, CinnabarGymScript_75792 + jp z, CinnabarGymResetScripts ld a, $f0 ld [wJoyIgnore], a -CinnabarGymScript3_75857: +; fallthrough +CinnabarGymReceiveTM38: ld a, $a ldh [hSpriteIndexOrTextID], a call DisplayTextID @@ -170,19 +171,19 @@ CinnabarGymScript3_75857: ld hl, wCurrentMapScriptFlags set 5, [hl] - jp CinnabarGymScript_75792 + jp CinnabarGymResetScripts CinnabarGym_TextPointers: - dw CinnabarGymText1 - dw CinnabarGymText2 - dw CinnabarGymText3 - dw CinnabarGymText4 - dw CinnabarGymText5 - dw CinnabarGymText6 - dw CinnabarGymText7 - dw CinnabarGymText8 - dw CinnabarGymText9 - dw BlaineBadgeText + dw BlaineText + dw CinnabarGymTrainerText1 + dw CinnabarGymTrainerText2 + dw CinnabarGymTrainerText3 + dw CinnabarGymTrainerText4 + dw CinnabarGymTrainerText5 + dw CinnabarGymTrainerText6 + dw CinnabarGymTrainerText7 + dw CinnabarGymGuideText + dw BlaineVolcanoBadgeInfoText dw ReceivedTM38Text dw TM38NoRoomText @@ -206,45 +207,45 @@ CinnabarGymScript_758b7: ld [wCurMapScript], a jp TextScriptEnd -CinnabarGymText1: +BlaineText: text_asm CheckEvent EVENT_BEAT_BLAINE - jr z, .beginBattle + jr z, .beforeBeat CheckEventReuseA EVENT_GOT_TM38 - jr nz, .afterVictory - call z, CinnabarGymScript3_75857 + jr nz, .afterBeat + call z, CinnabarGymReceiveTM38 call DisableWaitingAfterTextDisplay jp TextScriptEnd -.afterVictory - ld hl, BlaineFireBlastText +.afterBeat + ld hl, BlainePostBattleAdviceText call PrintText jp TextScriptEnd -.beginBattle - ld hl, BlaineBattleText +.beforeBeat + ld hl, BlainePreBattleText call PrintText - ld hl, BlaineEndBattleText - ld de, BlaineEndBattleText + ld hl, ReceivedVolcanoBadgeText + ld de, ReceivedVolcanoBadgeText call SaveEndBattleTextPointers ld a, $7 ld [wGymLeaderNo], a jp CinnabarGymScript_758b7 -BlaineBattleText: - text_far _BlaineBattleText +BlainePreBattleText: + text_far _BlainePreBattleText text_end -BlaineEndBattleText: - text_far _BlaineEndBattleText +ReceivedVolcanoBadgeText: + text_far _ReceivedVolcanoBadgeText sound_get_key_item ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded text_waitbutton text_end -BlaineFireBlastText: - text_far _BlaineFireBlastText +BlainePostBattleAdviceText: + text_far _BlainePostBattleAdviceText text_end -BlaineBadgeText: - text_far _BlaineBadgeText +BlaineVolcanoBadgeInfoText: + text_far _BlaineVolcanoBadgeInfoText text_end ReceivedTM38Text: @@ -257,218 +258,218 @@ TM38NoRoomText: text_far _TM38NoRoomText text_end -CinnabarGymText2: +CinnabarGymTrainerText1: text_asm - call CinnabarGymScript_757a0 + call CinnabarGymSetTrainerHeader CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_0 jr nz, .asm_46bb4 - ld hl, CinnabarGymText_7595f + ld hl, CinnabarGymBattleText2 call PrintText - ld hl, CinnabarGymText_75964 - ld de, CinnabarGymText_75964 + ld hl, CinnabarGymEndBattleText2 + ld de, CinnabarGymEndBattleText2 call SaveEndBattleTextPointers jp CinnabarGymScript_758b7 .asm_46bb4 - ld hl, CinnabarGymText_75969 + ld hl, CinnabarGymAfterBattleText2 call PrintText jp TextScriptEnd -CinnabarGymText_7595f: - text_far _CinnabarGymText_7595f +CinnabarGymBattleText2: + text_far _CinnabarGymBattleText2 text_end -CinnabarGymText_75964: - text_far _CinnabarGymText_75964 +CinnabarGymEndBattleText2: + text_far _CinnabarGymEndBattleText2 text_end -CinnabarGymText_75969: - text_far _CinnabarGymText_75969 +CinnabarGymAfterBattleText2: + text_far _CinnabarGymAfterBattleText2 text_end -CinnabarGymText3: +CinnabarGymTrainerText2: text_asm - call CinnabarGymScript_757a0 + call CinnabarGymSetTrainerHeader CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_1 jr nz, .asm_4b406 - ld hl, CinnabarGymText_75994 + ld hl, CinnabarGymBattleText1 call PrintText - ld hl, CinnabarGymText_75999 - ld de, CinnabarGymText_75999 + ld hl, CinnabarGymEndBattleText1 + ld de, CinnabarGymEndBattleText1 call SaveEndBattleTextPointers jp CinnabarGymScript_758b7 .asm_4b406 - ld hl, CinnabarGymText_7599e + ld hl, CinnabarGymAfterBattleText1 call PrintText jp TextScriptEnd -CinnabarGymText_75994: - text_far _CinnabarGymText_75994 +CinnabarGymBattleText1: + text_far _CinnabarGymBattleText1 text_end -CinnabarGymText_75999: - text_far _CinnabarGymText_75999 +CinnabarGymEndBattleText1: + text_far _CinnabarGymEndBattleText1 text_end -CinnabarGymText_7599e: - text_far _CinnabarGymText_7599e +CinnabarGymAfterBattleText1: + text_far _CinnabarGymAfterBattleText1 text_end -CinnabarGymText4: +CinnabarGymTrainerText3: text_asm - call CinnabarGymScript_757a0 + call CinnabarGymSetTrainerHeader CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_2 - jr nz, .asm_c0673 - ld hl, CinnabarGymText_759c9 + jr nz, .afterBeat + ld hl, CinnabarGymBattleText3 call PrintText - ld hl, CinnabarGymText_759ce - ld de, CinnabarGymText_759ce + ld hl, CinnabarGymEndBattleText3 + ld de, CinnabarGymEndBattleText3 call SaveEndBattleTextPointers jp CinnabarGymScript_758b7 -.asm_c0673 - ld hl, CinnabarGymText_759d3 +.afterBeat + ld hl, CinnabarGymAfterBattleText3 call PrintText jp TextScriptEnd -CinnabarGymText_759c9: - text_far _CinnabarGymText_759c9 +CinnabarGymBattleText3: + text_far _CinnabarGymBattleText3 text_end -CinnabarGymText_759ce: - text_far _CinnabarGymText_759ce +CinnabarGymEndBattleText3: + text_far _CinnabarGymEndBattleText3 text_end -CinnabarGymText_759d3: - text_far _CinnabarGymText_759d3 +CinnabarGymAfterBattleText3: + text_far _CinnabarGymAfterBattleText3 text_end -CinnabarGymText5: +CinnabarGymTrainerText4: text_asm - call CinnabarGymScript_757a0 + call CinnabarGymSetTrainerHeader CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_3 - jr nz, .asm_5cfd7 - ld hl, CinnabarGymText_759fe + jr nz, .afterBeat + ld hl, CinnabarGymBattleText4 call PrintText - ld hl, CinnabarGymText_75a03 - ld de, CinnabarGymText_75a03 + ld hl, CinnabarGymEndBattleText4 + ld de, CinnabarGymEndBattleText4 call SaveEndBattleTextPointers jp CinnabarGymScript_758b7 -.asm_5cfd7 - ld hl, CinnabarGymText_75a08 +.afterBeat + ld hl, CinnabarGymAfterBattleText4 call PrintText jp TextScriptEnd -CinnabarGymText_759fe: - text_far _CinnabarGymText_759fe +CinnabarGymBattleText4: + text_far _CinnabarGymBattleText4 text_end -CinnabarGymText_75a03: - text_far _CinnabarGymText_75a03 +CinnabarGymEndBattleText4: + text_far _CinnabarGymEndBattleText4 text_end -CinnabarGymText_75a08: - text_far _CinnabarGymText_75a08 +CinnabarGymAfterBattleText4: + text_far _CinnabarGymAfterBattleText4 text_end -CinnabarGymText6: +CinnabarGymTrainerText5: text_asm - call CinnabarGymScript_757a0 + call CinnabarGymSetTrainerHeader CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_4 - jr nz, .asm_776b4 - ld hl, CinnabarGymText_75a33 + jr nz, .afterBeat + ld hl, CinnabarGymBattleText5 call PrintText - ld hl, CinnabarGymText_75a38 - ld de, CinnabarGymText_75a38 + ld hl, CinnabarGymEndBattleText5 + ld de, CinnabarGymEndBattleText5 call SaveEndBattleTextPointers jp CinnabarGymScript_758b7 -.asm_776b4 - ld hl, CinnabarGymText_75a3d +.afterBeat + ld hl, CinnabarGymAfterBattleText5 call PrintText jp TextScriptEnd -CinnabarGymText_75a33: - text_far _CinnabarGymText_75a33 +CinnabarGymBattleText5: + text_far _CinnabarGymBattleText5 text_end -CinnabarGymText_75a38: - text_far _CinnabarGymText_75a38 +CinnabarGymEndBattleText5: + text_far _CinnabarGymEndBattleText5 text_end -CinnabarGymText_75a3d: - text_far _CinnabarGymText_75a3d +CinnabarGymAfterBattleText5: + text_far _CinnabarGymAfterBattleText5 text_end -CinnabarGymText7: +CinnabarGymTrainerText6: text_asm - call CinnabarGymScript_757a0 + call CinnabarGymSetTrainerHeader CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_5 - jr nz, .asm_2f755 - ld hl, CinnabarGymText_75a68 + jr nz, .afterBeat + ld hl, CinnabarGymBattleText6 call PrintText - ld hl, CinnabarGymText_75a6d - ld de, CinnabarGymText_75a6d + ld hl, CinnabarGymEndBattleText6 + ld de, CinnabarGymEndBattleText6 call SaveEndBattleTextPointers jp CinnabarGymScript_758b7 -.asm_2f755 - ld hl, CinnabarGymText_75a72 +.afterBeat + ld hl, CinnabarGymAfterBattleText6 call PrintText jp TextScriptEnd -CinnabarGymText_75a68: - text_far _CinnabarGymText_75a68 +CinnabarGymBattleText6: + text_far _CinnabarGymBattleText6 text_end -CinnabarGymText_75a6d: - text_far _CinnabarGymText_75a6d +CinnabarGymEndBattleText6: + text_far _CinnabarGymEndBattleText6 text_end -CinnabarGymText_75a72: - text_far _CinnabarGymText_75a72 +CinnabarGymAfterBattleText6: + text_far _CinnabarGymAfterBattleText6 text_end -CinnabarGymText8: +CinnabarGymTrainerText7: text_asm - call CinnabarGymScript_757a0 + call CinnabarGymSetTrainerHeader CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_6 - jr nz, .asm_d87be - ld hl, CinnabarGymText_75a9d + jr nz, .afterBeat + ld hl, CinnabarGymBattleText7 call PrintText - ld hl, CinnabarGymText_75aa2 - ld de, CinnabarGymText_75aa2 + ld hl, CinnabarGymEndBattleText7 + ld de, CinnabarGymEndBattleText7 call SaveEndBattleTextPointers jp CinnabarGymScript_758b7 -.asm_d87be - ld hl, CinnabarGymText_75aa7 +.afterBeat + ld hl, CinnabarGymAfterBattleText7 call PrintText jp TextScriptEnd -CinnabarGymText_75a9d: - text_far _CinnabarGymText_75a9d +CinnabarGymBattleText7: + text_far _CinnabarGymBattleText7 text_end -CinnabarGymText_75aa2: - text_far _CinnabarGymText_75aa2 +CinnabarGymEndBattleText7: + text_far _CinnabarGymEndBattleText7 text_end -CinnabarGymText_75aa7: - text_far _CinnabarGymText_75aa7 +CinnabarGymAfterBattleText7: + text_far _CinnabarGymAfterBattleText7 text_end -CinnabarGymText9: +CinnabarGymGuideText: text_asm CheckEvent EVENT_BEAT_BLAINE - jr nz, .asm_627d9 - ld hl, CinnabarGymText_75ac2 - jr .asm_0b11d -.asm_627d9 - ld hl, CinnabarGymText_75ac7 -.asm_0b11d + jr nz, .afterBeat + ld hl, CinnabarGymGuidePreBattleText + jr .done +.afterBeat + ld hl, CinnabarGymGuidePostBattleText +.done call PrintText jp TextScriptEnd -CinnabarGymText_75ac2: - text_far _CinnabarGymText_75ac2 +CinnabarGymGuidePreBattleText: + text_far _CinnabarGymGuidePreBattleText text_end -CinnabarGymText_75ac7: - text_far _CinnabarGymText_75ac7 +CinnabarGymGuidePostBattleText: + text_far _CinnabarGymGuidePostBattleText text_end diff --git a/scripts/FuchsiaGym.asm b/scripts/FuchsiaGym.asm index 9216ab0899..8dc93d22f0 100644 --- a/scripts/FuchsiaGym.asm +++ b/scripts/FuchsiaGym.asm @@ -24,7 +24,7 @@ FuchsiaGym_Script: .LeaderName: db "KOGA@" -FuchsiaGymScript_75477: +FuchsiaGymResetScripts: xor a ld [wJoyIgnore], a ld [wFuchsiaGymCurScript], a @@ -35,15 +35,16 @@ FuchsiaGym_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle - dw FuchsiaGymScript3 + dw FuchsiaGymKogaPostBattle -FuchsiaGymScript3: +FuchsiaGymKogaPostBattle: ld a, [wIsInBattle] cp $ff - jp z, FuchsiaGymScript_75477 + jp z, FuchsiaGymResetScripts ld a, $f0 ld [wJoyIgnore], a -FuchsiaGymScript3_75497: +; fallthrough +FuchsiaGymReceiveTM06: ld a, $9 ldh [hSpriteIndexOrTextID], a call DisplayTextID @@ -69,20 +70,20 @@ FuchsiaGymScript3_75497: ; deactivate gym trainers SetEventRange EVENT_BEAT_FUCHSIA_GYM_TRAINER_0, EVENT_BEAT_FUCHSIA_GYM_TRAINER_5 - jp FuchsiaGymScript_75477 + jp FuchsiaGymResetScripts FuchsiaGym_TextPointers: - dw FuchsiaGymText1 - dw FuchsiaGymText2 - dw FuchsiaGymText3 - dw FuchsiaGymText4 - dw FuchsiaGymText5 - dw FuchsiaGymText6 - dw FuchsiaGymText7 - dw FuchsiaGymText8 - dw FuchsiaGymText9 - dw FuchsiaGymText10 - dw FuchsiaGymText11 + dw KogaText + dw FuchsiaGymTrainerText1 + dw FuchsiaGymTrainerText2 + dw FuchsiaGymTrainerText3 + dw FuchsiaGymTrainerText4 + dw FuchsiaGymTrainerText5 + dw FuchsiaGymTrainerText6 + dw FuchsiaGymGuideText + dw KogaSoulBadgeInfoText + dw ReceivedTM06Text + dw TM06NoRoomText FuchsiaGymTrainerHeaders: def_trainers 2 @@ -100,27 +101,27 @@ FuchsiaGymTrainerHeader5: trainer EVENT_BEAT_FUCHSIA_GYM_TRAINER_5, 2, FuchsiaGymBattleText6, FuchsiaGymEndBattleText6, FuchsiaGymAfterBattleText6 db -1 ; end -FuchsiaGymText1: +KogaText: text_asm CheckEvent EVENT_BEAT_KOGA - jr z, .beginBattle + jr z, .beforeBeat CheckEventReuseA EVENT_GOT_TM06 - jr nz, .afterVictory - call z, FuchsiaGymScript3_75497 + jr nz, .afterBeat + call z, FuchsiaGymReceiveTM06 call DisableWaitingAfterTextDisplay jr .done -.afterVictory - ld hl, KogaExplainToxicText +.afterBeat + ld hl, KogaPostBattleAdviceText call PrintText jr .done -.beginBattle +.beforeBeat ld hl, KogaBeforeBattleText call PrintText ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, KogaAfterBattleText - ld de, KogaAfterBattleText + ld hl, ReceivedSoulBadgeText + ld de, ReceivedSoulBadgeText call SaveEndBattleTextPointers ldh a, [hSpriteIndex] ld [wSpriteIndex], a @@ -139,19 +140,19 @@ KogaBeforeBattleText: text_far _KogaBeforeBattleText text_end -KogaAfterBattleText: - text_far _KogaAfterBattleText +ReceivedSoulBadgeText: + text_far _ReceivedSoulBadgeText text_end -KogaExplainToxicText: - text_far _KogaExplainToxicText +KogaPostBattleAdviceText: + text_far _KogaPostBattleAdviceText text_end -FuchsiaGymText9: - text_far _FuchsiaGymText9 +KogaSoulBadgeInfoText: + text_far _KogaSoulBadgeInfoText text_end -FuchsiaGymText10: +ReceivedTM06Text: text_far _ReceivedTM06Text sound_get_key_item @@ -159,11 +160,11 @@ TM06ExplanationText: text_far _TM06ExplanationText text_end -FuchsiaGymText11: +TM06NoRoomText: text_far _TM06NoRoomText text_end -FuchsiaGymText2: +FuchsiaGymTrainerText1: text_asm ld hl, FuchsiaGymTrainerHeader0 call TalkToTrainer @@ -181,7 +182,7 @@ FuchsiaGymAfterBattleText1: text_far _FuchsiaGymAfterBattleText1 text_end -FuchsiaGymText3: +FuchsiaGymTrainerText2: text_asm ld hl, FuchsiaGymTrainerHeader1 call TalkToTrainer @@ -199,7 +200,7 @@ FuchsiaGymAfterBattleText2: text_far _FuchsiaGymAfterBattleText2 text_end -FuchsiaGymText4: +FuchsiaGymTrainerText3: text_asm ld hl, FuchsiaGymTrainerHeader2 call TalkToTrainer @@ -217,7 +218,7 @@ FuchsiaGymAfterBattleText3: text_far _FuchsiaGymAfterBattleText3 text_end -FuchsiaGymText5: +FuchsiaGymTrainerText4: text_asm ld hl, FuchsiaGymTrainerHeader3 call TalkToTrainer @@ -235,7 +236,7 @@ FuchsiaGymAfterBattleText4: text_far _FuchsiaGymAfterBattleText4 text_end -FuchsiaGymText6: +FuchsiaGymTrainerText5: text_asm ld hl, FuchsiaGymTrainerHeader4 call TalkToTrainer @@ -253,7 +254,7 @@ FuchsiaGymAfterBattleText5: text_far _FuchsiaGymAfterBattleText5 text_end -FuchsiaGymText7: +FuchsiaGymTrainerText6: text_asm ld hl, FuchsiaGymTrainerHeader5 call TalkToTrainer @@ -271,20 +272,20 @@ FuchsiaGymAfterBattleText6: text_far _FuchsiaGymAfterBattleText6 text_end -FuchsiaGymText8: +FuchsiaGymGuideText: text_asm CheckEvent EVENT_BEAT_KOGA - ld hl, FuchsiaGymText_75653 - jr nz, .asm_50671 - ld hl, FuchsiaGymText_7564e -.asm_50671 + ld hl, FuchsiaGymGuidePostBattleText + jr nz, .afterBeat + ld hl, FuchsiaGymGuidePreBattleText +.afterBeat call PrintText jp TextScriptEnd -FuchsiaGymText_7564e: - text_far _FuchsiaGymText_7564e +FuchsiaGymGuidePreBattleText: + text_far _FuchsiaGymGuidePreBattleText text_end -FuchsiaGymText_75653: - text_far _FuchsiaGymText_75653 +FuchsiaGymGuidePostBattleText: + text_far _FuchsiaGymGuidePostBattleText text_end diff --git a/scripts/PewterGym.asm b/scripts/PewterGym.asm index f65d55068f..798285d3af 100644 --- a/scripts/PewterGym.asm +++ b/scripts/PewterGym.asm @@ -22,7 +22,7 @@ PewterGym_Script: .LeaderName: db "BROCK@" -PewterGymScript_5c3bf: +PewterGymResetScripts: xor a ld [wJoyIgnore], a ld [wPewterGymCurScript], a @@ -33,15 +33,16 @@ PewterGym_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle - dw PewterGymScript3 + dw PewterGymBrockPostBattle -PewterGymScript3: +PewterGymBrockPostBattle: ld a, [wIsInBattle] cp $ff - jp z, PewterGymScript_5c3bf + jp z, PewterGymResetScripts ld a, $f0 ld [wJoyIgnore], a -PewterGymScript_5c3df: +; fallthrough +PewterGymScriptReceiveTM34: ld a, $4 ldh [hSpriteIndexOrTextID], a call DisplayTextID @@ -76,15 +77,15 @@ PewterGymScript_5c3df: ; deactivate gym trainers SetEvent EVENT_BEAT_PEWTER_GYM_TRAINER_0 - jp PewterGymScript_5c3bf + jp PewterGymResetScripts PewterGym_TextPointers: - dw PewterGymText1 - dw PewterGymText2 - dw PewterGymText3 - dw PewterGymText4 - dw PewterGymText5 - dw PewterGymText6 + dw BrockText + dw PewterGymTrainerText1 + dw PewterGymGuideText + dw BeforeReceivedTM34Text + dw ReceivedTM34Text + dw TM34NoRoomText PewterGymTrainerHeaders: def_trainers 2 @@ -92,27 +93,27 @@ PewterGymTrainerHeader0: trainer EVENT_BEAT_PEWTER_GYM_TRAINER_0, 5, PewterGymBattleText1, PewterGymEndBattleText1, PewterGymAfterBattleText1 db -1 ; end -PewterGymText1: +BrockText: text_asm CheckEvent EVENT_BEAT_BROCK - jr z, .beginBattle + jr z, .beforeBeat CheckEventReuseA EVENT_GOT_TM34 - jr nz, .gymVictory - call z, PewterGymScript_5c3df + jr nz, .afterBeat + call z, PewterGymScriptReceiveTM34 call DisableWaitingAfterTextDisplay jr .done -.gymVictory - ld hl, PewterGymText_5c4a3 +.afterBeat + ld hl, BrockPostBattleAdviceText call PrintText jr .done -.beginBattle - ld hl, PewterGymText_5c49e +.beforeBeat + ld hl, BrockPreBattleText call PrintText ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, PewterGymText_5c4bc - ld de, PewterGymText_5c4bc + ld hl, ReceivedBoulderBadgeText + ld de, ReceivedBoulderBadgeText call SaveEndBattleTextPointers ldh a, [hSpriteIndex] ld [wSpriteIndex], a @@ -128,35 +129,35 @@ PewterGymText1: .done jp TextScriptEnd -PewterGymText_5c49e: - text_far _PewterGymText_5c49e +BrockPreBattleText: + text_far _BrockPreBattleText text_end -PewterGymText_5c4a3: - text_far _PewterGymText_5c4a3 +BrockPostBattleAdviceText: + text_far _BrockPostBattleAdviceText text_end -PewterGymText4: - text_far _TM34PreReceiveText +BeforeReceivedTM34Text: + text_far _BeforeReceivedTM34Text text_end -PewterGymText5: +ReceivedTM34Text: text_far _ReceivedTM34Text sound_get_item_1 text_far _TM34ExplanationText text_end -PewterGymText6: +TM34NoRoomText: text_far _TM34NoRoomText text_end -PewterGymText_5c4bc: - text_far _PewterGymText_5c4bc +ReceivedBoulderBadgeText: + text_far _ReceivedBoulderBadgeText 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 -PewterGymText2: +PewterGymTrainerText1: text_asm ld hl, PewterGymTrainerHeader0 call TalkToTrainer @@ -174,49 +175,49 @@ PewterGymAfterBattleText1: text_far _PewterGymAfterBattleText1 text_end -PewterGymText3: +PewterGymGuideText: text_asm ld a, [wBeatGymFlags] bit BIT_BOULDERBADGE, a - jr nz, .asm_5c50c - ld hl, PewterGymText_5c515 + jr nz, .afterBeat + ld hl, PewterGymGuidePreAdviceText call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a - jr nz, .asm_5c4fe - ld hl, PewterGymText_5c51a + jr nz, .PewterGymGuideBeginAdviceText + ld hl, PewterGymGuideBeginAdviceText call PrintText - jr .asm_5c504 -.asm_5c4fe + jr .PewterGymGuideAdviceText +.PewterGymGuideBeginAdviceText ld hl, PewterGymText_5c524 call PrintText -.asm_5c504 - ld hl, PewterGymText_5c51f +.PewterGymGuideAdviceText + ld hl, PewterGymGuideAdviceText call PrintText - jr .asm_5c512 -.asm_5c50c - ld hl, PewterGymText_5c529 + jr .done +.afterBeat + ld hl, PewterGymGuidePostBattleText call PrintText -.asm_5c512 +.done jp TextScriptEnd -PewterGymText_5c515: - text_far _PewterGymText_5c515 +PewterGymGuidePreAdviceText: + text_far _PewterGymGuidePreAdviceText text_end -PewterGymText_5c51a: - text_far _PewterGymText_5c51a +PewterGymGuideBeginAdviceText: + text_far _PewterGymGuideBeginAdviceText text_end -PewterGymText_5c51f: - text_far _PewterGymText_5c51f +PewterGymGuideAdviceText: + text_far _PewterGymGuideAdviceText text_end PewterGymText_5c524: text_far _PewterGymText_5c524 text_end -PewterGymText_5c529: - text_far _PewterGymText_5c529 +PewterGymGuidePostBattleText: + text_far _PewterGymGuidePostBattleText text_end diff --git a/scripts/SaffronGym.asm b/scripts/SaffronGym.asm index a55c58ffb6..23b2dd857a 100644 --- a/scripts/SaffronGym.asm +++ b/scripts/SaffronGym.asm @@ -22,7 +22,7 @@ SaffronGym_Script: .LeaderName: db "SABRINA@" -SaffronGymText_5d048: +SaffronGymResetScripts: xor a ld [wJoyIgnore], a ld [wSaffronGymCurScript], a @@ -33,16 +33,16 @@ SaffronGym_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle - dw SaffronGymScript3 + dw SaffronGymSabrinaPostBattle -SaffronGymScript3: +SaffronGymSabrinaPostBattle: ld a, [wIsInBattle] cp $ff - jp z, SaffronGymText_5d048 + jp z, SaffronGymResetScripts ld a, $f0 ld [wJoyIgnore], a -SaffronGymText_5d068: +SaffronGymReceiveTM46: ld a, $a ldh [hSpriteIndexOrTextID], a call DisplayTextID @@ -68,21 +68,21 @@ SaffronGymText_5d068: ; deactivate gym trainers SetEventRange EVENT_BEAT_SAFFRON_GYM_TRAINER_0, EVENT_BEAT_SAFFRON_GYM_TRAINER_6 - jp SaffronGymText_5d048 + jp SaffronGymResetScripts SaffronGym_TextPointers: - dw SaffronGymText1 - dw SaffronGymText2 - dw SaffronGymText3 - dw SaffronGymText4 - dw SaffronGymText5 - dw SaffronGymText6 - dw SaffronGymText7 - dw SaffronGymText8 - dw SaffronGymText9 - dw SaffronGymText10 - dw SaffronGymText11 - dw SaffronGymText12 + dw SabrinaText + dw SaffronGymTrainerText1 + dw SaffronGymTrainerText2 + dw SaffronGymTrainerText3 + dw SaffronGymTrainerText4 + dw SaffronGymTrainerText5 + dw SaffronGymTrainerText6 + dw SaffronGymTrainerText7 + dw SaffronGymGuideText + dw KogaMarshBadgeInfoText + dw ReceivedTM46Text + dw TM46NoRoomText SaffronGymTrainerHeaders: def_trainers 2 @@ -102,27 +102,27 @@ SaffronGymTrainerHeader6: trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_6, 3, SaffronGymBattleText7, SaffronGymEndBattleText7, SaffronGymAfterBattleText7 db -1 ; end -SaffronGymText1: +SabrinaText: text_asm CheckEvent EVENT_BEAT_SABRINA - jr z, .beginBattle + jr z, .beforeBeat CheckEventReuseA EVENT_GOT_TM46 - jr nz, .afterVictory - call z, SaffronGymText_5d068 + jr nz, .afterBeat + call z, SaffronGymReceiveTM46 call DisableWaitingAfterTextDisplay jr .done -.afterVictory - ld hl, SaffronGymText_5d16e +.afterBeat + ld hl, SabrinaPostBattleAdviceText call PrintText jr .done -.beginBattle - ld hl, SaffronGymText_5d162 +.beforeBeat + ld hl, SabrinaPreBattleText call PrintText ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, SaffronGymText_5d167 - ld de, SaffronGymText_5d167 + ld hl, ReceivedMarshBadgeText + ld de, ReceivedMarshBadgeText call SaveEndBattleTextPointers ldh a, [hSpriteIndex] ld [wSpriteIndex], a @@ -135,95 +135,95 @@ SaffronGymText1: .done jp TextScriptEnd -SaffronGymText_5d162: - text_far _SaffronGymText_5d162 +SabrinaPreBattleText: + text_far _SabrinaPreBattleText text_end -SaffronGymText_5d167: - text_far _SaffronGymText_5d167 +ReceivedMarshBadgeText: + text_far _ReceivedMarshBadgeText sound_get_key_item ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded text_promptbutton text_end -SaffronGymText_5d16e: - text_far _SaffronGymText_5d16e +SabrinaPostBattleAdviceText: + text_far _SabrinaPostBattleAdviceText text_end -SaffronGymText10: - text_far _SaffronGymText_5d173 +KogaMarshBadgeInfoText: + text_far _KogaMarshBadgeInfoText text_end -SaffronGymText11: - text_far ReceivedTM46Text +ReceivedTM46Text: + text_far _ReceivedTM46Text sound_get_item_1 text_far _TM46ExplanationText text_end -SaffronGymText12: +TM46NoRoomText: text_far _TM46NoRoomText text_end -SaffronGymText2: +SaffronGymTrainerText1: text_asm ld hl, SaffronGymTrainerHeader0 call TalkToTrainer jp TextScriptEnd -SaffronGymText3: +SaffronGymTrainerText2: text_asm ld hl, SaffronGymTrainerHeader1 call TalkToTrainer jp TextScriptEnd -SaffronGymText4: +SaffronGymTrainerText3: text_asm ld hl, SaffronGymTrainerHeader2 call TalkToTrainer jp TextScriptEnd -SaffronGymText5: +SaffronGymTrainerText4: text_asm ld hl, SaffronGymTrainerHeader3 call TalkToTrainer jp TextScriptEnd -SaffronGymText6: +SaffronGymTrainerText5: text_asm ld hl, SaffronGymTrainerHeader4 call TalkToTrainer jp TextScriptEnd -SaffronGymText7: +SaffronGymTrainerText6: text_asm ld hl, SaffronGymTrainerHeader5 call TalkToTrainer jp TextScriptEnd -SaffronGymText8: +SaffronGymTrainerText7: text_asm ld hl, SaffronGymTrainerHeader6 call TalkToTrainer jp TextScriptEnd -SaffronGymText9: +SaffronGymGuideText: text_asm CheckEvent EVENT_BEAT_SABRINA - jr nz, .asm_5d1dd - ld hl, SaffronGymText_5d1e6 + jr nz, .afterBeat + ld hl, SaffronGymGuidePreBattleText call PrintText - jr .asm_5d1e3 -.asm_5d1dd - ld hl, SaffronGymText_5d1eb + jr .done +.afterBeat + ld hl, SaffronGymGuidePostBattleText call PrintText -.asm_5d1e3 +.done jp TextScriptEnd -SaffronGymText_5d1e6: - text_far _SaffronGymText_5d1e6 +SaffronGymGuidePreBattleText: + text_far _SaffronGymGuidePreBattleText text_end -SaffronGymText_5d1eb: - text_far _SaffronGymText_5d1eb +SaffronGymGuidePostBattleText: + text_far _SaffronGymGuidePostBattleText text_end SaffronGymBattleText1: diff --git a/scripts/VermilionGym.asm b/scripts/VermilionGym.asm index 3673f9b9dc..3bbb874390 100644 --- a/scripts/VermilionGym.asm +++ b/scripts/VermilionGym.asm @@ -94,8 +94,8 @@ VermilionGym_TextPointers: dw VermilionGymTrainerText1 dw VermilionGymTrainerText2 dw VermilionGymTrainerText3 - dw VermilionGymFanText - dw LTSurgeThunderbadgeInfoText + dw VermilionGymGuideText + dw LTSurgeThunderBadgeInfoText dw ReceivedTM24Text dw TM24NoRoomText @@ -128,8 +128,8 @@ LTSurgeText: ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, ReceivedThunderbadgeText - ld de, ReceivedThunderbadgeText + ld hl, ReceivedThunderBadgeText + ld de, ReceivedThunderBadgeText call SaveEndBattleTextPointers ldh a, [hSpriteIndex] ld [wSpriteIndex], a @@ -153,8 +153,8 @@ LTSurgePostBattleAdviceText: text_far _LTSurgePostBattleAdviceText text_end -LTSurgeThunderbadgeInfoText: - text_far _LTSurgeThunderbadgeInfoText +LTSurgeThunderBadgeInfoText: + text_far _LTSurgeThunderBadgeInfoText text_end ReceivedTM24Text: @@ -167,8 +167,8 @@ TM24NoRoomText: text_far _TM24NoRoomText text_end -ReceivedThunderbadgeText: - text_far _ReceivedThunderbadgeText +ReceivedThunderBadgeText: + text_far _ReceivedThunderBadgeText text_end VermilionGymTrainerText1: @@ -225,24 +225,24 @@ VermilionGymAfterBattleText3: text_far _VermilionGymAfterBattleText3 text_end -VermilionGymFanText: +VermilionGymGuideText: text_asm ld a, [wBeatGymFlags] bit BIT_THUNDERBADGE, a jr nz, .afterBeat - ld hl, VermilionGymFanPreBattleText + ld hl, VermilionGymGuidePreBattleText call PrintText jr .done .afterBeat - ld hl, VermilionGymFanPostBattleText + ld hl, VermilionGymGuidePostBattleText call PrintText .done jp TextScriptEnd -VermilionGymFanPreBattleText: - text_far _VermilionGymFanPreBattleText +VermilionGymGuidePreBattleText: + text_far _VermilionGymGuidePreBattleText text_end -VermilionGymFanPostBattleText: - text_far _VermilionGymFanPostBattleText +VermilionGymGuidePostBattleText: + text_far _VermilionGymGuidePostBattleText text_end diff --git a/scripts/ViridianGym.asm b/scripts/ViridianGym.asm index b7b4a34d60..0b90383c8c 100644 --- a/scripts/ViridianGym.asm +++ b/scripts/ViridianGym.asm @@ -16,7 +16,7 @@ ViridianGym_Script: .LeaderName: db "GIOVANNI@" -ViridianGymScript_748d6: +ViridianGymResetScripts: xor a ld [wJoyIgnore], a ld [wViridianGymCurScript], a @@ -27,7 +27,7 @@ ViridianGym_ScriptPointers: dw ViridianGymScript0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle - dw ViridianGymScript3 + dw ViridianGymGiovanniPostBattle dw ViridianGymScript4 ViridianGymScript0: @@ -116,7 +116,7 @@ ViridianGymArrowMovement12: ViridianGymScript4: ld a, [wSimulatedJoypadStatesIndex] and a - jr nz, .asm_74980 + jr nz, .ViridianGymLoadSpinnerArrow xor a ld [wJoyIgnore], a ld hl, wd736 @@ -124,16 +124,17 @@ ViridianGymScript4: ld a, $0 ld [wCurMapScript], a ret -.asm_74980 +.ViridianGymLoadSpinnerArrow farjp LoadSpinnerArrowTiles -ViridianGymScript3: +ViridianGymGiovanniPostBattle: ld a, [wIsInBattle] cp $ff - jp z, ViridianGymScript_748d6 + jp z, ViridianGymResetScripts ld a, $f0 ld [wJoyIgnore], a -ViridianGymScript3_74995: +; fallthrough +ViridianGymReceiveTM27: ld a, $c ldh [hSpriteIndexOrTextID], a call DisplayTextID @@ -163,23 +164,23 @@ ViridianGymScript3_74995: ld [wMissableObjectIndex], a predef ShowObject SetEvents EVENT_2ND_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE - jp ViridianGymScript_748d6 + jp ViridianGymResetScripts ViridianGym_TextPointers: - dw ViridianGymText1 - dw ViridianGymText2 - dw ViridianGymText3 - dw ViridianGymText4 - dw ViridianGymText5 - dw ViridianGymText6 - dw ViridianGymText7 - dw ViridianGymText8 - dw ViridianGymText9 - dw ViridianGymText10 + dw GiovanniText + dw ViridianGymTrainerText1 + dw ViridianGymTrainerText2 + dw ViridianGymTrainerText3 + dw ViridianGymTrainerText4 + dw ViridianGymTrainerText5 + dw ViridianGymTrainerText6 + dw ViridianGymTrainerText7 + dw ViridianGymTrainerText8 + dw ViridianGymGuideText dw PickUpItemText - dw ViridianGymText12 - dw ViridianGymText13 - dw ViridianGymText14 + dw GiovanniEarthBadgeInfoText + dw ReceivedTM27Text + dw TM27NoRoomText ViridianGymTrainerHeaders: def_trainers 2 @@ -201,19 +202,19 @@ ViridianGymTrainerHeader7: trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7, 4, ViridianGymBattleText8, ViridianGymEndBattleText8, ViridianGymAfterBattleText8 db -1 ; end -ViridianGymText1: +GiovanniText: text_asm CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI - jr z, .beginBattle + jr z, .beforeBeat CheckEventReuseA EVENT_GOT_TM27 - jr nz, .afterVictory - call z, ViridianGymScript3_74995 + jr nz, .afterBeat + call z, ViridianGymReceiveTM27 call DisableWaitingAfterTextDisplay jr .done -.afterVictory +.afterBeat ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, ViridianGymText_74ad9 + ld hl, GiovanniPostBattleAdviceText call PrintText call GBFadeOutToBlack ld a, HS_VIRIDIAN_GYM_GIOVANNI @@ -223,14 +224,14 @@ ViridianGymText1: call Delay3 call GBFadeInFromBlack jr .done -.beginBattle - ld hl, ViridianGymText_74ace +.beforeBeat + ld hl, GiovanniPreBattleText call PrintText ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, ViridianGymText_74ad3 - ld de, ViridianGymText_74ad3 + ld hl, ReceivedEarthBadgeText + ld de, ReceivedEarthBadgeText call SaveEndBattleTextPointers ldh a, [hSpriteIndex] ld [wSpriteIndex], a @@ -243,25 +244,25 @@ ViridianGymText1: .done jp TextScriptEnd -ViridianGymText_74ace: - text_far _ViridianGymText_74ace +GiovanniPreBattleText: + text_far _GiovanniPreBattleText text_end -ViridianGymText_74ad3: - text_far _ViridianGymText_74ad3 +ReceivedEarthBadgeText: + text_far _ReceivedEarthBadgeText sound_level_up ; probably supposed to play SFX_GET_ITEM_1 but the wrong music bank is loaded text_end -ViridianGymText_74ad9: - text_far _ViridianGymText_74ad9 +GiovanniPostBattleAdviceText: + text_far _GiovanniPostBattleAdviceText text_waitbutton text_end -ViridianGymText12: - text_far _ViridianGymText12 +GiovanniEarthBadgeInfoText: + text_far _GiovanniEarthBadgeInfoText text_end -ViridianGymText13: +ReceivedTM27Text: text_far _ReceivedTM27Text sound_get_item_1 @@ -269,11 +270,11 @@ TM27ExplanationText: text_far _TM27ExplanationText text_end -ViridianGymText14: +TM27NoRoomText: text_far _TM27NoRoomText text_end -ViridianGymText2: +ViridianGymTrainerText1: text_asm ld hl, ViridianGymTrainerHeader0 call TalkToTrainer @@ -291,7 +292,7 @@ ViridianGymAfterBattleText1: text_far _ViridianGymAfterBattleText1 text_end -ViridianGymText3: +ViridianGymTrainerText2: text_asm ld hl, ViridianGymTrainerHeader1 call TalkToTrainer @@ -309,7 +310,7 @@ ViridianGymAfterBattleText2: text_far _ViridianGymAfterBattleText2 text_end -ViridianGymText4: +ViridianGymTrainerText3: text_asm ld hl, ViridianGymTrainerHeader2 call TalkToTrainer @@ -327,7 +328,7 @@ ViridianGymAfterBattleText3: text_far _ViridianGymAfterBattleText3 text_end -ViridianGymText5: +ViridianGymTrainerText4: text_asm ld hl, ViridianGymTrainerHeader3 call TalkToTrainer @@ -345,7 +346,7 @@ ViridianGymAfterBattleText4: text_far _ViridianGymAfterBattleText4 text_end -ViridianGymText6: +ViridianGymTrainerText5: text_asm ld hl, ViridianGymTrainerHeader4 call TalkToTrainer @@ -363,7 +364,7 @@ ViridianGymAfterBattleText5: text_far _ViridianGymAfterBattleText5 text_end -ViridianGymText7: +ViridianGymTrainerText6: text_asm ld hl, ViridianGymTrainerHeader5 call TalkToTrainer @@ -381,7 +382,7 @@ ViridianGymAfterBattleText6: text_far _ViridianGymAfterBattleText6 text_end -ViridianGymText8: +ViridianGymTrainerText7: text_asm ld hl, ViridianGymTrainerHeader6 call TalkToTrainer @@ -399,7 +400,7 @@ ViridianGymAfterBattleText7: text_far _ViridianGymAfterBattleText7 text_end -ViridianGymText9: +ViridianGymTrainerText8: text_asm ld hl, ViridianGymTrainerHeader7 call TalkToTrainer @@ -417,23 +418,23 @@ ViridianGymAfterBattleText8: text_far _ViridianGymAfterBattleText8 text_end -ViridianGymText10: +ViridianGymGuideText: text_asm CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI - jr nz, .asm_1abd1 - ld hl, ViridianGymText_74bd4 + jr nz, .afterBeat + ld hl, ViridianGymGuidePreBattleText call PrintText - jr .asm_6064d -.asm_1abd1 - ld hl, ViridianGymText_74bd9 + jr .done +.afterBeat + ld hl, ViridianGymGuidePostBattleText call PrintText -.asm_6064d +.done jp TextScriptEnd -ViridianGymText_74bd4: - text_far _ViridianGymText_74bd4 +ViridianGymGuidePreBattleText: + text_far _ViridianGymGuidePreBattleText text_end -ViridianGymText_74bd9: - text_far _ViridianGymText_74bd9 +ViridianGymGuidePostBattleText: + text_far _ViridianGymGuidePostBattleText text_end diff --git a/text/CeladonGym.asm b/text/CeladonGym.asm index 5d354bbb3c..2ea0dc4429 100644 --- a/text/CeladonGym.asm +++ b/text/CeladonGym.asm @@ -1,4 +1,4 @@ -_CeladonGymText_48a5e:: +_ErikaPreBattleText:: text "Hello. Lovely" line "weather isn't it?" cont "It's so pleasant." @@ -25,7 +25,7 @@ _CeladonGymText_48a5e:: line "shall not lose." done -_CeladonGymText_48a63:: +_ReceivedRainbowBadgeText:: text "Oh!" line "I concede defeat." @@ -36,7 +36,7 @@ _CeladonGymText_48a63:: line "the RAINBOWBADGE." prompt -_CeladonGymText_48a68:: +_ErikaPostBattleAdviceText:: text "You are cataloging" line "#MON? I must" cont "say I'm impressed." @@ -47,7 +47,7 @@ _CeladonGymText_48a68:: cont "unattractive." done -_CeladonGymText9:: +_ErikaRainbowBadgeInfoText:: text "The RAINBOWBADGE" line "will make #MON" cont "up to L50 obey." diff --git a/text/CeruleanGym.asm b/text/CeruleanGym.asm index d302ec3aaa..2c90ed15fb 100644 --- a/text/CeruleanGym.asm +++ b/text/CeruleanGym.asm @@ -1,4 +1,4 @@ -_CeruleanGymText_5c7be:: +_MistyPreBattleText:: text "Hi, you're a new" line "face!" @@ -17,7 +17,7 @@ _CeruleanGymText_5c7be:: cont "#MON!" done -_CeruleanGymText_5c7c3:: +_TM11ExplanationText:: text "TM11 teaches" line "BUBBLEBEAM!" @@ -25,7 +25,7 @@ _CeruleanGymText_5c7c3:: line "aquatic #MON!" done -_CeruleanGymText_5c7c8:: +_MistyCascadeBadgeInfoText:: text "The CASCADEBADGE" line "makes all #MON" cont "up to L30 obey!" @@ -50,12 +50,12 @@ _ReceivedTM11Text:: line "TM11!@" text_end -_CeruleanGymText_5c7d3:: +_TM11NoRoomText:: text "You better make" line "room for this!" done -_CeruleanGymText_5c7d8:: +_ReceivedCascadeBadgeText:: text "Wow!" line "You're too much!" @@ -105,7 +105,7 @@ _CeruleanGymAfterBattleText2:: line "someone like you!" done -_CeruleanGymText_5c82a:: +_CeruleanGymGuidePreBattleText:: text "Yo! Champ in" line "making!" @@ -123,7 +123,7 @@ _CeruleanGymText_5c82a:: line "electricity!" done -_CeruleanGymText_5c82f:: +_CeruleanGymGuidePostBattleText:: text "You beat MISTY!" line "What'd I tell ya?" diff --git a/text/CinnabarGym.asm b/text/CinnabarGym.asm index bf6cc0fb24..00fa7084e9 100644 --- a/text/CinnabarGym.asm +++ b/text/CinnabarGym.asm @@ -1,4 +1,4 @@ -_BlaineBattleText:: +_BlainePreBattleText:: text "Hah!" para "I am BLAINE! I" @@ -13,7 +13,7 @@ _BlaineBattleText:: line "have BURN HEAL!" done -_BlaineEndBattleText:: +_ReceivedVolcanoBadgeText:: text "I have" line "burnt out!" @@ -21,7 +21,7 @@ _BlaineEndBattleText:: line "the VOLCANOBADGE!@" text_end -_BlaineFireBlastText:: +_BlainePostBattleAdviceText:: text "FIRE BLAST is the" line "ultimate fire" cont "technique!" @@ -30,7 +30,7 @@ _BlaineFireBlastText:: line "water #MON!" done -_BlaineBadgeText:: +_BlaineVolcanoBadgeInfoText:: text "Hah!" para "The VOLCANOBADGE" @@ -68,18 +68,18 @@ _TM38NoRoomText:: line "gift!" done -_CinnabarGymText_7595f:: +_CinnabarGymBattleText2:: text "Do you know how" line "hot #MON fire" cont "breath can get?" done -_CinnabarGymText_75964:: +_CinnabarGymEndBattleText2:: text "Yow!" line "Hot, hot, hot!" prompt -_CinnabarGymText_75969:: +_CinnabarGymAfterBattleText2:: text "Fire, or to be" line "more precise," cont "combustion..." @@ -88,66 +88,66 @@ _CinnabarGymText_75969:: line "blah..." done -_CinnabarGymText_75994:: +_CinnabarGymBattleText1:: text "I was a thief, but" line "I became straight" cont "as a trainer!" done -_CinnabarGymText_75999:: +_CinnabarGymEndBattleText1:: text "I" line "surrender!" prompt -_CinnabarGymText_7599e:: +_CinnabarGymAfterBattleText1:: text "I can't help" line "stealing other" cont "people's #MON!" done -_CinnabarGymText_759c9:: +_CinnabarGymBattleText3:: text "You can't win!" line "I have studied" cont "#MON totally!" done -_CinnabarGymText_759ce:: +_CinnabarGymEndBattleText3:: text "Waah!" line "My studies!" prompt -_CinnabarGymText_759d3:: +_CinnabarGymAfterBattleText3:: text "My theories are" line "too complicated" cont "for you!" done -_CinnabarGymText_759fe:: +_CinnabarGymBattleText4:: text "I just like using" line "fire #MON!" done -_CinnabarGymText_75a03:: +_CinnabarGymEndBattleText4:: text "Too hot" line "to handle!" prompt -_CinnabarGymText_75a08:: +_CinnabarGymAfterBattleText4:: text "I wish there was" line "a thief #MON!" cont "I'd use that!" done -_CinnabarGymText_75a33:: +_CinnabarGymBattleText5:: text "I know why BLAINE" line "became a trainer!" done -_CinnabarGymText_75a38:: +_CinnabarGymEndBattleText5:: text "Ow!" prompt -_CinnabarGymText_75a3d:: +_CinnabarGymAfterBattleText5:: text "BLAINE was lost" line "in the mountains" cont "when a fiery bird" @@ -158,40 +158,40 @@ _CinnabarGymText_75a3d:: cont "his way down!" done -_CinnabarGymText_75a68:: +_CinnabarGymBattleText6:: text "I've been to many" line "GYMs, but this is" cont "my favorite!" done -_CinnabarGymText_75a6d:: +_CinnabarGymEndBattleText6:: text "Yowza!" line "Too hot!" prompt -_CinnabarGymText_75a72:: +_CinnabarGymAfterBattleText6:: text "Us fire #MON" line "fans like PONYTA" cont "and NINETALES!" done -_CinnabarGymText_75a9d:: +_CinnabarGymBattleText7:: text "Fire is weak" line "against H2O!" done -_CinnabarGymText_75aa2:: +_CinnabarGymEndBattleText7:: text "Oh!" line "Snuffed out!" prompt -_CinnabarGymText_75aa7:: +_CinnabarGymAfterBattleText7:: text "Water beats fire!" line "But, fire melts" cont "ice #MON!" done -_CinnabarGymText_75ac2:: +_CinnabarGymGuidePreBattleText:: text "Yo! Champ in" line "making!" @@ -206,7 +206,7 @@ _CinnabarGymText_75ac2:: line "some BURN HEALs!" done -_CinnabarGymText_75ac7:: +_CinnabarGymGuidePostBattleText:: text "! You beat" line "that fire brand!" done diff --git a/text/FuchsiaGym.asm b/text/FuchsiaGym.asm index 9108fc7945..3b2c01e9f7 100644 --- a/text/FuchsiaGym.asm +++ b/text/FuchsiaGym.asm @@ -16,7 +16,7 @@ _KogaBeforeBattleText:: cont "techniques!" done -_KogaAfterBattleText:: +_ReceivedSoulBadgeText:: text "Humph!" line "You have proven" cont "your worth!" diff --git a/text/FuchsiaGym_2.asm b/text/FuchsiaGym_2.asm index e8043e2499..b6443a5ae0 100644 --- a/text/FuchsiaGym_2.asm +++ b/text/FuchsiaGym_2.asm @@ -1,4 +1,4 @@ -_KogaExplainToxicText:: +_KogaPostBattleAdviceText:: text "When afflicted by" line "TOXIC, #MON" cont "suffer more and" @@ -9,7 +9,7 @@ _KogaExplainToxicText:: line "terrorize foes!" done -_FuchsiaGymText9:: +_KogaSoulBadgeInfoText:: text "Now that you have" line "the SOULBADGE," cont "the DEFENSE of" @@ -170,7 +170,7 @@ _FuchsiaGymAfterBattleText6:: cont "choose?" done -_FuchsiaGymText_7564e:: +_FuchsiaGymGuidePreBattleText:: text "Yo! Champ in" line "making!" @@ -187,7 +187,7 @@ _FuchsiaGymText_7564e:: cont "to reach him!" done -_FuchsiaGymText_75653:: +_FuchsiaGymGuidePostBattleText:: text "It's amazing how" line "ninja can terrify" cont "even now!" diff --git a/text/PewterGym.asm b/text/PewterGym.asm index 6426dd7214..9114ec7b48 100644 --- a/text/PewterGym.asm +++ b/text/PewterGym.asm @@ -1,4 +1,4 @@ -_PewterGymText_5c49e:: +_BrockPreBattleText:: text "I'm BROCK!" line "I'm PEWTER's GYM" cont "LEADER!" diff --git a/text/PewterGym_2.asm b/text/PewterGym_2.asm index b3c079a4fc..2f65127830 100644 --- a/text/PewterGym_2.asm +++ b/text/PewterGym_2.asm @@ -1,4 +1,4 @@ -_PewterGymText_5c4a3:: +_BrockPostBattleAdviceText:: text "There are all" line "kinds of trainers" cont "in the world!" @@ -12,7 +12,7 @@ _PewterGymText_5c4a3:: cont "your abilities!" done -_TM34PreReceiveText:: +_BeforeReceivedTM34Text:: text "Wait! Take this" line "with you!" done @@ -51,7 +51,7 @@ _TM34NoRoomText:: line "room for this!" done -_PewterGymText_5c4bc:: +_ReceivedBoulderBadgeText:: text "I took" line "you for granted." @@ -63,7 +63,7 @@ _PewterGymText_5c4bc:: line "the BOULDERBADGE!@" text_end -_PewterGymText_5c4c1:: +_BrockBoulerBadgeInfoText:: text_start para "That's an official" @@ -102,7 +102,7 @@ _PewterGymAfterBattleText1:: cont "as BROCK!" done -_PewterGymText_5c515:: +_PewterGymGuidePreAdviceText:: text "Hiya! I can tell" line "you have what it" cont "takes to become a" @@ -116,12 +116,12 @@ _PewterGymText_5c515:: line "to the top!" done -_PewterGymText_5c51a:: +_PewterGymGuideBeginAdviceText:: text "All right! Let's" line "get happening!" prompt -_PewterGymText_5c51f:: +_PewterGymGuideAdviceText:: text "The 1st #MON" line "out in a match is" cont "at the top of the" @@ -139,7 +139,7 @@ _PewterGymText_5c524:: cont "get happening!" prompt -_PewterGymText_5c529:: +_PewterGymGuidePostBattleText:: text "Just as I thought!" line "You're #MON" cont "champ material!" diff --git a/text/SaffronGym.asm b/text/SaffronGym.asm index ae8556c0b8..090b951a00 100644 --- a/text/SaffronGym.asm +++ b/text/SaffronGym.asm @@ -1,4 +1,4 @@ -_SaffronGymText_5d162:: +_SabrinaPreBattleText:: text "I had a vision of" line "your arrival!" @@ -16,7 +16,7 @@ _SaffronGymText_5d162:: cont "you my powers!" done -_SaffronGymText_5d167:: +_ReceivedMarshBadgeText:: text "I'm" line "shocked!" cont "But, a loss is a" @@ -30,14 +30,14 @@ _SaffronGymText_5d167:: line "MARSHBADGE!@" text_end -_SaffronGymText_5d16e:: +_SabrinaPostBattleAdviceText:: text "Everyone has" line "psychic power!" cont "People just don't" cont "realize it!" done -_SaffronGymText_5d173:: +_KogaMarshBadgeInfoText:: text "The MARSHBADGE" line "makes #MON up" cont "to L70 obey you!" @@ -55,7 +55,7 @@ _SaffronGymText_5d173:: line "this TM with you!" done -ReceivedTM46Text:: +_ReceivedTM46Text:: text " received" line "TM46!@" text_end @@ -74,7 +74,7 @@ _TM46NoRoomText:: line "of other items!" done -_SaffronGymText_5d1e6:: +_SaffronGymGuidePreBattleText:: text "Yo! Champ in" line "making!" @@ -91,7 +91,7 @@ _SaffronGymText_5d1e6:: cont "even aim a punch!" done -_SaffronGymText_5d1eb:: +_SaffronGymGuidePostBattleText:: text "Psychic power," line "huh?" diff --git a/text/VermilionGym_2.asm b/text/VermilionGym_2.asm index bf50422d0a..02af599d77 100644 --- a/text/VermilionGym_2.asm +++ b/text/VermilionGym_2.asm @@ -10,7 +10,7 @@ _LTSurgePostBattleAdviceText:: cont "type #MON!" done -_LTSurgeThunderbadgeInfoText:: +_LTSurgeThunderBadgeInfoText:: text "The THUNDERBADGE" line "cranks up your" cont "#MON's SPEED!" @@ -45,7 +45,7 @@ _TM24NoRoomText:: line "in your pack!" done -_ReceivedThunderbadgeText:: +_ReceivedThunderBadgeText:: text "Whoa!" para "You're the real" @@ -113,7 +113,7 @@ _VermilionGymAfterBattleText3:: cont "next to it!" done -_VermilionGymFanPreBattleText:: +_VermilionGymGuidePreBattleText:: text "Yo! Champ in" line "making!" @@ -139,7 +139,7 @@ _VermilionGymFanPreBattleText:: cont "get to him!" done -_VermilionGymFanPostBattleText:: +_VermilionGymGuidePostBattleText:: text "Whew! That match" line "was electric!" done diff --git a/text/ViridianGym.asm b/text/ViridianGym.asm index 2b1f67ae2d..feac79637c 100644 --- a/text/ViridianGym.asm +++ b/text/ViridianGym.asm @@ -1,4 +1,4 @@ -_ViridianGymText_74ace:: +_GiovanniPreBattleText:: text "Fwahahaha! This is" line "my hideout!" @@ -18,7 +18,7 @@ _ViridianGymText_74ace:: cont "greatest trainer!" done -_ViridianGymText_74ad3:: +_ReceivedEarthBadgeText:: text "Ha!" line "That was a truly" cont "intense fight!" @@ -27,7 +27,7 @@ _ViridianGymText_74ad3:: cont "the EARTHBADGE!@" text_end -_ViridianGymText_74ad9:: +_GiovanniPostBattleAdviceText:: text "Having lost, I" line "cannot face my" cont "underlings!" @@ -43,7 +43,7 @@ _ViridianGymText_74ad9:: cont "Farewell!@" text_end -_ViridianGymText12:: +_GiovanniEarthBadgeInfoText:: text "The EARTHBADGE" line "makes #MON of" cont "any level obey!" @@ -215,7 +215,7 @@ _ViridianGymAfterBattleText8:: cont "our GYM LEADER!" done -_ViridianGymText_74bd4:: +_ViridianGymGuidePreBattleText:: text "Yo! Champ in" line "making!" @@ -233,7 +233,7 @@ _ViridianGymText_74bd4:: cont "#MON!" done -_ViridianGymText_74bd9:: +_ViridianGymGuidePostBattleText:: text "Blow me away!" line "GIOVANNI was the" cont "GYM LEADER here?"