aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/ssanne8.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/ssanne8.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/ssanne8.asm')
-rwxr-xr-xdata/mapObjects/ssanne8.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/mapObjects/ssanne8.asm b/data/mapObjects/ssanne8.asm
index e2df8fa9..92d784cb 100755
--- a/data/mapObjects/ssanne8.asm
+++ b/data/mapObjects/ssanne8.asm
@@ -11,18 +11,18 @@ SSAnne8Object: ; 0x61a60 (size=127)
db $0 ; signs
- db $b ; people
- db SPRITE_GENTLEMAN, $3 + 4, $2 + 4, $ff, $d2, TRAINER | $1, GENTLEMAN + $C8, $1
- db SPRITE_GENTLEMAN, $4 + 4, $b + 4, $ff, $d1, TRAINER | $2, GENTLEMAN + $C8, $2
- db SPRITE_BUG_CATCHER, $e + 4, $b + 4, $ff, $d1, TRAINER | $3, YOUNGSTER + $C8, $8
- db SPRITE_LASS, $b + 4, $d + 4, $ff, $d2, TRAINER | $4, LASS + $C8, $b
- db SPRITE_GIRL, $3 + 4, $16 + 4, $fe, $1, $5 ; person
- db SPRITE_FAT_BALD_GUY, $e + 4, $0 + 4, $ff, $ff, $6 ; person
- db SPRITE_LITTLE_GIRL, $b + 4, $2 + 4, $ff, $d0, $7 ; person
- db SPRITE_CLEFAIRY, $b + 4, $3 + 4, $ff, $d0, $8 ; person
- db SPRITE_GIRL, $d + 4, $a + 4, $ff, $d3, $9 ; person
- db SPRITE_BALL, $f + 4, $c + 4, $ff, $ff, ITEM | $a, TM_08
- db SPRITE_GENTLEMAN, $d + 4, $15 + 4, $fe, $2, $b ; person
+ db $b ; objects
+ object SPRITE_GENTLEMAN, $2, $3, FACE, RIGHT, $1, GENTLEMAN + $C8, $1
+ object SPRITE_GENTLEMAN, $b, $4, FACE, UP, $2, GENTLEMAN + $C8, $2
+ object SPRITE_BUG_CATCHER, $b, $e, FACE, UP, $3, YOUNGSTER + $C8, $8
+ object SPRITE_LASS, $d, $b, FACE, RIGHT, $4, LASS + $C8, $b
+ object SPRITE_GIRL, $16, $3, WALK, $1, $5 ; person
+ object SPRITE_FAT_BALD_GUY, $0, $e, FACE, STAY, $6 ; person
+ object SPRITE_LITTLE_GIRL, $2, $b, FACE, DOWN, $7 ; person
+ object SPRITE_CLEFAIRY, $3, $b, FACE, DOWN, $8 ; person
+ object SPRITE_GIRL, $a, $d, FACE, LEFT, $9 ; person
+ object SPRITE_BALL, $c, $f, FACE, STAY, $a, TM_08
+ object SPRITE_GENTLEMAN, $15, $d, WALK, $2, $b ; person
; warp-to
EVENT_DISP SS_ANNE_8_WIDTH, $0, $0 ; SS_ANNE_1