summaryrefslogtreecommitdiff
path: root/data/mapObjects/celadonmart1.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/celadonmart1.asm')
-rwxr-xr-xdata/mapObjects/celadonmart1.asm36
1 files changed, 18 insertions, 18 deletions
diff --git a/data/mapObjects/celadonmart1.asm b/data/mapObjects/celadonmart1.asm
index af647cf2..bfd66996 100755
--- a/data/mapObjects/celadonmart1.asm
+++ b/data/mapObjects/celadonmart1.asm
@@ -1,25 +1,25 @@
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
+ db 6 ; warps
+ warp 2, 7, 0, -1
+ warp 3, 7, 0, -1
+ warp 16, 7, 1, -1
+ warp 17, 7, 1, -1
+ warp 12, 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
+ db 2 ; signs
+ sign 11, 4, 2 ; CeladonMart1Text2
+ sign 14, 1, 3 ; CeladonMart1Text3
- db $1 ; objects
- object SPRITE_CABLE_CLUB_WOMAN, $8, $3, STAY, DOWN, $1 ; person
+ 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 16, 7, CELADON_MART_1_WIDTH
+ warp_to 17, 7, CELADON_MART_1_WIDTH
+ warp_to 12, 1, CELADON_MART_1_WIDTH ; CELADON_MART_2
+ warp_to 1, 1, CELADON_MART_1_WIDTH ; CELADON_MART_ELEVATOR