aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/celadonmansion5.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/celadonmansion5.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/celadonmansion5.asm')
-rwxr-xr-xdata/mapObjects/celadonmansion5.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/celadonmansion5.asm b/data/mapObjects/celadonmansion5.asm
index efc74275..c65a23b5 100755
--- a/data/mapObjects/celadonmansion5.asm
+++ b/data/mapObjects/celadonmansion5.asm
@@ -7,9 +7,9 @@ CeladonMansion5Object: ; 0x1dd5c (size=32)
db $0 ; signs
- db $2 ; people
- db SPRITE_HIKER, $2 + 4, $2 + 4, $ff, $d0, $1 ; person
- db SPRITE_BALL, $3 + 4, $4 + 4, $ff, $ff, $2 ; person
+ db $2 ; objects
+ object SPRITE_HIKER, $2, $2, FACE, DOWN, $1 ; person
+ object SPRITE_BALL, $4, $3, FACE, STAY, $2 ; person
; warp-to
EVENT_DISP CELADON_MANSION_5_WIDTH, $7, $2 ; CELADON_MANSION_4