summaryrefslogtreecommitdiff
path: root/data/mapObjects/celadonmart5.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/celadonmart5.asm')
-rwxr-xr-xdata/mapObjects/celadonmart5.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/data/mapObjects/celadonmart5.asm b/data/mapObjects/celadonmart5.asm
index 9914d51b..df47a70d 100755
--- a/data/mapObjects/celadonmart5.asm
+++ b/data/mapObjects/celadonmart5.asm
@@ -1,4 +1,4 @@
-CeladonMart5Object: ; 0x49085 (size=55)
+CeladonMart5Object:
db $f ; border block
db $3 ; warps
@@ -9,11 +9,11 @@ CeladonMart5Object: ; 0x49085 (size=55)
db $1 ; signs
db $1, $e, $5 ; CeladonMart5Text5
- db $4 ; people
- db SPRITE_GENTLEMAN, $5 + 4, $e + 4, $fe, $1, $1 ; person
- db SPRITE_SAILOR, $6 + 4, $2 + 4, $ff, $ff, $2 ; person
- db SPRITE_MART_GUY, $3 + 4, $5 + 4, $ff, $d0, $3 ; person
- db SPRITE_MART_GUY, $3 + 4, $6 + 4, $ff, $d0, $4 ; person
+ 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
; warp-to
EVENT_DISP CELADON_MART_5_WIDTH, $1, $c ; CELADON_MART_ROOF