aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/Route25.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2021-09-26 22:56:02 -0500
committerdannye <33dannye@gmail.com>2021-09-26 22:56:02 -0500
commit94ed208164c3f6484a26923c5bc7664b9a3c4002 (patch)
treee6141c9f312ae0edf4b4741a729b03fea1ddebf5 /data/maps/objects/Route25.asm
parentMerge branch 'master' of https://github.com/pret/pokered (diff)
parentAlign `object_event` coordinates (diff)
downloadpokeyellow-94ed208164c3f6484a26923c5bc7664b9a3c4002.tar.gz
pokeyellow-94ed208164c3f6484a26923c5bc7664b9a3c4002.tar.xz
pokeyellow-94ed208164c3f6484a26923c5bc7664b9a3c4002.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/maps/objects/Route25.asm')
-rw-r--r--data/maps/objects/Route25.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/data/maps/objects/Route25.asm b/data/maps/objects/Route25.asm
index 96af21ab..096fd225 100644
--- a/data/maps/objects/Route25.asm
+++ b/data/maps/objects/Route25.asm
@@ -8,15 +8,15 @@ Route25_Object:
bg_event 43, 3, 11 ; Route25Text11
def_object_events
- object_event 14, 2, SPRITE_YOUNGSTER, STAY, DOWN, 1, OPP_YOUNGSTER, 5
- object_event 18, 5, SPRITE_YOUNGSTER, STAY, UP, 2, OPP_YOUNGSTER, 6
- object_event 24, 4, SPRITE_COOLTRAINER_M, STAY, DOWN, 3, OPP_JR_TRAINER_M, 2
- object_event 18, 8, SPRITE_COOLTRAINER_F, STAY, RIGHT, 4, OPP_LASS, 9
- object_event 32, 3, SPRITE_YOUNGSTER, STAY, LEFT, 5, OPP_YOUNGSTER, 7
- object_event 37, 4, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_LASS, 10
- object_event 8, 4, SPRITE_HIKER, STAY, RIGHT, 7, OPP_HIKER, 2
- object_event 23, 9, SPRITE_HIKER, STAY, UP, 8, OPP_HIKER, 3
- object_event 13, 7, SPRITE_HIKER, STAY, RIGHT, 9, OPP_HIKER, 4
- object_event 22, 2, SPRITE_POKE_BALL, STAY, NONE, 10, TM_SEISMIC_TOSS
+ object_event 14, 2, SPRITE_YOUNGSTER, STAY, DOWN, 1, OPP_YOUNGSTER, 5
+ object_event 18, 5, SPRITE_YOUNGSTER, STAY, UP, 2, OPP_YOUNGSTER, 6
+ object_event 24, 4, SPRITE_COOLTRAINER_M, STAY, DOWN, 3, OPP_JR_TRAINER_M, 2
+ object_event 18, 8, SPRITE_COOLTRAINER_F, STAY, RIGHT, 4, OPP_LASS, 9
+ object_event 32, 3, SPRITE_YOUNGSTER, STAY, LEFT, 5, OPP_YOUNGSTER, 7
+ object_event 37, 4, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_LASS, 10
+ object_event 8, 4, SPRITE_HIKER, STAY, RIGHT, 7, OPP_HIKER, 2
+ object_event 23, 9, SPRITE_HIKER, STAY, UP, 8, OPP_HIKER, 3
+ object_event 13, 7, SPRITE_HIKER, STAY, RIGHT, 9, OPP_HIKER, 4
+ object_event 22, 2, SPRITE_POKE_BALL, STAY, NONE, 10, TM_SEISMIC_TOSS
def_warps_to ROUTE_25