aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/fanclub.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/fanclub.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/fanclub.asm')
-rwxr-xr-xdata/mapObjects/fanclub.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/data/mapObjects/fanclub.asm b/data/mapObjects/fanclub.asm
index 15b9a89f..4113343e 100755
--- a/data/mapObjects/fanclub.asm
+++ b/data/mapObjects/fanclub.asm
@@ -9,13 +9,13 @@ FanClubObject: ; 0x59c97 (size=62)
db $0, $1, $7 ; FanClubText7
db $0, $6, $8 ; FanClubText8
- db $6 ; people
- db SPRITE_FISHER2, $3 + 4, $6 + 4, $ff, $d2, $1 ; person
- db SPRITE_GIRL, $3 + 4, $1 + 4, $ff, $d3, $2 ; person
- db SPRITE_CLEFAIRY, $4 + 4, $6 + 4, $ff, $d2, $3 ; person
- db SPRITE_SEEL, $4 + 4, $1 + 4, $ff, $d3, $4 ; person
- db SPRITE_GENTLEMAN, $1 + 4, $3 + 4, $ff, $d0, $5 ; person
- db SPRITE_CABLE_CLUB_WOMAN, $1 + 4, $5 + 4, $ff, $d0, $6 ; person
+ db $6 ; objects
+ object SPRITE_FISHER2, $6, $3, FACE, RIGHT, $1 ; person
+ object SPRITE_GIRL, $1, $3, FACE, LEFT, $2 ; person
+ object SPRITE_CLEFAIRY, $6, $4, FACE, RIGHT, $3 ; person
+ object SPRITE_SEEL, $1, $4, FACE, LEFT, $4 ; person
+ object SPRITE_GENTLEMAN, $3, $1, FACE, DOWN, $5 ; person
+ object SPRITE_CABLE_CLUB_WOMAN, $5, $1, FACE, DOWN, $6 ; person
; warp-to
EVENT_DISP POKEMON_FAN_CLUB_WIDTH, $7, $2