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

@ -6,11 +6,11 @@ Route24Object: ; 0x506a4 (size=67)
db $0 ; signs
db $8 ; objects
object SPRITE_BLACK_HAIR_BOY_1, $b, $f, STAY, LEFT, $1, ROCKET + $C8, $6
object SPRITE_BLACK_HAIR_BOY_1, $5, $14, STAY, UP, $2, JR__TRAINER_M + $C8, $2
object SPRITE_BLACK_HAIR_BOY_1, $b, $13, STAY, LEFT, $3, JR__TRAINER_M + $C8, $3
object SPRITE_LASS, $a, $16, STAY, RIGHT, $4, LASS + $C8, $7
object SPRITE_BUG_CATCHER, $b, $19, STAY, LEFT, $5, YOUNGSTER + $C8, $4
object SPRITE_LASS, $a, $1c, STAY, RIGHT, $6, LASS + $C8, $8
object SPRITE_BUG_CATCHER, $b, $1f, STAY, LEFT, $7, BUG_CATCHER + $C8, $9
object SPRITE_BLACK_HAIR_BOY_1, $b, $f, STAY, LEFT, $1, OPP_ROCKET, $6
object SPRITE_BLACK_HAIR_BOY_1, $5, $14, STAY, UP, $2, OPP_JR__TRAINER_M, $2
object SPRITE_BLACK_HAIR_BOY_1, $b, $13, STAY, LEFT, $3, OPP_JR__TRAINER_M, $3
object SPRITE_LASS, $a, $16, STAY, RIGHT, $4, OPP_LASS, $7
object SPRITE_BUG_CATCHER, $b, $19, STAY, LEFT, $5, OPP_YOUNGSTER, $4
object SPRITE_LASS, $a, $1c, STAY, RIGHT, $6, OPP_LASS, $8
object SPRITE_BUG_CATCHER, $b, $1f, STAY, LEFT, $7, OPP_BUG_CATCHER, $9
object SPRITE_BALL, $a, $5, STAY, NONE, $8, TM_45