diff options
| author | dannye <33dannye@gmail.com> | 2023-11-19 12:33:30 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-19 12:33:30 -0600 |
| commit | 9f2d6aa0a877b57eb65bce4bf3cde8a3f960bcc8 (patch) | |
| tree | 28b6f1337f75cc1fed5aa2bd4a5b2d13d2a12f7c | |
| parent | Correct wTilePlayerStandingOn "unused?" comment (#433) (diff) | |
| download | pokeyellow-9f2d6aa0a877b57eb65bce4bf3cde8a3f960bcc8.tar.gz pokeyellow-9f2d6aa0a877b57eb65bce4bf3cde8a3f960bcc8.tar.xz pokeyellow-9f2d6aa0a877b57eb65bce4bf3cde8a3f960bcc8.zip | |
Fix Celedon typo
| -rw-r--r-- | data/maps/objects/Route19.asm | 2 | ||||
| -rw-r--r-- | scripts/CeladonCity.asm | 8 | ||||
| -rw-r--r-- | text/CeladonCity.asm | 8 |
3 files changed, 9 insertions, 9 deletions
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 "<PLAYER> 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 |