From 1ea23daefe69ab5b62f4903b92b96e7b06f2c113 Mon Sep 17 00:00:00 2001
From: AgustinGDLV <agustingomezdelavega@gmail.com>
Date: Sat, 3 Jun 2023 11:58:57 -0700
Subject: [PATCH] fixed bug with zeroing out abilities on switch-in

---
 src/battle_main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/battle_main.c b/src/battle_main.c
index 9795834530..f082fb210f 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -3307,7 +3307,8 @@ void SwitchInClearSetData(void)
     {
         u32 side = GetBattlerSide(gActiveBattler);
         u32 partyIndex = gBattlerPartyIndexes[gActiveBattler];
-        gBattleMons[gActiveBattler].ability = gBattleStruct->overwrittenAbilities[gActiveBattler] = TestRunner_Battle_GetForcedAbility(side, partyIndex);
+        if (TestRunner_Battle_GetForcedAbility(side, partyIndex))
+            gBattleMons[i].ability = gBattleStruct->overwrittenAbilities[i] = TestRunner_Battle_GetForcedAbility(side, partyIndex);
     }
 
     Ai_UpdateSwitchInData(gActiveBattler);