aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/celadonmansion1.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/celadonmansion1.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/celadonmansion1.asm')
-rwxr-xr-xdata/mapObjects/celadonmansion1.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/mapObjects/celadonmansion1.asm b/data/mapObjects/celadonmansion1.asm
index decb14e7..3ff485ea 100755
--- a/data/mapObjects/celadonmansion1.asm
+++ b/data/mapObjects/celadonmansion1.asm
@@ -11,11 +11,11 @@ CeladonMansion1Object: ; 0x486cf (size=71)
db $1 ; signs
db $9, $4, $5 ; CeladonMansion1Text5
- db $4 ; people
- db SPRITE_SLOWBRO, $5 + 4, $0 + 4, $ff, $d3, $1 ; person
- db SPRITE_OLD_MEDIUM_WOMAN, $5 + 4, $1 + 4, $ff, $d0, $2 ; person
- db SPRITE_CLEFAIRY, $8 + 4, $1 + 4, $fe, $2, $3 ; person
- db SPRITE_SLOWBRO, $4 + 4, $4 + 4, $fe, $1, $4 ; person
+ db $4 ; objects
+ object SPRITE_SLOWBRO, $0, $5, FACE, LEFT, $1 ; person
+ object SPRITE_OLD_MEDIUM_WOMAN, $1, $5, FACE, DOWN, $2 ; person
+ object SPRITE_CLEFAIRY, $1, $8, WALK, $2, $3 ; person
+ object SPRITE_SLOWBRO, $4, $4, WALK, $1, $4 ; person
; warp-to
EVENT_DISP CELADON_MANSION_1_WIDTH, $b, $4