aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/blueshouse.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/blueshouse.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/blueshouse.asm')
-rwxr-xr-xdata/mapObjects/blueshouse.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/blueshouse.asm b/data/mapObjects/blueshouse.asm
index 582733c0..08b0b2fe 100755
--- a/data/mapObjects/blueshouse.asm
+++ b/data/mapObjects/blueshouse.asm
@@ -7,10 +7,10 @@ BluesHouseObject: ; 19bce (6:5bce)
db $0 ; signs
- db $3 ; people
- db SPRITE_DAISY, $3 + 4, $2 + 4, $FF, $D3, $1 ; Daisy, sitting by map
- db SPRITE_DAISY, $4 + 4, $6 + 4, $FE, $1, ITEM | $2, $0 ; Daisy, walking around
- db SPRITE_BOOK_MAP_DEX, $3 + 4, $3 + 4, $FF, $FF, ITEM | $3, $0 ; map on table
+ db $3 ; objects
+ object SPRITE_DAISY, $2, $3, FACE, LEFT, $1 ; Daisy, sitting by map
+ object SPRITE_DAISY, $6, $4, WALK, $1, $2, $0 ; Daisy, walking around
+ object SPRITE_BOOK_MAP_DEX, $3, $3, FACE, STAY, $3, $0 ; map on table
; warp-to
EVENT_DISP BLUES_HOUSE_WIDTH, $7, $2