summaryrefslogtreecommitdiff
path: root/data/mapObjects/celadonmansion3.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/celadonmansion3.asm')
-rwxr-xr-xdata/mapObjects/celadonmansion3.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/mapObjects/celadonmansion3.asm b/data/mapObjects/celadonmansion3.asm
index 0564b1cb..f6e66a1a 100755
--- a/data/mapObjects/celadonmansion3.asm
+++ b/data/mapObjects/celadonmansion3.asm
@@ -2,16 +2,16 @@ CeladonMansion3Object:
db $f ; border block
db $4 ; warps
- db $1, $6, $0, CELADON_MANSION_2
- db $1, $7, $0, CELADON_MANSION_4
- db $1, $2, $1, CELADON_MANSION_4
- db $1, $4, $3, CELADON_MANSION_2
+ warp $6, $1, $0, CELADON_MANSION_2
+ warp $7, $1, $0, CELADON_MANSION_4
+ warp $2, $1, $1, CELADON_MANSION_4
+ warp $4, $1, $3, CELADON_MANSION_2
db $4 ; signs
- db $3, $1, $5 ; CeladonMansion3Text5
- db $3, $4, $6 ; CeladonMansion3Text6
- db $6, $1, $7 ; CeladonMansion3Text7
- db $9, $4, $8 ; CeladonMansion3Text8
+ sign $1, $3, $5 ; CeladonMansion3Text5
+ sign $4, $3, $6 ; CeladonMansion3Text6
+ sign $1, $6, $7 ; CeladonMansion3Text7
+ sign $4, $9, $8 ; CeladonMansion3Text8
db $4 ; objects
object SPRITE_BIKE_SHOP_GUY, $0, $4, STAY, UP, $1 ; person
@@ -20,7 +20,7 @@ CeladonMansion3Object:
object SPRITE_LAPRAS_GIVER, $2, $3, STAY, NONE, $4 ; person
; warp-to
- EVENT_DISP CELADON_MANSION_3_WIDTH, $1, $6 ; CELADON_MANSION_2
- EVENT_DISP CELADON_MANSION_3_WIDTH, $1, $7 ; CELADON_MANSION_4
- EVENT_DISP CELADON_MANSION_3_WIDTH, $1, $2 ; CELADON_MANSION_4
- EVENT_DISP CELADON_MANSION_3_WIDTH, $1, $4 ; CELADON_MANSION_2
+ warp_to $6, $1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_2
+ warp_to $7, $1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_4
+ warp_to $2, $1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_4
+ warp_to $4, $1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_2