From 74f348a25ee62b53fc61214b05998662d4fc610b Mon Sep 17 00:00:00 2001
From: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
Date: Fri, 15 Aug 2025 23:16:06 +0200
Subject: [PATCH] Changes to conditions to restrict master ball use

---
 src/phases/command-phase.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/phases/command-phase.ts b/src/phases/command-phase.ts
index 3d4a6897d40..e6494f07641 100644
--- a/src/phases/command-phase.ts
+++ b/src/phases/command-phase.ts
@@ -22,7 +22,7 @@ import type { MoveTargetSet } from "#moves/move";
 import { getMoveTargets } from "#moves/move-utils";
 import { FieldPhase } from "#phases/field-phase";
 import type { TurnMove } from "#types/turn-move";
-import { applyChallenges, isNuzlockeChallenge } from "#utils/challenge-utils";
+import { applyChallenges } from "#utils/challenge-utils";
 import { BooleanHolder } from "#utils/common";
 import i18next from "i18next";
 
@@ -429,7 +429,10 @@ export class CommandPhase extends FieldPhase {
       return false;
     }
 
-    const restrictMasterBall = isNuzlockeChallenge();
+    // Restricts use of Master Ball against final boss in challenges
+    const restrictMasterBall =
+      globalScene.gameMode.isChallenge &&
+      globalScene.gameMode.isBattleClassicFinalBoss(globalScene.currentBattle.waveIndex);
 
     const numBallTypes = 5;
     if (cursor < numBallTypes) {