From 428ea9702822202ca988979bb5a42b070daed1e8 Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Sat, 21 Jan 2023 12:11:12 -0500 Subject: [PATCH] IsBattlerAlive instead of hp check --- src/battle_util.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/battle_util.c b/src/battle_util.c index a4aef9a34..b6e131e13 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -2701,11 +2701,8 @@ u8 DoBattlerEndTurnEffects(void) gBattleStruct->turnEffectsTracker++; break; case ENDTURN_ORBS: - if (gBattleMons[gActiveBattler].hp != 0 - && ItemBattleEffects(ITEMEFFECT_ORBS, gActiveBattler, FALSE)) - { + if (IsBattlerAlive(gActiveBattler) && ItemBattleEffects(ITEMEFFECT_ORBS, gActiveBattler, FALSE)) effect++; - } gBattleStruct->turnEffectsTracker++; break; case ENDTURN_LEECH_SEED: // leech seed