From b556d19448f665d0174560b370b973f91e3e5b84 Mon Sep 17 00:00:00 2001
From: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
Date: Sun, 22 Dec 2024 23:24:09 +0100
Subject: [PATCH] Changing option name to commandCursorMemory

---
 src/battle-scene.ts             |  2 +-
 src/phases/command-phase.ts     |  4 ++--
 src/system/settings/settings.ts | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 7bc54e9ae59..11950f0a47f 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -147,7 +147,7 @@ export default class BattleScene extends SceneBase {
   public damageNumbersMode: integer = 0;
   public reroll: boolean = false;
   public shopCursorTarget: number = ShopCursorTarget.REWARDS;
-  public commandCursorReset: boolean = true;
+  public commandCursorMemory: boolean = false;
   public showMovesetFlyout: boolean = true;
   public showArenaFlyout: boolean = true;
   public showTimeOfDayWidget: boolean = true;
diff --git a/src/phases/command-phase.ts b/src/phases/command-phase.ts
index 29c53ad2780..fa85f2427e5 100644
--- a/src/phases/command-phase.ts
+++ b/src/phases/command-phase.ts
@@ -37,12 +37,12 @@ export class CommandPhase extends FieldPhase {
     const commandUiHandler = this.scene.ui.handlers[Mode.COMMAND];
 
     // If one of these conditions is true, we always reset the cursor to Command.FIGHT
-    const cursorResetBattle = this.scene.currentBattle.battleType === BattleType.MYSTERY_ENCOUNTER ||
+    const cursorResetEvent = this.scene.currentBattle.battleType === BattleType.MYSTERY_ENCOUNTER ||
                               this.scene.currentBattle.battleType === BattleType.TRAINER ||
                               this.scene.arena.biomeType === Biome.END;
 
     if (commandUiHandler) {
-      if ((this.scene.currentBattle.turn === 1 && (this.scene.commandCursorReset || cursorResetBattle)) || commandUiHandler.getCursor() === Command.POKEMON) {
+      if ((this.scene.currentBattle.turn === 1 && (!this.scene.commandCursorMemory || cursorResetEvent)) || commandUiHandler.getCursor() === Command.POKEMON) {
         commandUiHandler.setCursor(Command.FIGHT);
       } else {
         commandUiHandler.setCursor(commandUiHandler.getCursor());
diff --git a/src/system/settings/settings.ts b/src/system/settings/settings.ts
index d91a6fda2f0..cdd46de2f3d 100644
--- a/src/system/settings/settings.ts
+++ b/src/system/settings/settings.ts
@@ -157,7 +157,7 @@ export const SettingKeys = {
   Move_Animations: "MOVE_ANIMATIONS",
   Show_Stats_on_Level_Up: "SHOW_LEVEL_UP_STATS",
   Shop_Cursor_Target: "SHOP_CURSOR_TARGET",
-  Command_Cursor_Reset: "COMMAND_CURSOR_RESET",
+  Command_Cursor_Memory: "Command_Cursor_Memory",
   Candy_Upgrade_Notification: "CANDY_UPGRADE_NOTIFICATION",
   Candy_Upgrade_Display: "CANDY_UPGRADE_DISPLAY",
   Move_Info: "MOVE_INFO",
@@ -683,10 +683,10 @@ export const Setting: Array<Setting> = [
     type: SettingType.DISPLAY
   },
   {
-    key: SettingKeys.Command_Cursor_Reset,
-    label: i18next.t("settings:commandCursorReset"),
+    key: SettingKeys.Command_Cursor_Memory,
+    label: i18next.t("settings:commandCursorMemory"),
     options: OFF_ON,
-    default: 1,
+    default: 0,
     type: SettingType.DISPLAY
   },
   {
@@ -835,8 +835,8 @@ export function setSetting(scene: BattleScene, setting: string, value: integer):
       const selectedValue = shopCursorTargetIndexMap[value];
       scene.shopCursorTarget = selectedValue;
       break;
-    case SettingKeys.Command_Cursor_Reset:
-      scene.commandCursorReset = Setting[index].options[value].value === "On";
+    case SettingKeys.Command_Cursor_Memory:
+      scene.commandCursorMemory = Setting[index].options[value].value === "On";
       break;
     case SettingKeys.EXP_Gains_Speed:
       scene.expGainsSpeed = value;