From d001ced41b53271373753de835a9c3b3413dc318 Mon Sep 17 00:00:00 2001 From: vulcandth Date: Thu, 13 Jul 2023 20:27:56 -0500 Subject: Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified. --- scripts/CeruleanGym.asm | 90 +++++++++++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 44 deletions(-) (limited to 'scripts/CeruleanGym.asm') diff --git a/scripts/CeruleanGym.asm b/scripts/CeruleanGym.asm index 798716e3..8e6694ea 100644 --- a/scripts/CeruleanGym.asm +++ b/scripts/CeruleanGym.asm @@ -23,40 +23,41 @@ CeruleanGym_Script: db "MISTY@" CeruleanGymResetScripts: - xor a + xor a ; SCRIPT_CERULEANGYM_DEFAULT ld [wJoyIgnore], a ld [wCeruleanGymCurScript], a ld [wCurMapScript], a ret CeruleanGym_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw CeruleanGymMistyPostBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_CERULEANGYM_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_CERULEANGYM_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_CERULEANGYM_END_BATTLE + dw_const CeruleanGymMistyPostBattleScript, SCRIPT_CERULEANGYM_MISTY_POST_BATTLE -CeruleanGymMistyPostBattle: +CeruleanGymMistyPostBattleScript: ld a, [wIsInBattle] cp $ff jp z, CeruleanGymResetScripts - ld a, $f0 + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a CeruleanGymReceiveTM11: - ld a, $5 + ld a, TEXT_CERULEANGYM_MISTY_CASCADE_BADGE_INFO ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_BEAT_MISTY lb bc, TM_BUBBLEBEAM, 1 call GiveItem jr nc, .BagFull - ld a, $6 + ld a, TEXT_CERULEANGYM_MISTY_RECEIVED_TM11 ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM11 jr .gymVictory .BagFull - ld a, $7 + ld a, TEXT_CERULEANGYM_MISTY_TM11_NO_ROOM ldh [hSpriteIndexOrTextID], a call DisplayTextID .gymVictory @@ -71,13 +72,14 @@ CeruleanGymReceiveTM11: jp CeruleanGymResetScripts CeruleanGym_TextPointers: - dw MistyText - dw CeruleanGymTrainerText1 - dw CeruleanGymTrainerText2 - dw CeruleanGymGuideText - dw MistyCascadeBadgeInfoText - dw ReceivedTM11Text - dw TM11NoRoomText + def_text_pointers + dw_const CeruleanGymMistyText, TEXT_CERULEANGYM_MISTY + dw_const CeruleanGymCooltrainerFText, TEXT_CERULEANGYM_COOLTRAINER_F + dw_const CeruleanGymSwimmerText, TEXT_CERULEANGYM_SWIMMER + dw_const CeruleanGymGymGuideText, TEXT_CERULEANGYM_GYM_GUIDE + dw_const CeruleanGymMistyCascadeBadgeInfoText, TEXT_CERULEANGYM_MISTY_CASCADE_BADGE_INFO + dw_const CeruleanGymMistyReceivedTM11Text, TEXT_CERULEANGYM_MISTY_RECEIVED_TM11 + dw_const CeruleanGymMistyTM11NoRoomText, TEXT_CERULEANGYM_MISTY_TM11_NO_ROOM CeruleanGymTrainerHeaders: def_trainers 2 @@ -87,7 +89,7 @@ CeruleanGymTrainerHeader1: trainer EVENT_BEAT_CERULEAN_GYM_TRAINER_1, 3, CeruleanGymBattleText2, CeruleanGymEndBattleText2, CeruleanGymAfterBattleText2 db -1 ; end -MistyText: +CeruleanGymMistyText: text_asm CheckEvent EVENT_BEAT_MISTY jr z, .beforeBeat @@ -97,17 +99,17 @@ MistyText: call DisableWaitingAfterTextDisplay jr .done .afterBeat - ld hl, TM11ExplanationText + ld hl, .TM11ExplanationText call PrintText jr .done .beforeBeat - ld hl, MistyPreBattleText + ld hl, .PreBattleText call PrintText ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, ReceivedCascadeBadgeText - ld de, ReceivedCascadeBadgeText + ld hl, CeruleanGymMistyReceivedCascadeBadgeText + ld de, CeruleanGymMistyReceivedCascadeBadgeText call SaveEndBattleTextPointers ldh a, [hSpriteIndex] ld [wSpriteIndex], a @@ -117,39 +119,39 @@ MistyText: ld [wGymLeaderNo], a xor a ldh [hJoyHeld], a - ld a, $3 + ld a, SCRIPT_CERULEANGYM_MISTY_POST_BATTLE ld [wCeruleanGymCurScript], a .done jp TextScriptEnd -MistyPreBattleText: - text_far _MistyPreBattleText +.PreBattleText: + text_far _CeruleanGymMistyPreBattleText text_end -TM11ExplanationText: - text_far _TM11ExplanationText +.TM11ExplanationText: + text_far _CeruleanGymMistyTM11ExplanationText text_end -MistyCascadeBadgeInfoText: - text_far _MistyCascadeBadgeInfoText +CeruleanGymMistyCascadeBadgeInfoText: + text_far _CeruleanGymMistyCascadeBadgeInfoText text_end -ReceivedTM11Text: - text_far _ReceivedTM11Text +CeruleanGymMistyReceivedTM11Text: + text_far _CeruleanGymMistyReceivedTM11Text sound_get_item_1 text_end -TM11NoRoomText: - text_far _TM11NoRoomText +CeruleanGymMistyTM11NoRoomText: + text_far _CeruleanGymMistyTM11NoRoomText text_end -ReceivedCascadeBadgeText: - text_far _ReceivedCascadeBadgeText +CeruleanGymMistyReceivedCascadeBadgeText: + text_far _CeruleanGymMistyReceivedCascadeBadgeText 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 -CeruleanGymTrainerText1: +CeruleanGymCooltrainerFText: text_asm ld hl, CeruleanGymTrainerHeader0 call TalkToTrainer @@ -167,7 +169,7 @@ CeruleanGymAfterBattleText1: text_far _CeruleanGymAfterBattleText1 text_end -CeruleanGymTrainerText2: +CeruleanGymSwimmerText: text_asm ld hl, CeruleanGymTrainerHeader1 call TalkToTrainer @@ -185,23 +187,23 @@ CeruleanGymAfterBattleText2: text_far _CeruleanGymAfterBattleText2 text_end -CeruleanGymGuideText: +CeruleanGymGymGuideText: text_asm CheckEvent EVENT_BEAT_MISTY jr nz, .afterBeat - ld hl, CeruleanGymGuidePreBattleText + ld hl, .ChampInMakingText call PrintText jr .done .afterBeat - ld hl, CeruleanGymGuidePostBattleText + ld hl, .BeatMistyText call PrintText .done jp TextScriptEnd -CeruleanGymGuidePreBattleText: - text_far _CeruleanGymGuidePreBattleText +.ChampInMakingText: + text_far _CeruleanGymGymGuideChampInMakingText text_end -CeruleanGymGuidePostBattleText: - text_far _CeruleanGymGuidePostBattleText +.BeatMistyText: + text_far _CeruleanGymGymGuideBeatMistyText text_end -- cgit v1.3.1-sl0p