summaryrefslogtreecommitdiff
path: root/data/mapObjects/silphco3.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/silphco3.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/silphco3.asm')
-rwxr-xr-xdata/mapObjects/silphco3.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/mapObjects/silphco3.asm b/data/mapObjects/silphco3.asm
index a293593a..48bb8c1a 100755
--- a/data/mapObjects/silphco3.asm
+++ b/data/mapObjects/silphco3.asm
@@ -17,8 +17,8 @@ SilphCo3Object: ; 0x5a035 (size=113)
db $4 ; objects
object SPRITE_LAPRAS_GIVER, $18, $8, STAY, NONE, $1 ; person
- object SPRITE_ROCKET, $14, $7, STAY, LEFT, $2, ROCKET + $C8, $19
- object SPRITE_OAK_AIDE, $7, $9, STAY, DOWN, $3, SCIENTIST + $C8, $4
+ object SPRITE_ROCKET, $14, $7, STAY, LEFT, $2, OPP_ROCKET, $19
+ object SPRITE_OAK_AIDE, $7, $9, STAY, DOWN, $3, OPP_SCIENTIST, $4
object SPRITE_BALL, $8, $5, STAY, NONE, $4, HYPER_POTION
; warp-to