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

@ -10,16 +10,16 @@ Route20Object: ; 0x50113 (size=106)
db $b, $39, $c ; Route20Text12
db $a ; objects
object SPRITE_SWIMMER, $57, $8, STAY, UP, $1, SWIMMER + $C8, $9
object SPRITE_SWIMMER, $44, $b, STAY, UP, $2, BEAUTY + $C8, $f
object SPRITE_SWIMMER, $2d, $a, STAY, DOWN, $3, BEAUTY + $C8, $6
object SPRITE_SWIMMER, $37, $e, STAY, RIGHT, $4, JR__TRAINER_F + $C8, $18
object SPRITE_SWIMMER, $26, $d, STAY, DOWN, $5, SWIMMER + $C8, $a
object SPRITE_SWIMMER, $57, $d, STAY, UP, $6, SWIMMER + $C8, $b
object SPRITE_BLACK_HAIR_BOY_1, $22, $9, STAY, UP, $7, BIRD_KEEPER + $C8, $b
object SPRITE_SWIMMER, $19, $7, STAY, UP, $8, BEAUTY + $C8, $7
object SPRITE_SWIMMER, $18, $c, STAY, DOWN, $9, JR__TRAINER_F + $C8, $10
object SPRITE_SWIMMER, $f, $8, STAY, UP, $a, BEAUTY + $C8, $8
object SPRITE_SWIMMER, $57, $8, STAY, UP, $1, OPP_SWIMMER, $9
object SPRITE_SWIMMER, $44, $b, STAY, UP, $2, OPP_BEAUTY, $f
object SPRITE_SWIMMER, $2d, $a, STAY, DOWN, $3, OPP_BEAUTY, $6
object SPRITE_SWIMMER, $37, $e, STAY, RIGHT, $4, OPP_JR__TRAINER_F, $18
object SPRITE_SWIMMER, $26, $d, STAY, DOWN, $5, OPP_SWIMMER, $a
object SPRITE_SWIMMER, $57, $d, STAY, UP, $6, OPP_SWIMMER, $b
object SPRITE_BLACK_HAIR_BOY_1, $22, $9, STAY, UP, $7, OPP_BIRD_KEEPER, $b
object SPRITE_SWIMMER, $19, $7, STAY, UP, $8, OPP_BEAUTY, $7
object SPRITE_SWIMMER, $18, $c, STAY, DOWN, $9, OPP_JR__TRAINER_F, $10
object SPRITE_SWIMMER, $f, $8, STAY, UP, $a, OPP_BEAUTY, $8
; warp-to
EVENT_DISP ROUTE_20_WIDTH, $5, $30 ; SEAFOAM_ISLANDS_1