aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/RocketHideoutB1F.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/RocketHideoutB1F.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/RocketHideoutB1F.asm')
-rw-r--r--data/maps/objects/RocketHideoutB1F.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/RocketHideoutB1F.asm b/data/maps/objects/RocketHideoutB1F.asm
index f3d9fb79..99eb2dc0 100644
--- a/data/maps/objects/RocketHideoutB1F.asm
+++ b/data/maps/objects/RocketHideoutB1F.asm
@@ -11,12 +11,12 @@ RocketHideoutB1F_Object:
def_bg_events
def_object_events
- object_event 26, 8, SPRITE_ROCKET, STAY, LEFT, 1, OPP_ROCKET, 8
- object_event 12, 6, SPRITE_ROCKET, STAY, RIGHT, 2, OPP_ROCKET, 9
+ object_event 26, 8, SPRITE_ROCKET, STAY, LEFT, 1, OPP_ROCKET, 8
+ object_event 12, 6, SPRITE_ROCKET, STAY, RIGHT, 2, OPP_ROCKET, 9
object_event 18, 17, SPRITE_ROCKET, STAY, DOWN, 3, OPP_ROCKET, 10
object_event 15, 25, SPRITE_ROCKET, STAY, RIGHT, 4, OPP_ROCKET, 11
object_event 28, 18, SPRITE_ROCKET, STAY, LEFT, 5, OPP_ROCKET, 12
object_event 11, 14, SPRITE_POKE_BALL, STAY, NONE, 6, ESCAPE_ROPE
- object_event 9, 17, SPRITE_POKE_BALL, STAY, NONE, 7, HYPER_POTION
+ object_event 9, 17, SPRITE_POKE_BALL, STAY, NONE, 7, HYPER_POTION
def_warps_to ROCKET_HIDEOUT_B1F