aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/pallettown.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/pallettown.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/pallettown.asm')
-rwxr-xr-xdata/mapObjects/pallettown.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/pallettown.asm b/data/mapObjects/pallettown.asm
index cef66431..f0a1c8eb 100755
--- a/data/mapObjects/pallettown.asm
+++ b/data/mapObjects/pallettown.asm
@@ -12,10 +12,10 @@ PalletTownObject: ; 0x182c3 (size=58)
db $5, $3, $6 ; PalletTownText6
db $5, $b, $7 ; PalletTownText7
- db $3 ; people
- db SPRITE_OAK, $5 + 4, $8 + 4, $ff, $ff, $1 ; person
- db SPRITE_GIRL, $8 + 4, $3 + 4, $fe, $0, $2 ; person
- db SPRITE_FISHER2, $e + 4, $b + 4, $fe, $0, $3 ; person
+ db $3 ; objects
+ object SPRITE_OAK, $8, $5, FACE, STAY, $1 ; person
+ object SPRITE_GIRL, $3, $8, WALK, $0, $2 ; person
+ object SPRITE_FISHER2, $b, $e, WALK, $0, $3 ; person
; warp-to
EVENT_DISP PALLET_TOWN_WIDTH, $5, $5 ; REDS_HOUSE_1F