summaryrefslogtreecommitdiff
path: root/data/mapObjects/ssanne10.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/ssanne10.asm
parentc84667c4df36918071bb7487c456d7adafb921ca (diff)
Add warp, sign, and warp_to macros for data/mapObjects definitions
Diffstat (limited to 'data/mapObjects/ssanne10.asm')
-rwxr-xr-xdata/mapObjects/ssanne10.asm40
1 files changed, 20 insertions, 20 deletions
diff --git a/data/mapObjects/ssanne10.asm b/data/mapObjects/ssanne10.asm
index a8f49cf7..a281316c 100755
--- a/data/mapObjects/ssanne10.asm
+++ b/data/mapObjects/ssanne10.asm
@@ -2,16 +2,16 @@ SSAnne10Object:
db $c ; border block
db $a ; warps
- db $5, $2, $4, SS_ANNE_4
- db $5, $3, $4, SS_ANNE_4
- db $5, $c, $3, SS_ANNE_4
- db $5, $d, $3, SS_ANNE_4
- db $5, $16, $2, SS_ANNE_4
- db $5, $17, $2, SS_ANNE_4
- db $f, $2, $1, SS_ANNE_4
- db $f, $3, $1, SS_ANNE_4
- db $f, $c, $0, SS_ANNE_4
- db $f, $d, $0, SS_ANNE_4
+ warp $2, $5, $4, SS_ANNE_4
+ warp $3, $5, $4, SS_ANNE_4
+ warp $c, $5, $3, SS_ANNE_4
+ warp $d, $5, $3, SS_ANNE_4
+ warp $16, $5, $2, SS_ANNE_4
+ warp $17, $5, $2, SS_ANNE_4
+ warp $2, $f, $1, SS_ANNE_4
+ warp $3, $f, $1, SS_ANNE_4
+ warp $c, $f, $0, SS_ANNE_4
+ warp $d, $f, $0, SS_ANNE_4
db $0 ; signs
@@ -29,13 +29,13 @@ SSAnne10Object:
object SPRITE_BALL, $c, $b, STAY, NONE, $b, MAX_POTION
; warp-to
- EVENT_DISP SS_ANNE_10_WIDTH, $5, $2 ; SS_ANNE_4
- EVENT_DISP SS_ANNE_10_WIDTH, $5, $3 ; SS_ANNE_4
- EVENT_DISP SS_ANNE_10_WIDTH, $5, $c ; SS_ANNE_4
- EVENT_DISP SS_ANNE_10_WIDTH, $5, $d ; SS_ANNE_4
- EVENT_DISP SS_ANNE_10_WIDTH, $5, $16 ; SS_ANNE_4
- EVENT_DISP SS_ANNE_10_WIDTH, $5, $17 ; SS_ANNE_4
- EVENT_DISP SS_ANNE_10_WIDTH, $f, $2 ; SS_ANNE_4
- EVENT_DISP SS_ANNE_10_WIDTH, $f, $3 ; SS_ANNE_4
- EVENT_DISP SS_ANNE_10_WIDTH, $f, $c ; SS_ANNE_4
- EVENT_DISP SS_ANNE_10_WIDTH, $f, $d ; SS_ANNE_4
+ warp_to $2, $5, SS_ANNE_10_WIDTH ; SS_ANNE_4
+ warp_to $3, $5, SS_ANNE_10_WIDTH ; SS_ANNE_4
+ warp_to $c, $5, SS_ANNE_10_WIDTH ; SS_ANNE_4
+ warp_to $d, $5, SS_ANNE_10_WIDTH ; SS_ANNE_4
+ warp_to $16, $5, SS_ANNE_10_WIDTH ; SS_ANNE_4
+ warp_to $17, $5, SS_ANNE_10_WIDTH ; SS_ANNE_4
+ warp_to $2, $f, SS_ANNE_10_WIDTH ; SS_ANNE_4
+ warp_to $3, $f, SS_ANNE_10_WIDTH ; SS_ANNE_4
+ warp_to $c, $f, SS_ANNE_10_WIDTH ; SS_ANNE_4
+ warp_to $d, $f, SS_ANNE_10_WIDTH ; SS_ANNE_4