summaryrefslogtreecommitdiff
path: root/data/mapObjects/celadonmart2.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/celadonmart2.asm')
-rwxr-xr-xdata/mapObjects/celadonmart2.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/data/mapObjects/celadonmart2.asm b/data/mapObjects/celadonmart2.asm
index 6b40ed11..a6c9af59 100755
--- a/data/mapObjects/celadonmart2.asm
+++ b/data/mapObjects/celadonmart2.asm
@@ -1,4 +1,4 @@
-CeladonMart2Object: ; 0x56111 (size=55)
+CeladonMart2Object:
db $f ; border block
db $3 ; warps
@@ -9,11 +9,11 @@ CeladonMart2Object: ; 0x56111 (size=55)
db $1 ; signs
db $1, $e, $5 ; CeladonMart2Text5
- db $4 ; people
- db SPRITE_MART_GUY, $3 + 4, $5 + 4, $ff, $d0, $1 ; person
- db SPRITE_MART_GUY, $3 + 4, $6 + 4, $ff, $d0, $2 ; person
- db SPRITE_FAT_BALD_GUY, $5 + 4, $13 + 4, $ff, $ff, $3 ; person
- db SPRITE_GIRL, $4 + 4, $e + 4, $fe, $1, $4 ; person
+ db $4 ; objects
+ object SPRITE_MART_GUY, $5, $3, STAY, DOWN, $1 ; person
+ object SPRITE_MART_GUY, $6, $3, STAY, DOWN, $2 ; person
+ object SPRITE_FAT_BALD_GUY, $13, $5, STAY, NONE, $3 ; person
+ object SPRITE_GIRL, $e, $4, WALK, $1, $4 ; person
; warp-to
EVENT_DISP CELADON_MART_2_WIDTH, $1, $c ; CELADON_MART_1