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

@ -8,15 +8,15 @@ Route25Object: ; 0x507b2 (size=94)
db $3, $2b, $b ; Route25Text11
db $a ; objects
object SPRITE_BUG_CATCHER, $e, $2, STAY, DOWN, $1, YOUNGSTER + $C8, $5
object SPRITE_BUG_CATCHER, $12, $5, STAY, UP, $2, YOUNGSTER + $C8, $6
object SPRITE_BLACK_HAIR_BOY_1, $18, $4, STAY, DOWN, $3, JR__TRAINER_M + $C8, $2
object SPRITE_LASS, $12, $8, STAY, RIGHT, $4, LASS + $C8, $9
object SPRITE_BUG_CATCHER, $20, $3, STAY, LEFT, $5, YOUNGSTER + $C8, $7
object SPRITE_LASS, $25, $4, STAY, DOWN, $6, LASS + $C8, $a
object SPRITE_HIKER, $8, $4, STAY, RIGHT, $7, HIKER + $C8, $2
object SPRITE_HIKER, $17, $9, STAY, UP, $8, HIKER + $C8, $3
object SPRITE_HIKER, $d, $7, STAY, RIGHT, $9, HIKER + $C8, $4
object SPRITE_BUG_CATCHER, $e, $2, STAY, DOWN, $1, OPP_YOUNGSTER, $5
object SPRITE_BUG_CATCHER, $12, $5, STAY, UP, $2, OPP_YOUNGSTER, $6
object SPRITE_BLACK_HAIR_BOY_1, $18, $4, STAY, DOWN, $3, OPP_JR__TRAINER_M, $2
object SPRITE_LASS, $12, $8, STAY, RIGHT, $4, OPP_LASS, $9
object SPRITE_BUG_CATCHER, $20, $3, STAY, LEFT, $5, OPP_YOUNGSTER, $7
object SPRITE_LASS, $25, $4, STAY, DOWN, $6, OPP_LASS, $a
object SPRITE_HIKER, $8, $4, STAY, RIGHT, $7, OPP_HIKER, $2
object SPRITE_HIKER, $17, $9, STAY, UP, $8, OPP_HIKER, $3
object SPRITE_HIKER, $d, $7, STAY, RIGHT, $9, OPP_HIKER, $4
object SPRITE_BALL, $16, $2, STAY, NONE, $a, TM_19
; warp-to