aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/celadonmansion4.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/celadonmansion4.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/celadonmansion4.asm')
-rwxr-xr-xdata/mapObjects/celadonmansion4.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/data/mapObjects/celadonmansion4.asm b/data/mapObjects/celadonmansion4.asm
index c4f667fa..4f0fa214 100755
--- a/data/mapObjects/celadonmansion4.asm
+++ b/data/mapObjects/celadonmansion4.asm
@@ -2,16 +2,16 @@ CeladonMansion4Object:
db $9 ; border block
db $3 ; warps
- db $1, $6, $1, CELADON_MANSION_3
- db $1, $2, $2, CELADON_MANSION_3
- db $7, $2, $0, CELADON_MANSION_5
+ warp $6, $1, $1, CELADON_MANSION_3
+ warp $2, $1, $2, CELADON_MANSION_3
+ warp $2, $7, $0, CELADON_MANSION_5
db $1 ; signs
- db $7, $3, $1 ; CeladonMansion4Text1
+ sign $3, $7, $1 ; CeladonMansion4Text1
db $0 ; objects
; warp-to
- EVENT_DISP CELADON_MANSION_4_WIDTH, $1, $6 ; CELADON_MANSION_3
- EVENT_DISP CELADON_MANSION_4_WIDTH, $1, $2 ; CELADON_MANSION_3
- EVENT_DISP CELADON_MANSION_4_WIDTH, $7, $2 ; CELADON_MANSION_5
+ warp_to $6, $1, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_3
+ warp_to $2, $1, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_3
+ warp_to $2, $7, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_5