aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/celadonmart3.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/celadonmart3.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/celadonmart3.asm')
-rwxr-xr-xdata/mapObjects/celadonmart3.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/data/mapObjects/celadonmart3.asm b/data/mapObjects/celadonmart3.asm
index 8ffbf823..2f17cbb5 100755
--- a/data/mapObjects/celadonmart3.asm
+++ b/data/mapObjects/celadonmart3.asm
@@ -20,12 +20,12 @@ CeladonMart3Object: ; 0x482c4 (size=94)
db $1, $6, $10 ; CeladonMart3Text16
db $1, $a, $11 ; CeladonMart3Text17
- db $5 ; people
- db SPRITE_MART_GUY, $5 + 4, $10 + 4, $ff, $ff, $1 ; person
- db SPRITE_GAMEBOY_KID_COPY, $6 + 4, $b + 4, $ff, $d3, $2 ; person
- db SPRITE_GAMEBOY_KID_COPY, $2 + 4, $7 + 4, $ff, $d0, $3 ; person
- db SPRITE_GAMEBOY_KID_COPY, $2 + 4, $8 + 4, $ff, $d0, $4 ; person
- db SPRITE_YOUNG_BOY, $5 + 4, $2 + 4, $ff, $d1, $5 ; person
+ db $5 ; objects
+ object SPRITE_MART_GUY, $10, $5, FACE, STAY, $1 ; person
+ object SPRITE_GAMEBOY_KID_COPY, $b, $6, FACE, LEFT, $2 ; person
+ object SPRITE_GAMEBOY_KID_COPY, $7, $2, FACE, DOWN, $3 ; person
+ object SPRITE_GAMEBOY_KID_COPY, $8, $2, FACE, DOWN, $4 ; person
+ object SPRITE_YOUNG_BOY, $2, $5, FACE, UP, $5 ; person
; warp-to
EVENT_DISP CELADON_MART_3_WIDTH, $1, $c ; CELADON_MART_4