summaryrefslogtreecommitdiff
path: root/data/mapObjects/pokemontower7.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/pokemontower7.asm
parentccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff)
parent8a5a7d8e68538b727e0c166488265f395603366e (diff)
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'data/mapObjects/pokemontower7.asm')
-rwxr-xr-xdata/mapObjects/pokemontower7.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/pokemontower7.asm
index 270f3aa7..fd1fc884 100755
--- a/data/mapObjects/pokemontower7.asm
+++ b/data/mapObjects/pokemontower7.asm
@@ -13,9 +13,9 @@ IF DEF(_YELLOW)
object SPRITE_MR_FUJI, $a, 3, STAY, DOWN, 3
ELSE
db $4 ; objects
- object SPRITE_ROCKET, $9, $b, STAY, RIGHT, $1, ROCKET + $C8, $13
- object SPRITE_ROCKET, $c, $9, STAY, LEFT, $2, ROCKET + $C8, $14
- object SPRITE_ROCKET, $9, $7, STAY, RIGHT, $3, ROCKET + $C8, $15
+ object SPRITE_ROCKET, $9, $b, STAY, RIGHT, $1, OPP_ROCKET, $13
+ object SPRITE_ROCKET, $c, $9, STAY, LEFT, $2, OPP_ROCKET, $14
+ object SPRITE_ROCKET, $9, $7, STAY, RIGHT, $3, OPP_ROCKET, $15
object SPRITE_MR_FUJI, $a, $3, STAY, DOWN, $4 ; person
ENDC