aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/Route16.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/Route16.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/Route16.asm')
-rw-r--r--data/maps/objects/Route16.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/Route16.asm b/data/maps/objects/Route16.asm
index 4b4aa5bd..a0035b60 100644
--- a/data/maps/objects/Route16.asm
+++ b/data/maps/objects/Route16.asm
@@ -20,9 +20,9 @@ Route16_Object:
object_event 17, 12, SPRITE_BIKER, STAY, LEFT, 1, OPP_BIKER, 5
object_event 14, 13, SPRITE_BIKER, STAY, RIGHT, 2, OPP_CUE_BALL, 1
object_event 11, 12, SPRITE_BIKER, STAY, UP, 3, OPP_CUE_BALL, 2
- object_event 9, 11, SPRITE_BIKER, STAY, LEFT, 4, OPP_BIKER, 6
- object_event 6, 10, SPRITE_BIKER, STAY, RIGHT, 5, OPP_CUE_BALL, 3
- object_event 3, 12, SPRITE_BIKER, STAY, RIGHT, 6, OPP_BIKER, 7
+ object_event 9, 11, SPRITE_BIKER, STAY, LEFT, 4, OPP_BIKER, 6
+ object_event 6, 10, SPRITE_BIKER, STAY, RIGHT, 5, OPP_CUE_BALL, 3
+ object_event 3, 12, SPRITE_BIKER, STAY, RIGHT, 6, OPP_BIKER, 7
object_event 26, 10, SPRITE_SNORLAX, STAY, DOWN, 7 ; person
def_warps_to ROUTE_16