aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/RockTunnel1F.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/RockTunnel1F.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/RockTunnel1F.asm')
-rw-r--r--data/maps/objects/RockTunnel1F.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/RockTunnel1F.asm b/data/maps/objects/RockTunnel1F.asm
index 2d3b0522..cfe0e463 100644
--- a/data/maps/objects/RockTunnel1F.asm
+++ b/data/maps/objects/RockTunnel1F.asm
@@ -15,10 +15,10 @@ RockTunnel1F_Object:
bg_event 11, 29, 8 ; RockTunnel1Text8
def_object_events
- object_event 7, 5, SPRITE_HIKER, STAY, DOWN, 1, OPP_HIKER, 12
- object_event 5, 16, SPRITE_HIKER, STAY, DOWN, 2, OPP_HIKER, 13
+ object_event 7, 5, SPRITE_HIKER, STAY, DOWN, 1, OPP_HIKER, 12
+ object_event 5, 16, SPRITE_HIKER, STAY, DOWN, 2, OPP_HIKER, 13
object_event 17, 15, SPRITE_HIKER, STAY, LEFT, 3, OPP_HIKER, 14
- object_event 23, 8, SPRITE_SUPER_NERD, STAY, LEFT, 4, OPP_POKEMANIAC, 7
+ object_event 23, 8, SPRITE_SUPER_NERD, STAY, LEFT, 4, OPP_POKEMANIAC, 7
object_event 37, 21, SPRITE_COOLTRAINER_F, STAY, LEFT, 5, OPP_JR_TRAINER_F, 17
object_event 22, 24, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_JR_TRAINER_F, 18
object_event 32, 24, SPRITE_COOLTRAINER_F, STAY, RIGHT, 7, OPP_JR_TRAINER_F, 19