From c77c624e9f53f1b2abf7c044b3b59d33a5be6290 Mon Sep 17 00:00:00 2001
From: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Thu, 30 Oct 2025 16:14:03 +0100
Subject: [PATCH] Fixes Gooey/Tangling Hair ability pop up triggering on Clear
 Body (#8083)

---
 data/battle_scripts_1.s             |  2 ++
 test/battle/ability/tangling_hair.c | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index d65e846880..de2148bab2 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -8214,11 +8214,13 @@ BattleScript_CuteCharmActivates::
 	return
 
 BattleScript_GooeyActivates::
+	statbuffchange BS_ATTACKER, STAT_CHANGE_ONLY_CHECKING, BattleScript_GooeyActivatesRet
 	waitstate
 	call BattleScript_AbilityPopUp
 	swapattackerwithtarget  @ for defiant, mirror armor
 	seteffectsecondary BS_ATTACKER, BS_TARGET, MOVE_EFFECT_SPD_MINUS_1
 	swapattackerwithtarget
+BattleScript_GooeyActivatesRet:
 	return
 
 BattleScript_AbilityStatusEffect::
diff --git a/test/battle/ability/tangling_hair.c b/test/battle/ability/tangling_hair.c
index 13a0f27cb0..849c83df64 100644
--- a/test/battle/ability/tangling_hair.c
+++ b/test/battle/ability/tangling_hair.c
@@ -8,7 +8,6 @@ ASSUMPTIONS
     ASSUME(MoveMakesContact(MOVE_SCRATCH) == TRUE);
 }
 
-
 SINGLE_BATTLE_TEST("Tangling Hair drops opposing mon's speed if ability user got hit by a contact move")
 {
     u32 move;
@@ -85,3 +84,16 @@ SINGLE_BATTLE_TEST("Tangling Hair does not activate on confusion damage")
         }
     }
 }
+
+SINGLE_BATTLE_TEST("Tangling Hair does not trigger on Clear Body")
+{
+    GIVEN {
+        PLAYER(SPECIES_DUGTRIO) { Ability(ABILITY_TANGLING_HAIR); }
+        OPPONENT(SPECIES_BELDUM) { Ability(ABILITY_CLEAR_BODY); };
+    } WHEN {
+        TURN { MOVE(opponent, MOVE_SCRATCH); }
+    } SCENE {
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_SCRATCH, opponent);
+        NOT ABILITY_POPUP(player, ABILITY_TANGLING_HAIR);
+    }
+}