From dea7d02e76c63a34e656e924fc723047e5fd80b7 Mon Sep 17 00:00:00 2001
From: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Tue, 4 Nov 2025 21:57:49 +0100
Subject: [PATCH] Adjust faint battler script (#8137)

---
 data/battle_scripts_1.s      | 13 +++++++------
 src/battle_script_commands.c |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 28542a95fb..692377b2b7 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -4394,20 +4394,21 @@ BattleScript_EffectCamouflage::
 	goto BattleScript_MoveEnd
 
 BattleScript_FaintBattler::
-	tryillusionoff BS_SCRIPTING
+	tryillusionoff BS_FAINTED
 	tryactivategulpmissile
-	playfaintcry BS_SCRIPTING
+	playfaintcry BS_FAINTED
 	pause B_WAIT_TIME_LONG
-	dofaintanimation BS_SCRIPTING
+	dofaintanimation BS_FAINTED
+	copybyte sBATTLER, gBattlerFainted @ for message
 	printstring STRINGID_BATTLERFAINTED
-	cleareffectsonfaint BS_SCRIPTING
+	cleareffectsonfaint BS_FAINTED
 	trytoclearprimalweather
 	tryrevertweatherform
 	flushtextbox
 	waitanimation
 	tryactivatesoulheart
-	tryactivatereceiver BS_SCRIPTING
-	trytrainerslidemsgfirstoff BS_SCRIPTING
+	tryactivatereceiver BS_FAINTED
+	trytrainerslidemsgfirstoff BS_FAINTED
 	return
 
 
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index e41a4f297b..a24a0d23a6 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -4203,7 +4203,7 @@ static void Cmd_tryfaintmon(void)
         if (cmd->battler == BS_ATTACKER)
             TryUpdateEvolutionTracker(IF_DEFEAT_X_WITH_ITEMS, 1, MOVE_NONE);
 
-        gBattleScripting.battler = battler;
+        gBattlerFainted = battler;
         faintScript = BattleScript_FaintBattler;
         if (!(gAbsentBattlerFlags & (1u << battler))
          && !IsBattlerAlive(battler))