summaryrefslogtreecommitdiff
path: root/data/mapObjects/celadonmartroof.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/celadonmartroof.asm')
-rwxr-xr-xdata/mapObjects/celadonmartroof.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/mapObjects/celadonmartroof.asm b/data/mapObjects/celadonmartroof.asm
index e6fda0e7..7a2d1a7f 100755
--- a/data/mapObjects/celadonmartroof.asm
+++ b/data/mapObjects/celadonmartroof.asm
@@ -1,18 +1,18 @@
CeladonMartRoofObject:
- db $42 ; border block
+ db 66 ; border block
- db $1 ; warps
- warp $f, $2, $0, CELADON_MART_5
+ db 1 ; warps
+ warp 15, 2, 0, CELADON_MART_5
- db $4 ; signs
- sign $a, $1, $3 ; CeladonMartRoofText3
- sign $b, $1, $4 ; CeladonMartRoofText4
- sign $c, $2, $5 ; CeladonMartRoofText5
- sign $d, $2, $6 ; CeladonMartRoofText6
+ db 4 ; signs
+ sign 10, 1, 3 ; CeladonMartRoofText3
+ sign 11, 1, 4 ; CeladonMartRoofText4
+ sign 12, 2, 5 ; CeladonMartRoofText5
+ sign 13, 2, 6 ; CeladonMartRoofText6
- db $2 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, $a, $4, STAY, LEFT, $1 ; person
- object SPRITE_LITTLE_GIRL, $5, $5, WALK, $0, $2 ; person
+ db 2 ; objects
+ object SPRITE_BLACK_HAIR_BOY_2, 10, 4, STAY, LEFT, 1 ; person
+ object SPRITE_LITTLE_GIRL, 5, 5, WALK, 0, 2 ; person
; warp-to
- warp_to $f, $2, CELADON_MART_ROOF_WIDTH ; CELADON_MART_5
+ warp_to 15, 2, CELADON_MART_ROOF_WIDTH ; CELADON_MART_5