summaryrefslogtreecommitdiff
path: root/data/maps/objects/MtMoonB2F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/MtMoonB2F.asm')
-rwxr-xr-xdata/maps/objects/MtMoonB2F.asm12
1 files changed, 4 insertions, 8 deletions
diff --git a/data/maps/objects/MtMoonB2F.asm b/data/maps/objects/MtMoonB2F.asm
index 0303406d..556388cb 100755
--- a/data/maps/objects/MtMoonB2F.asm
+++ b/data/maps/objects/MtMoonB2F.asm
@@ -1,15 +1,15 @@
MtMoonB2F_Object:
db $3 ; border block
- db 4 ; warps
+ def_warps
warp 25, 9, 1, MT_MOON_B1F
warp 21, 17, 4, MT_MOON_B1F
warp 15, 27, 5, MT_MOON_B1F
warp 5, 7, 6, MT_MOON_B1F
- db 0 ; signs
+ def_signs
- db 9 ; objects
+ def_objects
object SPRITE_SUPER_NERD, 12, 8, STAY, RIGHT, 1, OPP_SUPER_NERD, 2
object SPRITE_ROCKET, 11, 16, STAY, DOWN, 2, OPP_ROCKET, 1
object SPRITE_ROCKET, 15, 22, STAY, DOWN, 3, OPP_ROCKET, 2
@@ -20,8 +20,4 @@ MtMoonB2F_Object:
object SPRITE_POKE_BALL, 25, 21, STAY, NONE, 8, HP_UP
object SPRITE_POKE_BALL, 29, 5, STAY, NONE, 9, TM_MEGA_PUNCH
- ; warp-to
- warp_to 25, 9, MT_MOON_B2F_WIDTH ; MT_MOON_B1F
- warp_to 21, 17, MT_MOON_B2F_WIDTH ; MT_MOON_B1F
- warp_to 15, 27, MT_MOON_B2F_WIDTH ; MT_MOON_B1F
- warp_to 5, 7, MT_MOON_B2F_WIDTH ; MT_MOON_B1F
+ def_warps_to MT_MOON_B2F