aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/RocketHideoutB3F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/RocketHideoutB3F.asm')
-rwxr-xr-xdata/maps/objects/RocketHideoutB3F.asm10
1 files changed, 4 insertions, 6 deletions
diff --git a/data/maps/objects/RocketHideoutB3F.asm b/data/maps/objects/RocketHideoutB3F.asm
index 2b0d7e5a..62164f92 100755
--- a/data/maps/objects/RocketHideoutB3F.asm
+++ b/data/maps/objects/RocketHideoutB3F.asm
@@ -1,18 +1,16 @@
RocketHideoutB3F_Object:
db $2e ; border block
- db 2 ; warps
+ def_warps
warp 25, 6, 1, ROCKET_HIDEOUT_B2F
warp 19, 18, 0, ROCKET_HIDEOUT_B4F
- db 0 ; signs
+ def_signs
- db 4 ; objects
+ def_objects
object SPRITE_ROCKET, 10, 22, STAY, RIGHT, 1, OPP_ROCKET, 14
object SPRITE_ROCKET, 26, 12, STAY, UP, 2, OPP_ROCKET, 15
object SPRITE_POKE_BALL, 26, 17, STAY, NONE, 3, TM_DOUBLE_EDGE
object SPRITE_POKE_BALL, 20, 14, STAY, NONE, 4, RARE_CANDY
- ; warp-to
- warp_to 25, 6, ROCKET_HIDEOUT_B3F_WIDTH ; ROCKET_HIDEOUT_B2F
- warp_to 19, 18, ROCKET_HIDEOUT_B3F_WIDTH ; ROCKET_HIDEOUT_B4F
+ def_warps_to ROCKET_HIDEOUT_B3F