From d398b9e8e7f0a4ef851395cd55bccd92b1319ba0 Mon Sep 17 00:00:00 2001
From: kittenchilly <mario.pikmin.zelda@gmail.com>
Date: Mon, 22 Apr 2024 03:49:53 -0500
Subject: [PATCH] Fix ABILITY_POPUP not respecting abilityPopupOverwrite in
 tests (#4423)

---
 src/battle_interface.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/battle_interface.c b/src/battle_interface.c
index d46c95dd3c..59f89ae30c 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -3243,6 +3243,9 @@ void CreateAbilityPopUp(u8 battlerId, u32 ability, bool32 isDoubleBattle)
     if (B_ABILITY_POP_UP == FALSE)
         return;
 
+    if (gBattleScripting.abilityPopupOverwrite != 0)
+        ability = gBattleScripting.abilityPopupOverwrite;
+
     if (gTestRunnerEnabled)
     {
         TestRunner_Battle_RecordAbilityPopUp(battlerId, ability);
@@ -3250,9 +3253,6 @@ void CreateAbilityPopUp(u8 battlerId, u32 ability, bool32 isDoubleBattle)
             return;
     }
 
-    if (gBattleScripting.abilityPopupOverwrite != 0)
-        ability = gBattleScripting.abilityPopupOverwrite;
-
     if (!gBattleStruct->activeAbilityPopUps)
     {
         LoadSpriteSheet(&sSpriteSheet_AbilityPopUp);