summaryrefslogtreecommitdiff
path: root/data/mapObjects/celadonmart2.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2015-07-18 22:22:51 -0500
committerdannye <corrnondacqb@yahoo.com>2015-07-18 22:22:51 -0500
commit0e48333fb864b0c8b6914fe1b5e57929d5258080 (patch)
tree02a69d268fd1234b0a3da2745065130f7193118c /data/mapObjects/celadonmart2.asm
parent148d3f3cf28f9c270e3d5043af0692d95bc731c5 (diff)
Map object macro
closes https://github.com/iimarckus/pokered/issues/89
Diffstat (limited to 'data/mapObjects/celadonmart2.asm')
-rwxr-xr-xdata/mapObjects/celadonmart2.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/mapObjects/celadonmart2.asm b/data/mapObjects/celadonmart2.asm
index 6b40ed11..55c4d741 100755
--- a/data/mapObjects/celadonmart2.asm
+++ b/data/mapObjects/celadonmart2.asm
@@ -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, FACE, DOWN, $1 ; person
+ object SPRITE_MART_GUY, $6, $3, FACE, DOWN, $2 ; person
+ object SPRITE_FAT_BALD_GUY, $13, $5, FACE, STAY, $3 ; person
+ object SPRITE_GIRL, $e, $4, WALK, $1, $4 ; person
; warp-to
EVENT_DISP CELADON_MART_2_WIDTH, $1, $c ; CELADON_MART_1