summaryrefslogtreecommitdiff
path: root/data/mapObjects/route14.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/route14.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/route14.asm')
-rwxr-xr-xdata/mapObjects/route14.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/data/mapObjects/route14.asm b/data/mapObjects/route14.asm
index 6b8dcd40..ce6d52b0 100755
--- a/data/mapObjects/route14.asm
+++ b/data/mapObjects/route14.asm
@@ -7,13 +7,13 @@ Route14Object: ; 0x549bb (size=87)
db $d, $11, $b ; Route14Text11
db $a ; objects
- object SPRITE_BLACK_HAIR_BOY_1, $4, $4, STAY, DOWN, $1, BIRD_KEEPER + $C8, $e
- object SPRITE_BLACK_HAIR_BOY_1, $f, $6, STAY, DOWN, $2, BIRD_KEEPER + $C8, $f
- object SPRITE_BLACK_HAIR_BOY_1, $c, $b, STAY, DOWN, $3, BIRD_KEEPER + $C8, $10
- object SPRITE_BLACK_HAIR_BOY_1, $e, $f, STAY, UP, $4, BIRD_KEEPER + $C8, $11
- object SPRITE_BLACK_HAIR_BOY_1, $f, $1f, STAY, LEFT, $5, BIRD_KEEPER + $C8, $4
- object SPRITE_BLACK_HAIR_BOY_1, $6, $31, STAY, UP, $6, BIRD_KEEPER + $C8, $5
- object SPRITE_BIKER, $5, $27, STAY, DOWN, $7, BIKER + $C8, $d
- object SPRITE_BIKER, $4, $1e, STAY, RIGHT, $8, BIKER + $C8, $e
- object SPRITE_BIKER, $f, $1e, STAY, LEFT, $9, BIKER + $C8, $f
- object SPRITE_BIKER, $4, $1f, STAY, RIGHT, $a, BIKER + $C8, $2
+ object SPRITE_BLACK_HAIR_BOY_1, $4, $4, STAY, DOWN, $1, OPP_BIRD_KEEPER, $e
+ object SPRITE_BLACK_HAIR_BOY_1, $f, $6, STAY, DOWN, $2, OPP_BIRD_KEEPER, $f
+ object SPRITE_BLACK_HAIR_BOY_1, $c, $b, STAY, DOWN, $3, OPP_BIRD_KEEPER, $10
+ object SPRITE_BLACK_HAIR_BOY_1, $e, $f, STAY, UP, $4, OPP_BIRD_KEEPER, $11
+ object SPRITE_BLACK_HAIR_BOY_1, $f, $1f, STAY, LEFT, $5, OPP_BIRD_KEEPER, $4
+ object SPRITE_BLACK_HAIR_BOY_1, $6, $31, STAY, UP, $6, OPP_BIRD_KEEPER, $5
+ object SPRITE_BIKER, $5, $27, STAY, DOWN, $7, OPP_BIKER, $d
+ object SPRITE_BIKER, $4, $1e, STAY, RIGHT, $8, OPP_BIKER, $e
+ object SPRITE_BIKER, $f, $1e, STAY, LEFT, $9, OPP_BIKER, $f
+ object SPRITE_BIKER, $4, $1f, STAY, RIGHT, $a, OPP_BIKER, $2