aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/SilphCo8F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/SilphCo8F.asm')
-rwxr-xr-xdata/maps/objects/SilphCo8F.asm15
1 files changed, 4 insertions, 11 deletions
diff --git a/data/maps/objects/SilphCo8F.asm b/data/maps/objects/SilphCo8F.asm
index 12470f55..91d1c433 100755
--- a/data/maps/objects/SilphCo8F.asm
+++ b/data/maps/objects/SilphCo8F.asm
@@ -1,7 +1,7 @@
SilphCo8F_Object:
db $2e ; border block
- db 7 ; warps
+ def_warps
warp 16, 0, 1, SILPH_CO_9F
warp 14, 0, 0, SILPH_CO_7F
warp 18, 0, 0, SILPH_CO_ELEVATOR
@@ -10,19 +10,12 @@ SilphCo8F_Object:
warp 11, 5, 5, SILPH_CO_2F
warp 11, 9, 3, SILPH_CO_8F
- db 0 ; signs
+ def_signs
- db 4 ; objects
+ def_objects
object SPRITE_SILPH_WORKER, 4, 2, STAY, NONE, 1 ; person
object SPRITE_ROCKET, 19, 2, STAY, LEFT, 2, OPP_ROCKET, 35
object SPRITE_SCIENTIST, 10, 2, STAY, DOWN, 3, OPP_SCIENTIST, 9
object SPRITE_ROCKET, 12, 15, STAY, RIGHT, 4, OPP_ROCKET, 36
- ; warp-to
- warp_to 16, 0, SILPH_CO_8F_WIDTH ; SILPH_CO_9F
- warp_to 14, 0, SILPH_CO_8F_WIDTH ; SILPH_CO_7F
- warp_to 18, 0, SILPH_CO_8F_WIDTH ; SILPH_CO_ELEVATOR
- warp_to 3, 11, SILPH_CO_8F_WIDTH ; SILPH_CO_8F
- warp_to 3, 15, SILPH_CO_8F_WIDTH ; SILPH_CO_2F
- warp_to 11, 5, SILPH_CO_8F_WIDTH ; SILPH_CO_2F
- warp_to 11, 9, SILPH_CO_8F_WIDTH ; SILPH_CO_8F_WIDTH
+ def_warps_to SILPH_CO_8F