aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/ssanne10.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/ssanne10.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/ssanne10.asm')
-rwxr-xr-xdata/mapObjects/ssanne10.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/mapObjects/ssanne10.asm b/data/mapObjects/ssanne10.asm
index b98f734f..1d1f4377 100755
--- a/data/mapObjects/ssanne10.asm
+++ b/data/mapObjects/ssanne10.asm
@@ -15,18 +15,18 @@ SSAnne10Object: ; 0x61e75 (size=165)
db $0 ; signs
- db $b ; people
- db SPRITE_SAILOR, $d + 4, $0 + 4, $ff, $d0, TRAINER | $1, SAILOR + $C8, $3
- db SPRITE_SAILOR, $b + 4, $2 + 4, $ff, $d0, TRAINER | $2, SAILOR + $C8, $4
- db SPRITE_SAILOR, $3 + 4, $c + 4, $ff, $d2, TRAINER | $3, SAILOR + $C8, $5
- db SPRITE_SAILOR, $2 + 4, $16 + 4, $ff, $d0, TRAINER | $4, SAILOR + $C8, $6
- db SPRITE_SAILOR, $2 + 4, $0 + 4, $ff, $d3, TRAINER | $5, SAILOR + $C8, $7
- db SPRITE_FISHER2, $4 + 4, $0 + 4, $ff, $d3, TRAINER | $6, FISHER + $C8, $2
- db SPRITE_BLACK_HAIR_BOY_2, $d + 4, $a + 4, $ff, $d3, $7 ; person
- db SPRITE_SLOWBRO, $c + 4, $b + 4, $ff, $ff, $8 ; person
- db SPRITE_BALL, $2 + 4, $14 + 4, $ff, $ff, ITEM | $9, ETHER
- db SPRITE_BALL, $2 + 4, $a + 4, $ff, $ff, ITEM | $a, TM_44
- db SPRITE_BALL, $b + 4, $c + 4, $ff, $ff, ITEM | $b, MAX_POTION
+ db $b ; objects
+ object SPRITE_SAILOR, $0, $d, FACE, DOWN, $1, SAILOR + $C8, $3
+ object SPRITE_SAILOR, $2, $b, FACE, DOWN, $2, SAILOR + $C8, $4
+ object SPRITE_SAILOR, $c, $3, FACE, RIGHT, $3, SAILOR + $C8, $5
+ object SPRITE_SAILOR, $16, $2, FACE, DOWN, $4, SAILOR + $C8, $6
+ object SPRITE_SAILOR, $0, $2, FACE, LEFT, $5, SAILOR + $C8, $7
+ object SPRITE_FISHER2, $0, $4, FACE, LEFT, $6, FISHER + $C8, $2
+ object SPRITE_BLACK_HAIR_BOY_2, $a, $d, FACE, LEFT, $7 ; person
+ object SPRITE_SLOWBRO, $b, $c, FACE, STAY, $8 ; person
+ object SPRITE_BALL, $14, $2, FACE, STAY, $9, ETHER
+ object SPRITE_BALL, $a, $2, FACE, STAY, $a, TM_44
+ object SPRITE_BALL, $c, $b, FACE, STAY, $b, MAX_POTION
; warp-to
EVENT_DISP SS_ANNE_10_WIDTH, $5, $2 ; SS_ANNE_4