summaryrefslogtreecommitdiff
path: root/data/mapObjects/route16.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/route16.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/route16.asm')
-rwxr-xr-xdata/mapObjects/route16.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/data/mapObjects/route16.asm b/data/mapObjects/route16.asm
index 94adaf96..600dbbf1 100755
--- a/data/mapObjects/route16.asm
+++ b/data/mapObjects/route16.asm
@@ -17,12 +17,12 @@ Route16Object: ; 0x58afc (size=136)
db $11, $5, $9 ; Route16Text9
db $7 ; objects
- object SPRITE_BIKER, $11, $c, STAY, LEFT, $1, BIKER + $C8, $5
- object SPRITE_BIKER, $e, $d, STAY, RIGHT, $2, CUE_BALL + $C8, $1
- object SPRITE_BIKER, $b, $c, STAY, UP, $3, CUE_BALL + $C8, $2
- object SPRITE_BIKER, $9, $b, STAY, LEFT, $4, BIKER + $C8, $6
- object SPRITE_BIKER, $6, $a, STAY, RIGHT, $5, CUE_BALL + $C8, $3
- object SPRITE_BIKER, $3, $c, STAY, RIGHT, $6, BIKER + $C8, $7
+ object SPRITE_BIKER, $11, $c, STAY, LEFT, $1, OPP_BIKER, $5
+ object SPRITE_BIKER, $e, $d, STAY, RIGHT, $2, OPP_CUE_BALL, $1
+ object SPRITE_BIKER, $b, $c, STAY, UP, $3, OPP_CUE_BALL, $2
+ object SPRITE_BIKER, $9, $b, STAY, LEFT, $4, OPP_BIKER, $6
+ object SPRITE_BIKER, $6, $a, STAY, RIGHT, $5, OPP_CUE_BALL, $3
+ object SPRITE_BIKER, $3, $c, STAY, RIGHT, $6, OPP_BIKER, $7
object SPRITE_SNORLAX, $1a, $a, STAY, DOWN, $7 ; person
; warp-to