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

@ -14,12 +14,12 @@ Route10Object: ; 0x582f6 (size=96)
db $29, $5, $a ; Route10Text10
db $6 ; objects
object SPRITE_BLACK_HAIR_BOY_2, $a, $2c, STAY, LEFT, $1, POKEMANIAC + $C8, $1
object SPRITE_HIKER, $3, $39, STAY, UP, $2, HIKER + $C8, $7
object SPRITE_BLACK_HAIR_BOY_2, $e, $40, STAY, LEFT, $3, POKEMANIAC + $C8, $2
object SPRITE_LASS, $7, $19, STAY, LEFT, $4, JR__TRAINER_F + $C8, $7
object SPRITE_HIKER, $3, $3d, STAY, DOWN, $5, HIKER + $C8, $8
object SPRITE_LASS, $7, $36, STAY, DOWN, $6, JR__TRAINER_F + $C8, $8
object SPRITE_BLACK_HAIR_BOY_2, $a, $2c, STAY, LEFT, $1, OPP_POKEMANIAC, $1
object SPRITE_HIKER, $3, $39, STAY, UP, $2, OPP_HIKER, $7
object SPRITE_BLACK_HAIR_BOY_2, $e, $40, STAY, LEFT, $3, OPP_POKEMANIAC, $2
object SPRITE_LASS, $7, $19, STAY, LEFT, $4, OPP_JR__TRAINER_F, $7
object SPRITE_HIKER, $3, $3d, STAY, DOWN, $5, OPP_HIKER, $8
object SPRITE_LASS, $7, $36, STAY, DOWN, $6, OPP_JR__TRAINER_F, $8
; warp-to
EVENT_DISP ROUTE_10_WIDTH, $13, $b ; ROCK_TUNNEL_POKECENTER