summaryrefslogtreecommitdiff
path: root/data/mapObjects/celadonmart5.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/celadonmart5.asm')
-rwxr-xr-xdata/mapObjects/celadonmart5.asm28
1 files changed, 14 insertions, 14 deletions
diff --git a/data/mapObjects/celadonmart5.asm b/data/mapObjects/celadonmart5.asm
index df47a70d..ac2fa454 100755
--- a/data/mapObjects/celadonmart5.asm
+++ b/data/mapObjects/celadonmart5.asm
@@ -1,21 +1,21 @@
CeladonMart5Object:
db $f ; border block
- db $3 ; warps
- db $1, $c, $0, CELADON_MART_ROOF
- db $1, $10, $1, CELADON_MART_4
- db $1, $1, $0, CELADON_MART_ELEVATOR
+ db 3 ; warps
+ warp 12, 1, 0, CELADON_MART_ROOF
+ warp 16, 1, 1, CELADON_MART_4
+ warp 1, 1, 0, CELADON_MART_ELEVATOR
- db $1 ; signs
- db $1, $e, $5 ; CeladonMart5Text5
+ db 1 ; signs
+ sign 14, 1, 5 ; CeladonMart5Text5
- db $4 ; objects
- object SPRITE_GENTLEMAN, $e, $5, WALK, $1, $1 ; person
- object SPRITE_SAILOR, $2, $6, STAY, NONE, $2 ; person
- object SPRITE_MART_GUY, $5, $3, STAY, DOWN, $3 ; person
- object SPRITE_MART_GUY, $6, $3, STAY, DOWN, $4 ; person
+ db 4 ; objects
+ object SPRITE_GENTLEMAN, 14, 5, WALK, 1, 1 ; person
+ object SPRITE_SAILOR, 2, 6, STAY, NONE, 2 ; person
+ object SPRITE_MART_GUY, 5, 3, STAY, DOWN, 3 ; person
+ object SPRITE_MART_GUY, 6, 3, STAY, DOWN, 4 ; person
; warp-to
- EVENT_DISP CELADON_MART_5_WIDTH, $1, $c ; CELADON_MART_ROOF
- EVENT_DISP CELADON_MART_5_WIDTH, $1, $10 ; CELADON_MART_4
- EVENT_DISP CELADON_MART_5_WIDTH, $1, $1 ; CELADON_MART_ELEVATOR
+ warp_to 12, 1, CELADON_MART_5_WIDTH ; CELADON_MART_ROOF
+ warp_to 16, 1, CELADON_MART_5_WIDTH ; CELADON_MART_4
+ warp_to 1, 1, CELADON_MART_5_WIDTH ; CELADON_MART_ELEVATOR