summaryrefslogtreecommitdiff
path: root/data/maps/objects/SilphCo11F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/SilphCo11F.asm')
-rw-r--r--data/maps/objects/SilphCo11F.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/maps/objects/SilphCo11F.asm b/data/maps/objects/SilphCo11F.asm
index fd1167f0..dc7cd526 100644
--- a/data/maps/objects/SilphCo11F.asm
+++ b/data/maps/objects/SilphCo11F.asm
@@ -1,19 +1,19 @@
SilphCo11F_Object:
db $d ; border block
- def_warps
- warp 9, 0, 1, SILPH_CO_10F
- warp 13, 0, 0, SILPH_CO_ELEVATOR
- warp 5, 5, 9, LAST_MAP
- warp 3, 2, 3, SILPH_CO_7F
+ def_warp_events
+ warp_event 9, 0, SILPH_CO_10F, 1
+ warp_event 13, 0, SILPH_CO_ELEVATOR, 0
+ warp_event 5, 5, LAST_MAP, 9
+ warp_event 3, 2, SILPH_CO_7F, 3
- def_signs
+ def_bg_events
- def_objects
- object SPRITE_SILPH_PRESIDENT, 7, 5, STAY, DOWN, 1 ; person
- object SPRITE_BEAUTY, 10, 5, STAY, DOWN, 2 ; person
- object SPRITE_GIOVANNI, 6, 9, STAY, DOWN, 3, OPP_GIOVANNI, 2
- object SPRITE_ROCKET, 3, 16, STAY, UP, 4, OPP_ROCKET, 41
- object SPRITE_ROCKET, 15, 9, STAY, UP, 5, OPP_ROCKET, 40
+ def_object_events
+ object_event 7, 5, SPRITE_SILPH_PRESIDENT, STAY, DOWN, 1 ; person
+ object_event 10, 5, SPRITE_BEAUTY, STAY, DOWN, 2 ; person
+ object_event 6, 9, SPRITE_GIOVANNI, STAY, DOWN, 3, OPP_GIOVANNI, 2
+ object_event 3, 16, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 41
+ object_event 15, 9, SPRITE_ROCKET, STAY, UP, 5, OPP_ROCKET, 40
def_warps_to SILPH_CO_11F