From 1fc89941ac28700b601ad6a2c0e342ccad92b75f Mon Sep 17 00:00:00 2001 From: Eduardo Alvaro Quezada D'Ottone Date: Sat, 14 Mar 2020 08:16:18 -0300 Subject: [PATCH] Fixed Ability Pop Up for Immunity-type abilities with Mold Breaker. (#301) * Fixed Ability Pop Up for Immunity-type abilities with Mold Breaker When a mon with Mold Breaker caused a status move to another one with an Immunity-type ability such as that mon healed inmiediatly from it, the ability pop up would incorrectly show the attacker's ability instead. * Compressed 3 lines into one. --- src/battle_util.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/battle_util.c b/src/battle_util.c index 4a404eebd..c7a8d1900 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -3618,8 +3618,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_AbilityCuredStatus; - gBattleScripting.battler = battler; - gActiveBattler = battler; + gBattleScripting.battler = gActiveBattler = gAbilityBattler = battler; BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1); MarkBattlerForControllerExec(gActiveBattler); return effect;