aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/RockTunnelB1F.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/RockTunnelB1F.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/RockTunnelB1F.asm')
-rw-r--r--data/maps/objects/RockTunnelB1F.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/RockTunnelB1F.asm b/data/maps/objects/RockTunnelB1F.asm
index 82f6ae83..79030034 100644
--- a/data/maps/objects/RockTunnelB1F.asm
+++ b/data/maps/objects/RockTunnelB1F.asm
@@ -11,12 +11,12 @@ RockTunnelB1F_Object:
def_object_events
object_event 11, 13, SPRITE_COOLTRAINER_F, STAY, DOWN, 1, OPP_JR_TRAINER_F, 9
- object_event 6, 10, SPRITE_HIKER, STAY, DOWN, 2, OPP_HIKER, 9
- object_event 3, 5, SPRITE_SUPER_NERD, STAY, DOWN, 3, OPP_POKEMANIAC, 3
+ object_event 6, 10, SPRITE_HIKER, STAY, DOWN, 2, OPP_HIKER, 9
+ object_event 3, 5, SPRITE_SUPER_NERD, STAY, DOWN, 3, OPP_POKEMANIAC, 3
object_event 20, 21, SPRITE_SUPER_NERD, STAY, RIGHT, 4, OPP_POKEMANIAC, 4
object_event 30, 10, SPRITE_HIKER, STAY, DOWN, 5, OPP_HIKER, 10
object_event 14, 28, SPRITE_COOLTRAINER_F, STAY, RIGHT, 6, OPP_JR_TRAINER_F, 10
- object_event 33, 5, SPRITE_HIKER, STAY, RIGHT, 7, OPP_HIKER, 11
+ object_event 33, 5, SPRITE_HIKER, STAY, RIGHT, 7, OPP_HIKER, 11
object_event 26, 30, SPRITE_SUPER_NERD, STAY, DOWN, 8, OPP_POKEMANIAC, 5
def_warps_to ROCK_TUNNEL_B1F