summaryrefslogtreecommitdiff
path: root/data/mapObjects/celadonmart1.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/celadonmart1.asm')
-rwxr-xr-xdata/mapObjects/celadonmart1.asm28
1 files changed, 14 insertions, 14 deletions
diff --git a/data/mapObjects/celadonmart1.asm b/data/mapObjects/celadonmart1.asm
index af647cf2..3442e3cc 100755
--- a/data/mapObjects/celadonmart1.asm
+++ b/data/mapObjects/celadonmart1.asm
@@ -2,24 +2,24 @@ CeladonMart1Object:
db $f ; border block
db $6 ; warps
- db $7, $2, $0, $ff
- db $7, $3, $0, $ff
- db $7, $10, $1, $ff
- db $7, $11, $1, $ff
- db $1, $c, $0, CELADON_MART_2
- db $1, $1, $0, CELADON_MART_ELEVATOR
+ warp $2, $7, $0, $ff
+ warp $3, $7, $0, $ff
+ warp $10, $7, $1, $ff
+ warp $11, $7, $1, $ff
+ warp $c, $1, $0, CELADON_MART_2
+ warp $1, $1, $0, CELADON_MART_ELEVATOR
db $2 ; signs
- db $4, $b, $2 ; CeladonMart1Text2
- db $1, $e, $3 ; CeladonMart1Text3
+ sign $b, $4, $2 ; CeladonMart1Text2
+ sign $e, $1, $3 ; CeladonMart1Text3
db $1 ; objects
object SPRITE_CABLE_CLUB_WOMAN, $8, $3, STAY, DOWN, $1 ; person
; warp-to
- EVENT_DISP CELADON_MART_1_WIDTH, $7, $2
- EVENT_DISP CELADON_MART_1_WIDTH, $7, $3
- EVENT_DISP CELADON_MART_1_WIDTH, $7, $10
- EVENT_DISP CELADON_MART_1_WIDTH, $7, $11
- EVENT_DISP CELADON_MART_1_WIDTH, $1, $c ; CELADON_MART_2
- EVENT_DISP CELADON_MART_1_WIDTH, $1, $1 ; CELADON_MART_ELEVATOR
+ warp_to $2, $7, CELADON_MART_1_WIDTH
+ warp_to $3, $7, CELADON_MART_1_WIDTH
+ warp_to $10, $7, CELADON_MART_1_WIDTH
+ warp_to $11, $7, CELADON_MART_1_WIDTH
+ warp_to $c, $1, CELADON_MART_1_WIDTH ; CELADON_MART_2
+ warp_to $1, $1, CELADON_MART_1_WIDTH ; CELADON_MART_ELEVATOR