summaryrefslogtreecommitdiff
path: root/data/mapObjects/mansion3.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/mansion3.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/mansion3.asm')
-rwxr-xr-xdata/mapObjects/mansion3.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/mapObjects/mansion3.asm b/data/mapObjects/mansion3.asm
index 52b46327..288b4753 100755
--- a/data/mapObjects/mansion3.asm
+++ b/data/mapObjects/mansion3.asm
@@ -9,8 +9,8 @@ Mansion3Object: ; 0x522e6 (size=64)
db $0 ; signs
db $5 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, $5, $b, WALK, $2, $1, BURGLAR + $C8, $8
- object SPRITE_OAK_AIDE, $14, $b, STAY, LEFT, $2, SCIENTIST + $C8, $c
+ object SPRITE_BLACK_HAIR_BOY_2, $5, $b, WALK, $2, $1, OPP_BURGLAR, $8
+ object SPRITE_OAK_AIDE, $14, $b, STAY, LEFT, $2, OPP_SCIENTIST, $c
object SPRITE_BALL, $1, $10, STAY, NONE, $3, MAX_POTION
object SPRITE_BALL, $19, $5, STAY, NONE, $4, IRON
object SPRITE_BOOK_MAP_DEX, $6, $c, STAY, NONE, $5 ; person