From f374291f69a28133049ef2483b96445c6399fe1c Mon Sep 17 00:00:00 2001
From: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Thu, 5 Jun 2025 22:47:32 +0200
Subject: [PATCH] Fixes Wandering Spirit copied ability activation on fainted
 mon (#7066)

---
 data/battle_scripts_1.s                |  2 ++
 test/battle/ability/wandering_spirit.c | 15 +++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 9625033c81..5928ea1bb1 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -8234,7 +8234,9 @@ BattleScript_WanderingSpiritActivates::
 	printstring STRINGID_SWAPPEDABILITIES
 	waitmessage B_WAIT_TIME_LONG
 	switchinabilities BS_ATTACKER
+	jumpiffainted BS_TARGET, TRUE, BattleScript_WanderingSpiritActivatesRet
 	switchinabilities BS_TARGET
+BattleScript_WanderingSpiritActivatesRet:
 	return
 
 BattleScript_TargetsStatWasMaxedOut::
diff --git a/test/battle/ability/wandering_spirit.c b/test/battle/ability/wandering_spirit.c
index d32fb7c7b2..9d8d7fad36 100644
--- a/test/battle/ability/wandering_spirit.c
+++ b/test/battle/ability/wandering_spirit.c
@@ -2,3 +2,18 @@
 #include "test/battle.h"
 
 TO_DO_BATTLE_TEST("TODO: Write Wandering Spirit (Ability) test titles")
+
+SINGLE_BATTLE_TEST("Wandering Spirit copied ability should not trigger on fainted mon")
+{
+    GIVEN {
+        PLAYER(SPECIES_EKANS) { Ability(ABILITY_INTIMIDATE); }
+        PLAYER(SPECIES_WOBBUFFET)
+        OPPONENT(SPECIES_YAMASK_GALAR) { HP(1); Ability(ABILITY_WANDERING_SPIRIT); }
+        OPPONENT(SPECIES_WOBBUFFET);
+    } WHEN {
+        TURN { MOVE(player, MOVE_POISON_FANG); SEND_OUT(opponent, 1); }
+    } SCENE {
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_POISON_FANG, player);
+        NOT ABILITY_POPUP(opponent, ABILITY_INTIMIDATE);
+    }
+}