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/CeladonCity.asm | 131 ++++++++++++++++++++++++------------------------ 1 file changed, 66 insertions(+), 65 deletions(-) (limited to 'scripts/CeladonCity.asm') diff --git a/scripts/CeladonCity.asm b/scripts/CeladonCity.asm index bd0228d8..ee62c78b 100644 --- a/scripts/CeladonCity.asm +++ b/scripts/CeladonCity.asm @@ -5,128 +5,129 @@ CeladonCity_Script: ret CeladonCity_TextPointers: - dw CeladonCityText1 - dw CeladonCityText2 - dw CeladonCityText3 - dw CeladonCityText4 - dw CeladonCityText5 - dw CeladonCityText6 - dw CeladonCityText7 - dw CeladonCityText8 - dw CeladonCityText9 - dw CeladonCityText10 - dw CeladonCityText11 - dw PokeCenterSignText - dw CeladonCityText13 - dw CeladonCityText14 - dw CeladonCityText15 - dw CeladonCityText16 - dw CeladonCityText17 - dw CeladonCityText18 + def_text_pointers + dw_const CeladonCityLittleGirlText, TEXT_CELADONCITY_LITTLE_GIRL + dw_const CeladonCityGramps1Text, TEXT_CELADONCITY_GRAMPS1 + dw_const CeladonCityGirlText, TEXT_CELADONCITY_GIRL + dw_const CeladonCityGramps2Text, TEXT_CELADONCITY_GRAMPS2 + dw_const CeladonCityGramps3Text, TEXT_CELADONCITY_GRAMPS3 + dw_const CeladonCityFisherText, TEXT_CELADONCITY_FISHER + dw_const CeladonCityPoliwrathText, TEXT_CELADONCITY_POLIWRATH + dw_const CeladonCityRocket1Text, TEXT_CELADONCITY_ROCKET1 + dw_const CeladonCityRocket2Text, TEXT_CELADONCITY_ROCKET2 + dw_const CeladonCityTrainerTips1Text, TEXT_CELADONCITY_TRAINER_TIPS1 + dw_const CeladonCitySignText, TEXT_CELADONCITY_SIGN + dw_const PokeCenterSignText, TEXT_CELADONCITY_POKECENTER_SIGN + dw_const CeladonCityGymSignText, TEXT_CELADONCITY_GYM_SIGN + dw_const CeladonCityMansionSignText, TEXT_CELADONCITY_MANSION_SIGN + dw_const CeladonCityDeptStoreSignText, TEXT_CELADONCITY_DEPTSTORE_SIGN + dw_const CeladonCityTrainerTips2Text, TEXT_CELADONCITY_TRAINER_TIPS2 + dw_const CeladonCityPrizeExchangeSignText, TEXT_CELADONCITY_PRIZEEXCHANGE_SIGN + dw_const CeladonCityGameCornerSignText, TEXT_CELADONCITY_GAMECORNER_SIGN -CeladonCityText1: - text_far _CeladonCityText1 +CeladonCityLittleGirlText: + text_far _CeladonCityLittleGirlText text_end -CeladonCityText2: - text_far _CeladonCityText2 +CeladonCityGramps1Text: + text_far _CeladonCityGramps1Text text_end -CeladonCityText3: - text_far _CeladonCityText3 +CeladonCityGirlText: + text_far _CeladonCityGirlText text_end -CeladonCityText4: - text_far _CeladonCityText4 +CeladonCityGramps2Text: + text_far _CeladonCityGramps2Text text_end -CeladonCityText5: +CeladonCityGramps3Text: text_asm CheckEvent EVENT_GOT_TM41 - jr nz, .asm_7053f - ld hl, TM41PreText + jr nz, .gotTM41 + ld hl, .Text call PrintText lb bc, TM_SOFTBOILED, 1 call GiveItem jr c, .Success - ld hl, TM41NoRoomText + ld hl, .TM41NoRoomText call PrintText jr .Done .Success - ld hl, ReceivedTM41Text + ld hl, .ReceivedTM41Text call PrintText SetEvent EVENT_GOT_TM41 jr .Done -.asm_7053f - ld hl, TM41ExplanationText +.gotTM41 + ld hl, .TM41ExplanationText call PrintText .Done jp TextScriptEnd -TM41PreText: - text_far _TM41PreText +.Text: + text_far _CeledonCityGramps3Text text_end -ReceivedTM41Text: - text_far _ReceivedTM41Text +.ReceivedTM41Text: + text_far _CeledonCityGramps3ReceivedTM41Text sound_get_item_1 text_end -TM41ExplanationText: - text_far _TM41ExplanationText +.TM41ExplanationText: + text_far _CeledonCityGramps3TM41ExplanationText text_end -TM41NoRoomText: - text_far _TM41NoRoomText +.TM41NoRoomText: + text_far _CeledonCityGramps3TM41NoRoomText text_end -CeladonCityText6: - text_far _CeladonCityText6 +CeladonCityFisherText: + text_far _CeladonCityFisherText text_end -CeladonCityText7: - text_far _CeladonCityText7 +CeladonCityPoliwrathText: + text_far _CeladonCityPoliwrathText text_asm ld a, POLIWRATH call PlayCry jp TextScriptEnd -CeladonCityText8: - text_far _CeladonCityText8 +CeladonCityRocket1Text: + text_far _CeladonCityRocket1Text text_end -CeladonCityText9: - text_far _CeladonCityText9 +CeladonCityRocket2Text: + text_far _CeladonCityRocket2Text text_end -CeladonCityText10: - text_far _CeladonCityText10 +CeladonCityTrainerTips1Text: + text_far _CeladonCityTrainerTips1Text text_end -CeladonCityText11: - text_far _CeladonCityText11 +CeladonCitySignText: + text_far _CeladonCitySignText text_end -CeladonCityText13: - text_far _CeladonCityText13 +CeladonCityGymSignText: + text_far _CeladonCityGymSignText text_end -CeladonCityText14: - text_far _CeladonCityText14 +CeladonCityMansionSignText: + text_far _CeladonCityMansionSignText text_end -CeladonCityText15: - text_far _CeladonCityText15 +CeladonCityDeptStoreSignText: + text_far _CeladonCityDeptStoreSignText text_end -CeladonCityText16: - text_far _CeladonCityText16 +CeladonCityTrainerTips2Text: + text_far _CeladonCityTrainerTips2Text text_end -CeladonCityText17: - text_far _CeladonCityText17 +CeladonCityPrizeExchangeSignText: + text_far _CeladonCityPrizeExchangeSignText text_end -CeladonCityText18: - text_far _CeladonCityText18 +CeladonCityGameCornerSignText: + text_far _CeladonCityGameCornerSignText text_end -- cgit v1.3.1-sl0p From 9f2d6aa0a877b57eb65bce4bf3cde8a3f960bcc8 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 19 Nov 2023 12:33:30 -0600 Subject: Fix Celedon typo --- data/maps/objects/Route19.asm | 2 +- scripts/CeladonCity.asm | 8 ++++---- text/CeladonCity.asm | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'scripts/CeladonCity.asm') diff --git a/data/maps/objects/Route19.asm b/data/maps/objects/Route19.asm index ca5a2ffa..3513d477 100644 --- a/data/maps/objects/Route19.asm +++ b/data/maps/objects/Route19.asm @@ -20,7 +20,7 @@ Route19_Object: def_object_events object_event 8, 7, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE19_COOLTRAINER_M1, OPP_SWIMMER, 2 - object_event 13, 7, SPRITE_COOLTRAINER_M,STAY, LEFT, TEXT_ROUTE19_COOLTRAINER_M2, OPP_SWIMMER, 3 + object_event 13, 7, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE19_COOLTRAINER_M2, OPP_SWIMMER, 3 object_event 13, 25, SPRITE_SWIMMER, STAY, LEFT, TEXT_ROUTE19_SWIMMER1, OPP_SWIMMER, 4 object_event 4, 27, SPRITE_SWIMMER, STAY, RIGHT, TEXT_ROUTE19_SWIMMER2, OPP_SWIMMER, 5 object_event 16, 31, SPRITE_SWIMMER, STAY, UP, TEXT_ROUTE19_SWIMMER3, OPP_SWIMMER, 6 diff --git a/scripts/CeladonCity.asm b/scripts/CeladonCity.asm index ee62c78b..60ca58c3 100644 --- a/scripts/CeladonCity.asm +++ b/scripts/CeladonCity.asm @@ -65,20 +65,20 @@ CeladonCityGramps3Text: jp TextScriptEnd .Text: - text_far _CeledonCityGramps3Text + text_far _CeladonCityGramps3Text text_end .ReceivedTM41Text: - text_far _CeledonCityGramps3ReceivedTM41Text + text_far _CeladonCityGramps3ReceivedTM41Text sound_get_item_1 text_end .TM41ExplanationText: - text_far _CeledonCityGramps3TM41ExplanationText + text_far _CeladonCityGramps3TM41ExplanationText text_end .TM41NoRoomText: - text_far _CeledonCityGramps3TM41NoRoomText + text_far _CeladonCityGramps3TM41NoRoomText text_end CeladonCityFisherText: diff --git a/text/CeladonCity.asm b/text/CeladonCity.asm index 8baaf8d3..d1ea4147 100644 --- a/text/CeladonCity.asm +++ b/text/CeladonCity.asm @@ -28,7 +28,7 @@ _CeladonCityGramps2Text:: cont "coins for prizes!" done -_CeledonCityGramps3Text:: +_CeladonCityGramps3Text:: text "Hello, there!" para "I've seen you," @@ -39,14 +39,14 @@ _CeledonCityGramps3Text:: line "dropping by!" prompt -_CeledonCityGramps3ReceivedTM41Text:: +_CeladonCityGramps3ReceivedTM41Text:: text " received" line "@" text_ram wStringBuffer text "!@" text_end -_CeledonCityGramps3TM41ExplanationText:: +_CeladonCityGramps3TM41ExplanationText:: text "TM41 teaches" line "SOFTBOILED!" @@ -57,7 +57,7 @@ _CeledonCityGramps3TM41ExplanationText:: line "CHANSEY!" done -_CeledonCityGramps3TM41NoRoomText:: +_CeladonCityGramps3TM41NoRoomText:: text "Oh, your pack is" line "full of items!" done -- cgit v1.3.1-sl0p