summaryrefslogtreecommitdiff
path: root/data/mapObjects/celadonmart3.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/celadonmart3.asm')
-rwxr-xr-xdata/mapObjects/celadonmart3.asm36
1 files changed, 18 insertions, 18 deletions
diff --git a/data/mapObjects/celadonmart3.asm b/data/mapObjects/celadonmart3.asm
index 41054371..803ff6ff 100755
--- a/data/mapObjects/celadonmart3.asm
+++ b/data/mapObjects/celadonmart3.asm
@@ -2,23 +2,23 @@ CeladonMart3Object:
db $f ; border block
db $3 ; warps
- db $1, $c, $0, CELADON_MART_4
- db $1, $10, $1, CELADON_MART_2
- db $1, $1, $0, CELADON_MART_ELEVATOR
+ warp $c, $1, $0, CELADON_MART_4
+ warp $10, $1, $1, CELADON_MART_2
+ warp $1, $1, $0, CELADON_MART_ELEVATOR
db $c ; signs
- db $4, $2, $6 ; CeladonMart3Text6
- db $4, $3, $7 ; CeladonMart3Text7
- db $4, $5, $8 ; CeladonMart3Text8
- db $4, $6, $9 ; CeladonMart3Text9
- db $6, $2, $a ; CeladonMart3Text10
- db $6, $3, $b ; CeladonMart3Text11
- db $6, $5, $c ; CeladonMart3Text12
- db $6, $6, $d ; CeladonMart3Text13
- db $1, $e, $e ; CeladonMart3Text14
- db $1, $4, $f ; CeladonMart3Text15
- db $1, $6, $10 ; CeladonMart3Text16
- db $1, $a, $11 ; CeladonMart3Text17
+ sign $2, $4, $6 ; CeladonMart3Text6
+ sign $3, $4, $7 ; CeladonMart3Text7
+ sign $5, $4, $8 ; CeladonMart3Text8
+ sign $6, $4, $9 ; CeladonMart3Text9
+ sign $2, $6, $a ; CeladonMart3Text10
+ sign $3, $6, $b ; CeladonMart3Text11
+ sign $5, $6, $c ; CeladonMart3Text12
+ sign $6, $6, $d ; CeladonMart3Text13
+ sign $e, $1, $e ; CeladonMart3Text14
+ sign $4, $1, $f ; CeladonMart3Text15
+ sign $6, $1, $10 ; CeladonMart3Text16
+ sign $a, $1, $11 ; CeladonMart3Text17
db $5 ; objects
object SPRITE_MART_GUY, $10, $5, STAY, NONE, $1 ; person
@@ -28,6 +28,6 @@ CeladonMart3Object:
object SPRITE_YOUNG_BOY, $2, $5, STAY, UP, $5 ; person
; warp-to
- EVENT_DISP CELADON_MART_3_WIDTH, $1, $c ; CELADON_MART_4
- EVENT_DISP CELADON_MART_3_WIDTH, $1, $10 ; CELADON_MART_2
- EVENT_DISP CELADON_MART_3_WIDTH, $1, $1 ; CELADON_MART_ELEVATOR
+ warp_to $c, $1, CELADON_MART_3_WIDTH ; CELADON_MART_4
+ warp_to $10, $1, CELADON_MART_3_WIDTH ; CELADON_MART_2
+ warp_to $1, $1, CELADON_MART_3_WIDTH ; CELADON_MART_ELEVATOR