aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/celadonmansion5.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/celadonmansion5.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/celadonmansion5.asm')
-rwxr-xr-xdata/mapObjects/celadonmansion5.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/celadonmansion5.asm b/data/mapObjects/celadonmansion5.asm
index 243e345b..3c5c04e3 100755
--- a/data/mapObjects/celadonmansion5.asm
+++ b/data/mapObjects/celadonmansion5.asm
@@ -1,16 +1,16 @@
CeladonMansion5Object:
db $a ; border block
- db $2 ; warps
- db $7, $2, $2, CELADON_MANSION_4
- db $7, $3, $2, CELADON_MANSION_4
+ db 2 ; warps
+ warp 2, 7, 2, CELADON_MANSION_4
+ warp 3, 7, 2, CELADON_MANSION_4
- db $0 ; signs
+ db 0 ; signs
- db $2 ; objects
- object SPRITE_HIKER, $2, $2, STAY, DOWN, $1 ; person
- object SPRITE_BALL, $4, $3, STAY, NONE, $2 ; person
+ db 2 ; objects
+ object SPRITE_HIKER, 2, 2, STAY, DOWN, 1 ; person
+ object SPRITE_BALL, 4, 3, STAY, NONE, 2 ; person
; warp-to
- EVENT_DISP CELADON_MANSION_5_WIDTH, $7, $2 ; CELADON_MANSION_4
- EVENT_DISP CELADON_MANSION_5_WIDTH, $7, $3 ; CELADON_MANSION_4
+ warp_to 2, 7, CELADON_MANSION_5_WIDTH ; CELADON_MANSION_ROOF
+ warp_to 3, 7, CELADON_MANSION_5_WIDTH ; CELADON_MANSION_ROOF