Merge 7673d8dfae into 46c78a0540

src/phases/command-phase.ts

@@ -402,8 +402,6 @@ 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");
@@ -452,12 +450,10 @@ export class CommandPhase extends FieldPhase {
       ) {
         if (restrictMasterBall) {
           this.queueShowText("battle:noPokeballStrongFinalBossCatchable");
-          return false;
-        }
-        if (cursor < PokeballType.MASTER_BALL) {
+        } else if (cursor < PokeballType.MASTER_BALL) {
           this.queueShowText("battle:noPokeballStrong");
-          return false;
         }
+        return false;
       }
 
       globalScene.currentBattle.turnCommands[this.fieldIndex] = {