From ed46cde3047dcc7aac6b5bbea064555eeb922a85 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 6 Jan 2020 21:33:44 +0100 Subject: [PATCH] Fix Persim Berry and cure attract battler assignment --- src/battle_util.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/battle_util.c b/src/battle_util.c index a80849d5d..6bbe25ad6 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -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);