ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-19 20:18:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

IsBattlerAlive instead of hp check

Browse Source
This commit is contained in:
ghoulslash 2023-01-21 12:11:12 -05:00
parent a044084182
commit 428ea97028
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/battle_util.c
View File

@ -2701,11 +2701,8 @@ u8 DoBattlerEndTurnEffects(void)
gBattleStruct->turnEffectsTracker++; gBattleStruct->turnEffectsTracker++;
break; break;
case ENDTURN_ORBS: case ENDTURN_ORBS:
if (gBattleMons[gActiveBattler].hp != 0 if (IsBattlerAlive(gActiveBattler) && ItemBattleEffects(ITEMEFFECT_ORBS, gActiveBattler, FALSE))
&& ItemBattleEffects(ITEMEFFECT_ORBS, gActiveBattler, FALSE))
{
effect++; effect++;
}
gBattleStruct->turnEffectsTracker++; gBattleStruct->turnEffectsTracker++;
break; break;
case ENDTURN_LEECH_SEED: // leech seed case ENDTURN_LEECH_SEED: // leech seed