From 9e6c5725d03da31f1640febefa47ac9ef1a1f24e Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Sat, 21 Jan 2023 08:55:20 -0500 Subject: [PATCH 1/3] 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 From a044084182bc700370aca1b1e76e96c6121e4ebc Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Sat, 21 Jan 2023 11:11:50 -0500 Subject: [PATCH 2/3] Remove redundant IsBattlerAlive checks from ITEMEFFECT_ORBS --- src/battle_util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/battle_util.c b/src/battle_util.c index 88c4b667d2..a4aef9a349 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -7844,7 +7844,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) switch (battlerHoldEffect) { case HOLD_EFFECT_TOXIC_ORB: - if (IsBattlerAlive(battlerId) && CanBePoisoned(battlerId, battlerId)) + if (CanBePoisoned(battlerId, battlerId)) { effect = ITEM_STATUS_CHANGE; gBattleMons[battlerId].status1 = STATUS1_TOXIC_POISON; @@ -7853,7 +7853,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) } break; case HOLD_EFFECT_FLAME_ORB: - if (IsBattlerAlive(battlerId) && CanBeBurned(battlerId)) + if (CanBeBurned(battlerId)) { effect = ITEM_STATUS_CHANGE; gBattleMons[battlerId].status1 = STATUS1_BURN; From 428ea9702822202ca988979bb5a42b070daed1e8 Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Sat, 21 Jan 2023 12:11:12 -0500 Subject: [PATCH 3/3] 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 a4aef9a349..b6e131e130 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