From 9e6c5725d03da31f1640febefa47ac9ef1a1f24e Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Sat, 21 Jan 2023 08:55:20 -0500 Subject: [PATCH] add hp check to ITEMEFFECT_ORBS --- src/battle_util.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/battle_util.c b/src/battle_util.c index 54982dab80..88c4b667d2 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -2701,8 +2701,11 @@ u8 DoBattlerEndTurnEffects(void) gBattleStruct->turnEffectsTracker++; break; case ENDTURN_ORBS: - if (ItemBattleEffects(ITEMEFFECT_ORBS, gActiveBattler, FALSE)) + if (gBattleMons[gActiveBattler].hp != 0 + && ItemBattleEffects(ITEMEFFECT_ORBS, gActiveBattler, FALSE)) + { effect++; + } gBattleStruct->turnEffectsTracker++; break; case ENDTURN_LEECH_SEED: // leech seed