summaryrefslogtreecommitdiff
path: root/data/maps/objects/SilphCo2F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/SilphCo2F.asm')
-rw-r--r--data/maps/objects/SilphCo2F.asm30
1 files changed, 15 insertions, 15 deletions
diff --git a/data/maps/objects/SilphCo2F.asm b/data/maps/objects/SilphCo2F.asm
index 186d1581..b7a68c4e 100644
--- a/data/maps/objects/SilphCo2F.asm
+++ b/data/maps/objects/SilphCo2F.asm
@@ -1,22 +1,22 @@
SilphCo2F_Object:
db $2e ; border block
- def_warps
- warp 24, 0, 2, SILPH_CO_1F
- warp 26, 0, 0, SILPH_CO_3F
- warp 20, 0, 0, SILPH_CO_ELEVATOR
- warp 3, 3, 6, SILPH_CO_3F
- warp 13, 3, 4, SILPH_CO_8F
- warp 27, 15, 5, SILPH_CO_8F
- warp 9, 15, 4, SILPH_CO_6F
+ def_warp_events
+ warp_event 24, 0, SILPH_CO_1F, 2
+ warp_event 26, 0, SILPH_CO_3F, 0
+ warp_event 20, 0, SILPH_CO_ELEVATOR, 0
+ warp_event 3, 3, SILPH_CO_3F, 6
+ warp_event 13, 3, SILPH_CO_8F, 4
+ warp_event 27, 15, SILPH_CO_8F, 5
+ warp_event 9, 15, SILPH_CO_6F, 4
- def_signs
+ def_bg_events
- def_objects
- object SPRITE_ERIKA, 10, 1, STAY, UP, 1 ; person
- object SPRITE_SCIENTIST, 5, 12, STAY, DOWN, 2, OPP_SCIENTIST, 2
- object SPRITE_SCIENTIST, 24, 13, STAY, LEFT, 3, OPP_SCIENTIST, 3
- object SPRITE_ROCKET, 16, 11, STAY, UP, 4, OPP_ROCKET, 23
- object SPRITE_ROCKET, 24, 7, STAY, UP, 5, OPP_ROCKET, 24
+ def_object_events
+ object_event 10, 1, SPRITE_ERIKA, STAY, UP, 1 ; person
+ object_event 5, 12, SPRITE_SCIENTIST, STAY, DOWN, 2, OPP_SCIENTIST, 2
+ object_event 24, 13, SPRITE_SCIENTIST, STAY, LEFT, 3, OPP_SCIENTIST, 3
+ object_event 16, 11, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 23
+ object_event 24, 7, SPRITE_ROCKET, STAY, UP, 5, OPP_ROCKET, 24
def_warps_to SILPH_CO_2F