aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/Route6.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2023-11-19 16:03:49 -0600
committerdannye <33dannye@gmail.com>2023-11-19 16:03:49 -0600
commite7f94cc52005142315878bb3a8f0bc96a9eda6fc (patch)
tree69fc403d68753520ea94f214421fe74a7d444cf9 /data/maps/objects/Route6.asm
parentRemove incorrect sign object consts (diff)
downloadpokeyellow-e7f94cc52005142315878bb3a8f0bc96a9eda6fc.tar.gz
pokeyellow-e7f94cc52005142315878bb3a8f0bc96a9eda6fc.tar.xz
pokeyellow-e7f94cc52005142315878bb3a8f0bc96a9eda6fc.zip
Fix inconsistent object const names
Diffstat (limited to 'data/maps/objects/Route6.asm')
-rw-r--r--data/maps/objects/Route6.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/objects/Route6.asm b/data/maps/objects/Route6.asm
index cd666768..155cbfb6 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