summaryrefslogtreecommitdiff
path: root/data/mapObjects/pokemontower4.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2016-01-12 18:45:02 -0600
committerdannye <corrnondacqb@yahoo.com>2016-01-12 18:45:02 -0600
commit5914540ba780d7936fd6624d6fde2d67a9f7a773 (patch)
treea1ce27018f39d98f49d89468df426d0291e18560 /data/mapObjects/pokemontower4.asm
parentccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff)
parent8a5a7d8e68538b727e0c166488265f395603366e (diff)
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'data/mapObjects/pokemontower4.asm')
-rwxr-xr-xdata/mapObjects/pokemontower4.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/pokemontower4.asm b/data/mapObjects/pokemontower4.asm
index de95d1b0..722f6e08 100755
--- a/data/mapObjects/pokemontower4.asm
+++ b/data/mapObjects/pokemontower4.asm
@@ -8,9 +8,9 @@ PokemonTower4Object: ; 0x6088b (size=65)
db $0 ; signs
db $6 ; objects
- object SPRITE_MEDIUM, $5, $a, STAY, RIGHT, $1, CHANNELER + $C8, $9
- object SPRITE_MEDIUM, $f, $7, STAY, DOWN, $2, CHANNELER + $C8, $a
- object SPRITE_MEDIUM, $e, $c, STAY, LEFT, $3, CHANNELER + $C8, $c
+ object SPRITE_MEDIUM, $5, $a, STAY, RIGHT, $1, OPP_CHANNELER, $9
+ object SPRITE_MEDIUM, $f, $7, STAY, DOWN, $2, OPP_CHANNELER, $a
+ object SPRITE_MEDIUM, $e, $c, STAY, LEFT, $3, OPP_CHANNELER, $c
object SPRITE_BALL, $c, $a, STAY, NONE, $4, ELIXER
object SPRITE_BALL, $9, $a, STAY, NONE, $5, AWAKENING
object SPRITE_BALL, $c, $10, STAY, NONE, $6, HP_UP