summaryrefslogtreecommitdiff
path: root/data/mapObjects/route13.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2015-08-10 11:09:16 -0500
committerdannye <corrnondacqb@yahoo.com>2015-08-10 11:09:16 -0500
commitdfc152d667e3695f83eb0fbabb839b0fad275ceb (patch)
tree37255b78ab19c520a651ec68ca10a9f43ebe07d7 /data/mapObjects/route13.asm
parent31d267d4ad87042dbdd30be645ad4b43e4e3ceb1 (diff)
No more $C8
Use OPP_ constants separate from trainer constants since valid opponents can be all Pokemon and trainers
Diffstat (limited to 'data/mapObjects/route13.asm')
-rwxr-xr-xdata/mapObjects/route13.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/data/mapObjects/route13.asm b/data/mapObjects/route13.asm
index 3b2c6b87..1512ce3a 100755
--- a/data/mapObjects/route13.asm
+++ b/data/mapObjects/route13.asm
@@ -9,13 +9,13 @@ Route13Object: ; 0x5482e (size=93)
db $b, $1f, $d ; Route13Text13
db $a ; objects
- object SPRITE_BLACK_HAIR_BOY_1, $31, $a, STAY, RIGHT, $1, BIRD_KEEPER + $C8, $1
- object SPRITE_LASS, $30, $a, STAY, DOWN, $2, JR__TRAINER_F + $C8, $c
- object SPRITE_LASS, $1b, $9, STAY, DOWN, $3, JR__TRAINER_F + $C8, $d
- object SPRITE_LASS, $17, $a, STAY, LEFT, $4, JR__TRAINER_F + $C8, $e
- object SPRITE_LASS, $32, $5, STAY, DOWN, $5, JR__TRAINER_F + $C8, $f
- object SPRITE_BLACK_HAIR_BOY_1, $c, $4, STAY, RIGHT, $6, BIRD_KEEPER + $C8, $2
- object SPRITE_FOULARD_WOMAN, $21, $6, STAY, DOWN, $7, BEAUTY + $C8, $4
- object SPRITE_FOULARD_WOMAN, $20, $6, STAY, DOWN, $8, BEAUTY + $C8, $5
- object SPRITE_BIKER, $a, $7, STAY, UP, $9, BIKER + $C8, $1
- object SPRITE_BLACK_HAIR_BOY_1, $7, $d, STAY, UP, $a, BIRD_KEEPER + $C8, $3
+ object SPRITE_BLACK_HAIR_BOY_1, $31, $a, STAY, RIGHT, $1, OPP_BIRD_KEEPER, $1
+ object SPRITE_LASS, $30, $a, STAY, DOWN, $2, OPP_JR__TRAINER_F, $c
+ object SPRITE_LASS, $1b, $9, STAY, DOWN, $3, OPP_JR__TRAINER_F, $d
+ object SPRITE_LASS, $17, $a, STAY, LEFT, $4, OPP_JR__TRAINER_F, $e
+ object SPRITE_LASS, $32, $5, STAY, DOWN, $5, OPP_JR__TRAINER_F, $f
+ object SPRITE_BLACK_HAIR_BOY_1, $c, $4, STAY, RIGHT, $6, OPP_BIRD_KEEPER, $2
+ object SPRITE_FOULARD_WOMAN, $21, $6, STAY, DOWN, $7, OPP_BEAUTY, $4
+ object SPRITE_FOULARD_WOMAN, $20, $6, STAY, DOWN, $8, OPP_BEAUTY, $5
+ object SPRITE_BIKER, $a, $7, STAY, UP, $9, OPP_BIKER, $1
+ object SPRITE_BLACK_HAIR_BOY_1, $7, $d, STAY, UP, $a, OPP_BIRD_KEEPER, $3