aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/Route9.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/Route9.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/Route9.asm')
-rw-r--r--data/maps/objects/Route9.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/data/maps/objects/Route9.asm b/data/maps/objects/Route9.asm
index a5c29bef..5d5a66cb 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