aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/lavenderhouse1.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/lavenderhouse1.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/lavenderhouse1.asm')
-rwxr-xr-xdata/mapObjects/lavenderhouse1.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/data/mapObjects/lavenderhouse1.asm b/data/mapObjects/lavenderhouse1.asm
index 4472c7ed..0b198199 100755
--- a/data/mapObjects/lavenderhouse1.asm
+++ b/data/mapObjects/lavenderhouse1.asm
@@ -7,13 +7,13 @@ LavenderHouse1Object: ; 0x1d96a (size=56)
db $0 ; signs
- db $6 ; people
- db SPRITE_BLACK_HAIR_BOY_2, $5 + 4, $3 + 4, $ff, $ff, $1 ; person
- db SPRITE_LITTLE_GIRL, $3 + 4, $6 + 4, $ff, $d0, $2 ; person
- db SPRITE_SLOWBRO, $4 + 4, $6 + 4, $ff, $d1, $3 ; person
- db SPRITE_SLOWBRO, $3 + 4, $1 + 4, $ff, $ff, $4 ; person
- db SPRITE_MR_FUJI, $1 + 4, $3 + 4, $ff, $ff, $5 ; person
- db SPRITE_BOOK_MAP_DEX, $3 + 4, $3 + 4, $ff, $ff, $6 ; person
+ db $6 ; objects
+ object SPRITE_BLACK_HAIR_BOY_2, $3, $5, FACE, STAY, $1 ; person
+ object SPRITE_LITTLE_GIRL, $6, $3, FACE, DOWN, $2 ; person
+ object SPRITE_SLOWBRO, $6, $4, FACE, UP, $3 ; person
+ object SPRITE_SLOWBRO, $1, $3, FACE, STAY, $4 ; person
+ object SPRITE_MR_FUJI, $3, $1, FACE, STAY, $5 ; person
+ object SPRITE_BOOK_MAP_DEX, $3, $3, FACE, STAY, $6 ; person
; warp-to
EVENT_DISP LAVENDER_HOUSE_1_WIDTH, $7, $2