From dfc152d667e3695f83eb0fbabb839b0fad275ceb Mon Sep 17 00:00:00 2001 From: dannye Date: Mon, 10 Aug 2015 11:09:16 -0500 Subject: No more $C8 Use OPP_ constants separate from trainer constants since valid opponents can be all Pokemon and trainers --- data/mapObjects/silphco6.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/mapObjects/silphco6.asm') diff --git a/data/mapObjects/silphco6.asm b/data/mapObjects/silphco6.asm index c1cdebd0..66372f57 100755 --- a/data/mapObjects/silphco6.asm +++ b/data/mapObjects/silphco6.asm @@ -16,9 +16,9 @@ SilphCo6Object: ; 0x1a2fb (size=112) object SPRITE_ERIKA, $15, $6, STAY, DOWN, $3 ; person object SPRITE_ERIKA, $b, $a, STAY, RIGHT, $4 ; person object SPRITE_LAPRAS_GIVER, $12, $d, STAY, UP, $5 ; person - object SPRITE_ROCKET, $11, $3, STAY, RIGHT, $6, ROCKET + $C8, $1e - object SPRITE_OAK_AIDE, $7, $8, STAY, DOWN, $7, SCIENTIST + $C8, $7 - object SPRITE_ROCKET, $e, $f, STAY, LEFT, $8, ROCKET + $C8, $1f + object SPRITE_ROCKET, $11, $3, STAY, RIGHT, $6, OPP_ROCKET, $1e + object SPRITE_OAK_AIDE, $7, $8, STAY, DOWN, $7, OPP_SCIENTIST, $7 + object SPRITE_ROCKET, $e, $f, STAY, LEFT, $8, OPP_ROCKET, $1f object SPRITE_BALL, $3, $c, STAY, NONE, $9, HP_UP object SPRITE_BALL, $2, $f, STAY, NONE, $a, X_ACCURACY -- cgit v1.2.3