aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/celadonmart4.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/celadonmart4.asm
parentConsolidate coord macros (diff)
downloadpokeyellow-0e48333fb864b0c8b6914fe1b5e57929d5258080.tar.gz
pokeyellow-0e48333fb864b0c8b6914fe1b5e57929d5258080.tar.xz
pokeyellow-0e48333fb864b0c8b6914fe1b5e57929d5258080.zip
Map object macro
closes https://github.com/iimarckus/pokered/issues/89
Diffstat (limited to 'data/mapObjects/celadonmart4.asm')
-rwxr-xr-xdata/mapObjects/celadonmart4.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/celadonmart4.asm b/data/mapObjects/celadonmart4.asm
index 5bdbbf4a..4773644a 100755
--- a/data/mapObjects/celadonmart4.asm
+++ b/data/mapObjects/celadonmart4.asm
@@ -9,10 +9,10 @@ CeladonMart4Object: ; 0x48370 (size=49)
db $1 ; signs
db $1, $e, $4 ; CeladonMart4Text4
- db $3 ; people
- db SPRITE_MART_GUY, $7 + 4, $5 + 4, $ff, $ff, $1 ; person
- db SPRITE_BLACK_HAIR_BOY_2, $5 + 4, $f + 4, $fe, $2, $2 ; person
- db SPRITE_BUG_CATCHER, $2 + 4, $5 + 4, $fe, $2, $3 ; person
+ db $3 ; objects
+ object SPRITE_MART_GUY, $5, $7, FACE, STAY, $1 ; person
+ object SPRITE_BLACK_HAIR_BOY_2, $f, $5, WALK, $2, $2 ; person
+ object SPRITE_BUG_CATCHER, $5, $2, WALK, $2, $3 ; person
; warp-to
EVENT_DISP CELADON_MART_4_WIDTH, $1, $c ; CELADON_MART_3