diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index cf8a34b9d28..edf68f8af1b 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -13,6 +13,7 @@ import { Arena, ArenaBase } from "#app/field/arena";
 import { GameData } from "#app/system/game-data";
 import { addTextObject, getTextColor, TextStyle } from "#app/ui/text";
 import { allMoves } from "#app/data/move";
+import { MusicPreference } from "./system/settings/settings";
 import { getDefaultModifierTypeForTier, getEnemyModifierTypesForWave, getLuckString, getLuckTextTint, getModifierPoolForType, getModifierType, getPartyLuckValue, ModifierPoolType, modifierTypes, PokemonHeldItemModifierType } from "#app/modifier/modifier-type";
 import AbilityBar from "#app/ui/ability-bar";
 import { allAbilities, applyAbAttrs, applyPostBattleInitAbAttrs, BlockItemTheftAbAttr, DoubleBattleChanceAbAttr, PostBattleInitAbAttr } from "#app/data/ability";
diff --git a/src/battle.ts b/src/battle.ts
index c093cf12999..acafd5c5325 100644
--- a/src/battle.ts
+++ b/src/battle.ts
@@ -6,7 +6,7 @@ import { GameMode } from "./game-mode";
 import { MoneyMultiplierModifier, PokemonHeldItemModifier } from "./modifier/modifier";
 import { PokeballType } from "./data/pokeball";
 import { trainerConfigs } from "#app/data/trainer-config";
-import { SpeciesFormKey } from "#app/data/pokemon-species";
+import { SpeciesFormKey } from "#enums/species-form-key";
 import Pokemon, { EnemyPokemon, PlayerPokemon, QueuedMove } from "#app/field/pokemon";
 import { ArenaTagType } from "#enums/arena-tag-type";
 import { BattleSpec } from "#enums/battle-spec";
