From e7f94cc52005142315878bb3a8f0bc96a9eda6fc Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 19 Nov 2023 16:03:49 -0600 Subject: [PATCH] Fix inconsistent object const names --- data/maps/objects/Route24.asm | 8 ++++---- data/maps/objects/Route6.asm | 8 ++++---- data/maps/objects/Route9.asm | 20 ++++++++++---------- scripts/Route24.asm | 4 ++-- scripts/Route6.asm | 4 ++-- scripts/Route9.asm | 10 +++++----- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/data/maps/objects/Route24.asm b/data/maps/objects/Route24.asm index f23eb7f84b..780bedd2bf 100644 --- a/data/maps/objects/Route24.asm +++ b/data/maps/objects/Route24.asm @@ -3,9 +3,9 @@ const_export ROUTE24_COOLTRAINER_M2 const_export ROUTE24_COOLTRAINER_M3 const_export ROUTE24_COOLTRAINER_F1 - const_export ROUTE24_YOUNGSTER_1 + const_export ROUTE24_YOUNGSTER1 const_export ROUTE24_COOLTRAINER_F2 - const_export ROUTE24_YOUNGSTER_2 + const_export ROUTE24_YOUNGSTER2 const_export ROUTE24_TM_THUNDER_WAVE Route24_Object: @@ -20,9 +20,9 @@ Route24_Object: object_event 5, 20, SPRITE_COOLTRAINER_M, STAY, UP, TEXT_ROUTE24_COOLTRAINER_M2, OPP_JR_TRAINER_M, 2 object_event 11, 19, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE24_COOLTRAINER_M3, OPP_JR_TRAINER_M, 3 object_event 10, 22, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROUTE24_COOLTRAINER_F1, OPP_LASS, 7 - object_event 11, 25, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE24_YOUNGSTER_1, OPP_YOUNGSTER, 4 + object_event 11, 25, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE24_YOUNGSTER1, OPP_YOUNGSTER, 4 object_event 10, 28, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROUTE24_COOLTRAINER_F2, OPP_LASS, 8 - object_event 11, 31, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE24_YOUNGSTER_2, OPP_BUG_CATCHER, 9 + object_event 11, 31, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE24_YOUNGSTER2, OPP_BUG_CATCHER, 9 object_event 10, 5, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROUTE24_TM_THUNDER_WAVE, TM_THUNDER_WAVE def_warps_to ROUTE_24 diff --git a/data/maps/objects/Route6.asm b/data/maps/objects/Route6.asm index cd66676882..155cbfb65d 100644 --- a/data/maps/objects/Route6.asm +++ b/data/maps/objects/Route6.asm @@ -1,10 +1,10 @@ object_const_def const_export ROUTE6_COOLTRAINER_M1 const_export ROUTE6_COOLTRAINER_F1 - const_export ROUTE6_YOUNGSTER_1 + const_export ROUTE6_YOUNGSTER1 const_export ROUTE6_COOLTRAINER_M2 const_export ROUTE6_COOLTRAINER_F2 - const_export ROUTE6_YOUNGSTER_2 + const_export ROUTE6_YOUNGSTER2 Route6_Object: db $f ; border block @@ -21,9 +21,9 @@ Route6_Object: def_object_events object_event 10, 21, SPRITE_COOLTRAINER_M, STAY, RIGHT, TEXT_ROUTE6_COOLTRAINER_M1, OPP_JR_TRAINER_M, 4 object_event 11, 21, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE6_COOLTRAINER_F1, OPP_JR_TRAINER_F, 2 - object_event 0, 15, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_ROUTE6_YOUNGSTER_1, OPP_BUG_CATCHER, 10 + object_event 0, 15, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_ROUTE6_YOUNGSTER1, OPP_BUG_CATCHER, 10 object_event 11, 31, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE6_COOLTRAINER_M2, OPP_JR_TRAINER_M, 5 object_event 11, 30, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE6_COOLTRAINER_F2, OPP_JR_TRAINER_F, 3 - object_event 19, 26, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE6_YOUNGSTER_2, OPP_BUG_CATCHER, 11 + object_event 19, 26, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE6_YOUNGSTER2, OPP_BUG_CATCHER, 11 def_warps_to ROUTE_6 diff --git a/data/maps/objects/Route9.asm b/data/maps/objects/Route9.asm index a5c29befd1..5d5a66cb7b 100644 --- a/data/maps/objects/Route9.asm +++ b/data/maps/objects/Route9.asm @@ -3,11 +3,11 @@ const_export ROUTE9_COOLTRAINER_M1 const_export ROUTE9_COOLTRAINER_M2 const_export ROUTE9_COOLTRAINER_F2 - const_export ROUTE9_HIKER_1 - const_export ROUTE9_HIKER_2 - const_export ROUTE9_YOUNGSTER_1 - const_export ROUTE9_HIKER_3 - const_export ROUTE9_YOUNGSTER_2 + const_export ROUTE9_HIKER1 + const_export ROUTE9_HIKER2 + const_export ROUTE9_YOUNGSTER1 + const_export ROUTE9_HIKER3 + const_export ROUTE9_YOUNGSTER2 const_export ROUTE9_TM_TELEPORT Route9_Object: @@ -23,11 +23,11 @@ Route9_Object: object_event 24, 7, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE9_COOLTRAINER_M1, OPP_JR_TRAINER_M, 7 object_event 31, 7, SPRITE_COOLTRAINER_M, STAY, RIGHT, TEXT_ROUTE9_COOLTRAINER_M2, OPP_JR_TRAINER_M, 8 object_event 48, 8, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROUTE9_COOLTRAINER_F2, OPP_JR_TRAINER_F, 6 - object_event 16, 15, SPRITE_HIKER, STAY, LEFT, TEXT_ROUTE9_HIKER_1, OPP_HIKER, 11 - object_event 43, 3, SPRITE_HIKER, STAY, LEFT, TEXT_ROUTE9_HIKER_2, OPP_HIKER, 6 - object_event 22, 2, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_ROUTE9_YOUNGSTER_1, OPP_BUG_CATCHER, 13 - object_event 45, 15, SPRITE_HIKER, STAY, RIGHT, TEXT_ROUTE9_HIKER_3, OPP_HIKER, 5 - object_event 40, 8, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_ROUTE9_YOUNGSTER_2, OPP_BUG_CATCHER, 14 + object_event 16, 15, SPRITE_HIKER, STAY, LEFT, TEXT_ROUTE9_HIKER1, OPP_HIKER, 11 + object_event 43, 3, SPRITE_HIKER, STAY, LEFT, TEXT_ROUTE9_HIKER2, OPP_HIKER, 6 + object_event 22, 2, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_ROUTE9_YOUNGSTER1, OPP_BUG_CATCHER, 13 + object_event 45, 15, SPRITE_HIKER, STAY, RIGHT, TEXT_ROUTE9_HIKER3, OPP_HIKER, 5 + object_event 40, 8, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_ROUTE9_YOUNGSTER2, OPP_BUG_CATCHER, 14 object_event 10, 15, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROUTE9_TM_TELEPORT, TM_TELEPORT def_warps_to ROUTE_9 diff --git a/scripts/Route24.asm b/scripts/Route24.asm index 8fa9dd202c..47d6eb9f04 100644 --- a/scripts/Route24.asm +++ b/scripts/Route24.asm @@ -83,9 +83,9 @@ Route24_TextPointers: dw_const Route24CooltrainerM2Text, TEXT_ROUTE24_COOLTRAINER_M2 dw_const Route24CooltrainerM3Text, TEXT_ROUTE24_COOLTRAINER_M3 dw_const Route24CooltrainerF1Text, TEXT_ROUTE24_COOLTRAINER_F1 - dw_const Route24Youngster1Text, TEXT_ROUTE24_YOUNGSTER_1 + dw_const Route24Youngster1Text, TEXT_ROUTE24_YOUNGSTER1 dw_const Route24CooltrainerF2Text, TEXT_ROUTE24_COOLTRAINER_F2 - dw_const Route24Youngster2Text, TEXT_ROUTE24_YOUNGSTER_2 + dw_const Route24Youngster2Text, TEXT_ROUTE24_YOUNGSTER2 dw_const PickUpItemText, TEXT_ROUTE24_TM_THUNDER_WAVE Route24TrainerHeaders: diff --git a/scripts/Route6.asm b/scripts/Route6.asm index b7b8c1ce81..0151c9248e 100644 --- a/scripts/Route6.asm +++ b/scripts/Route6.asm @@ -17,10 +17,10 @@ Route6_TextPointers: def_text_pointers dw_const Route6CooltrainerM1Text, TEXT_ROUTE6_COOLTRAINER_M1 dw_const Route6CooltrainerF1Text, TEXT_ROUTE6_COOLTRAINER_F1 - dw_const Route6Youngster1Text, TEXT_ROUTE6_YOUNGSTER_1 + dw_const Route6Youngster1Text, TEXT_ROUTE6_YOUNGSTER1 dw_const Route6CooltrainerM2Text, TEXT_ROUTE6_COOLTRAINER_M2 dw_const Route6CooltrainerF2Text, TEXT_ROUTE6_COOLTRAINER_F2 - dw_const Route6Youngster2Text, TEXT_ROUTE6_YOUNGSTER_2 + dw_const Route6Youngster2Text, TEXT_ROUTE6_YOUNGSTER2 dw_const Route6UndergroundPathSignText, TEXT_ROUTE6_UNDERGROUND_PATH_SIGN Route6TrainerHeaders: diff --git a/scripts/Route9.asm b/scripts/Route9.asm index 0aa9122945..a2bb6abb50 100644 --- a/scripts/Route9.asm +++ b/scripts/Route9.asm @@ -19,11 +19,11 @@ Route9_TextPointers: dw_const Route9CooltrainerM1Text, TEXT_ROUTE9_COOLTRAINER_M1 dw_const Route9CooltrainerM2Text, TEXT_ROUTE9_COOLTRAINER_M2 dw_const Route9CooltrainerF2Text, TEXT_ROUTE9_COOLTRAINER_F2 - dw_const Route9Hiker1Text, TEXT_ROUTE9_HIKER_1 - dw_const Route9Hiker2Text, TEXT_ROUTE9_HIKER_2 - dw_const Route9Youngster1Text, TEXT_ROUTE9_YOUNGSTER_1 - dw_const Route9Hiker3Text, TEXT_ROUTE9_HIKER_3 - dw_const Route9Youngster2Text, TEXT_ROUTE9_YOUNGSTER_2 + dw_const Route9Hiker1Text, TEXT_ROUTE9_HIKER1 + dw_const Route9Hiker2Text, TEXT_ROUTE9_HIKER2 + dw_const Route9Youngster1Text, TEXT_ROUTE9_YOUNGSTER1 + dw_const Route9Hiker3Text, TEXT_ROUTE9_HIKER3 + dw_const Route9Youngster2Text, TEXT_ROUTE9_YOUNGSTER2 dw_const PickUpItemText, TEXT_ROUTE9_TM_TELEPORT dw_const Route9SignText, TEXT_ROUTE9_SIGN