summaryrefslogtreecommitdiff
path: root/data/maps/objects/SilphCo3F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/SilphCo3F.asm')
-rw-r--r--data/maps/objects/SilphCo3F.asm34
1 files changed, 17 insertions, 17 deletions
diff --git a/data/maps/objects/SilphCo3F.asm b/data/maps/objects/SilphCo3F.asm
index e9ea1cce..5f37ed91 100644
--- a/data/maps/objects/SilphCo3F.asm
+++ b/data/maps/objects/SilphCo3F.asm
@@ -1,24 +1,24 @@
SilphCo3F_Object:
db $2e ; border block
- def_warps
- warp 26, 0, 1, SILPH_CO_2F
- warp 24, 0, 0, SILPH_CO_4F
- warp 20, 0, 0, SILPH_CO_ELEVATOR
- warp 23, 11, 9, SILPH_CO_3F
- warp 3, 3, 5, SILPH_CO_5F
- warp 3, 15, 6, SILPH_CO_5F
- warp 27, 3, 3, SILPH_CO_2F
- warp 3, 11, 3, SILPH_CO_9F
- warp 11, 11, 4, SILPH_CO_7F
- warp 27, 15, 3, SILPH_CO_3F
+ def_warp_events
+ warp_event 26, 0, SILPH_CO_2F, 1
+ warp_event 24, 0, SILPH_CO_4F, 0
+ warp_event 20, 0, SILPH_CO_ELEVATOR, 0
+ warp_event 23, 11, SILPH_CO_3F, 9
+ warp_event 3, 3, SILPH_CO_5F, 5
+ warp_event 3, 15, SILPH_CO_5F, 6
+ warp_event 27, 3, SILPH_CO_2F, 3
+ warp_event 3, 11, SILPH_CO_9F, 3
+ warp_event 11, 11, SILPH_CO_7F, 4
+ warp_event 27, 15, SILPH_CO_3F, 3
- def_signs
+ def_bg_events
- def_objects
- object SPRITE_SILPH_WORKER, 24, 8, STAY, NONE, 1 ; person
- object SPRITE_ROCKET, 20, 7, STAY, LEFT, 2, OPP_ROCKET, 25
- object SPRITE_SCIENTIST, 7, 9, STAY, DOWN, 3, OPP_SCIENTIST, 4
- object SPRITE_POKE_BALL, 8, 5, STAY, NONE, 4, HYPER_POTION
+ def_object_events
+ object_event 24, 8, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person
+ object_event 20, 7, SPRITE_ROCKET, STAY, LEFT, 2, OPP_ROCKET, 25
+ object_event 7, 9, SPRITE_SCIENTIST, STAY, DOWN, 3, OPP_SCIENTIST, 4
+ object_event 8, 5, SPRITE_POKE_BALL, STAY, NONE, 4, HYPER_POTION
def_warps_to SILPH_CO_3F