diff --git a/src/data/battle-anims.ts b/src/data/battle-anims.ts
index 0b40469b255..c446917d986 100644
--- a/src/data/battle-anims.ts
+++ b/src/data/battle-anims.ts
@@ -5,11 +5,11 @@ import type Pokemon from "../field/pokemon";
 import { type nil, getFrameMs, getEnumKeys, getEnumValues, animationFileName } from "../utils/common";
 import type { BattlerIndex } from "#enums/battler-index";
 import { MoveId } from "#enums/move-id";
-import { SubstituteTag } from "./battler-tags";
 import { isNullOrUndefined } from "../utils/common";
 import Phaser from "phaser";
 import { EncounterAnim } from "#enums/encounter-anims";
 import { AnimBlendType, AnimFrameTarget, AnimFocus, ChargeAnim, CommonAnim } from "#enums/move-anims-common";
+import { BattlerTagType } from "#enums/battler-tag-type";
 
 export class AnimConfig {
   public id: number;
@@ -770,7 +770,7 @@ export abstract class BattleAnim {
     const user = !isOppAnim ? this.user : this.target;
     const target = !isOppAnim ? this.target : this.user;
 
-    const targetSubstitute = onSubstitute && user !== target ? target!.getTag(SubstituteTag) : null;
+    const targetSubstitute = onSubstitute && user !== target ? target!.getTag(BattlerTagType.SUBSTITUTE) : null;
 
     const userInitialX = user!.x; // TODO: is this bang correct?
     const userInitialY = user!.y; // TODO: is this bang correct?
diff --git a/src/data/dialogue.ts b/src/data/dialogue.ts
index fa640e92b00..6bb96f0efb2 100644
--- a/src/data/dialogue.ts
+++ b/src/data/dialogue.ts
@@ -1723,49 +1723,6 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
   ],
 };
 
