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/silphco9.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/mapObjects/silphco9.asm') diff --git a/data/mapObjects/silphco9.asm b/data/mapObjects/silphco9.asm index 5fb1db79..204f0d1d 100755 --- a/data/mapObjects/silphco9.asm +++ b/data/mapObjects/silphco9.asm @@ -12,9 +12,9 @@ SilphCo9Object: ; 0x5d93f (size=74) db $4 ; objects object SPRITE_NURSE, $3, $e, STAY, DOWN, $1 ; person - object SPRITE_ROCKET, $2, $4, STAY, UP, $2, ROCKET + $C8, $25 - object SPRITE_OAK_AIDE, $15, $d, STAY, DOWN, $3, SCIENTIST + $C8, $a - object SPRITE_ROCKET, $d, $10, STAY, UP, $4, ROCKET + $C8, $26 + object SPRITE_ROCKET, $2, $4, STAY, UP, $2, OPP_ROCKET, $25 + object SPRITE_OAK_AIDE, $15, $d, STAY, DOWN, $3, OPP_SCIENTIST, $a + object SPRITE_ROCKET, $d, $10, STAY, UP, $4, OPP_ROCKET, $26 ; warp-to EVENT_DISP SILPH_CO_9F_WIDTH, $0, $e ; SILPH_CO_10F -- cgit v1.2.3