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 --- home.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'home.asm') diff --git a/home.asm b/home.asm index 41d25238..2d64833f 100644 --- a/home.asm +++ b/home.asm @@ -2396,7 +2396,7 @@ EndTrainerBattle:: ; 3275 (0:3275) ld b, FLAG_SET call TrainerFlagAction ; flag trainer as fought ld a, [W_ENEMYMONORTRAINERCLASS] - cp $c8 + cp 200 jr nc, .skipRemoveSprite ; test if trainer was fought (in that case skip removing the corresponding sprite) ld hl, W_MISSABLEOBJECTLIST ld de, $2 @@ -2430,7 +2430,7 @@ InitBattleEnemyParameters:: ; 32d7 (0:32d7) ld a, [wEngagedTrainerClass] ld [W_CUROPPONENT], a ld [W_ENEMYMONORTRAINERCLASS], a - cp $c8 + cp 200 ld a, [wEngagedTrainerSet] jr c, .noTrainer ld [W_TRAINERNO], a @@ -2594,11 +2594,11 @@ CheckIfAlreadyEngaged:: ; 33dd (0:33dd) PlayTrainerMusic:: ; 33e8 (0:33e8) ld a, [wEngagedTrainerClass] - cp $c8 + SONY1 + cp OPP_SONY1 ret z - cp $c8 + SONY2 + cp OPP_SONY2 ret z - cp $c8 + SONY3 + cp OPP_SONY3 ret z ld a, [W_GYMLEADERNO] and a -- cgit v1.2.3