diff --git a/scripts/CeladonGym.asm b/scripts/CeladonGym.asm index 30e4fa357e..717c867764 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..8ca7427ab9 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 CeruleanGymFanText + 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, .aterBeat + call z, CeruleanGymReceiveTM11 call DisableWaitingAfterTextDisplay jr .done -.afterVictory - ld hl, CeruleanGymText_5c7c3 +.aterBeat + 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: +CeruleanGymFanText: text_asm CheckEvent EVENT_BEAT_MISTY - jr nz, .asm_5c821 - ld hl, CeruleanGymText_5c82a + jr nz, .afterBeat + ld hl, CeruleanGymFanPreBattleText call PrintText - jr .asm_5c827 -.asm_5c821 - ld hl, CeruleanGymText_5c82f + jr .done +.afterBeat + ld hl, CeruleanGymFanPostBattleText call PrintText -.asm_5c827 +.done jp TextScriptEnd -CeruleanGymText_5c82a: - text_far _CeruleanGymText_5c82a +CeruleanGymFanPreBattleText: + text_far _CeruleanGymFanPreBattleText text_end -CeruleanGymText_5c82f: - text_far _CeruleanGymText_5c82f +CeruleanGymFanPostBattleText: + text_far _CeruleanGymFanPostBattleText text_end diff --git a/scripts/FuchsiaGym.asm b/scripts/FuchsiaGym.asm index 9216ab0899..60e4f033cd 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: + +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 FuchsiaGymFanText + 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: +FuchsiaGymFanText: text_asm CheckEvent EVENT_BEAT_KOGA - ld hl, FuchsiaGymText_75653 - jr nz, .asm_50671 - ld hl, FuchsiaGymText_7564e -.asm_50671 + ld hl, FuchsiaGymFanPostBattleText + jr nz, .afterBeat + ld hl, FuchsiaGymFanPreBattleText +.afterBeat call PrintText jp TextScriptEnd -FuchsiaGymText_7564e: - text_far _FuchsiaGymText_7564e +FuchsiaGymFanPreBattleText: + text_far _FuchsiaGymFanPreBattleText text_end -FuchsiaGymText_75653: - text_far _FuchsiaGymText_75653 +FuchsiaGymFanPostBattleText: + text_far _FuchsiaGymFanPostBattleText text_end diff --git a/scripts/PewterGym.asm b/scripts/PewterGym.asm index f65d55068f..06a17d1a85 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: + +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 PewterGymFanText + 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: +PewterGymFanText: text_asm ld a, [wBeatGymFlags] bit BIT_BOULDERBADGE, a - jr nz, .asm_5c50c - ld hl, PewterGymText_5c515 + jr nz, .afterBeat + ld hl, PewterGymFanPreAdviceText call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a - jr nz, .asm_5c4fe - ld hl, PewterGymText_5c51a + jr nz, .PewterGymFanBeginAdviceText + ld hl, PewterGymFanBeginAdviceText call PrintText - jr .asm_5c504 -.asm_5c4fe + jr .PewterGymFanAdviceText +.PewterGymFanBeginAdviceText ld hl, PewterGymText_5c524 call PrintText -.asm_5c504 - ld hl, PewterGymText_5c51f +.PewterGymFanAdviceText + ld hl, PewterGymFanAdviceText call PrintText - jr .asm_5c512 -.asm_5c50c - ld hl, PewterGymText_5c529 + jr .done +.afterBeat + ld hl, PewterGymFanPostBattleText call PrintText -.asm_5c512 +.done jp TextScriptEnd -PewterGymText_5c515: - text_far _PewterGymText_5c515 +PewterGymFanPreAdviceText: + text_far _PewterGymFanPreAdviceText text_end -PewterGymText_5c51a: - text_far _PewterGymText_5c51a +PewterGymFanBeginAdviceText: + text_far _PewterGymFanBeginAdviceText text_end -PewterGymText_5c51f: - text_far _PewterGymText_5c51f +PewterGymFanAdviceText: + text_far _PewterGymFanAdviceText text_end PewterGymText_5c524: text_far _PewterGymText_5c524 text_end -PewterGymText_5c529: - text_far _PewterGymText_5c529 +PewterGymFanPostBattleText: + text_far _PewterGymFanPostBattleText text_end diff --git a/scripts/SaffronGym.asm b/scripts/SaffronGym.asm index a55c58ffb6..35efdba451 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 SaffronGymFanText + 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: +SaffronGymFanText: text_asm CheckEvent EVENT_BEAT_SABRINA - jr nz, .asm_5d1dd - ld hl, SaffronGymText_5d1e6 + jr nz, .afterBeat + ld hl, SaffronGymFanPreBattleText call PrintText - jr .asm_5d1e3 -.asm_5d1dd - ld hl, SaffronGymText_5d1eb + jr .done +.afterBeat + ld hl, SaffronGymFanPostBattleText call PrintText -.asm_5d1e3 +.done jp TextScriptEnd -SaffronGymText_5d1e6: - text_far _SaffronGymText_5d1e6 +SaffronGymFanPreBattleText: + text_far _SaffronGymFanPreBattleText text_end -SaffronGymText_5d1eb: - text_far _SaffronGymText_5d1eb +SaffronGymFanPostBattleText: + text_far _SaffronGymFanPostBattleText text_end SaffronGymBattleText1: diff --git a/text/CeladonGym.asm b/text/CeladonGym.asm index 5d354bbb3c..3bab86404c 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..0a2eee5e2a 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:: +_CeruleanGymFanPreBattleText:: text "Yo! Champ in" line "making!" @@ -123,7 +123,7 @@ _CeruleanGymText_5c82a:: line "electricity!" done -_CeruleanGymText_5c82f:: +_CeruleanGymFanPostBattleText:: text "You beat MISTY!" line "What'd I tell ya?" diff --git a/text/FuchsiaGym.asm b/text/FuchsiaGym.asm index 9108fc7945..a707b80dea 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..ee77e74269 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:: +_FuchsiaGymFanPreBattleText:: text "Yo! Champ in" line "making!" @@ -187,7 +187,7 @@ _FuchsiaGymText_7564e:: cont "to reach him!" done -_FuchsiaGymText_75653:: +_FuchsiaGymFanPostBattleText:: 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..4189500fde 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:: +_PewterGymFanPreAdviceText:: 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:: +_PewterGymFanBeginAdviceText:: text "All right! Let's" line "get happening!" prompt -_PewterGymText_5c51f:: +_PewterGymFanAdviceText:: 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:: +_PewterGymFanPostBattleText:: text "Just as I thought!" line "You're #MON" cont "champ material!" diff --git a/text/SaffronGym.asm b/text/SaffronGym.asm index ae8556c0b8..a1a7da5671 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:: +_SaffronGymFanPreBattleText:: text "Yo! Champ in" line "making!" @@ -91,7 +91,7 @@ _SaffronGymText_5d1e6:: cont "even aim a punch!" done -_SaffronGymText_5d1eb:: +_SaffronGymFanPostBattleText:: text "Psychic power," line "huh?"