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/silphco2.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/mapObjects/silphco2.asm') diff --git a/data/mapObjects/silphco2.asm b/data/mapObjects/silphco2.asm index cd4f8be5..44271d70 100755 --- a/data/mapObjects/silphco2.asm +++ b/data/mapObjects/silphco2.asm @@ -14,10 +14,10 @@ SilphCo2Object: ; 0x59e66 (size=98) db $5 ; objects object SPRITE_ERIKA, $a, $1, STAY, UP, $1 ; person - object SPRITE_OAK_AIDE, $5, $c, STAY, DOWN, $2, SCIENTIST + $C8, $2 - object SPRITE_OAK_AIDE, $18, $d, STAY, LEFT, $3, SCIENTIST + $C8, $3 - object SPRITE_ROCKET, $10, $b, STAY, UP, $4, ROCKET + $C8, $17 - object SPRITE_ROCKET, $18, $7, STAY, UP, $5, ROCKET + $C8, $18 + object SPRITE_OAK_AIDE, $5, $c, STAY, DOWN, $2, OPP_SCIENTIST, $2 + object SPRITE_OAK_AIDE, $18, $d, STAY, LEFT, $3, OPP_SCIENTIST, $3 + object SPRITE_ROCKET, $10, $b, STAY, UP, $4, OPP_ROCKET, $17 + object SPRITE_ROCKET, $18, $7, STAY, UP, $5, OPP_ROCKET, $18 ; warp-to EVENT_DISP SILPH_CO_2F_WIDTH, $0, $18 ; SILPH_CO_1F -- cgit v1.2.3