From 5e7f2042fcba5ea38de0f6d7298499d93019a9fc Mon Sep 17 00:00:00 2001
From: Mumble <171087428+frutescens@users.noreply.github.com>
Date: Tue, 22 Oct 2024 13:05:37 -0700
Subject: [PATCH] [UI][QoL] Cursor defaults to Fight at the start of each new
 wave (#4666)

* cursors are dumb

* update

* fixed?

* maybe solution

* fix in!

* Possible cursor fixes

---------

Co-authored-by: frutescens <info@laptop>
Co-authored-by: Opaque02 <66582645+Opaque02@users.noreply.github.com>
---
 src/phases/command-phase.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/phases/command-phase.ts b/src/phases/command-phase.ts
index e6f2eb69ff3..6d4d46c51c9 100644
--- a/src/phases/command-phase.ts
+++ b/src/phases/command-phase.ts
@@ -30,6 +30,15 @@ export class CommandPhase extends FieldPhase {
   start() {
     super.start();
 
+    const commandUiHandler = this.scene.ui.handlers[Mode.COMMAND];
+    if (commandUiHandler) {
+      if (this.scene.currentBattle.turn === 1 || commandUiHandler.getCursor() === Command.POKEMON) {
+        commandUiHandler.setCursor(Command.FIGHT);
+      } else {
+        commandUiHandler.setCursor(commandUiHandler.getCursor());
+      }
+    }
+
     if (this.fieldIndex) {
       // If we somehow are attempting to check the right pokemon but there's only one pokemon out
       // Switch back to the center pokemon. This can happen rarely in double battles with mid turn switching