No more $C8

Use OPP_ constants separate from trainer constants since
valid opponents can be all Pokemon and trainers
This commit is contained in:
dannye 2015-08-10 11:09:16 -05:00
parent 31d267d4ad
commit dfc152d667
88 changed files with 428 additions and 423 deletions

View file

@ -12,13 +12,13 @@ MtMoon1Object: ; 0x49b06 (size=145)
db $17, $f, $e ; MtMoon1Text14
db $d ; objects
object SPRITE_HIKER, $5, $6, STAY, DOWN, $1, HIKER + $C8, $1
object SPRITE_BUG_CATCHER, $c, $10, STAY, RIGHT, $2, YOUNGSTER + $C8, $3
object SPRITE_LASS, $1e, $4, STAY, DOWN, $3, LASS + $C8, $5
object SPRITE_BLACK_HAIR_BOY_2, $18, $1f, STAY, UP, $4, SUPER_NERD + $C8, $1
object SPRITE_LASS, $10, $17, STAY, DOWN, $5, LASS + $C8, $6
object SPRITE_BUG_CATCHER, $7, $16, STAY, DOWN, $6, BUG_CATCHER + $C8, $7
object SPRITE_BUG_CATCHER, $1e, $1b, STAY, RIGHT, $7, BUG_CATCHER + $C8, $8
object SPRITE_HIKER, $5, $6, STAY, DOWN, $1, OPP_HIKER, $1
object SPRITE_BUG_CATCHER, $c, $10, STAY, RIGHT, $2, OPP_YOUNGSTER, $3
object SPRITE_LASS, $1e, $4, STAY, DOWN, $3, OPP_LASS, $5
object SPRITE_BLACK_HAIR_BOY_2, $18, $1f, STAY, UP, $4, OPP_SUPER_NERD, $1
object SPRITE_LASS, $10, $17, STAY, DOWN, $5, OPP_LASS, $6
object SPRITE_BUG_CATCHER, $7, $16, STAY, DOWN, $6, OPP_BUG_CATCHER, $7
object SPRITE_BUG_CATCHER, $1e, $1b, STAY, RIGHT, $7, OPP_BUG_CATCHER, $8
object SPRITE_BALL, $2, $14, STAY, NONE, $8, POTION
object SPRITE_BALL, $2, $2, STAY, NONE, $9, MOON_STONE
object SPRITE_BALL, $23, $1f, STAY, NONE, $a, RARE_CANDY