From 0e48333fb864b0c8b6914fe1b5e57929d5258080 Mon Sep 17 00:00:00 2001 From: dannye Date: Sat, 18 Jul 2015 22:22:51 -0500 Subject: Map object macro closes https://github.com/iimarckus/pokered/issues/89 --- data/mapObjects/fuchsiahouse2.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/mapObjects/fuchsiahouse2.asm') diff --git a/data/mapObjects/fuchsiahouse2.asm b/data/mapObjects/fuchsiahouse2.asm index f2958f02..8fb8fd34 100755 --- a/data/mapObjects/fuchsiahouse2.asm +++ b/data/mapObjects/fuchsiahouse2.asm @@ -9,10 +9,10 @@ FuchsiaHouse2Object: ; 0x75180 (size=45) db $3, $4, $4 ; FuchsiaHouse2Text4 db $3, $5, $5 ; FuchsiaHouse2Text5 - db $3 ; people - db SPRITE_WARDEN, $3 + 4, $2 + 4, $ff, $ff, $1 ; person - db SPRITE_BALL, $3 + 4, $8 + 4, $ff, $ff, ITEM | $2, RARE_CANDY - db SPRITE_BOULDER, $4 + 4, $8 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $3 ; person + db $3 ; objects + object SPRITE_WARDEN, $2, $3, FACE, STAY, $1 ; person + object SPRITE_BALL, $8, $3, FACE, STAY, $2, RARE_CANDY + object SPRITE_BOULDER, $8, $4, FACE, BOULDER_MOVEMENT_BYTE_2, $3 ; person ; warp-to EVENT_DISP FUCHSIA_HOUSE_2_WIDTH, $7, $4 -- cgit v1.3.1-sl0p