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,14 +8,14 @@ CeladonGymObject: ; 0x48b30 (size=84)
db $0 ; signs
db $8 ; objects
object SPRITE_ERIKA, $4, $3, STAY, DOWN, $1, ERIKA + $C8, $1
object SPRITE_LASS, $2, $b, STAY, RIGHT, $2, LASS + $C8, $11
object SPRITE_FOULARD_WOMAN, $7, $a, STAY, LEFT, $3, BEAUTY + $C8, $1
object SPRITE_LASS, $9, $5, STAY, DOWN, $4, JR__TRAINER_F + $C8, $b
object SPRITE_FOULARD_WOMAN, $1, $5, STAY, DOWN, $5, BEAUTY + $C8, $2
object SPRITE_LASS, $6, $3, STAY, DOWN, $6, LASS + $C8, $12
object SPRITE_FOULARD_WOMAN, $3, $3, STAY, DOWN, $7, BEAUTY + $C8, $3
object SPRITE_LASS, $5, $3, STAY, DOWN, $8, COOLTRAINER_F + $C8, $1
object SPRITE_ERIKA, $4, $3, STAY, DOWN, $1, OPP_ERIKA, $1
object SPRITE_LASS, $2, $b, STAY, RIGHT, $2, OPP_LASS, $11
object SPRITE_FOULARD_WOMAN, $7, $a, STAY, LEFT, $3, OPP_BEAUTY, $1
object SPRITE_LASS, $9, $5, STAY, DOWN, $4, OPP_JR__TRAINER_F, $b
object SPRITE_FOULARD_WOMAN, $1, $5, STAY, DOWN, $5, OPP_BEAUTY, $2
object SPRITE_LASS, $6, $3, STAY, DOWN, $6, OPP_LASS, $12
object SPRITE_FOULARD_WOMAN, $3, $3, STAY, DOWN, $7, OPP_BEAUTY, $3
object SPRITE_LASS, $5, $3, STAY, DOWN, $8, OPP_COOLTRAINER_F, $1
; warp-to
EVENT_DISP CELADON_GYM_WIDTH, $11, $4