aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/Route20.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/Route20.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/Route20.asm')
-rw-r--r--data/maps/objects/Route20.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/objects/Route20.asm b/data/maps/objects/Route20.asm
index 6b55e6e0..c00d2284 100644
--- a/data/maps/objects/Route20.asm
+++ b/data/maps/objects/Route20.asm
@@ -10,15 +10,15 @@ Route20_Object:
bg_event 57, 11, 12 ; Route20Text12
def_object_events
- object_event 87, 8, SPRITE_SWIMMER, STAY, UP, 1, OPP_SWIMMER, 9
+ object_event 87, 8, SPRITE_SWIMMER, STAY, UP, 1, OPP_SWIMMER, 9
object_event 68, 11, SPRITE_SWIMMER, STAY, UP, 2, OPP_BEAUTY, 15
object_event 45, 10, SPRITE_SWIMMER, STAY, DOWN, 3, OPP_BEAUTY, 6
object_event 55, 14, SPRITE_SWIMMER, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 24
object_event 38, 13, SPRITE_SWIMMER, STAY, DOWN, 5, OPP_SWIMMER, 10
object_event 87, 13, SPRITE_SWIMMER, STAY, UP, 6, OPP_SWIMMER, 11
- object_event 34, 9, SPRITE_COOLTRAINER_M, STAY, UP, 7, OPP_BIRD_KEEPER, 11
- object_event 25, 7, SPRITE_SWIMMER, STAY, UP, 8, OPP_BEAUTY, 7
+ object_event 34, 9, SPRITE_COOLTRAINER_M, STAY, UP, 7, OPP_BIRD_KEEPER, 11
+ object_event 25, 7, SPRITE_SWIMMER, STAY, UP, 8, OPP_BEAUTY, 7
object_event 24, 12, SPRITE_SWIMMER, STAY, DOWN, 9, OPP_JR_TRAINER_F, 16
- object_event 15, 8, SPRITE_SWIMMER, STAY, UP, 10, OPP_BEAUTY, 8
+ object_event 15, 8, SPRITE_SWIMMER, STAY, UP, 10, OPP_BEAUTY, 8
def_warps_to ROUTE_20