@@ -214,7 +214,6 @@ export default class Battle {
   }
 
   getBgmOverride(scene: BattleScene): string | null {
-    const battlers = this.enemyParty.slice(0, this.getBattlerCount());
     if (this.isBattleMysteryEncounter() && this.mysteryEncounter?.encounterMode === MysteryEncounterMode.DEFAULT) {
       // Music is overridden for MEs during ME onInit()
       // Should not use any BGM overrides before swapping from DEFAULT mode
@@ -242,151 +241,151 @@ export default class Battle {
       if (pokemon.species.legendary || pokemon.species.subLegendary || pokemon.species.mythical) {
         if (scene.musicPreference === MusicPreference.CONSISTENT) {
           switch (pokemon.species.speciesId) {
-          case Species.REGIROCK:
-          case Species.REGICE:
-          case Species.REGISTEEL:
-          case Species.REGIGIGAS:
-          case Species.REGIDRAGO:
-          case Species.REGIELEKI:
-            return "battle_legendary_regis_g5";
-          case Species.KYUREM:
-            return "battle_legendary_kyurem";
-          default:
-            if (pokemon.species.legendary) {
-              return "battle_legendary_res_zek";
-            }
-            return "battle_legendary_unova";
+            case Species.REGIROCK:
+            case Species.REGICE:
+            case Species.REGISTEEL:
+            case Species.REGIGIGAS:
+            case Species.REGIDRAGO:
+            case Species.REGIELEKI:
+              return "battle_legendary_regis_g5";
+            case Species.KYUREM:
+              return "battle_legendary_kyurem";
+            default:
+              if (pokemon.species.legendary) {
+                return "battle_legendary_res_zek";
+              }
+              return "battle_legendary_unova";
           }
         } else if (scene.musicPreference === MusicPreference.MIXED) {
           switch (pokemon.species.speciesId) {
-          case Species.ARTICUNO:
-          case Species.ZAPDOS:
-          case Species.MOLTRES:
-          case Species.MEWTWO:
-          case Species.MEW:
-            return "battle_legendary_kanto";
-          case Species.RAIKOU:
-            return "battle_legendary_raikou";
-          case Species.ENTEI:
-            return "battle_legendary_entei";
-          case Species.SUICUNE:
-            return "battle_legendary_suicune";
-          case Species.LUGIA:
-            return "battle_legendary_lugia";
-          case Species.HO_OH:
-            return "battle_legendary_ho_oh";
-          case Species.REGIROCK:
-          case Species.REGICE:
-          case Species.REGISTEEL:
-          case Species.REGIGIGAS:
-          case Species.REGIDRAGO:
-          case Species.REGIELEKI:
-            return "battle_legendary_regis_g6";
-          case Species.GROUDON:
-          case Species.KYOGRE:
-            return "battle_legendary_gro_kyo";
-          case Species.RAYQUAZA:
-            return "battle_legendary_rayquaza";
-          case Species.DEOXYS:
-            return "battle_legendary_deoxys";
-          case Species.HEATRAN:
-          case Species.CRESSELIA:
-          case Species.DARKRAI:
-          case Species.SHAYMIN:
-            return "battle_legendary_sinnoh";
-          case Species.DIALGA:
-          case Species.PALKIA:
-            if (pokemon.species.getFormSpriteKey() === SpeciesFormKey.ORIGIN) {
-              return "battle_legendary_origin_forme";
-            }
-            return "battle_legendary_dia_pal";
-          case Species.GIRATINA:
-            return "battle_legendary_giratina";
-          case Species.ARCEUS:
-            return "battle_legendary_arceus";
-          case Species.COBALION:
-          case Species.TERRAKION:
-          case Species.VIRIZION:
-          case Species.KELDEO:
-          case Species.TORNADUS:
-          case Species.LANDORUS:
-          case Species.THUNDURUS:
-          case Species.MELOETTA:
-          case Species.GENESECT:
-            return "battle_legendary_unova";
-          case Species.KYUREM:
-            return "battle_legendary_kyurem";
-          case Species.XERNEAS:
-          case Species.YVELTAL:
-          case Species.ZYGARDE:
-            return "battle_legendary_xern_yvel";
-          case Species.TAPU_KOKO:
-          case Species.TAPU_LELE:
-          case Species.TAPU_BULU:
-          case Species.TAPU_FINI:
-            return "battle_legendary_tapu";
-          case Species.SOLGALEO:
-          case Species.LUNALA:
-            return "battle_legendary_sol_lun";
-          case Species.NECROZMA:
-            switch (pokemon.getFormKey()) {
-            case "dusk-mane":
-            case "dawn-wings":
-              return "battle_legendary_dusk_dawn";
-            case "ultra":
-              return "battle_legendary_ultra_nec";
-            default:
+            case Species.ARTICUNO:
+            case Species.ZAPDOS:
+            case Species.MOLTRES:
+            case Species.MEWTWO:
+            case Species.MEW:
+              return "battle_legendary_kanto";
+            case Species.RAIKOU:
+              return "battle_legendary_raikou";
+            case Species.ENTEI:
+              return "battle_legendary_entei";
+            case Species.SUICUNE:
+              return "battle_legendary_suicune";
+            case Species.LUGIA:
+              return "battle_legendary_lugia";
+            case Species.HO_OH:
+              return "battle_legendary_ho_oh";
+            case Species.REGIROCK:
+            case Species.REGICE:
+            case Species.REGISTEEL:
+            case Species.REGIGIGAS:
+            case Species.REGIDRAGO:
+            case Species.REGIELEKI:
+              return "battle_legendary_regis_g6";
+            case Species.GROUDON:
+            case Species.KYOGRE:
+              return "battle_legendary_gro_kyo";
+            case Species.RAYQUAZA:
+              return "battle_legendary_rayquaza";
+            case Species.DEOXYS:
+              return "battle_legendary_deoxys";
+            case Species.HEATRAN:
+            case Species.CRESSELIA:
+            case Species.DARKRAI:
+            case Species.SHAYMIN:
+              return "battle_legendary_sinnoh";
+            case Species.DIALGA:
+            case Species.PALKIA:
+              if (pokemon.species.getFormSpriteKey() === SpeciesFormKey.ORIGIN) {
+                return "battle_legendary_origin_forme";
+              }
+              return "battle_legendary_dia_pal";
+            case Species.GIRATINA:
+              return "battle_legendary_giratina";
+            case Species.ARCEUS:
+              return "battle_legendary_arceus";
+            case Species.COBALION:
+            case Species.TERRAKION:
+            case Species.VIRIZION:
+            case Species.KELDEO:
+            case Species.TORNADUS:
+            case Species.LANDORUS:
+            case Species.THUNDURUS:
+            case Species.MELOETTA:
+            case Species.GENESECT:
+              return "battle_legendary_unova";
+            case Species.KYUREM:
+              return "battle_legendary_kyurem";
+            case Species.XERNEAS:
+            case Species.YVELTAL:
+            case Species.ZYGARDE:
+              return "battle_legendary_xern_yvel";
+            case Species.TAPU_KOKO:
+            case Species.TAPU_LELE:
+            case Species.TAPU_BULU:
+            case Species.TAPU_FINI:
+              return "battle_legendary_tapu";
+            case Species.SOLGALEO:
+            case Species.LUNALA:
               return "battle_legendary_sol_lun";
-            }
-          case Species.NIHILEGO:
-          case Species.PHEROMOSA:
-          case Species.BUZZWOLE:
-          case Species.XURKITREE:
-          case Species.CELESTEELA:
-          case Species.GUZZLORD:
-          case Species.POIPOLE:
-          case Species.NAGANADEL:
-          case Species.STAKATAKA:
-          case Species.BLACEPHALON:
-            return "battle_legendary_ub";
-          case Species.ZACIAN:
-          case Species.ZAMAZENTA:
-            return "battle_legendary_zac_zam";
-          case Species.GLASTRIER:
-          case Species.SPECTRIER:
-            return "battle_legendary_glas_spec";
-          case Species.CALYREX:
-            if (pokemon.getFormKey() === "ice" || pokemon.getFormKey() === "shadow") {
-              return "battle_legendary_riders";
-            }
-            return "battle_legendary_calyrex";
-          case Species.GALAR_ARTICUNO:
-          case Species.GALAR_ZAPDOS:
-          case Species.GALAR_MOLTRES:
-            return "battle_legendary_birds_galar";
-          case Species.WO_CHIEN:
-          case Species.CHIEN_PAO:
-          case Species.TING_LU:
-          case Species.CHI_YU:
-            return "battle_legendary_ruinous";
-          case Species.KORAIDON:
-          case Species.MIRAIDON:
-            return "battle_legendary_kor_mir";
-          case Species.OKIDOGI:
-          case Species.MUNKIDORI:
-          case Species.FEZANDIPITI:
-            return "battle_legendary_loyal_three";
-          case Species.OGERPON:
-            return "battle_legendary_ogerpon";
-          case Species.TERAPAGOS:
-            return "battle_legendary_terapagos";
-          case Species.PECHARUNT:
-            return "battle_legendary_pecharunt";
-          default:
-            if (pokemon.species.legendary) {
-              return "battle_legendary_res_zek";
-            }
-            return "battle_legendary_unova";
+            case Species.NECROZMA:
+              switch (pokemon.getFormKey()) {
+                case "dusk-mane":
+                case "dawn-wings":
+                  return "battle_legendary_dusk_dawn";
+                case "ultra":
+                  return "battle_legendary_ultra_nec";
+                default:
+                  return "battle_legendary_sol_lun";
+              }
+            case Species.NIHILEGO:
+            case Species.PHEROMOSA:
+            case Species.BUZZWOLE:
+            case Species.XURKITREE:
+            case Species.CELESTEELA:
+            case Species.GUZZLORD:
+            case Species.POIPOLE:
+            case Species.NAGANADEL:
+            case Species.STAKATAKA:
+            case Species.BLACEPHALON:
+              return "battle_legendary_ub";
+            case Species.ZACIAN:
+            case Species.ZAMAZENTA:
+              return "battle_legendary_zac_zam";
+            case Species.GLASTRIER:
+            case Species.SPECTRIER:
+              return "battle_legendary_glas_spec";
+            case Species.CALYREX:
+              if (pokemon.getFormKey() === "ice" || pokemon.getFormKey() === "shadow") {
+                return "battle_legendary_riders";
+              }
+              return "battle_legendary_calyrex";
+            case Species.GALAR_ARTICUNO:
+            case Species.GALAR_ZAPDOS:
+            case Species.GALAR_MOLTRES:
+              return "battle_legendary_birds_galar";
+            case Species.WO_CHIEN:
+            case Species.CHIEN_PAO:
+            case Species.TING_LU:
+            case Species.CHI_YU:
+              return "battle_legendary_ruinous";
+            case Species.KORAIDON:
+            case Species.MIRAIDON:
+              return "battle_legendary_kor_mir";
+            case Species.OKIDOGI:
+            case Species.MUNKIDORI:
+            case Species.FEZANDIPITI:
+              return "battle_legendary_loyal_three";
+            case Species.OGERPON:
+              return "battle_legendary_ogerpon";
+            case Species.TERAPAGOS:
+              return "battle_legendary_terapagos";
+            case Species.PECHARUNT:
+              return "battle_legendary_pecharunt";
+            default:
+              if (pokemon.species.legendary) {
+                return "battle_legendary_res_zek";
+              }
+              return "battle_legendary_unova";
           }
         }
       }