summaryrefslogtreecommitdiff
path: root/data/mapObjects/mansion1.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/mansion1.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/mansion1.asm')
-rwxr-xr-xdata/mapObjects/mansion1.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/data/mapObjects/mansion1.asm b/data/mapObjects/mansion1.asm
index 30b79433..0bb168bb 100755
--- a/data/mapObjects/mansion1.asm
+++ b/data/mapObjects/mansion1.asm
@@ -14,7 +14,7 @@ Mansion1Object: ; 0x443a4 (size=90)
db $0 ; signs
db $3 ; objects
- object SPRITE_OAK_AIDE, $11, $11, STAY, LEFT, $1, SCIENTIST + $C8, $4
+ object SPRITE_OAK_AIDE, $11, $11, STAY, LEFT, $1, OPP_SCIENTIST, $4
object SPRITE_BALL, $e, $3, STAY, NONE, $2, ESCAPE_ROPE
object SPRITE_BALL, $12, $15, STAY, NONE, $3, CARBOS