summaryrefslogtreecommitdiff
path: root/data/mapObjects/mtmoon3.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2015-08-10 11:09:16 -0500
committerdannye <corrnondacqb@yahoo.com>2015-08-10 11:09:16 -0500
commitdfc152d667e3695f83eb0fbabb839b0fad275ceb (patch)
tree37255b78ab19c520a651ec68ca10a9f43ebe07d7 /data/mapObjects/mtmoon3.asm
parent31d267d4ad87042dbdd30be645ad4b43e4e3ceb1 (diff)
No more $C8
Use OPP_ constants separate from trainer constants since valid opponents can be all Pokemon and trainers
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