summaryrefslogtreecommitdiff
path: root/data/mapObjects/route17.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/route17.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/route17.asm')
-rwxr-xr-xdata/mapObjects/route17.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/data/mapObjects/route17.asm b/data/mapObjects/route17.asm
index b0f22cde..c496373e 100755
--- a/data/mapObjects/route17.asm
+++ b/data/mapObjects/route17.asm
@@ -12,13 +12,13 @@ Route17Object: ; 0x54b42 (size=102)
db $8d, $9, $10 ; Route17Text16
db $a ; objects
- object SPRITE_BIKER, $c, $13, STAY, LEFT, $1, CUE_BALL + $C8, $4
- object SPRITE_BIKER, $b, $10, STAY, RIGHT, $2, CUE_BALL + $C8, $5
- object SPRITE_BIKER, $4, $12, STAY, UP, $3, BIKER + $C8, $8
- object SPRITE_BIKER, $7, $20, STAY, LEFT, $4, BIKER + $C8, $9
- object SPRITE_BIKER, $e, $22, STAY, RIGHT, $5, BIKER + $C8, $a
- object SPRITE_BIKER, $11, $3a, STAY, LEFT, $6, CUE_BALL + $C8, $6
- object SPRITE_BIKER, $2, $44, STAY, RIGHT, $7, CUE_BALL + $C8, $7
- object SPRITE_BIKER, $e, $62, STAY, RIGHT, $8, CUE_BALL + $C8, $8
- object SPRITE_BIKER, $5, $62, STAY, LEFT, $9, BIKER + $C8, $b
- object SPRITE_BIKER, $a, $76, STAY, DOWN, $a, BIKER + $C8, $c
+ object SPRITE_BIKER, $c, $13, STAY, LEFT, $1, OPP_CUE_BALL, $4
+ object SPRITE_BIKER, $b, $10, STAY, RIGHT, $2, OPP_CUE_BALL, $5
+ object SPRITE_BIKER, $4, $12, STAY, UP, $3, OPP_BIKER, $8
+ object SPRITE_BIKER, $7, $20, STAY, LEFT, $4, OPP_BIKER, $9
+ object SPRITE_BIKER, $e, $22, STAY, RIGHT, $5, OPP_BIKER, $a
+ object SPRITE_BIKER, $11, $3a, STAY, LEFT, $6, OPP_CUE_BALL, $6
+ object SPRITE_BIKER, $2, $44, STAY, RIGHT, $7, OPP_CUE_BALL, $7
+ object SPRITE_BIKER, $e, $62, STAY, RIGHT, $8, OPP_CUE_BALL, $8
+ object SPRITE_BIKER, $5, $62, STAY, LEFT, $9, OPP_BIKER, $b
+ object SPRITE_BIKER, $a, $76, STAY, DOWN, $a, OPP_BIKER, $c