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

Fix Persim Berry and cure attract battler assignment

Browse source
This commit is contained in:
DizzyEggg 2020-01-06 21:33:44 +01:00
parent 952bdbd9f5
commit ed46cde304
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/battle_util.c
View file

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