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

@ -15,13 +15,13 @@ RockTunnel1Object: ; 0x445f6 (size=127)
db $1d, $b, $8 ; RockTunnel1Text8
db $7 ; objects
object SPRITE_HIKER, $7, $5, STAY, DOWN, $1, HIKER + $C8, $c
object SPRITE_HIKER, $5, $10, STAY, DOWN, $2, HIKER + $C8, $d
object SPRITE_HIKER, $11, $f, STAY, LEFT, $3, HIKER + $C8, $e
object SPRITE_BLACK_HAIR_BOY_2, $17, $8, STAY, LEFT, $4, POKEMANIAC + $C8, $7
object SPRITE_LASS, $25, $15, STAY, LEFT, $5, JR__TRAINER_F + $C8, $11
object SPRITE_LASS, $16, $18, STAY, DOWN, $6, JR__TRAINER_F + $C8, $12
object SPRITE_LASS, $20, $18, STAY, RIGHT, $7, JR__TRAINER_F + $C8, $13
object SPRITE_HIKER, $7, $5, STAY, DOWN, $1, OPP_HIKER, $c
object SPRITE_HIKER, $5, $10, STAY, DOWN, $2, OPP_HIKER, $d
object SPRITE_HIKER, $11, $f, STAY, LEFT, $3, OPP_HIKER, $e
object SPRITE_BLACK_HAIR_BOY_2, $17, $8, STAY, LEFT, $4, OPP_POKEMANIAC, $7
object SPRITE_LASS, $25, $15, STAY, LEFT, $5, OPP_JR__TRAINER_F, $11
object SPRITE_LASS, $16, $18, STAY, DOWN, $6, OPP_JR__TRAINER_F, $12
object SPRITE_LASS, $20, $18, STAY, RIGHT, $7, OPP_JR__TRAINER_F, $13
; warp-to
EVENT_DISP ROCK_TUNNEL_1_WIDTH, $3, $f