summaryrefslogtreecommitdiff
path: root/data/mapObjects/mtmoon3.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/mtmoon3.asm
parentccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff)
parent8a5a7d8e68538b727e0c166488265f395603366e (diff)
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'data/mapObjects/mtmoon3.asm')
-rwxr-xr-xdata/mapObjects/mtmoon3.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/mapObjects/mtmoon3.asm b/data/mapObjects/mtmoon3.asm
index 3bcfe40f..4f8f911c 100755
--- a/data/mapObjects/mtmoon3.asm
+++ b/data/mapObjects/mtmoon3.asm
@@ -10,11 +10,11 @@ MtMoon3Object: ; 0x49fdb (size=102)
db $0 ; signs
db $9 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, $c, $8, STAY, RIGHT, $1, SUPER_NERD + $C8, $2
- object SPRITE_ROCKET, $b, $10, STAY, DOWN, $2, ROCKET + $C8, $1
- object SPRITE_ROCKET, $f, $16, STAY, DOWN, $3, ROCKET + $C8, $2
- object SPRITE_ROCKET, $1d, $b, STAY, UP, $4, ROCKET + $C8, $3
- object SPRITE_ROCKET, $1d, $11, STAY, LEFT, $5, ROCKET + $C8, $4
+ object SPRITE_BLACK_HAIR_BOY_2, $c, $8, STAY, RIGHT, $1, OPP_SUPER_NERD, $2
+ object SPRITE_ROCKET, $b, $10, STAY, DOWN, $2, OPP_ROCKET, $1
+ object SPRITE_ROCKET, $f, $16, STAY, DOWN, $3, OPP_ROCKET, $2
+ object SPRITE_ROCKET, $1d, $b, STAY, UP, $4, OPP_ROCKET, $3
+ object SPRITE_ROCKET, $1d, $11, STAY, LEFT, $5, OPP_ROCKET, $4
object SPRITE_OMANYTE, $c, $6, STAY, NONE, $6 ; person
object SPRITE_OMANYTE, $d, $6, STAY, NONE, $7 ; person
object SPRITE_BALL, $19, $15, STAY, NONE, $8, HP_UP