From 93740ae3a28047d04da0c7affe8c166584a01a3e Mon Sep 17 00:00:00 2001
From: Bertie690 <136088738+Bertie690@users.noreply.github.com>
Date: Mon, 16 Jun 2025 08:23:44 -0400
Subject: [PATCH] Update turn-start-phase.ts

---
 src/phases/turn-start-phase.ts | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/phases/turn-start-phase.ts b/src/phases/turn-start-phase.ts
index 1efe6320fff..281100660d4 100644
--- a/src/phases/turn-start-phase.ts
+++ b/src/phases/turn-start-phase.ts
@@ -223,12 +223,11 @@ export class TurnStartPhase extends FieldPhase {
   }
 
   private handleFightCommand(turnCommand: TurnCommand, pokemon: Pokemon) {
-    if (!turnCommand.move) {
+    const queuedMove = turnCommand.move;
+    if (!queuedMove) {
       return;
     }
 
-    const queuedMove = turnCommand.move;
-
     // TODO: This seems somewhat dubious
     const move =
       pokemon.getMoveset().find(m => m.moveId === queuedMove.move && m.ppUsed < m.getMovePp()) ??
@@ -238,18 +237,12 @@ export class TurnStartPhase extends FieldPhase {
       globalScene.phaseManager.unshiftNew("MoveHeaderPhase", pokemon, move);
     }
 
-    // TODO: Review what a `-1` cursor means
-    if (pokemon.isPlayer() && turnCommand.cursor === -1) {
-      globalScene.phaseManager.pushNew("MovePhase", pokemon, turnCommand.targets ?? queuedMove.targets, move);
-    } else {
-      globalScene.phaseManager.pushNew(
-        "MovePhase",
-        pokemon,
-        turnCommand.targets ?? turnCommand.move.targets,
-        move,
-        false,
-        queuedMove.useMode,
-      );
-    }
+    globalScene.phaseManager.pushNew(
+      "MovePhase",
+      pokemon,
+      turnCommand.targets ?? queuedMove.targets,
+      move,
+      queuedMove.useMode,
+    );
   }
 }