From 4643bc90016e3d5db7a17591a6c5fbf28320fb21 Mon Sep 17 00:00:00 2001
From: ImperialSympathizer <imperialsympathizer@gmail.com>
Date: Sat, 7 Sep 2024 11:55:50 -0400
Subject: [PATCH] add BGM music names for ME music

---
 .../encounters/global-trade-system-encounter.ts        | 10 +++++++---
 src/locales/en/bgm-name.json                           |  7 ++++++-
 src/modifier/modifier-type.ts                          | 10 ++++------
 3 files changed, 17 insertions(+), 10 deletions(-)

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 e265ab103f7..7ba9b0336c5 100644
--- a/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts
+++ b/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts
@@ -93,10 +93,10 @@ export const GlobalTradeSystemEncounter: MysteryEncounter =
 
       // Load bgm
       if (scene.musicPreference === 0) {
-        scene.loadBgm("mystery_encounter_gts", "mystery_encounter_gen_5_gts.mp3");
+        scene.loadBgm("mystery_encounter_gen_5_gts", "mystery_encounter_gen_5_gts.mp3");
       } else {
         // Mixed option
-        scene.loadBgm("mystery_encounter_gts", "mystery_encounter_gen_6_gts.mp3");
+        scene.loadBgm("mystery_encounter_gen_6_gts", "mystery_encounter_gen_6_gts.mp3");
       }
 
       // Load possible trade options
@@ -113,7 +113,11 @@ export const GlobalTradeSystemEncounter: MysteryEncounter =
       // Change the bgm
       scene.fadeOutBgm(1500, false);
       scene.time.delayedCall(1500, () => {
-        scene.playBgm("mystery_encounter_gts");
+        if (scene.musicPreference === 0) {
+          scene.playBgm("mystery_encounter_gen_5_gts");
+        } else {
+          scene.playBgm("mystery_encounter_gen_6_gts");
+        }
       });
 
       return true;
diff --git a/src/locales/en/bgm-name.json b/src/locales/en/bgm-name.json
index 8838942c8a6..c2babed4dff 100644
--- a/src/locales/en/bgm-name.json
+++ b/src/locales/en/bgm-name.json
@@ -146,5 +146,10 @@
   "encounter_youngster": "BW Trainers' Eyes Meet (Youngster)",
   "heal": "BW Pokémon Heal",
   "menu": "PMD EoS Welcome to the World of Pokémon!",
-  "title": "PMD EoS Top Menu Theme"
+  "title": "PMD EoS Top Menu Theme",
+
+  "mystery_encounter_weird_dream": "PMD EoS Temporal Spire",
+  "mystery_encounter_fun_and_games": "PMD EoS Guildmaster Wigglytuff",
+  "mystery_encounter_gen_5_gts": "BW GTS",
+  "mystery_encounter_gen_6_gts": "XY GTS"
 }
diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts
index f9c5702ff31..1281ac3512f 100644
--- a/src/modifier/modifier-type.ts
+++ b/src/modifier/modifier-type.ts
@@ -125,12 +125,10 @@ export class ModifierType {
    * @param poolType - Default 'ModifierPoolType.PLAYER'. Which pool to lookup item tier from
    */
   withTierFromPool(poolType: ModifierPoolType = ModifierPoolType.PLAYER): ModifierType {
-    const modifierPool = getModifierPoolForType(poolType);
-
-    for (const weightedModifiers of Object.values(modifierPool)) {
-      for (const mod of weightedModifiers) {
-        if (mod.modifierType.id === this.id) {
-          this.tier = mod.modifierType.tier;
+    for (const tier of Object.values(getModifierPoolForType(poolType))) {
+      for (const modifier of tier) {
+        if (this.id === modifier.modifierType.id) {
+          this.tier = modifier.modifierType.tier;
           return this;
         }
       }