ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-31 00:13:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant IsBattlerAlive checks from ITEMEFFECT_ORBS

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

4
src/battle_util.c
View File

@ -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;