From 1b6374f4697c2cdb77c30eca694acf4a43ece8e9 Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Mon, 30 Dec 2024 18:55:28 -0800
Subject: [PATCH] [UI/UX] Change label for music settings (#5053)

Changes from "Consistent/Mixed" to "Gen V + PMD"/"All Gens"

Update `MusicPreferences` enum

* Update locales submodule
---
 public/locales                                     |  2 +-
 src/battle-scene.ts                                |  2 +-
 src/battle.ts                                      |  6 +++---
 .../encounters/global-trade-system-encounter.ts    |  2 +-
 src/system/settings/settings.ts                    | 14 +++++++-------
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/public/locales b/public/locales
index 6c6f0af398a..b28ba1255c8 160000
--- a/public/locales
+++ b/public/locales
@@ -1 +1 @@
-Subproject commit 6c6f0af398ae11f8d96c6ac064f171d927812c85
+Subproject commit b28ba1255c8db12cb07947f88635cb6be0143a15
diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 11950f0a47f..327ab1cc926 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -174,7 +174,7 @@ export default class BattleScene extends SceneBase {
   public uiTheme: UiTheme = UiTheme.DEFAULT;
   public windowType: integer = 0;
   public experimentalSprites: boolean = false;
-  public musicPreference: number = MusicPreference.MIXED;
+  public musicPreference: number = MusicPreference.ALLGENS;
   public moveAnimations: boolean = true;
   public expGainsSpeed: ExpGainsSpeed = ExpGainsSpeed.DEFAULT;
   public skipSeenDialogues: boolean = false;
diff --git a/src/battle.ts b/src/battle.ts
index 75f0dff2534..38ee7b5eae0 100644
--- a/src/battle.ts
+++ b/src/battle.ts
@@ -222,7 +222,7 @@ export default class Battle {
       if (!this.started && this.trainer?.config.encounterBgm && this.trainer?.getEncounterMessages()?.length) {
         return `encounter_${this.trainer?.getEncounterBgm()}`;
       }
-      if (scene.musicPreference === MusicPreference.CONSISTENT) {
+      if (scene.musicPreference === MusicPreference.GENFIVE) {
         return this.trainer?.getBattleBgm() ?? null;
       } else {
         return this.trainer?.getMixedBattleBgm() ?? null;
@@ -239,7 +239,7 @@ export default class Battle {
         return "battle_final_encounter";
       }
       if (pokemon.species.legendary || pokemon.species.subLegendary || pokemon.species.mythical) {
-        if (scene.musicPreference === MusicPreference.CONSISTENT) {
+        if (scene.musicPreference === MusicPreference.GENFIVE) {
           switch (pokemon.species.speciesId) {
             case Species.REGIROCK:
             case Species.REGICE:
@@ -256,7 +256,7 @@ export default class Battle {
               }
               return "battle_legendary_unova";
           }
-        } else if (scene.musicPreference === MusicPreference.MIXED) {
+        } else if (scene.musicPreference === MusicPreference.ALLGENS) {
           switch (pokemon.species.speciesId) {
             case Species.ARTICUNO:
             case Species.ZAPDOS:
diff --git a/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts b/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts
index fa445d75d4f..b7376c2bfd2 100644
--- a/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts
+++ b/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts
@@ -107,7 +107,7 @@ export const GlobalTradeSystemEncounter: MysteryEncounter =
 
       // Load bgm
       let bgmKey: string;
-      if (scene.musicPreference === MusicPreference.CONSISTENT) {
+      if (scene.musicPreference === MusicPreference.GENFIVE) {
         bgmKey = "mystery_encounter_gen_5_gts";
         scene.loadBgm(bgmKey, `${bgmKey}.mp3`);
       } else {
diff --git a/src/system/settings/settings.ts b/src/system/settings/settings.ts
index ebdcad1c4f9..0a11648c171 100644
--- a/src/system/settings/settings.ts
+++ b/src/system/settings/settings.ts
@@ -181,8 +181,8 @@ export const SettingKeys = {
 };
 
 export enum MusicPreference {
-  CONSISTENT,
-  MIXED
+  GENFIVE,
+  ALLGENS
 }
 
 /**
@@ -670,15 +670,15 @@ export const Setting: Array<Setting> = [
     label: i18next.t("settings:musicPreference"),
     options: [
       {
-        value: "Consistent",
-        label: i18next.t("settings:consistent")
+        value: "Gen V + PMD",
+        label: i18next.t("settings:musicGenFive")
       },
       {
-        value: "Mixed",
-        label: i18next.t("settings:mixed")
+        value: "All Gens",
+        label: i18next.t("settings:musicAllGens")
       }
     ],
-    default: MusicPreference.MIXED,
+    default: MusicPreference.ALLGENS,
     type: SettingType.AUDIO,
     requireReload: true
   },