aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/viridianhouse.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/viridianhouse.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/viridianhouse.asm')
-rwxr-xr-xdata/mapObjects/viridianhouse.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/mapObjects/viridianhouse.asm b/data/mapObjects/viridianhouse.asm
index dd2d6069..30dd6356 100755
--- a/data/mapObjects/viridianhouse.asm
+++ b/data/mapObjects/viridianhouse.asm
@@ -7,11 +7,11 @@ ViridianHouseObject: ; 0x1d5bb (size=44)
db $0 ; signs
- db $4 ; people
- db SPRITE_BALDING_GUY, $3 + 4, $5 + 4, $ff, $ff, $1 ; person
- db SPRITE_LITTLE_GIRL, $4 + 4, $1 + 4, $fe, $1, $2 ; person
- db SPRITE_BIRD, $5 + 4, $5 + 4, $fe, $2, $3 ; person
- db SPRITE_CLIPBOARD, $0 + 4, $4 + 4, $ff, $ff, $4 ; person
+ db $4 ; objects
+ object SPRITE_BALDING_GUY, $5, $3, FACE, STAY, $1 ; person
+ object SPRITE_LITTLE_GIRL, $1, $4, WALK, $1, $2 ; person
+ object SPRITE_BIRD, $5, $5, WALK, $2, $3 ; person
+ object SPRITE_CLIPBOARD, $4, $0, FACE, STAY, $4 ; person
; warp-to
EVENT_DISP VIRIDIAN_HOUSE_WIDTH, $7, $2