aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/Route17.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/Route17.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/Route17.asm')
-rw-r--r--data/maps/objects/Route17.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/objects/Route17.asm b/data/maps/objects/Route17.asm
index a2923c29..48d88926 100644
--- a/data/maps/objects/Route17.asm
+++ b/data/maps/objects/Route17.asm
@@ -14,13 +14,13 @@ Route17_Object:
def_object_events
object_event 12, 19, SPRITE_BIKER, STAY, LEFT, 1, OPP_CUE_BALL, 4
object_event 11, 16, SPRITE_BIKER, STAY, RIGHT, 2, OPP_CUE_BALL, 5
- object_event 4, 18, SPRITE_BIKER, STAY, UP, 3, OPP_BIKER, 8
- object_event 7, 32, SPRITE_BIKER, STAY, LEFT, 4, OPP_BIKER, 9
+ object_event 4, 18, SPRITE_BIKER, STAY, UP, 3, OPP_BIKER, 8
+ object_event 7, 32, SPRITE_BIKER, STAY, LEFT, 4, OPP_BIKER, 9
object_event 14, 34, SPRITE_BIKER, STAY, RIGHT, 5, OPP_BIKER, 10
object_event 17, 58, SPRITE_BIKER, STAY, LEFT, 6, OPP_CUE_BALL, 6
- object_event 2, 68, SPRITE_BIKER, STAY, RIGHT, 7, OPP_CUE_BALL, 7
+ object_event 2, 68, SPRITE_BIKER, STAY, RIGHT, 7, OPP_CUE_BALL, 7
object_event 14, 98, SPRITE_BIKER, STAY, RIGHT, 8, OPP_CUE_BALL, 8
- object_event 5, 98, SPRITE_BIKER, STAY, LEFT, 9, OPP_BIKER, 11
+ object_event 5, 98, SPRITE_BIKER, STAY, LEFT, 9, OPP_BIKER, 11
object_event 10, 118, SPRITE_BIKER, STAY, DOWN, 10, OPP_BIKER, 12
def_warps_to ROUTE_17