From 9e49f55aaa4b5624d97dc6f073756fbfd07f227d Mon Sep 17 00:00:00 2001
From: surskitty <surskitty@gmail.com>
Date: Tue, 12 Aug 2025 17:17:08 -0400
Subject: [PATCH] Uncommenting out No Retreat, Clangorous Soul, and Extreme
 Evoboost from CheckBadMove (#7541)

---
 src/battle_ai_main.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/battle_ai_main.c b/src/battle_ai_main.c
index 2d9e37d688..6eeabc1823 100644
--- a/src/battle_ai_main.c
+++ b/src/battle_ai_main.c
@@ -2853,18 +2853,18 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score)
             ||  GetBattlerWeight(battlerDef) >= 2000) //200.0 kg
                 ADJUST_SCORE(-10);
             break;
-        /*case EFFECT_NO_RETREAT:
-            if (TrappedByNoRetreat(battlerAtk))
+        case EFFECT_NO_RETREAT:
+            if (gDisableStructs[battlerAtk].noRetreat)
                 ADJUST_SCORE(-10);
             break;
         case EFFECT_EXTREME_EVOBOOST:
-            if (MainStatsMaxed(battlerAtk))
+            if (AreBattlersStatsMaxed(battlerAtk))
                 ADJUST_SCORE(-10);
             break;
         case EFFECT_CLANGOROUS_SOUL:
             if (gBattleMons[battlerAtk].hp <= gBattleMons[battlerAtk].maxHP / 3)
                 ADJUST_SCORE(-10);
-            break;*/
+            break;
         case EFFECT_REVIVAL_BLESSING:
             if (GetFirstFaintedPartyIndex(battlerAtk) == PARTY_SIZE)
                 ADJUST_SCORE(-10);