From 98df023c117d5685b51c7f05f1004fb3fb5515b0 Mon Sep 17 00:00:00 2001
From: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
Date: Sat, 16 Aug 2025 16:25:35 +0200
Subject: [PATCH] Fixed some bugs which prevented correct usage of balls

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

diff --git a/src/phases/command-phase.ts b/src/phases/command-phase.ts
index 615e54c2466..f37f6413707 100644
--- a/src/phases/command-phase.ts
+++ b/src/phases/command-phase.ts
@@ -402,6 +402,8 @@ export class CommandPhase extends FieldPhase {
       } else if ((isClassic && missingMultipleStarters) || (isEndless && isEndlessMinorBoss) || isDaily) {
         // Uncatchable final boss in classic and endless
         this.queueShowText("battle:noPokeballForceFinalBoss");
+      } else {
+        return true;
       }
     } else if (battleType === BattleType.TRAINER) {
       this.queueShowText("battle:noPokeballTrainer");
@@ -450,10 +452,12 @@ export class CommandPhase extends FieldPhase {
       ) {
         if (restrictMasterBall) {
           this.queueShowText("battle:noPokeballStrongFinalBossCatchable");
-        } else if (cursor < PokeballType.MASTER_BALL) {
-          this.queueShowText("battle:noPokeballStrong");
+          return false;
+        }
+        if (cursor < PokeballType.MASTER_BALL) {
+          this.queueShowText("battle:noPokeballStrong");
+          return false;
         }
-        return false;
       }
 
       globalScene.currentBattle.turnCommands[this.fieldIndex] = {