summaryrefslogtreecommitdiff
path: root/data/maps/objects/SeafoamIslands1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/SeafoamIslands1F.asm')
-rwxr-xr-xdata/maps/objects/SeafoamIslands1F.asm15
1 files changed, 4 insertions, 11 deletions
diff --git a/data/maps/objects/SeafoamIslands1F.asm b/data/maps/objects/SeafoamIslands1F.asm
index 2599c6ec..9d098cba 100755
--- a/data/maps/objects/SeafoamIslands1F.asm
+++ b/data/maps/objects/SeafoamIslands1F.asm
@@ -1,7 +1,7 @@
SeafoamIslands1F_Object:
db $7d ; border block
- db 7 ; warps
+ def_warps
warp 4, 17, 0, LAST_MAP
warp 5, 17, 0, LAST_MAP
warp 26, 17, 1, LAST_MAP
@@ -10,20 +10,13 @@ SeafoamIslands1F_Object:
warp 25, 3, 6, SEAFOAM_ISLANDS_B1F
warp 23, 15, 4, SEAFOAM_ISLANDS_B1F
- db 0 ; signs
+ def_signs
- db 2 ; objects
+ def_objects
object SPRITE_BOULDER, 18, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person
object SPRITE_BOULDER, 26, 7, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
- ; warp-to
- warp_to 4, 17, SEAFOAM_ISLANDS_1F_WIDTH
- warp_to 5, 17, SEAFOAM_ISLANDS_1F_WIDTH
- warp_to 26, 17, SEAFOAM_ISLANDS_1F_WIDTH
- warp_to 27, 17, SEAFOAM_ISLANDS_1F_WIDTH
- warp_to 7, 5, SEAFOAM_ISLANDS_1F_WIDTH ; SEAFOAM_ISLANDS_B1F
- warp_to 25, 3, SEAFOAM_ISLANDS_1F_WIDTH ; SEAFOAM_ISLANDS_B1F
- warp_to 23, 15, SEAFOAM_ISLANDS_1F_WIDTH ; SEAFOAM_ISLANDS_B1F
+ def_warps_to SEAFOAM_ISLANDS_1F
; holes
warp_to 17, 6, SEAFOAM_ISLANDS_1F_WIDTH