aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/pokemontower3.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/pokemontower3.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/pokemontower3.asm')
-rwxr-xr-xdata/mapObjects/pokemontower3.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/mapObjects/pokemontower3.asm b/data/mapObjects/pokemontower3.asm
index 3a16070a..c083c267 100755
--- a/data/mapObjects/pokemontower3.asm
+++ b/data/mapObjects/pokemontower3.asm
@@ -7,11 +7,11 @@ PokemonTower3Object: ; 0x6075d (size=51)
db $0 ; signs
- db $4 ; people
- db SPRITE_MEDIUM, $3 + 4, $c + 4, $ff, $d2, TRAINER | $1, CHANNELER + $C8, $5
- db SPRITE_MEDIUM, $8 + 4, $9 + 4, $ff, $d0, TRAINER | $2, CHANNELER + $C8, $6
- db SPRITE_MEDIUM, $d + 4, $a + 4, $ff, $d0, TRAINER | $3, CHANNELER + $C8, $8
- db SPRITE_BALL, $1 + 4, $c + 4, $ff, $ff, ITEM | $4, ESCAPE_ROPE
+ db $4 ; objects
+ object SPRITE_MEDIUM, $c, $3, FACE, RIGHT, $1, CHANNELER + $C8, $5
+ object SPRITE_MEDIUM, $9, $8, FACE, DOWN, $2, CHANNELER + $C8, $6
+ object SPRITE_MEDIUM, $a, $d, FACE, DOWN, $3, CHANNELER + $C8, $8
+ object SPRITE_BALL, $c, $1, FACE, STAY, $4, ESCAPE_ROPE
; warp-to
EVENT_DISP POKEMONTOWER_3_WIDTH, $9, $3 ; POKEMONTOWER_2