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

Merge pull request #2076 from ghoulslash/be/orbfix

Browse Source 
fix toxic/flame orb. use CanBeX'ed functions
This commit is contained in:
Eduardo Quezada D'Ottone 2022-03-08 17:25:01 -03:00 committed by GitHub
commit 20da792f90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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)
{
case HOLD_EFFECT_TOXIC_ORB:
if (!gBattleMons[battlerId].status1
&& CanPoisonType(battlerId, battlerId)
&& battlerAbility != ABILITY_IMMUNITY
&& battlerAbility != ABILITY_COMATOSE
&& IsBattlerAlive)
if (IsBattlerAlive(battlerId) && CanBePoisoned(battlerId, battlerId))
{
effect = ITEM_STATUS_CHANGE;
gBattleMons[battlerId].status1 = STATUS1_TOXIC_POISON;
@ -7345,12 +7341,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
}
break;
case HOLD_EFFECT_FLAME_ORB:
if (!gBattleMons[battlerId].status1
&& !IS_BATTLER_OF_TYPE(battlerId, TYPE_FIRE)
&& battlerAbility != ABILITY_WATER_VEIL
&& battlerAbility != ABILITY_WATER_BUBBLE
&& battlerAbility != ABILITY_COMATOSE
&& IsBattlerAlive)
if (IsBattlerAlive(battlerId) && CanBeBurned(battlerId))
{
effect = ITEM_STATUS_CHANGE;
gBattleMons[battlerId].status1 = STATUS1_BURN;