Fix Persim Berry and cure attract battler assignment

This commit is contained in:
DizzyEggg 2020-01-06 21:33:44 +01:00
parent 952bdbd9f5
commit ed46cde304

View File

@ -4457,10 +4457,9 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
break;
}
if (effect == ITEM_STATUS_CHANGE)
if (effect)
{
gBattleScripting.battler = battlerId;
gPotentialItemEffectBattler = battlerId;
gPotentialItemEffectBattler = gBattleScripting.battler = battlerId;
gActiveBattler = battlerId;
BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
MarkBattlerForControllerExec(gActiveBattler);