summaryrefslogtreecommitdiff
path: root/data/mapObjects/victoryroad3.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/victoryroad3.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/victoryroad3.asm')
-rwxr-xr-xdata/mapObjects/victoryroad3.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/victoryroad3.asm b/data/mapObjects/victoryroad3.asm
index 843b388f..19a06c65 100755
--- a/data/mapObjects/victoryroad3.asm
+++ b/data/mapObjects/victoryroad3.asm
@@ -10,10 +10,10 @@ VictoryRoad3Object: ; 0x44acd (size=106)
db $0 ; signs
db $a ; objects
- object SPRITE_BLACK_HAIR_BOY_1, $1c, $5, STAY, LEFT, $1, COOLTRAINER_M + $C8, $2
- object SPRITE_LASS, $7, $d, STAY, RIGHT, $2, COOLTRAINER_F + $C8, $2
- object SPRITE_BLACK_HAIR_BOY_1, $6, $e, STAY, LEFT, $3, COOLTRAINER_M + $C8, $3
- object SPRITE_LASS, $d, $3, STAY, RIGHT, $4, COOLTRAINER_F + $C8, $3
+ object SPRITE_BLACK_HAIR_BOY_1, $1c, $5, STAY, LEFT, $1, OPP_COOLTRAINER_M, $2
+ object SPRITE_LASS, $7, $d, STAY, RIGHT, $2, OPP_COOLTRAINER_F, $2
+ object SPRITE_BLACK_HAIR_BOY_1, $6, $e, STAY, LEFT, $3, OPP_COOLTRAINER_M, $3
+ object SPRITE_LASS, $d, $3, STAY, RIGHT, $4, OPP_COOLTRAINER_F, $3
object SPRITE_BALL, $1a, $5, STAY, NONE, $5, MAX_REVIVE
object SPRITE_BALL, $7, $7, STAY, NONE, $6, TM_47
object SPRITE_BOULDER, $16, $3, STAY, BOULDER_MOVEMENT_BYTE_2, $7 ; person