summaryrefslogtreecommitdiff
path: root/data/mapObjects/seafoamislands1.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/seafoamislands1.asm')
-rwxr-xr-xdata/mapObjects/seafoamislands1.asm42
1 files changed, 21 insertions, 21 deletions
diff --git a/data/mapObjects/seafoamislands1.asm b/data/mapObjects/seafoamislands1.asm
index 4f7f7a8e..a1617004 100755
--- a/data/mapObjects/seafoamislands1.asm
+++ b/data/mapObjects/seafoamislands1.asm
@@ -1,30 +1,30 @@
SeafoamIslands1Object:
db $7d ; border block
- db $7 ; warps
- db $11, $4, $0, $ff
- db $11, $5, $0, $ff
- db $11, $1a, $1, $ff
- db $11, $1b, $1, $ff
- db $5, $7, $1, SEAFOAM_ISLANDS_2
- db $3, $19, $6, SEAFOAM_ISLANDS_2
- db $f, $17, $4, SEAFOAM_ISLANDS_2
+ db 7 ; warps
+ warp 4, 17, 0, -1
+ warp 5, 17, 0, -1
+ warp 26, 17, 1, -1
+ warp 27, 17, 1, -1
+ warp 7, 5, 1, SEAFOAM_ISLANDS_2
+ warp 25, 3, 6, SEAFOAM_ISLANDS_2
+ warp 23, 15, 4, SEAFOAM_ISLANDS_2
- db $0 ; signs
+ db 0 ; signs
- db $2 ; objects
- object SPRITE_BOULDER, $12, $a, STAY, BOULDER_MOVEMENT_BYTE_2, $1 ; person
- object SPRITE_BOULDER, $1a, $7, STAY, BOULDER_MOVEMENT_BYTE_2, $2 ; person
+ db 2 ; 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
- EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $11, $4
- EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $11, $5
- EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $11, $1a
- EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $11, $1b
- EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $5, $7 ; SEAFOAM_ISLANDS_2
- EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $3, $19 ; SEAFOAM_ISLANDS_2
- EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $f, $17 ; SEAFOAM_ISLANDS_2
+ warp_to 4, 17, SEAFOAM_ISLANDS_1_WIDTH
+ warp_to 5, 17, SEAFOAM_ISLANDS_1_WIDTH
+ warp_to 26, 17, SEAFOAM_ISLANDS_1_WIDTH
+ warp_to 27, 17, SEAFOAM_ISLANDS_1_WIDTH
+ warp_to 7, 5, SEAFOAM_ISLANDS_1_WIDTH ; SEAFOAM_ISLANDS_2
+ warp_to 25, 3, SEAFOAM_ISLANDS_1_WIDTH ; SEAFOAM_ISLANDS_2
+ warp_to 23, 15, SEAFOAM_ISLANDS_1_WIDTH ; SEAFOAM_ISLANDS_2
; holes
- EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $6, $11
- EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $6, $18
+ warp_to 17, 6, SEAFOAM_ISLANDS_1_WIDTH
+ warp_to 24, 6, SEAFOAM_ISLANDS_1_WIDTH