summaryrefslogtreecommitdiff
path: root/data/mapObjects/celadonmart4.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/celadonmart4.asm')
-rwxr-xr-xdata/mapObjects/celadonmart4.asm28
1 files changed, 14 insertions, 14 deletions
diff --git a/data/mapObjects/celadonmart4.asm b/data/mapObjects/celadonmart4.asm
index b7e3e68f..749cc401 100755
--- a/data/mapObjects/celadonmart4.asm
+++ b/data/mapObjects/celadonmart4.asm
@@ -1,20 +1,20 @@
CeladonMart4Object:
- db $f ; border block
+ db 15 ; border block
- db $3 ; warps
- warp $c, $1, $0, CELADON_MART_3
- warp $10, $1, $1, CELADON_MART_5
- warp $1, $1, $0, CELADON_MART_ELEVATOR
+ db 3 ; warps
+ warp 12, 1, 0, CELADON_MART_3
+ warp 16, 1, 1, CELADON_MART_5
+ warp 1, 1, 0, CELADON_MART_ELEVATOR
- db $1 ; signs
- sign $e, $1, $4 ; CeladonMart4Text4
+ db 1 ; signs
+ sign 14, 1, 4 ; CeladonMart4Text4
- db $3 ; objects
- object SPRITE_MART_GUY, $5, $7, STAY, NONE, $1 ; person
- object SPRITE_BLACK_HAIR_BOY_2, $f, $5, WALK, $2, $2 ; person
- object SPRITE_BUG_CATCHER, $5, $2, WALK, $2, $3 ; person
+ db 3 ; objects
+ object SPRITE_MART_GUY, 5, 7, STAY, NONE, 1 ; person
+ object SPRITE_BLACK_HAIR_BOY_2, 15, 5, WALK, 2, 2 ; person
+ object SPRITE_BUG_CATCHER, 5, 2, WALK, 2, 3 ; person
; warp-to
- warp_to $c, $1, CELADON_MART_4_WIDTH ; CELADON_MART_3
- warp_to $10, $1, CELADON_MART_4_WIDTH ; CELADON_MART_5
- warp_to $1, $1, CELADON_MART_4_WIDTH ; CELADON_MART_ELEVATOR
+ warp_to 12, 1, CELADON_MART_4_WIDTH ; CELADON_MART_3
+ warp_to 16, 1, CELADON_MART_4_WIDTH ; CELADON_MART_5
+ warp_to 1, 1, CELADON_MART_4_WIDTH ; CELADON_MART_ELEVATOR