summaryrefslogtreecommitdiff
path: root/data/mapObjects/celadonmansion2.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/celadonmansion2.asm
parentc84667c4df36918071bb7487c456d7adafb921ca (diff)
Add warp, sign, and warp_to macros for data/mapObjects definitions
Diffstat (limited to 'data/mapObjects/celadonmansion2.asm')
-rwxr-xr-xdata/mapObjects/celadonmansion2.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/celadonmansion2.asm b/data/mapObjects/celadonmansion2.asm
index 883cae36..675afdc7 100755
--- a/data/mapObjects/celadonmansion2.asm
+++ b/data/mapObjects/celadonmansion2.asm
@@ -2,18 +2,18 @@ CeladonMansion2Object:
db $f ; border block
db $4 ; warps
- db $1, $6, $0, CELADON_MANSION_3
- db $1, $7, $3, CELADON_MANSION_1
- db $1, $2, $4, CELADON_MANSION_1
- db $1, $4, $3, CELADON_MANSION_3
+ warp $6, $1, $0, CELADON_MANSION_3
+ warp $7, $1, $3, CELADON_MANSION_1
+ warp $2, $1, $4, CELADON_MANSION_1
+ warp $4, $1, $3, CELADON_MANSION_3
db $1 ; signs
- db $9, $4, $1 ; CeladonMansion2Text1
+ sign $4, $9, $1 ; CeladonMansion2Text1
db $0 ; objects
; warp-to
- EVENT_DISP CELADON_MANSION_2_WIDTH, $1, $6 ; CELADON_MANSION_3
- EVENT_DISP CELADON_MANSION_2_WIDTH, $1, $7 ; CELADON_MANSION_1
- EVENT_DISP CELADON_MANSION_2_WIDTH, $1, $2 ; CELADON_MANSION_1
- EVENT_DISP CELADON_MANSION_2_WIDTH, $1, $4 ; CELADON_MANSION_3
+ warp_to $6, $1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_3
+ warp_to $7, $1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_1
+ warp_to $2, $1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_1
+ warp_to $4, $1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_3