summaryrefslogtreecommitdiff
path: root/data/maps/objects/MtMoonB2F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/MtMoonB2F.asm')
-rw-r--r--data/maps/objects/MtMoonB2F.asm32
1 files changed, 16 insertions, 16 deletions
diff --git a/data/maps/objects/MtMoonB2F.asm b/data/maps/objects/MtMoonB2F.asm
index 7b2e7e5a..8fb91617 100644
--- a/data/maps/objects/MtMoonB2F.asm
+++ b/data/maps/objects/MtMoonB2F.asm
@@ -1,23 +1,23 @@
MtMoonB2F_Object:
db $3 ; border block
- 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
+ def_warp_events
+ warp_event 25, 9, MT_MOON_B1F, 1
+ warp_event 21, 17, MT_MOON_B1F, 4
+ warp_event 15, 27, MT_MOON_B1F, 5
+ warp_event 5, 7, MT_MOON_B1F, 6
- def_signs
+ def_bg_events
- 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
- object SPRITE_ROCKET, 29, 11, STAY, UP, 4, OPP_ROCKET, 3
- object SPRITE_ROCKET, 29, 17, STAY, LEFT, 5, OPP_ROCKET, 4
- object SPRITE_FOSSIL, 12, 6, STAY, NONE, 6 ; person
- object SPRITE_FOSSIL, 13, 6, STAY, NONE, 7 ; person
- object SPRITE_POKE_BALL, 25, 21, STAY, NONE, 8, HP_UP
- object SPRITE_POKE_BALL, 29, 5, STAY, NONE, 9, TM_MEGA_PUNCH
+ def_object_events
+ object_event 12, 8, SPRITE_SUPER_NERD, STAY, RIGHT, 1, OPP_SUPER_NERD, 2
+ object_event 11, 16, SPRITE_ROCKET, STAY, DOWN, 2, OPP_ROCKET, 1
+ object_event 15, 22, SPRITE_ROCKET, STAY, DOWN, 3, OPP_ROCKET, 2
+ object_event 29, 11, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 3
+ object_event 29, 17, SPRITE_ROCKET, STAY, LEFT, 5, OPP_ROCKET, 4
+ object_event 12, 6, SPRITE_FOSSIL, STAY, NONE, 6 ; person
+ object_event 13, 6, SPRITE_FOSSIL, STAY, NONE, 7 ; person
+ object_event 25, 21, SPRITE_POKE_BALL, STAY, NONE, 8, HP_UP
+ object_event 29, 5, SPRITE_POKE_BALL, STAY, NONE, 9, TM_MEGA_PUNCH
def_warps_to MT_MOON_B2F