From 3497f9314142a8dcdc0735c2166db9c60fa61cb5 Mon Sep 17 00:00:00 2001
From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Date: Mon, 26 May 2025 16:41:58 -0500
Subject: [PATCH] Minor touchups

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

diff --git a/src/phases/command-phase.ts b/src/phases/command-phase.ts
index bf328178b1c..da8e8c91140 100644
--- a/src/phases/command-phase.ts
+++ b/src/phases/command-phase.ts
@@ -248,8 +248,7 @@ export class CommandPhase extends FieldPhase {
     const playerPokemon = this.getPokemon();
     const ignorePP = isIgnorePP(useMode);
 
-    /** Whether or not to display an error message instead of attempting to initiate the command selection process */
-    let canUse = cursor !== -1 || !playerPokemon.trySelectMove(cursor, ignorePP);
+    let canUse = cursor === -1 || playerPokemon.trySelectMove(cursor, ignorePP);
 
     const useStruggle = canUse
       ? false
@@ -290,7 +289,7 @@ export class CommandPhase extends FieldPhase {
 
     console.log(moveTargets, getPokemonNameWithAffix(playerPokemon));
 
-    if (moveTargets.multiple) {
+    if (moveTargets.targets.length > 1 && moveTargets.multiple) {
       globalScene.phaseManager.unshiftNew("SelectTargetPhase", this.fieldIndex);
     }
 
@@ -418,7 +417,7 @@ export class CommandPhase extends FieldPhase {
   }
 
   /**
-   * Common helper method to handle the logic for effects that prevent the pokemon from leaving the field
+   * Helper method to handle the logic for effects that prevent the pokemon from leaving the field
    * due to trapping abilities or effects.
    *
    * This method queues the proper messages in the case of trapping abilities or effects
@@ -477,11 +476,16 @@ export class CommandPhase extends FieldPhase {
   private tryLeaveField(cursor?: number, isBatonSwitch = false): boolean {
     const currentBattle = globalScene.currentBattle;
 
-    if (isBatonSwitch && !this.handleTrap()) {
-      currentBattle.turnCommands[this.fieldIndex] = {
-        command: this.isSwitch ? Command.POKEMON : Command.RUN,
-        cursor: cursor,
-      };
+    if (isBatonSwitch || !this.handleTrap()) {
+      currentBattle.turnCommands[this.fieldIndex] = this.isSwitch
+        ? {
+            command: Command.POKEMON,
+            cursor: cursor,
+            args: [isBatonSwitch],
+          }
+        : {
+            command: Command.RUN,
+          };
       if (!this.isSwitch && this.fieldIndex) {
         currentBattle.turnCommands[this.fieldIndex - 1]!.skip = true;
       }
@@ -536,7 +540,7 @@ export class CommandPhase extends FieldPhase {
     );
   }
 
-  // Overloads for handleCommand to provide a more specific type signature for the different options
+  // Overloads for handleCommand to provide a more specific signature for the different options
   handleCommand(command: Command.FIGHT | Command.TERA, cursor: number, useMode?: MoveUseMode, move?: TurnMove): boolean;
   handleCommand(command: Command.BALL, cursor: number): boolean;
   handleCommand(command: Command.POKEMON, cursor: number, useBaton: boolean): boolean;