aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/pokemontower1.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/pokemontower1.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/pokemontower1.asm')
-rwxr-xr-xdata/mapObjects/pokemontower1.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/data/mapObjects/pokemontower1.asm b/data/mapObjects/pokemontower1.asm
index 30fb9cbc..b3aea3f8 100755
--- a/data/mapObjects/pokemontower1.asm
+++ b/data/mapObjects/pokemontower1.asm
@@ -8,12 +8,12 @@ PokemonTower1Object: ; 0x60452 (size=58)
db $0 ; signs
- db $5 ; people
- db SPRITE_CABLE_CLUB_WOMAN, $d + 4, $f + 4, $ff, $d1, $1 ; person
- db SPRITE_MOM_GEISHA, $8 + 4, $6 + 4, $ff, $ff, $2 ; person
- db SPRITE_BALDING_GUY, $c + 4, $8 + 4, $ff, $ff, $3 ; person
- db SPRITE_GIRL, $7 + 4, $d + 4, $ff, $ff, $4 ; person
- db SPRITE_MEDIUM, $7 + 4, $11 + 4, $ff, $d2, $5 ; person
+ db $5 ; objects
+ object SPRITE_CABLE_CLUB_WOMAN, $f, $d, FACE, UP, $1 ; person
+ object SPRITE_MOM_GEISHA, $6, $8, FACE, STAY, $2 ; person
+ object SPRITE_BALDING_GUY, $8, $c, FACE, STAY, $3 ; person
+ object SPRITE_GIRL, $d, $7, FACE, STAY, $4 ; person
+ object SPRITE_MEDIUM, $11, $7, FACE, RIGHT, $5 ; person
; warp-to
EVENT_DISP POKEMONTOWER_1_WIDTH, $11, $a