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. --- text/CeladonCity.asm | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'text/CeladonCity.asm') diff --git a/text/CeladonCity.asm b/text/CeladonCity.asm index 12146016..8baaf8d3 100644 --- a/text/CeladonCity.asm +++ b/text/CeladonCity.asm @@ -1,4 +1,4 @@ -_CeladonCityText1:: +_CeladonCityLittleGirlText:: text "I got my KOFFING" line "in CINNABAR!" @@ -7,19 +7,19 @@ _CeladonCityText1:: cont "when it's angry!" done -_CeladonCityText2:: +_CeladonCityGramps1Text:: text "Heheh! This GYM" line "is great! It's" cont "full of women!" done -_CeladonCityText3:: +_CeladonCityGirlText:: text "The GAME CORNER" line "is bad for our" cont "city's image!" done -_CeladonCityText4:: +_CeladonCityGramps2Text:: text "Moan! I blew it" line "all at the slots!" @@ -28,7 +28,7 @@ _CeladonCityText4:: cont "coins for prizes!" done -_TM41PreText:: +_CeledonCityGramps3Text:: text "Hello, there!" para "I've seen you," @@ -39,14 +39,14 @@ _TM41PreText:: line "dropping by!" prompt -_ReceivedTM41Text:: +_CeledonCityGramps3ReceivedTM41Text:: text " received" line "@" text_ram wStringBuffer text "!@" text_end -_TM41ExplanationText:: +_CeledonCityGramps3TM41ExplanationText:: text "TM41 teaches" line "SOFTBOILED!" @@ -57,12 +57,12 @@ _TM41ExplanationText:: line "CHANSEY!" done -_TM41NoRoomText:: +_CeledonCityGramps3TM41NoRoomText:: text "Oh, your pack is" line "full of items!" done -_CeladonCityText6:: +_CeladonCityFisherText:: text "This is my trusted" line "pal, POLIWRATH!" @@ -71,22 +71,22 @@ _CeladonCityText6:: cont "used WATER STONE!" done -_CeladonCityText7:: +_CeladonCityPoliwrathText:: text "POLIWRATH: Ribi" line "ribit!@" text_end -_CeladonCityText8:: +_CeladonCityRocket1Text:: text "What are you" line "staring at?" done -_CeladonCityText9:: +_CeladonCityRocket2Text:: text "Keep out of TEAM" line "ROCKET's way!" done -_CeladonCityText10:: +_CeladonCityTrainerTips1Text:: text "TRAINER TIPS" para "X ACCURACY boosts" @@ -102,13 +102,13 @@ _CeladonCityText10:: cont "STORE!" done -_CeladonCityText11:: +_CeladonCitySignText:: text "CELADON CITY" line "The City of" cont "Rainbow Dreams" done -_CeladonCityText13:: +_CeladonCityGymSignText:: text "CELADON CITY" line "#MON GYM" cont "LEADER: ERIKA" @@ -117,17 +117,17 @@ _CeladonCityText13:: line "Princess!" done -_CeladonCityText14:: +_CeladonCityMansionSignText:: text "CELADON MANSION" done -_CeladonCityText15:: +_CeladonCityDeptStoreSignText:: text "Find what you" line "need at CELADON" cont "DEPT. STORE!" done -_CeladonCityText16:: +_CeladonCityTrainerTips2Text:: text "TRAINER TIPS" para "GUARD SPEC." @@ -141,13 +141,13 @@ _CeladonCityText16:: cont "STORE!" done -_CeladonCityText17:: +_CeladonCityPrizeExchangeSignText:: text "Coins exchanged" line "for prizes!" cont "PRIZE EXCHANGE" done -_CeladonCityText18:: +_CeladonCityGameCornerSignText:: text "ROCKET GAME CORNER" line "The playground" cont "for grown-ups!" -- 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 'text/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