aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/copycatshouse2f.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/copycatshouse2f.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/copycatshouse2f.asm')
-rwxr-xr-xdata/mapObjects/copycatshouse2f.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/data/mapObjects/copycatshouse2f.asm b/data/mapObjects/copycatshouse2f.asm
index 3d0432c6..f97befd4 100755
--- a/data/mapObjects/copycatshouse2f.asm
+++ b/data/mapObjects/copycatshouse2f.asm
@@ -8,12 +8,12 @@ CopycatsHouse2FObject: ; 0x5cd21 (size=48)
db $5, $3, $6 ; CopycatsHouse2FText6
db $1, $0, $7 ; CopycatsHouse2FText7
- db $5 ; people
- db SPRITE_BRUNETTE_GIRL, $3 + 4, $4 + 4, $fe, $0, $1 ; person
- db SPRITE_BIRD, $6 + 4, $4 + 4, $fe, $2, $2 ; person
- db SPRITE_SLOWBRO, $1 + 4, $5 + 4, $ff, $d0, $3 ; person
- db SPRITE_BIRD, $0 + 4, $2 + 4, $ff, $d0, $4 ; person
- db SPRITE_CLEFAIRY, $6 + 4, $1 + 4, $ff, $d3, $5 ; person
+ db $5 ; objects
+ object SPRITE_BRUNETTE_GIRL, $4, $3, WALK, $0, $1 ; person
+ object SPRITE_BIRD, $4, $6, WALK, $2, $2 ; person
+ object SPRITE_SLOWBRO, $5, $1, FACE, DOWN, $3 ; person
+ object SPRITE_BIRD, $2, $0, FACE, DOWN, $4 ; person
+ object SPRITE_CLEFAIRY, $1, $6, FACE, LEFT, $5 ; person
; warp-to
EVENT_DISP COPYCATS_HOUSE_2F_WIDTH, $1, $7 ; COPYCATS_HOUSE_1F