aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/celadonhouse.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/celadonhouse.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/celadonhouse.asm')
-rwxr-xr-xdata/mapObjects/celadonhouse.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/celadonhouse.asm b/data/mapObjects/celadonhouse.asm
index 19be473b..0919e99a 100755
--- a/data/mapObjects/celadonhouse.asm
+++ b/data/mapObjects/celadonhouse.asm
@@ -7,10 +7,10 @@ CeladonHouseObject: ; 0x49227 (size=38)
db $0 ; signs
- db $3 ; people
- db SPRITE_OLD_PERSON, $2 + 4, $4 + 4, $ff, $d0, $1 ; person
- db SPRITE_ROCKET, $4 + 4, $1 + 4, $fe, $0, $2 ; person
- db SPRITE_SAILOR, $6 + 4, $5 + 4, $ff, $d2, $3 ; person
+ db $3 ; objects
+ object SPRITE_OLD_PERSON, $4, $2, FACE, DOWN, $1 ; person
+ object SPRITE_ROCKET, $1, $4, WALK, $0, $2 ; person
+ object SPRITE_SAILOR, $5, $6, FACE, RIGHT, $3 ; person
; warp-to
EVENT_DISP CELADON_HOUSE_WIDTH, $7, $2