summaryrefslogtreecommitdiff
path: root/data/maps/objects/RocketHideoutB2F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/RocketHideoutB2F.asm')
-rw-r--r--data/maps/objects/RocketHideoutB2F.asm26
1 files changed, 13 insertions, 13 deletions
diff --git a/data/maps/objects/RocketHideoutB2F.asm b/data/maps/objects/RocketHideoutB2F.asm
index f6ce5113..19a77d20 100644
--- a/data/maps/objects/RocketHideoutB2F.asm
+++ b/data/maps/objects/RocketHideoutB2F.asm
@@ -1,20 +1,20 @@
RocketHideoutB2F_Object:
db $2e ; border block
- def_warps
- warp 27, 8, 0, ROCKET_HIDEOUT_B1F
- warp 21, 8, 0, ROCKET_HIDEOUT_B3F
- warp 24, 19, 0, ROCKET_HIDEOUT_ELEVATOR
- warp 21, 22, 3, ROCKET_HIDEOUT_B1F
- warp 25, 19, 1, ROCKET_HIDEOUT_ELEVATOR
+ def_warp_events
+ warp_event 27, 8, ROCKET_HIDEOUT_B1F, 0
+ warp_event 21, 8, ROCKET_HIDEOUT_B3F, 0
+ warp_event 24, 19, ROCKET_HIDEOUT_ELEVATOR, 0
+ warp_event 21, 22, ROCKET_HIDEOUT_B1F, 3
+ warp_event 25, 19, ROCKET_HIDEOUT_ELEVATOR, 1
- def_signs
+ def_bg_events
- def_objects
- object SPRITE_ROCKET, 20, 12, STAY, DOWN, 1, OPP_ROCKET, 13
- object SPRITE_POKE_BALL, 1, 11, STAY, NONE, 2, MOON_STONE
- object SPRITE_POKE_BALL, 16, 8, STAY, NONE, 3, NUGGET
- object SPRITE_POKE_BALL, 6, 12, STAY, NONE, 4, TM_HORN_DRILL
- object SPRITE_POKE_BALL, 3, 21, STAY, NONE, 5, SUPER_POTION
+ def_object_events
+ object_event 20, 12, SPRITE_ROCKET, STAY, DOWN, 1, OPP_ROCKET, 13
+ object_event 1, 11, SPRITE_POKE_BALL, STAY, NONE, 2, MOON_STONE
+ object_event 16, 8, SPRITE_POKE_BALL, STAY, NONE, 3, NUGGET
+ object_event 6, 12, SPRITE_POKE_BALL, STAY, NONE, 4, TM_HORN_DRILL
+ object_event 3, 21, SPRITE_POKE_BALL, STAY, NONE, 5, SUPER_POTION
def_warps_to ROCKET_HIDEOUT_B2F