ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-06 07:27:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix toxic/flame orb. use CanBeX'ed functions

Browse Source
This commit is contained in:
ghoulslash 2022-03-08 15:16:17 -05:00
parent ed464a9e8d
commit f53de6ae87
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/battle_util.c
View File

@ -7332,11 +7332,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
switch (battlerHoldEffect) switch (battlerHoldEffect)
{ {
case HOLD_EFFECT_TOXIC_ORB: case HOLD_EFFECT_TOXIC_ORB:
if (!gBattleMons[battlerId].status1 if (IsBattlerAlive(battlerId) && CanBePoisoned(battlerId, battlerId))
&& CanPoisonType(battlerId, battlerId)
&& battlerAbility != ABILITY_IMMUNITY
&& battlerAbility != ABILITY_COMATOSE
&& IsBattlerAlive)
{ {
effect = ITEM_STATUS_CHANGE; effect = ITEM_STATUS_CHANGE;
gBattleMons[battlerId].status1 = STATUS1_TOXIC_POISON; gBattleMons[battlerId].status1 = STATUS1_TOXIC_POISON;
@ -7345,12 +7341,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
} }
break; break;
case HOLD_EFFECT_FLAME_ORB: case HOLD_EFFECT_FLAME_ORB:
if (!gBattleMons[battlerId].status1 if (IsBattlerAlive(battlerId) && CanBeBurned(battlerId))
&& !IS_BATTLER_OF_TYPE(battlerId, TYPE_FIRE)
&& battlerAbility != ABILITY_WATER_VEIL
&& battlerAbility != ABILITY_WATER_BUBBLE
&& battlerAbility != ABILITY_COMATOSE
&& IsBattlerAlive)
{ {
effect = ITEM_STATUS_CHANGE; effect = ITEM_STATUS_CHANGE;
gBattleMons[battlerId].status1 = STATUS1_BURN; gBattleMons[battlerId].status1 = STATUS1_BURN;