aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/celadonmansion4.asm
diff options
context:
space:
mode:
authorShakib2001 <shakibafzali@gmail.com>2020-03-27 14:31:38 -0400
committerShakib2001 <shakibafzali@gmail.com>2020-03-27 14:31:38 -0400
commit3d8e949d373a828fee370b08d005f131abb67333 (patch)
treee200b8d12dbbbcb7683560fb904b32a5c5a1c9a7 /data/mapObjects/celadonmansion4.asm
parentMerge branch 'master' of https://github.com/CelestialAmber/pokeyellow (diff)
downloadpokeyellow-3d8e949d373a828fee370b08d005f131abb67333.tar.gz
pokeyellow-3d8e949d373a828fee370b08d005f131abb67333.tar.xz
pokeyellow-3d8e949d373a828fee370b08d005f131abb67333.zip
Added warp, warp_to and sign compatibility
Diffstat (limited to 'data/mapObjects/celadonmansion4.asm')
-rwxr-xr-xdata/mapObjects/celadonmansion4.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/data/mapObjects/celadonmansion4.asm b/data/mapObjects/celadonmansion4.asm
index c4f667fa..49ec71cf 100755
--- a/data/mapObjects/celadonmansion4.asm
+++ b/data/mapObjects/celadonmansion4.asm
@@ -1,17 +1,17 @@
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
+ db 3 ; warps
+ 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
+ db 1 ; signs
+ sign 3, 7, 1 ; CeladonMansion4Text1
- db $0 ; objects
+ 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_3F
+ warp_to 2, 1, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_3F
+ warp_to 2, 7, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_ROOF_HOUSE