summaryrefslogtreecommitdiff
path: root/data/mapObjects/mansion2.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/mansion2.asm
parentc84667c4df36918071bb7487c456d7adafb921ca (diff)
Add warp, sign, and warp_to macros for data/mapObjects definitions
Diffstat (limited to 'data/mapObjects/mansion2.asm')
-rwxr-xr-xdata/mapObjects/mansion2.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/mapObjects/mansion2.asm b/data/mapObjects/mansion2.asm
index bda2ad27..cbb546c1 100755
--- a/data/mapObjects/mansion2.asm
+++ b/data/mapObjects/mansion2.asm
@@ -2,10 +2,10 @@ Mansion2Object:
db $1 ; border block
db $4 ; warps
- db $a, $5, $4, MANSION_1
- db $a, $7, $0, MANSION_3
- db $e, $19, $2, MANSION_3
- db $1, $6, $1, MANSION_3
+ warp $5, $a, $4, MANSION_1
+ warp $7, $a, $0, MANSION_3
+ warp $19, $e, $2, MANSION_3
+ warp $6, $1, $1, MANSION_3
db $0 ; signs
@@ -16,7 +16,7 @@ Mansion2Object:
object SPRITE_BOOK_MAP_DEX, $3, $16, STAY, NONE, $4 ; person
; warp-to
- EVENT_DISP MANSION_2_WIDTH, $a, $5 ; MANSION_1
- EVENT_DISP MANSION_2_WIDTH, $a, $7 ; MANSION_3
- EVENT_DISP MANSION_2_WIDTH, $e, $19 ; MANSION_3
- EVENT_DISP MANSION_2_WIDTH, $1, $6 ; MANSION_3
+ warp_to $5, $a, MANSION_2_WIDTH ; MANSION_1
+ warp_to $7, $a, MANSION_2_WIDTH ; MANSION_3
+ warp_to $19, $e, MANSION_2_WIDTH ; MANSION_3
+ warp_to $6, $1, MANSION_2_WIDTH ; MANSION_3