summaryrefslogtreecommitdiff
path: root/data/mapObjects/seafoamislands5.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/seafoamislands5.asm')
-rwxr-xr-xdata/mapObjects/seafoamislands5.asm32
1 files changed, 16 insertions, 16 deletions
diff --git a/data/mapObjects/seafoamislands5.asm b/data/mapObjects/seafoamislands5.asm
index a05c00cc..9bd82887 100755
--- a/data/mapObjects/seafoamislands5.asm
+++ b/data/mapObjects/seafoamislands5.asm
@@ -1,23 +1,23 @@
SeafoamIslands5Object:
db $7d ; border block
- db $4 ; warps
- db $11, $14, $5, SEAFOAM_ISLANDS_4
- db $11, $15, $6, SEAFOAM_ISLANDS_4
- db $7, $b, $1, SEAFOAM_ISLANDS_4
- db $4, $19, $2, SEAFOAM_ISLANDS_4
+ db 4 ; warps
+ warp 20, 17, 5, SEAFOAM_ISLANDS_4
+ warp 21, 17, 6, SEAFOAM_ISLANDS_4
+ warp 11, 7, 1, SEAFOAM_ISLANDS_4
+ warp 25, 4, 2, SEAFOAM_ISLANDS_4
- db $2 ; signs
- db $f, $9, $4 ; SeafoamIslands5Text4
- db $1, $17, $5 ; SeafoamIslands5Text5
+ db 2 ; signs
+ sign 9, 15, 4 ; SeafoamIslands5Text4
+ sign 23, 1, 5 ; SeafoamIslands5Text5
- db $3 ; objects
- object SPRITE_BOULDER, $4, $f, STAY, NONE, $1 ; person
- object SPRITE_BOULDER, $5, $f, STAY, NONE, $2 ; person
- object SPRITE_BIRD, $6, $1, STAY, DOWN, $3, ARTICUNO, 50
+ db 3 ; objects
+ object SPRITE_BOULDER, 4, 15, STAY, NONE, 1 ; person
+ object SPRITE_BOULDER, 5, 15, STAY, NONE, 2 ; person
+ object SPRITE_BIRD, 6, 1, STAY, DOWN, 3, ARTICUNO, 50
; warp-to
- EVENT_DISP SEAFOAM_ISLANDS_5_WIDTH, $11, $14 ; SEAFOAM_ISLANDS_4
- EVENT_DISP SEAFOAM_ISLANDS_5_WIDTH, $11, $15 ; SEAFOAM_ISLANDS_4
- EVENT_DISP SEAFOAM_ISLANDS_5_WIDTH, $7, $b ; SEAFOAM_ISLANDS_4
- EVENT_DISP SEAFOAM_ISLANDS_5_WIDTH, $4, $19 ; SEAFOAM_ISLANDS_4
+ warp_to 20, 17, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_4
+ warp_to 21, 17, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_4
+ warp_to 11, 7, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_4
+ warp_to 25, 4, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_4