summaryrefslogtreecommitdiff
path: root/data/maps/objects/SeafoamIslandsB1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/SeafoamIslandsB1F.asm')
-rwxr-xr-xdata/maps/objects/SeafoamIslandsB1F.asm15
1 files changed, 4 insertions, 11 deletions
diff --git a/data/maps/objects/SeafoamIslandsB1F.asm b/data/maps/objects/SeafoamIslandsB1F.asm
index 426ca0c3..b0a9525b 100755
--- a/data/maps/objects/SeafoamIslandsB1F.asm
+++ b/data/maps/objects/SeafoamIslandsB1F.asm
@@ -1,7 +1,7 @@
SeafoamIslandsB1F_Object:
db $7d ; border block
- db 7 ; warps
+ def_warps
warp 4, 2, 0, SEAFOAM_ISLANDS_B2F
warp 7, 5, 4, SEAFOAM_ISLANDS_1F
warp 13, 7, 2, SEAFOAM_ISLANDS_B2F
@@ -10,17 +10,10 @@ SeafoamIslandsB1F_Object:
warp 25, 11, 5, SEAFOAM_ISLANDS_B2F
warp 25, 3, 5, SEAFOAM_ISLANDS_1F
- db 0 ; signs
+ def_signs
- db 2 ; objects
+ def_objects
object SPRITE_BOULDER, 17, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person
object SPRITE_BOULDER, 22, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
- ; warp-to
- warp_to 4, 2, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F
- warp_to 7, 5, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_1F
- warp_to 13, 7, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F
- warp_to 19, 15, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F
- warp_to 23, 15, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_1F
- warp_to 25, 11, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F
- warp_to 25, 3, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_1F
+ def_warps_to SEAFOAM_ISLANDS_B1F