-export const doubleBattleDialogue = {
-  blue_red_double: {
-    encounter: ["doubleBattleDialogue:blue_red_double.encounter.1"],
-    victory: ["doubleBattleDialogue:blue_red_double.victory.1"],
-  },
-  red_blue_double: {
-    encounter: ["doubleBattleDialogue:red_blue_double.encounter.1"],
-    victory: ["doubleBattleDialogue:red_blue_double.victory.1"],
-  },
-  tate_liza_double: {
-    encounter: ["doubleBattleDialogue:tate_liza_double.encounter.1"],
-    victory: ["doubleBattleDialogue:tate_liza_double.victory.1"],
-  },
-  liza_tate_double: {
-    encounter: ["doubleBattleDialogue:liza_tate_double.encounter.1"],
-    victory: ["doubleBattleDialogue:liza_tate_double.victory.1"],
-  },
-  wallace_steven_double: {
-    encounter: ["doubleBattleDialogue:wallace_steven_double.encounter.1"],
-    victory: ["doubleBattleDialogue:wallace_steven_double.victory.1"],
-  },
-  steven_wallace_double: {
-    encounter: ["doubleBattleDialogue:steven_wallace_double.encounter.1"],
-    victory: ["doubleBattleDialogue:steven_wallace_double.victory.1"],
-  },
-  alder_iris_double: {
-    encounter: ["doubleBattleDialogue:alder_iris_double.encounter.1"],
-    victory: ["doubleBattleDialogue:alder_iris_double.victory.1"],
-  },
-  iris_alder_double: {
-    encounter: ["doubleBattleDialogue:iris_alder_double.encounter.1"],
-    victory: ["doubleBattleDialogue:iris_alder_double.victory.1"],
-  },
-  marnie_piers_double: {
-    encounter: ["doubleBattleDialogue:marnie_piers_double.encounter.1"],
-    victory: ["doubleBattleDialogue:marnie_piers_double.victory.1"],
-  },
-  piers_marnie_double: {
-    encounter: ["doubleBattleDialogue:piers_marnie_double.encounter.1"],
-    victory: ["doubleBattleDialogue:piers_marnie_double.victory.1"],
-  },
-};
-
 export const battleSpecDialogue = {
   [BattleSpec.FINAL_BOSS]: {
     encounter: "battleSpecDialogue:encounter",
diff --git a/src/data/double-battle-dialogue.ts b/src/data/double-battle-dialogue.ts
new file mode 100644
index 00000000000..f15b74e4729
--- /dev/null
+++ b/src/data/double-battle-dialogue.ts
@@ -0,0 +1,44 @@
+// TODO: Move this back into `dialogue.ts` after finding a suitable way to remove the circular dependencies
+// that caused this to be moved out in the first place
+export const doubleBattleDialogue = {
+  blue_red_double: {
+    encounter: ["doubleBattleDialogue:blue_red_double.encounter.1"],
+    victory: ["doubleBattleDialogue:blue_red_double.victory.1"],
+  },
+  red_blue_double: {
+    encounter: ["doubleBattleDialogue:red_blue_double.encounter.1"],
+    victory: ["doubleBattleDialogue:red_blue_double.victory.1"],
+  },
+  tate_liza_double: {
+    encounter: ["doubleBattleDialogue:tate_liza_double.encounter.1"],
+    victory: ["doubleBattleDialogue:tate_liza_double.victory.1"],
+  },
+  liza_tate_double: {
+    encounter: ["doubleBattleDialogue:liza_tate_double.encounter.1"],
+    victory: ["doubleBattleDialogue:liza_tate_double.victory.1"],
+  },
+  wallace_steven_double: {
+    encounter: ["doubleBattleDialogue:wallace_steven_double.encounter.1"],
+    victory: ["doubleBattleDialogue:wallace_steven_double.victory.1"],
+  },
+  steven_wallace_double: {
+    encounter: ["doubleBattleDialogue:steven_wallace_double.encounter.1"],
+    victory: ["doubleBattleDialogue:steven_wallace_double.victory.1"],
+  },
+  alder_iris_double: {
+    encounter: ["doubleBattleDialogue:alder_iris_double.encounter.1"],
+    victory: ["doubleBattleDialogue:alder_iris_double.victory.1"],
+  },
+  iris_alder_double: {
+    encounter: ["doubleBattleDialogue:iris_alder_double.encounter.1"],
+    victory: ["doubleBattleDialogue:iris_alder_double.victory.1"],
+  },
+  marnie_piers_double: {
+    encounter: ["doubleBattleDialogue:marnie_piers_double.encounter.1"],
+    victory: ["doubleBattleDialogue:marnie_piers_double.victory.1"],
+  },
+  piers_marnie_double: {
+    encounter: ["doubleBattleDialogue:piers_marnie_double.encounter.1"],
+    victory: ["doubleBattleDialogue:piers_marnie_double.victory.1"],
+  },
+};
diff --git a/src/data/trainers/trainer-config.ts b/src/data/trainers/trainer-config.ts
index 31c7631c6dd..8c065666202 100644
--- a/src/data/trainers/trainer-config.ts
+++ b/src/data/trainers/trainer-config.ts
@@ -5,7 +5,7 @@ import { toReadableString, isNullOrUndefined, randSeedItem, randSeedInt, randSee
 import { pokemonEvolutions, pokemonPrevolutions } from "#app/data/balance/pokemon-evolutions";
 import { getPokemonSpecies } from "#app/data/pokemon-species";
 import { tmSpecies } from "#app/data/balance/tms";
-import { doubleBattleDialogue } from "#app/data/dialogue";
+import { doubleBattleDialogue } from "../double-battle-dialogue";
 import { TrainerVariant } from "#enums/trainer-variant";
 import { getIsInitialized, initI18n } from "#app/plugins/i18n";
 import i18next from "i18next";
diff --git a/src/modifier/init-modifier-pools.ts b/src/modifier/init-modifier-pools.ts
index 7cc77a69ea2..2fdac392065 100644
--- a/src/modifier/init-modifier-pools.ts
+++ b/src/modifier/init-modifier-pools.ts
@@ -18,7 +18,7 @@ import { BerryType } from "#enums/berry-type";
 import { SpeciesId } from "#enums/species-id";
 import { timedEventManager } from "#app/global-event-manager";
 import { pokemonEvolutions } from "#app/data/balance/pokemon-evolutions";
-import { Unlockables } from "#app/system/unlockables";
+import { Unlockables } from "#enums/unlockables";
 import { isNullOrUndefined } from "#app/utils/common";
 import { MoveId } from "#enums/move-id";
 import { StatusEffect } from "#enums/status-effect";
diff --git a/src/modifier/init-modifier-types.ts b/src/modifier/init-modifier-types.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/overrides.ts b/src/overrides.ts
index 1fbca8e8de1..b5df1073c28 100644
--- a/src/overrides.ts
+++ b/src/overrides.ts
@@ -4,7 +4,7 @@ import { Gender } from "#app/data/gender";
 import { FormChangeItem } from "#enums/form-change-item";
 import { type ModifierOverride } from "#app/modifier/modifier-type";
 import { Variant } from "#app/sprites/variant";
-import { Unlockables } from "#app/system/unlockables";
+import { Unlockables } from "#enums/unlockables";
 import { AbilityId } from "#enums/ability-id";
 import { BattleType } from "#enums/battle-type";
 import { BerryType } from "#enums/berry-type";
diff --git a/src/phases/game-over-phase.ts b/src/phases/game-over-phase.ts
index 82c454e95f3..2cd8bf120b5 100644
--- a/src/phases/game-over-phase.ts
+++ b/src/phases/game-over-phase.ts
@@ -11,7 +11,7 @@ import { modifierTypes } from "#app/data/data-lists";
 import { BattlePhase } from "#app/phases/battle-phase";
 import type { EndCardPhase } from "#app/phases/end-card-phase";
 import { achvs, ChallengeAchv } from "#app/system/achv";
-import { Unlockables } from "#app/system/unlockables";
+import { Unlockables } from "#enums/unlockables";
 import { UiMode } from "#enums/ui-mode";
 import { isLocal, isLocalServerConnected } from "#app/utils/common";
 import { PlayerGender } from "#enums/player-gender";
diff --git a/src/phases/title-phase.ts b/src/phases/title-phase.ts
index 785e88dba27..5e36081b899 100644
--- a/src/phases/title-phase.ts
+++ b/src/phases/title-phase.ts
@@ -11,7 +11,7 @@ import { modifierTypes } from "#app/data/data-lists";
 import { ModifierPoolType } from "#enums/modifier-pool-type";
 import { Phase } from "#app/phase";
 import type { SessionSaveData } from "#app/system/game-data";
-import { Unlockables } from "#app/system/unlockables";
+import { Unlockables } from "#enums/unlockables";
 import { vouchers } from "#app/system/voucher";
 import type { OptionSelectConfig, OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler";
 import { SaveSlotUiMode } from "#app/ui/save-slot-select-ui-handler";
diff --git a/src/phases/unlock-phase.ts b/src/phases/unlock-phase.ts
index 839ac31dc5d..76719847f92 100644
--- a/src/phases/unlock-phase.ts
+++ b/src/phases/unlock-phase.ts
@@ -1,6 +1,6 @@
 import { globalScene } from "#app/global-scene";
 import { Phase } from "#app/phase";
-import type { Unlockables } from "#app/system/unlockables";
+import type { Unlockables } from "#enums/unlockables";
 import { getUnlockableName } from "#app/system/unlockables";
 import { UiMode } from "#enums/ui-mode";
 import i18next from "i18next";
diff --git a/src/system/game-data.ts b/src/system/game-data.ts
index 31c7ad7e41c..00b46b9e5f4 100644
--- a/src/system/game-data.ts
+++ b/src/system/game-data.ts
@@ -13,7 +13,7 @@ import Overrides from "#app/overrides";
 import PokemonData from "#app/system/pokemon-data";
 import PersistentModifierData from "#app/system/modifier-data";
 import ArenaData from "#app/system/arena-data";
-import { Unlockables } from "#app/system/unlockables";
+import { Unlockables } from "#enums/unlockables";
 import { getGameMode } from "#app/game-mode";
 import { GameModes } from "#enums/game-modes";
 import { BattleType } from "#enums/battle-type";
diff --git a/src/system/unlockables.ts b/src/system/unlockables.ts
index f64d4d33966..72588858eae 100644
--- a/src/system/unlockables.ts
+++ b/src/system/unlockables.ts
@@ -1,13 +1,7 @@
 import i18next from "i18next";
 import { GameMode } from "../game-mode";
 import { GameModes } from "#enums/game-modes";
-
-export enum Unlockables {
-  ENDLESS_MODE,
-  MINI_BLACK_HOLE,
-  SPLICED_ENDLESS_MODE,
-  EVIOLITE,
-}
+import { Unlockables } from "#enums/unlockables";
 
 export function getUnlockableName(unlockable: Unlockables) {
   switch (unlockable) {
diff --git a/test/phases/game-over-phase.test.ts b/test/phases/game-over-phase.test.ts
index c430223b774..d45330697fc 100644
--- a/test/phases/game-over-phase.test.ts
+++ b/test/phases/game-over-phase.test.ts
@@ -6,7 +6,7 @@ import GameManager from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { achvs } from "#app/system/achv";
-import { Unlockables } from "#app/system/unlockables";
+import { Unlockables } from "#enums/unlockables";
 
 describe("Game Over Phase", () => {
   let phaserGame: Phaser.Game;
diff --git a/test/testUtils/helpers/overridesHelper.ts b/test/testUtils/helpers/overridesHelper.ts
index 32219fa833c..c01acbe0f2e 100644
--- a/test/testUtils/helpers/overridesHelper.ts
+++ b/test/testUtils/helpers/overridesHelper.ts
@@ -4,7 +4,7 @@ import { AbilityId } from "#enums/ability-id";
 import type { ModifierOverride } from "#app/modifier/modifier-type";
 import type { BattleStyle } from "#app/overrides";
 import Overrides, { defaultOverrides } from "#app/overrides";
-import type { Unlockables } from "#app/system/unlockables";
+import type { Unlockables } from "#enums/unlockables";
 import { BiomeId } from "#enums/biome-id";
 import { MoveId } from "#enums/move-id";
 import type { MysteryEncounterTier } from "#enums/mystery-encounter-tier";