aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/seafoamislands2.asm
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2018-01-29 02:31:32 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2018-01-29 02:31:32 -0500
commitd271d6917549074e721f3e5064b77e1ad1dbe44a (patch)
treecee0f1b9a44aa7394dbf36ee3ad3654dde08df06 /data/mapObjects/seafoamislands2.asm
parentAdd pokegold and pokefirered. (diff)
downloadpokeyellow-d271d6917549074e721f3e5064b77e1ad1dbe44a.tar.gz
pokeyellow-d271d6917549074e721f3e5064b77e1ad1dbe44a.tar.xz
pokeyellow-d271d6917549074e721f3e5064b77e1ad1dbe44a.zip
Add warp, sign, and warp_to macros for data/mapObjects definitions
Diffstat (limited to 'data/mapObjects/seafoamislands2.asm')
-rwxr-xr-xdata/mapObjects/seafoamislands2.asm28
1 files changed, 14 insertions, 14 deletions
diff --git a/data/mapObjects/seafoamislands2.asm b/data/mapObjects/seafoamislands2.asm
index d25e5375..e2cdc09a 100755
--- a/data/mapObjects/seafoamislands2.asm
+++ b/data/mapObjects/seafoamislands2.asm
@@ -2,13 +2,13 @@ SeafoamIslands2Object:
db $7d ; border block
db $7 ; warps
- db $2, $4, $0, SEAFOAM_ISLANDS_3
- db $5, $7, $4, SEAFOAM_ISLANDS_1
- db $7, $d, $2, SEAFOAM_ISLANDS_3
- db $f, $13, $3, SEAFOAM_ISLANDS_3
- db $f, $17, $6, SEAFOAM_ISLANDS_1
- db $b, $19, $5, SEAFOAM_ISLANDS_3
- db $3, $19, $5, SEAFOAM_ISLANDS_1
+ warp $4, $2, $0, SEAFOAM_ISLANDS_3
+ warp $7, $5, $4, SEAFOAM_ISLANDS_1
+ warp $d, $7, $2, SEAFOAM_ISLANDS_3
+ warp $13, $f, $3, SEAFOAM_ISLANDS_3
+ warp $17, $f, $6, SEAFOAM_ISLANDS_1
+ warp $19, $b, $5, SEAFOAM_ISLANDS_3
+ warp $19, $3, $5, SEAFOAM_ISLANDS_1
db $0 ; signs
@@ -17,10 +17,10 @@ SeafoamIslands2Object:
object SPRITE_BOULDER, $16, $6, STAY, BOULDER_MOVEMENT_BYTE_2, $2 ; person
; warp-to
- EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $2, $4 ; SEAFOAM_ISLANDS_3
- EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $5, $7 ; SEAFOAM_ISLANDS_1
- EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $7, $d ; SEAFOAM_ISLANDS_3
- EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $f, $13 ; SEAFOAM_ISLANDS_3
- EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $f, $17 ; SEAFOAM_ISLANDS_1
- EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $b, $19 ; SEAFOAM_ISLANDS_3
- EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $3, $19 ; SEAFOAM_ISLANDS_1
+ warp_to $4, $2, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3
+ warp_to $7, $5, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_1
+ warp_to $d, $7, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3
+ warp_to $13, $f, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3
+ warp_to $17, $f, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_1
+ warp_to $19, $b, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3
+ warp_to $19, $3, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_1