atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2585 from ghoulslash/be/endturn_fix

Browse source 
add hp check to ITEMEFFECT_ORBS
This commit is contained in:
Eduardo Quezada D'Ottone 2023-01-21 19:06:22 -03:00 committed by GitHub
commit 1c7757032b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/battle_util.c
View file

@ -2701,7 +2701,7 @@ u8 DoBattlerEndTurnEffects(void)
gBattleStruct->turnEffectsTracker++;
break;
case ENDTURN_ORBS:
if (ItemBattleEffects(ITEMEFFECT_ORBS, gActiveBattler, FALSE))
if (IsBattlerAlive(gActiveBattler) && ItemBattleEffects(ITEMEFFECT_ORBS, gActiveBattler, FALSE))
effect++;
gBattleStruct->turnEffectsTracker++;
break;
@ -7841,7 +7841,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;
@ -7850,7 +7850,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;