From f3854abc166bf4ec4137a26864b4726cc0290066 Mon Sep 17 00:00:00 2001
From: Bertie690 <136088738+Bertie690@users.noreply.github.com>
Date: Sun, 27 Jul 2025 16:16:04 -0400
Subject: [PATCH 01/44] [Test] Added custom equality matchers (#6157)

* Added rudimentary test matchers for `toEqualArrayUnsorted` and `toHaveTypes`

Might port the rest at a later date

* Actually run the effing setup matchers file + fixed ls lint to not be angy

* added dev dep

* Update .ls-lint.yml

* Update .ls-lint.yml

---------

Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Co-authored-by: Amani H. <109637146+xsn34kzx@users.noreply.github.com>
---
 .ls-lint.yml                                  |  4 +-
 package.json                                  |  1 +
 pnpm-lock.yaml                                |  3 +
 test/@types/vitest.d.ts                       | 26 ++++++++
 test/matchers.setup.ts                        | 14 ++++
 .../matchers/to-equal-array-unsorted.ts       | 43 +++++++++++++
 test/test-utils/matchers/to-have-types.ts     | 64 +++++++++++++++++++
 vitest.config.ts                              |  2 +-
 8 files changed, 154 insertions(+), 3 deletions(-)
 create mode 100644 test/@types/vitest.d.ts
 create mode 100644 test/matchers.setup.ts
 create mode 100644 test/test-utils/matchers/to-equal-array-unsorted.ts
 create mode 100644 test/test-utils/matchers/to-have-types.ts

diff --git a/.ls-lint.yml b/.ls-lint.yml
index 610218f8ed2..22f08f72938 100644
--- a/.ls-lint.yml
+++ b/.ls-lint.yml
@@ -11,14 +11,14 @@ _cfg: &cfg
 
 ls:
    <<: *cfg
-   src:
+   src: &src
       <<: *cfg
       .dir: kebab-case | regex:@types
       .js: exists:0
    src/system/version-migration/versions:
       .ts: snake_case
       <<: *cfg
-
+   test: *src
 ignore:
    - node_modules
    - .vscode
diff --git a/package.json b/package.json
index 9bba5e56f89..02d063389b7 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,7 @@
     "@types/jsdom": "^21.1.7",
     "@types/node": "^22.16.3",
     "@vitest/coverage-istanbul": "^3.2.4",
+    "@vitest/expect": "^3.2.4",
     "chalk": "^5.4.1",
     "dependency-cruiser": "^16.10.4",
     "inquirer": "^12.7.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e77bf065fd5..86a7bb904a1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -57,6 +57,9 @@ importers:
       '@vitest/coverage-istanbul':
         specifier: ^3.2.4
         version: 3.2.4(vitest@3.2.4(@types/node@22.16.3)(jsdom@26.1.0)(msw@2.10.4(@types/node@22.16.3)(typescript@5.8.3))(yaml@2.8.0))
+      '@vitest/expect':
+        specifier: ^3.2.4
+        version: 3.2.4
       chalk:
         specifier: ^5.4.1
         version: 5.4.1
diff --git a/test/@types/vitest.d.ts b/test/@types/vitest.d.ts
new file mode 100644
index 00000000000..3a0a0fec9cf
--- /dev/null
+++ b/test/@types/vitest.d.ts
@@ -0,0 +1,26 @@
+import type { Pokemon } from "#field/pokemon";
+import type { PokemonType } from "#enums/pokemon-type";
+import type { expect } from "vitest";
+import { toHaveTypesOptions } from "#test/test-utils/matchers/to-have-types";
+
+declare module "vitest" {
+  interface Assertion {
+    /**
+     * Matcher to check if an array contains EXACTLY the given items (in any order).
+     *
+     * Different from {@linkcode expect.arrayContaining} as the latter only requires the array contain
+     * _at least_ the listed items.
+     *
+     * @param expected - The expected contents of the array, in any order.
+     * @see {@linkcode expect.arrayContaining}
+     */
+    toEqualArrayUnsorted<E>(expected: E[]): void;
+    /**
+     * Matcher to check if a {@linkcode Pokemon}'s current typing includes the given types.
+     *
+     * @param expected - The expected types (in any order).
+     * @param options - The options passed to the matcher.
+     */
+    toHaveTypes(expected: PokemonType[], options?: toHaveTypesOptions): void;
+  }
+}
\ No newline at end of file
diff --git a/test/matchers.setup.ts b/test/matchers.setup.ts
new file mode 100644
index 00000000000..7fd5fcb463e
--- /dev/null
+++ b/test/matchers.setup.ts
@@ -0,0 +1,14 @@
+import { toEqualArrayUnsorted } from "#test/test-utils/matchers/to-equal-array-unsorted";
+import { toHaveTypes } from "#test/test-utils/matchers/to-have-types";
+import { expect } from "vitest";
+
+/**
+ * @module
+ * Setup file for custom matchers.
+ * Make sure to define the call signatures in `test/@types/vitest.d.ts` too!
+ */
+
+expect.extend({
+  toEqualArrayUnsorted,
+  toHaveTypes,
+});
diff --git a/test/test-utils/matchers/to-equal-array-unsorted.ts b/test/test-utils/matchers/to-equal-array-unsorted.ts
new file mode 100644
index 00000000000..0627623bbd9
--- /dev/null
+++ b/test/test-utils/matchers/to-equal-array-unsorted.ts
@@ -0,0 +1,43 @@
+import type { MatcherState, SyncExpectationResult } from "@vitest/expect";
+
+/**
+ * Matcher to check if an array contains exactly the given items, disregarding order.
+ * @param received - The object to check. Should be an array of elements.
+ * @returns The result of the matching
+ */
+export function toEqualArrayUnsorted(this: MatcherState, received: unknown, expected: unknown): SyncExpectationResult {
+  if (!Array.isArray(received)) {
+    return {
+      pass: this.isNot,
+      message: () => `Expected an array, but got ${this.utils.stringify(received)}!`,
+    };
+  }
+
+  if (!Array.isArray(expected)) {
+    return {
+      pass: this.isNot,
+      message: () => `Expected to recieve an array, but got ${this.utils.stringify(expected)}!`,
+    };
+  }
+
+  if (received.length !== expected.length) {
+    return {
+      pass: this.isNot,
+      message: () => `Expected to recieve array of length ${received.length}, but got ${expected.length}!`,
+      actual: received,
+      expected,
+    };
+  }
+
+  const gotSorted = received.slice().sort();
+  const wantSorted = expected.slice().sort();
+  const pass = this.equals(gotSorted, wantSorted, [...this.customTesters, this.utils.iterableEquality]);
+
+  return {
+    pass: this.isNot !== pass,
+    message: () =>
+      `Expected ${this.utils.stringify(received)} to exactly equal ${this.utils.stringify(expected)} without order!`,
+    actual: gotSorted,
+    expected: wantSorted,
+  };
+}
diff --git a/test/test-utils/matchers/to-have-types.ts b/test/test-utils/matchers/to-have-types.ts
new file mode 100644
index 00000000000..d09f4fc5f76
--- /dev/null
+++ b/test/test-utils/matchers/to-have-types.ts
@@ -0,0 +1,64 @@
+import { PokemonType } from "#enums/pokemon-type";
+import { Pokemon } from "#field/pokemon";
+import type { MatcherState, SyncExpectationResult } from "@vitest/expect";
+
+export interface toHaveTypesOptions {
+  /**
+   * Whether to enforce exact matches (`true`) or superset matches (`false`).
+   * @defaultValue `true`
+   */
+  exact?: boolean;
+  /**
+   * Optional arguments to pass to {@linkcode Pokemon.getTypes}.
+   */
+  args?: Parameters<(typeof Pokemon.prototype)["getTypes"]>;
+}
+
+/**
+ * Matcher to check if an array contains exactly the given items, disregarding order.
+ * @param received - The object to check. Should be an array of one or more {@linkcode PokemonType}s.
+ * @param options - The {@linkcode toHaveTypesOptions | options} for this matcher
+ * @returns The result of the matching
+ */
+export function toHaveTypes(
+  this: MatcherState,
+  received: unknown,
+  expected: unknown,
+  options: toHaveTypesOptions = {},
+): SyncExpectationResult {
+  if (!(received instanceof Pokemon)) {
+    return {
+      pass: this.isNot,
+      message: () => `Expected a Pokemon, but got ${this.utils.stringify(received)}!`,
+    };
+  }
+
+  if (!Array.isArray(expected) || expected.length === 0) {
+    return {
+      pass: this.isNot,
+      message: () => `Expected to recieve an array with length >=1, but got ${this.utils.stringify(expected)}!`,
+    };
+  }
+
+  if (!expected.every((t): t is PokemonType => t in PokemonType)) {
+    return {
+      pass: this.isNot,
+      message: () => `Expected to recieve array of PokemonTypes but got ${this.utils.stringify(expected)}!`,
+    };
+  }
+
+  const gotSorted = pkmnTypeToStr(received.getTypes(...(options.args ?? [])));
+  const wantSorted = pkmnTypeToStr(expected.slice());
+  const pass = this.equals(gotSorted, wantSorted, [...this.customTesters, this.utils.iterableEquality]);
+
+  return {
+    pass: this.isNot !== pass,
+    message: () => `Expected ${received.name} to have types ${this.utils.stringify(wantSorted)}, but got ${gotSorted}!`,
+    actual: gotSorted,
+    expected: wantSorted,
+  };
+}
+
+function pkmnTypeToStr(p: PokemonType[]): string[] {
+  return p.sort().map(type => PokemonType[type]);
+}
diff --git a/vitest.config.ts b/vitest.config.ts
index e788302857b..65c5427e591 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -9,7 +9,7 @@ export default defineProject(({ mode }) => ({
       TZ: "UTC",
     },
     testTimeout: 20000,
-    setupFiles: ["./test/font-face.setup.ts", "./test/vitest.setup.ts"],
+    setupFiles: ["./test/font-face.setup.ts", "./test/vitest.setup.ts", "./test/matchers.setup.ts"],
     sequence: {
       sequencer: MySequencer,
     },

From 7cb2c560abbba0b5c8dad79ef3bc349ccbfc4a55 Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Sun, 27 Jul 2025 13:32:47 -0700
Subject: [PATCH 02/44] [Misc] Fix import in `vitest.d.ts`

---
 test/@types/vitest.d.ts | 2 +-
 test/matchers.setup.ts  | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/test/@types/vitest.d.ts b/test/@types/vitest.d.ts
index 3a0a0fec9cf..58b36580727 100644
--- a/test/@types/vitest.d.ts
+++ b/test/@types/vitest.d.ts
@@ -1,7 +1,7 @@
 import type { Pokemon } from "#field/pokemon";
 import type { PokemonType } from "#enums/pokemon-type";
 import type { expect } from "vitest";
-import { toHaveTypesOptions } from "#test/test-utils/matchers/to-have-types";
+import type { toHaveTypesOptions } from "#test/test-utils/matchers/to-have-types";
 
 declare module "vitest" {
   interface Assertion {
diff --git a/test/matchers.setup.ts b/test/matchers.setup.ts
index 7fd5fcb463e..03d9dd342e4 100644
--- a/test/matchers.setup.ts
+++ b/test/matchers.setup.ts
@@ -2,8 +2,7 @@ import { toEqualArrayUnsorted } from "#test/test-utils/matchers/to-equal-array-u
 import { toHaveTypes } from "#test/test-utils/matchers/to-have-types";
 import { expect } from "vitest";
 
-/**
- * @module
+/*
  * Setup file for custom matchers.
  * Make sure to define the call signatures in `test/@types/vitest.d.ts` too!
  */

From 29d9bb6e7b554fa21403144f0c80b865c3af67c4 Mon Sep 17 00:00:00 2001
From: Bertie690 <136088738+Bertie690@users.noreply.github.com>
Date: Sun, 27 Jul 2025 16:42:57 -0400
Subject: [PATCH 03/44] [Dev] Turned on `checkJs` in TSConfig; fixed script
 type errors (#6115)

---
 biome.jsonc                        |  7 ++++---
 scripts/create-test/create-test.js | 24 +++++++++++++-----------
 tsconfig.json                      |  1 +
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/biome.jsonc b/biome.jsonc
index d4cb67d33a6..470885a543d 100644
--- a/biome.jsonc
+++ b/biome.jsonc
@@ -177,9 +177,10 @@
       }
     },
 
-    // Overrides to prevent unused import removal inside `overrides.ts` and enums files (for TSDoc linkcodes)
+    // Overrides to prevent unused import removal inside `overrides.ts` and enums files (for TSDoc linkcodes),
+    // as well as in all TS files in `scripts/` (which are assumed to be boilerplate templates).
     {
-      "includes": ["**/src/overrides.ts", "**/src/enums/**/*"],
+      "includes": ["**/src/overrides.ts", "**/src/enums/**/*", "**/scripts/**/*.ts"],
       "linter": {
         "rules": {
           "correctness": {
@@ -189,7 +190,7 @@
       }
     },
     {
-      "includes": ["**/src/overrides.ts"],
+      "includes": ["**/src/overrides.ts", "**/scripts/**/*.ts"],
       "linter": {
         "rules": {
           "style": {
diff --git a/scripts/create-test/create-test.js b/scripts/create-test/create-test.js
index f24aac548fc..c0f27f8891e 100644
--- a/scripts/create-test/create-test.js
+++ b/scripts/create-test/create-test.js
@@ -44,20 +44,22 @@ function getTestFolderPath(...folders) {
  * @returns {Promise<{selectedOption: {label: string, dir: string}}>} the selected type
  */
 async function promptTestType() {
-  const typeAnswer = await inquirer.prompt([
-    {
-      type: "list",
-      name: "selectedOption",
-      message: "What type of test would you like to create?",
-      choices: [...choices.map(choice => ({ name: choice.label, value: choice })), "EXIT"],
-    },
-  ]);
+  const typeAnswer = await inquirer
+    .prompt([
+      {
+        type: "list",
+        name: "selectedOption",
+        message: "What type of test would you like to create?",
+        choices: [...choices.map(choice => ({ name: choice.label, value: choice })), { name: "EXIT", value: "N/A" }],
+      },
+    ])
+    .then(ans => ans.selectedOption);
 
-  if (typeAnswer.selectedOption === "EXIT") {
+  if (typeAnswer.name === "EXIT") {
     console.log("Exiting...");
-    return process.exit();
+    return process.exit(0);
   }
-  if (!choices.some(choice => choice.dir === typeAnswer.selectedOption.dir)) {
+  if (!choices.some(choice => choice.dir === typeAnswer.dir)) {
     console.error(`Please provide a valid type: (${choices.map(choice => choice.label).join(", ")})!`);
     return await promptTestType();
   }
diff --git a/tsconfig.json b/tsconfig.json
index 8c53625ce55..1e067dcff03 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -18,6 +18,7 @@
     "esModuleInterop": true,
     "strictNullChecks": true,
     "sourceMap": false,
+    "checkJs": true,
     "strict": false, // TODO: Enable this eventually
     "rootDir": ".",
     "baseUrl": "./src",

From 19730f9cf0345ed54e13c606bca8313c2d1aa0de Mon Sep 17 00:00:00 2001
From: Bertie690 <136088738+Bertie690@users.noreply.github.com>
Date: Sun, 27 Jul 2025 16:59:03 -0400
Subject: [PATCH 04/44] [Misc] Moved + cleaned up string manipulation functions
 (#6112)

* Added string utility package to replace util functions

* Changed string manipulation functions fully over to `change-case`

* Fixed missing comma in package.json

trailing commas when :(

* fixed lockfile

* Hopefully re-added all the string utils

* fixed package json

* Fixed remaining cases of regex + code dupliation

* Fixed more bugs and errors

* Moved around functions and hopefully fixed the regex issues

* Minor renaming

* Fixed incorrect casing on setting strings

pascal snake case :skull:

* ran biome
---
 src/data/balance/egg-moves.ts                 |   4 +-
 src/data/battle-anims.ts                      |  15 +-
 src/data/challenge.ts                         |  99 +++-------
 src/data/dialogue.ts                          |   4 +-
 src/data/moves/move.ts                        |   5 +-
 .../mystery-encounters/mystery-encounter.ts   |   3 +-
 src/data/nature.ts                            |   4 +-
 src/data/pokemon-species.ts                   |  21 +-
 src/data/trainer-names.ts                     |   4 +-
 src/data/trainers/trainer-config.ts           |  14 +-
 src/field/trainer.ts                          |   7 +-
 src/plugins/i18n.ts                           |   8 +-
 src/system/game-data.ts                       |   4 +-
 src/ui/admin-ui-handler.ts                    |   6 +-
 src/ui/arena-flyout.ts                        |   7 +-
 src/ui/bgm-bar.ts                             |   4 +-
 src/ui/game-stats-ui-handler.ts               |   9 +-
 src/ui/party-ui-handler.ts                    |   5 +-
 src/ui/pokedex-page-ui-handler.ts             |  12 +-
 .../abstract-control-settings-ui-handler.ts   |  14 +-
 .../settings/settings-keyboard-ui-handler.ts  |   5 +-
 src/ui/starter-select-ui-handler.ts           |   4 +-
 src/ui/summary-ui-handler.ts                  |   6 +-
 src/utils/common.ts                           | 105 +---------
 src/utils/strings.ts                          | 179 ++++++++++++++++++
 test/setting-menu/helpers/in-game-manip.ts    |  14 +-
 test/setting-menu/helpers/menu-manip.ts       |   1 +
 test/test-utils/helpers/move-helper.ts        |  15 +-
 test/utils/strings.test.ts                    |  47 +++++
 29 files changed, 342 insertions(+), 283 deletions(-)
 create mode 100644 src/utils/strings.ts
 create mode 100644 test/utils/strings.test.ts

diff --git a/src/data/balance/egg-moves.ts b/src/data/balance/egg-moves.ts
index f5026abe2ef..3475fe4fdea 100644
--- a/src/data/balance/egg-moves.ts
+++ b/src/data/balance/egg-moves.ts
@@ -1,8 +1,8 @@
 import { allMoves } from "#data/data-lists";
 import { MoveId } from "#enums/move-id";
 import { SpeciesId } from "#enums/species-id";
-import { toReadableString } from "#utils/common";
 import { getEnumKeys, getEnumValues } from "#utils/enums";
+import { toTitleCase } from "#utils/strings";
 
 export const speciesEggMoves = {
   [SpeciesId.BULBASAUR]: [ MoveId.SAPPY_SEED, MoveId.MALIGNANT_CHAIN, MoveId.EARTH_POWER, MoveId.MATCHA_GOTCHA ],
@@ -617,7 +617,7 @@ function parseEggMoves(content: string): void {
     }
 
     if (eggMoves.every(m => m === MoveId.NONE)) {
-      console.warn(`Species ${toReadableString(SpeciesId[species])} could not be parsed, excluding from output...`)
+      console.warn(`Species ${toTitleCase(SpeciesId[species])} could not be parsed, excluding from output...`)
     } else {
       output += `[SpeciesId.${SpeciesId[species]}]: [ ${eggMoves.map(m => `MoveId.${MoveId[m]}`).join(", ")} ],\n`;
     }
diff --git a/src/data/battle-anims.ts b/src/data/battle-anims.ts
index 0dc8bf4850c..55a3cc4e916 100644
--- a/src/data/battle-anims.ts
+++ b/src/data/battle-anims.ts
@@ -7,8 +7,9 @@ import { AnimBlendType, AnimFocus, AnimFrameTarget, ChargeAnim, CommonAnim } fro
 import { MoveFlags } from "#enums/move-flags";
 import { MoveId } from "#enums/move-id";
 import type { Pokemon } from "#field/pokemon";
-import { animationFileName, coerceArray, getFrameMs, isNullOrUndefined, type nil } from "#utils/common";
+import { coerceArray, getFrameMs, isNullOrUndefined, type nil } from "#utils/common";
 import { getEnumKeys, getEnumValues } from "#utils/enums";
+import { toKebabCase } from "#utils/strings";
 import Phaser from "phaser";
 
 export class AnimConfig {
@@ -412,7 +413,7 @@ export function initCommonAnims(): Promise<void> {
       const commonAnimId = commonAnimIds[ca];
       commonAnimFetches.push(
         globalScene
-          .cachedFetch(`./battle-anims/common-${commonAnimNames[ca].toLowerCase().replace(/_/g, "-")}.json`)
+          .cachedFetch(`./battle-anims/common-${toKebabCase(commonAnimNames[ca])}.json`)
           .then(response => response.json())
           .then(cas => commonAnims.set(commonAnimId, new AnimConfig(cas))),
       );
@@ -450,7 +451,7 @@ export function initMoveAnim(move: MoveId): Promise<void> {
 
       const fetchAnimAndResolve = (move: MoveId) => {
         globalScene
-          .cachedFetch(`./battle-anims/${animationFileName(move)}.json`)
+          .cachedFetch(`./battle-anims/${toKebabCase(MoveId[move])}.json`)
           .then(response => {
             const contentType = response.headers.get("content-type");
             if (!response.ok || contentType?.indexOf("application/json") === -1) {
@@ -506,7 +507,7 @@ function useDefaultAnim(move: MoveId, defaultMoveAnim: MoveId) {
  * @remarks use {@linkcode useDefaultAnim} to use a default animation
  */
 function logMissingMoveAnim(move: MoveId, ...optionalParams: any[]) {
-  const moveName = animationFileName(move);
+  const moveName = toKebabCase(MoveId[move]);
   console.warn(`Could not load animation file for move '${moveName}'`, ...optionalParams);
 }
 
@@ -524,7 +525,7 @@ export async function initEncounterAnims(encounterAnim: EncounterAnim | Encounte
     }
     encounterAnimFetches.push(
       globalScene
-        .cachedFetch(`./battle-anims/encounter-${encounterAnimNames[anim].toLowerCase().replace(/_/g, "-")}.json`)
+        .cachedFetch(`./battle-anims/encounter-${toKebabCase(encounterAnimNames[anim])}.json`)
         .then(response => response.json())
         .then(cas => encounterAnims.set(anim, new AnimConfig(cas))),
     );
@@ -548,7 +549,7 @@ export function initMoveChargeAnim(chargeAnim: ChargeAnim): Promise<void> {
     } else {
       chargeAnims.set(chargeAnim, null);
       globalScene
-        .cachedFetch(`./battle-anims/${ChargeAnim[chargeAnim].toLowerCase().replace(/_/g, "-")}.json`)
+        .cachedFetch(`./battle-anims/${toKebabCase(ChargeAnim[chargeAnim])}.json`)
         .then(response => response.json())
         .then(ca => {
           if (Array.isArray(ca)) {
@@ -1405,7 +1406,9 @@ export async function populateAnims() {
   const chargeAnimIds = getEnumValues(ChargeAnim);
   const commonNamePattern = /name: (?:Common:)?(Opp )?(.*)/;
   const moveNameToId = {};
+  // Exclude MoveId.NONE;
   for (const move of getEnumValues(MoveId).slice(1)) {
+    // KARATE_CHOP => KARATECHOP
     const moveName = MoveId[move].toUpperCase().replace(/_/g, "");
     moveNameToId[moveName] = move;
   }
diff --git a/src/data/challenge.ts b/src/data/challenge.ts
index 938ee482d01..db4ec931bc2 100644
--- a/src/data/challenge.ts
+++ b/src/data/challenge.ts
@@ -27,6 +27,7 @@ import type { DexAttrProps, GameData } from "#system/game-data";
 import { BooleanHolder, type NumberHolder, randSeedItem } from "#utils/common";
 import { deepCopy } from "#utils/data";
 import { getPokemonSpecies } from "#utils/pokemon-utils";
+import { toCamelCase, toSnakeCase } from "#utils/strings";
 import i18next from "i18next";
 
 /** A constant for the default max cost of the starting party before a run */
@@ -67,14 +68,11 @@ export abstract class Challenge {
   }
 
   /**
-   * Gets the localisation key for the challenge
-   * @returns {@link string} The i18n key for this challenge
+   * Gets the localization key for the challenge
+   * @returns The i18n key for this challenge as camel case.
    */
   geti18nKey(): string {
-    return Challenges[this.id]
-      .split("_")
-      .map((f, i) => (i ? `${f[0]}${f.slice(1).toLowerCase()}` : f.toLowerCase()))
-      .join("");
+    return toCamelCase(Challenges[this.id]);
   }
 
   /**
@@ -105,23 +103,22 @@ export abstract class Challenge {
   }
 
   /**
-   * Returns the textual representation of a challenge's current value.
-   * @param overrideValue {@link number} The value to check for. If undefined, gets the current value.
-   * @returns {@link string} The localised name for the current value.
+   * Return the textual representation of a challenge's current value.
+   * @param overrideValue - The value to check for; default {@linkcode this.value}
+   * @returns The localised text for the current value.
    */
-  getValue(overrideValue?: number): string {
-    const value = overrideValue ?? this.value;
-    return i18next.t(`challenges:${this.geti18nKey()}.value.${value}`);
+  getValue(overrideValue: number = this.value): string {
+    return i18next.t(`challenges:${this.geti18nKey()}.value.${overrideValue}`);
   }
 
   /**
-   * Returns the description of a challenge's current value.
-   * @param overrideValue {@link number} The value to check for. If undefined, gets the current value.
-   * @returns {@link string} The localised description for the current value.
+   * Return the description of a challenge's current value.
+   * @param overrideValue - The value to check for; default {@linkcode this.value}
+   * @returns The localised description for the current value.
    */
-  getDescription(overrideValue?: number): string {
-    const value = overrideValue ?? this.value;
-    return `${i18next.t([`challenges:${this.geti18nKey()}.desc.${value}`, `challenges:${this.geti18nKey()}.desc`])}`;
+  // TODO: Do we need an override value here? it's currently unused
+  getDescription(overrideValue: number = this.value): string {
+    return `${i18next.t([`challenges:${this.geti18nKey()}.desc.${overrideValue}`, `challenges:${this.geti18nKey()}.desc`])}`;
   }
 
   /**
@@ -579,31 +576,19 @@ export class SingleGenerationChallenge extends Challenge {
     return this.value > 0 ? 1 : 0;
   }
 
-  /**
-   * Returns the textual representation of a challenge's current value.
-   * @param {value} overrideValue The value to check for. If undefined, gets the current value.
-   * @returns {string} The localised name for the current value.
-   */
-  getValue(overrideValue?: number): string {
-    const value = overrideValue ?? this.value;
-    if (value === 0) {
+  getValue(overrideValue: number = this.value): string {
+    if (overrideValue === 0) {
       return i18next.t("settings:off");
     }
-    return i18next.t(`starterSelectUiHandler:gen${value}`);
+    return i18next.t(`starterSelectUiHandler:gen${overrideValue}`);
   }
 
-  /**
-   * Returns the description of a challenge's current value.
-   * @param {value} overrideValue The value to check for. If undefined, gets the current value.
-   * @returns {string} The localised description for the current value.
-   */
-  getDescription(overrideValue?: number): string {
-    const value = overrideValue ?? this.value;
-    if (value === 0) {
+  getDescription(overrideValue: number = this.value): string {
+    if (overrideValue === 0) {
       return i18next.t("challenges:singleGeneration.desc_default");
     }
     return i18next.t("challenges:singleGeneration.desc", {
-      gen: i18next.t(`challenges:singleGeneration.gen_${value}`),
+      gen: i18next.t(`challenges:singleGeneration.gen_${overrideValue}`),
     });
   }
 
@@ -671,29 +656,13 @@ export class SingleTypeChallenge extends Challenge {
     return this.value > 0 ? 1 : 0;
   }
 
-  /**
-   * Returns the textual representation of a challenge's current value.
-   * @param {value} overrideValue The value to check for. If undefined, gets the current value.
-   * @returns {string} The localised name for the current value.
-   */
-  getValue(overrideValue?: number): string {
-    if (overrideValue === undefined) {
-      overrideValue = this.value;
-    }
-    return PokemonType[this.value - 1].toLowerCase();
+  getValue(overrideValue: number = this.value): string {
+    return toSnakeCase(PokemonType[overrideValue - 1]);
   }
 
-  /**
-   * Returns the description of a challenge's current value.
-   * @param {value} overrideValue The value to check for. If undefined, gets the current value.
-   * @returns {string} The localised description for the current value.
-   */
-  getDescription(overrideValue?: number): string {
-    if (overrideValue === undefined) {
-      overrideValue = this.value;
-    }
-    const type = i18next.t(`pokemonInfo:Type.${PokemonType[this.value - 1]}`);
-    const typeColor = `[color=${TypeColor[PokemonType[this.value - 1]]}][shadow=${TypeShadow[PokemonType[this.value - 1]]}]${type}[/shadow][/color]`;
+  getDescription(overrideValue: number = this.value): string {
+    const type = i18next.t(`pokemonInfo:Type.${PokemonType[overrideValue - 1]}`);
+    const typeColor = `[color=${TypeColor[PokemonType[overrideValue - 1]]}][shadow=${TypeShadow[PokemonType[this.value - 1]]}]${type}[/shadow][/color]`;
     const defaultDesc = i18next.t("challenges:singleType.desc_default");
     const typeDesc = i18next.t("challenges:singleType.desc", {
       type: typeColor,
@@ -832,13 +801,7 @@ export class LowerStarterMaxCostChallenge extends Challenge {
     super(Challenges.LOWER_MAX_STARTER_COST, 9);
   }
 
-  /**
-   * @override
-   */
-  getValue(overrideValue?: number): string {
-    if (overrideValue === undefined) {
-      overrideValue = this.value;
-    }
+  getValue(overrideValue: number = this.value): string {
     return (DEFAULT_PARTY_MAX_COST - overrideValue).toString();
   }
 
@@ -866,13 +829,7 @@ export class LowerStarterPointsChallenge extends Challenge {
     super(Challenges.LOWER_STARTER_POINTS, 9);
   }
 
-  /**
-   * @override
-   */
-  getValue(overrideValue?: number): string {
-    if (overrideValue === undefined) {
-      overrideValue = this.value;
-    }
+  getValue(overrideValue: number = this.value): string {
     return (DEFAULT_PARTY_MAX_COST - overrideValue).toString();
   }
 
diff --git a/src/data/dialogue.ts b/src/data/dialogue.ts
index 406e72ee82b..361d005e83b 100644
--- a/src/data/dialogue.ts
+++ b/src/data/dialogue.ts
@@ -1,6 +1,7 @@
 import { BattleSpec } from "#enums/battle-spec";
 import { TrainerType } from "#enums/trainer-type";
 import { trainerConfigs } from "#trainers/trainer-config";
+import { capitalizeFirstLetter } from "#utils/strings";
 
 export interface TrainerTypeMessages {
   encounter?: string | string[];
@@ -1755,8 +1756,7 @@ export function initTrainerTypeDialogue(): void {
           trainerConfigs[trainerType][`${messageType}Messages`] = messages[0][messageType];
         }
         if (messages.length > 1) {
-          trainerConfigs[trainerType][`female${messageType.slice(0, 1).toUpperCase()}${messageType.slice(1)}Messages`] =
-            messages[1][messageType];
+          trainerConfigs[trainerType][`female${capitalizeFirstLetter(messageType)}Messages`] = messages[1][messageType];
         }
       } else {
         trainerConfigs[trainerType][`${messageType}Messages`] = messages[messageType];
diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts
index 779f2d4fc76..965ab23a692 100644
--- a/src/data/moves/move.ts
+++ b/src/data/moves/move.ts
@@ -87,8 +87,9 @@ import type { AttackMoveResult } from "#types/attack-move-result";
 import type { Localizable } from "#types/locales";
 import type { ChargingMove, MoveAttrMap, MoveAttrString, MoveClassMap, MoveKindString } from "#types/move-types";
 import type { TurnMove } from "#types/turn-move";
-import { BooleanHolder, type Constructor, isNullOrUndefined, NumberHolder, randSeedFloat, randSeedInt, randSeedItem, toDmgValue, toReadableString } from "#utils/common";
+import { BooleanHolder, type Constructor, isNullOrUndefined, NumberHolder, randSeedFloat, randSeedInt, randSeedItem, toDmgValue } from "#utils/common";
 import { getEnumValues } from "#utils/enums";
+import { toTitleCase } from "#utils/strings";
 import i18next from "i18next";
 
 /**
@@ -8137,7 +8138,7 @@ export class ResistLastMoveTypeAttr extends MoveEffectAttr {
     }
     const type = validTypes[user.randBattleSeedInt(validTypes.length)];
     user.summonData.types = [ type ];
-    globalScene.phaseManager.queueMessage(i18next.t("battle:transformedIntoType", { pokemonName: getPokemonNameWithAffix(user), type: toReadableString(PokemonType[type]) }));
+    globalScene.phaseManager.queueMessage(i18next.t("battle:transformedIntoType", { pokemonName: getPokemonNameWithAffix(user), type: toTitleCase(PokemonType[type]) }));
     user.updateInfo();
 
     return true;
diff --git a/src/data/mystery-encounters/mystery-encounter.ts b/src/data/mystery-encounters/mystery-encounter.ts
index a2ca2b20ce7..47dfe58cace 100644
--- a/src/data/mystery-encounters/mystery-encounter.ts
+++ b/src/data/mystery-encounters/mystery-encounter.ts
@@ -25,7 +25,8 @@ import {
   StatusEffectRequirement,
   WaveRangeRequirement,
 } from "#mystery-encounters/mystery-encounter-requirements";
-import { capitalizeFirstLetter, coerceArray, isNullOrUndefined, randSeedInt } from "#utils/common";
+import { coerceArray, isNullOrUndefined, randSeedInt } from "#utils/common";
+import { capitalizeFirstLetter } from "#utils/strings";
 
 export interface EncounterStartOfBattleEffect {
   sourcePokemon?: Pokemon;
diff --git a/src/data/nature.ts b/src/data/nature.ts
index 41764ec4276..b085faebb80 100644
--- a/src/data/nature.ts
+++ b/src/data/nature.ts
@@ -3,7 +3,7 @@ import { EFFECTIVE_STATS, getShortenedStatKey, Stat } from "#enums/stat";
 import { TextStyle } from "#enums/text-style";
 import { UiTheme } from "#enums/ui-theme";
 import { getBBCodeFrag } from "#ui/text";
-import { toReadableString } from "#utils/common";
+import { toTitleCase } from "#utils/strings";
 import i18next from "i18next";
 
 export function getNatureName(
@@ -13,7 +13,7 @@ export function getNatureName(
   ignoreBBCode = false,
   uiTheme: UiTheme = UiTheme.DEFAULT,
 ): string {
-  let ret = toReadableString(Nature[nature]);
+  let ret = toTitleCase(Nature[nature]);
   //Translating nature
   if (i18next.exists(`nature:${ret}`)) {
     ret = i18next.t(`nature:${ret}` as any);
diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts
index 4e1c01642cb..dfaa6425ef1 100644
--- a/src/data/pokemon-species.ts
+++ b/src/data/pokemon-species.ts
@@ -29,15 +29,9 @@ import type { Variant, VariantSet } from "#sprites/variant";
 import { populateVariantColorCache, variantColorCache, variantData } from "#sprites/variant";
 import type { StarterMoveset } from "#system/game-data";
 import type { Localizable } from "#types/locales";
-import {
-  capitalizeString,
-  isNullOrUndefined,
-  randSeedFloat,
-  randSeedGauss,
-  randSeedInt,
-  randSeedItem,
-} from "#utils/common";
+import { isNullOrUndefined, randSeedFloat, randSeedGauss, randSeedInt, randSeedItem } from "#utils/common";
 import { getPokemonSpecies } from "#utils/pokemon-utils";
+import { toCamelCase, toPascalCase } from "#utils/strings";
 import { argbFromRgba, QuantizerCelebi, rgbaFromArgb } from "@material/material-color-utilities";
 import i18next from "i18next";
 
@@ -91,6 +85,7 @@ export function getPokemonSpeciesForm(species: SpeciesId, formIndex: number): Po
   return retSpecies;
 }
 
+// TODO: Clean this up and seriously review alternate means of fusion naming
 export function getFusedSpeciesName(speciesAName: string, speciesBName: string): string {
   const fragAPattern = /([a-z]{2}.*?[aeiou(?:y$)\-']+)(.*?)$/i;
   const fragBPattern = /([a-z]{2}.*?[aeiou(?:y$)\-'])(.*?)$/i;
@@ -904,14 +899,14 @@ export class PokemonSpecies extends PokemonSpeciesForm implements Localizable {
    * @returns the pokemon-form locale key for the single form name ("Alolan Form", "Eternal Flower" etc)
    */
   getFormNameToDisplay(formIndex = 0, append = false): string {
-    const formKey = this.forms?.[formIndex!]?.formKey;
-    const formText = capitalizeString(formKey, "-", false, false) || "";
-    const speciesName = capitalizeString(SpeciesId[this.speciesId], "_", true, false);
+    const formKey = this.forms[formIndex]?.formKey ?? "";
+    const formText = toPascalCase(formKey);
+    const speciesName = toCamelCase(SpeciesId[this.speciesId]);
     let ret = "";
 
     const region = this.getRegion();
     if (this.speciesId === SpeciesId.ARCEUS) {
-      ret = i18next.t(`pokemonInfo:Type.${formText?.toUpperCase()}`);
+      ret = i18next.t(`pokemonInfo:Type.${formText.toUpperCase()}`);
     } else if (
       [
         SpeciesFormKey.MEGA,
@@ -937,7 +932,7 @@ export class PokemonSpecies extends PokemonSpeciesForm implements Localizable {
       if (i18next.exists(i18key)) {
         ret = i18next.t(i18key);
       } else {
-        const rootSpeciesName = capitalizeString(SpeciesId[this.getRootSpeciesId()], "_", true, false);
+        const rootSpeciesName = toCamelCase(SpeciesId[this.getRootSpeciesId()]);
         const i18RootKey = `pokemonForm:${rootSpeciesName}${formText}`;
         ret = i18next.exists(i18RootKey) ? i18next.t(i18RootKey) : formText;
       }
diff --git a/src/data/trainer-names.ts b/src/data/trainer-names.ts
index 6b882d1ddc1..8eafd9f6404 100644
--- a/src/data/trainer-names.ts
+++ b/src/data/trainer-names.ts
@@ -1,12 +1,12 @@
 import { TrainerType } from "#enums/trainer-type";
-import { toReadableString } from "#utils/common";
+import { toPascalSnakeCase } from "#utils/strings";
 
 class TrainerNameConfig {
   public urls: string[];
   public femaleUrls: string[] | null;
 
   constructor(type: TrainerType, ...urls: string[]) {
-    this.urls = urls.length ? urls : [toReadableString(TrainerType[type]).replace(/ /g, "_")];
+    this.urls = urls.length ? urls : [toPascalSnakeCase(TrainerType[type])];
   }
 
   hasGenderVariant(...femaleUrls: string[]): TrainerNameConfig {
diff --git a/src/data/trainers/trainer-config.ts b/src/data/trainers/trainer-config.ts
index 4e88399bec3..6b3fcf70f80 100644
--- a/src/data/trainers/trainer-config.ts
+++ b/src/data/trainers/trainer-config.ts
@@ -41,15 +41,9 @@ import type {
   TrainerConfigs,
   TrainerTierPools,
 } from "#types/trainer-funcs";
-import {
-  coerceArray,
-  isNullOrUndefined,
-  randSeedInt,
-  randSeedIntRange,
-  randSeedItem,
-  toReadableString,
-} from "#utils/common";
+import { coerceArray, isNullOrUndefined, randSeedInt, randSeedIntRange, randSeedItem } from "#utils/common";
 import { getPokemonSpecies } from "#utils/pokemon-utils";
+import { toSnakeCase, toTitleCase } from "#utils/strings";
 import i18next from "i18next";
 
 /** Minimum BST for Pokemon generated onto the Elite Four's teams */
@@ -140,7 +134,7 @@ export class TrainerConfig {
   constructor(trainerType: TrainerType, allowLegendaries?: boolean) {
     this.trainerType = trainerType;
     this.trainerAI = new TrainerAI();
-    this.name = toReadableString(TrainerType[this.getDerivedType()]);
+    this.name = toTitleCase(TrainerType[this.getDerivedType()]);
     this.battleBgm = "battle_trainer";
     this.mixedBattleBgm = "battle_trainer";
     this.victoryBgm = "victory_trainer";
@@ -734,7 +728,7 @@ export class TrainerConfig {
     }
 
     // Localize the trainer's name by converting it to lowercase and replacing spaces with underscores.
-    const nameForCall = this.name.toLowerCase().replace(/\s/g, "_");
+    const nameForCall = toSnakeCase(this.name);
     this.name = i18next.t(`trainerNames:${nameForCall}`);
 
     // Set the title to "elite_four". (this is the key in the i18n file)
diff --git a/src/field/trainer.ts b/src/field/trainer.ts
index 7186cc4e928..a8af298e1cf 100644
--- a/src/field/trainer.ts
+++ b/src/field/trainer.ts
@@ -23,6 +23,7 @@ import {
 } from "#trainers/trainer-party-template";
 import { randSeedInt, randSeedItem, randSeedWeightedItem } from "#utils/common";
 import { getPokemonSpecies } from "#utils/pokemon-utils";
+import { toSnakeCase } from "#utils/strings";
 import i18next from "i18next";
 
 export class Trainer extends Phaser.GameObjects.Container {
@@ -170,7 +171,7 @@ export class Trainer extends Phaser.GameObjects.Container {
     const evilTeamTitles = ["grunt"];
     if (this.name === "" && evilTeamTitles.some(t => name.toLocaleLowerCase().includes(t))) {
       // This is a evil team grunt so we localize it by only using the "name" as the title
-      title = i18next.t(`trainerClasses:${name.toLowerCase().replace(/\s/g, "_")}`);
+      title = i18next.t(`trainerClasses:${toSnakeCase(name)}`);
       console.log("Localized grunt name: " + title);
       // Since grunts are not named we can just return the title
       return title;
@@ -187,7 +188,7 @@ export class Trainer extends Phaser.GameObjects.Container {
         }
         // Get the localized trainer class name from the i18n file and set it as the title.
         // This is used for trainer class names, not titles like "Elite Four, Champion, etc."
-        title = i18next.t(`trainerClasses:${name.toLowerCase().replace(/\s/g, "_")}`);
+        title = i18next.t(`trainerClasses:${toSnakeCase(name)}`);
       }
 
       // If no specific trainer slot is set.
@@ -208,7 +209,7 @@ export class Trainer extends Phaser.GameObjects.Container {
 
     if (this.config.titleDouble && this.variant === TrainerVariant.DOUBLE && !this.config.doubleOnly) {
       title = this.config.titleDouble;
-      name = i18next.t(`trainerNames:${this.config.nameDouble.toLowerCase().replace(/\s/g, "_")}`);
+      name = i18next.t(`trainerNames:${toSnakeCase(this.config.nameDouble)}`);
     }
 
     console.log(title ? `${title} ${name}` : name);
diff --git a/src/plugins/i18n.ts b/src/plugins/i18n.ts
index 4ee4aa730fb..89946b2691b 100644
--- a/src/plugins/i18n.ts
+++ b/src/plugins/i18n.ts
@@ -1,5 +1,5 @@
 import pkg from "#package.json";
-import { camelCaseToKebabCase } from "#utils/common";
+import { toKebabCase } from "#utils/strings";
 import i18next from "i18next";
 import LanguageDetector from "i18next-browser-languagedetector";
 import HttpBackend from "i18next-http-backend";
@@ -194,14 +194,16 @@ export async function initI18n(): Promise<void> {
     ],
     backend: {
       loadPath(lng: string, [ns]: string[]) {
+        // Use namespace maps where required
         let fileName: string;
         if (namespaceMap[ns]) {
           fileName = namespaceMap[ns];
         } else if (ns.startsWith("mysteryEncounters/")) {
-          fileName = camelCaseToKebabCase(ns + "Dialogue");
+          fileName = toKebabCase(ns + "-dialogue"); // mystery-encounters/a-trainers-test-dialogue
         } else {
-          fileName = camelCaseToKebabCase(ns);
+          fileName = toKebabCase(ns);
         }
+        // ex: "./locales/en/move-anims"
         return `./locales/${lng}/${fileName}.json?v=${pkg.version}`;
       },
     },
diff --git a/src/system/game-data.ts b/src/system/game-data.ts
index c52a5155fb4..b148ed4e2ba 100644
--- a/src/system/game-data.ts
+++ b/src/system/game-data.ts
@@ -1454,11 +1454,10 @@ export class GameData {
 
       reader.onload = (_ => {
         return e => {
-          let dataName: string;
+          let dataName = GameDataType[dataType].toLowerCase();
           let dataStr = AES.decrypt(e.target?.result?.toString()!, saveKey).toString(enc.Utf8); // TODO: is this bang correct?
           let valid = false;
           try {
-            dataName = GameDataType[dataType].toLowerCase();
             switch (dataType) {
               case GameDataType.SYSTEM: {
                 dataStr = this.convertSystemDataStr(dataStr);
@@ -1493,7 +1492,6 @@ export class GameData {
 
           const displayError = (error: string) =>
             globalScene.ui.showText(error, null, () => globalScene.ui.showText("", 0), fixedInt(1500));
-          dataName = dataName!; // tell TS compiler that dataName is defined!
 
           if (!valid) {
             return globalScene.ui.showText(
diff --git a/src/ui/admin-ui-handler.ts b/src/ui/admin-ui-handler.ts
index f136aeb5008..e577368363d 100644
--- a/src/ui/admin-ui-handler.ts
+++ b/src/ui/admin-ui-handler.ts
@@ -6,7 +6,7 @@ import { UiMode } from "#enums/ui-mode";
 import type { InputFieldConfig } from "#ui/form-modal-ui-handler";
 import { FormModalUiHandler } from "#ui/form-modal-ui-handler";
 import type { ModalConfig } from "#ui/modal-ui-handler";
-import { formatText } from "#utils/common";
+import { toTitleCase } from "#utils/strings";
 
 type AdminUiHandlerService = "discord" | "google";
 type AdminUiHandlerServiceMode = "Link" | "Unlink";
@@ -21,9 +21,9 @@ export class AdminUiHandler extends FormModalUiHandler {
   private readonly httpUserNotFoundErrorCode: number = 404;
   private readonly ERR_REQUIRED_FIELD = (field: string) => {
     if (field === "username") {
-      return `${formatText(field)} is required`;
+      return `${toTitleCase(field)} is required`;
     }
-    return `${formatText(field)} Id is required`;
+    return `${toTitleCase(field)} Id is required`;
   };
   // returns a string saying whether a username has been successfully linked/unlinked to discord/google
   private readonly SUCCESS_SERVICE_MODE = (service: string, mode: string) => {
diff --git a/src/ui/arena-flyout.ts b/src/ui/arena-flyout.ts
index 9a674719202..d2a45646690 100644
--- a/src/ui/arena-flyout.ts
+++ b/src/ui/arena-flyout.ts
@@ -18,7 +18,8 @@ import { BattleSceneEventType } from "#events/battle-scene";
 import { addTextObject } from "#ui/text";
 import { TimeOfDayWidget } from "#ui/time-of-day-widget";
 import { addWindow, WindowVariant } from "#ui/ui-theme";
-import { fixedInt, formatText, toCamelCaseString } from "#utils/common";
+import { fixedInt } from "#utils/common";
+import { toCamelCase, toTitleCase } from "#utils/strings";
 import type { ParseKeys } from "i18next";
 import i18next from "i18next";
 
@@ -49,10 +50,10 @@ export function getFieldEffectText(arenaTagType: string): string {
   if (!arenaTagType || arenaTagType === ArenaTagType.NONE) {
     return arenaTagType;
   }
-  const effectName = toCamelCaseString(arenaTagType);
+  const effectName = toCamelCase(arenaTagType);
   const i18nKey = `arenaFlyout:${effectName}` as ParseKeys;
   const resultName = i18next.t(i18nKey);
-  return !resultName || resultName === i18nKey ? formatText(arenaTagType) : resultName;
+  return !resultName || resultName === i18nKey ? toTitleCase(arenaTagType) : resultName;
 }
 
 export class ArenaFlyout extends Phaser.GameObjects.Container {
diff --git a/src/ui/bgm-bar.ts b/src/ui/bgm-bar.ts
index fb50e444aa5..e2c6925ec30 100644
--- a/src/ui/bgm-bar.ts
+++ b/src/ui/bgm-bar.ts
@@ -1,7 +1,7 @@
 import { globalScene } from "#app/global-scene";
 import { TextStyle } from "#enums/text-style";
 import { addTextObject } from "#ui/text";
-import { formatText } from "#utils/common";
+import { toTitleCase } from "#utils/strings";
 import i18next from "i18next";
 
 const hiddenX = -150;
@@ -101,7 +101,7 @@ export class BgmBar extends Phaser.GameObjects.Container {
 
   getRealBgmName(bgmName: string): string {
     return i18next.t([`bgmName:${bgmName}`, "bgmName:missing_entries"], {
-      name: formatText(bgmName),
+      name: toTitleCase(bgmName),
     });
   }
 }
diff --git a/src/ui/game-stats-ui-handler.ts b/src/ui/game-stats-ui-handler.ts
index fa5cd0a989a..ed66230bed7 100644
--- a/src/ui/game-stats-ui-handler.ts
+++ b/src/ui/game-stats-ui-handler.ts
@@ -8,7 +8,8 @@ import type { GameData } from "#system/game-data";
 import { addTextObject } from "#ui/text";
 import { UiHandler } from "#ui/ui-handler";
 import { addWindow } from "#ui/ui-theme";
-import { formatFancyLargeNumber, getPlayTimeString, toReadableString } from "#utils/common";
+import { formatFancyLargeNumber, getPlayTimeString } from "#utils/common";
+import { toTitleCase } from "#utils/strings";
 import i18next from "i18next";
 import Phaser from "phaser";
 
@@ -502,11 +503,9 @@ export function initStatsKeys() {
         sourceFunc: gameData => gameData.gameStats[key].toString(),
       };
     }
-    if (!(displayStats[key] as DisplayStat).label_key) {
+    if (!displayStats[key].label_key) {
       const splittableKey = key.replace(/([a-z]{2,})([A-Z]{1}(?:[^A-Z]|$))/g, "$1_$2");
-      (displayStats[key] as DisplayStat).label_key = toReadableString(
-        `${splittableKey[0].toUpperCase()}${splittableKey.slice(1)}`,
-      );
+      displayStats[key].label_key = toTitleCase(splittableKey);
     }
   }
 }
diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts
index 2b29a564f9f..915cc76fd73 100644
--- a/src/ui/party-ui-handler.ts
+++ b/src/ui/party-ui-handler.ts
@@ -26,7 +26,8 @@ import { MoveInfoOverlay } from "#ui/move-info-overlay";
 import { PokemonIconAnimHandler, PokemonIconAnimMode } from "#ui/pokemon-icon-anim-handler";
 import { addBBCodeTextObject, addTextObject, getTextColor } from "#ui/text";
 import { addWindow } from "#ui/ui-theme";
-import { BooleanHolder, getLocalizedSpriteKey, randInt, toReadableString } from "#utils/common";
+import { BooleanHolder, getLocalizedSpriteKey, randInt } from "#utils/common";
+import { toTitleCase } from "#utils/strings";
 import i18next from "i18next";
 import type BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext";
 
@@ -1409,7 +1410,7 @@ export class PartyUiHandler extends MessageUiHandler {
               if (this.localizedOptions.includes(option)) {
                 optionName = i18next.t(`partyUiHandler:${PartyOption[option]}`);
               } else {
-                optionName = toReadableString(PartyOption[option]);
+                optionName = toTitleCase(PartyOption[option]);
               }
             }
             break;
diff --git a/src/ui/pokedex-page-ui-handler.ts b/src/ui/pokedex-page-ui-handler.ts
index b3eb8de0f50..49ce5b64d9f 100644
--- a/src/ui/pokedex-page-ui-handler.ts
+++ b/src/ui/pokedex-page-ui-handler.ts
@@ -54,16 +54,10 @@ import { PokedexInfoOverlay } from "#ui/pokedex-info-overlay";
 import { StatsContainer } from "#ui/stats-container";
 import { addBBCodeTextObject, addTextObject, getTextColor, getTextStyleOptions } from "#ui/text";
 import { addWindow } from "#ui/ui-theme";
-import {
-  BooleanHolder,
-  getLocalizedSpriteKey,
-  isNullOrUndefined,
-  padInt,
-  rgbHexToRgba,
-  toReadableString,
-} from "#utils/common";
+import { BooleanHolder, getLocalizedSpriteKey, isNullOrUndefined, padInt, rgbHexToRgba } from "#utils/common";
 import { getEnumValues } from "#utils/enums";
 import { getPokemonSpecies } from "#utils/pokemon-utils";
+import { toTitleCase } from "#utils/strings";
 import { argbFromRgba } from "@material/material-color-utilities";
 import i18next from "i18next";
 import type BBCodeText from "phaser3-rex-plugins/plugins/gameobjects/tagtext/bbcodetext/BBCodeText";
@@ -2620,7 +2614,7 @@ export class PokedexPageUiHandler extends MessageUiHandler {
 
       // Setting growth rate text
       if (isFormCaught) {
-        let growthReadable = toReadableString(GrowthRate[species.growthRate]);
+        let growthReadable = toTitleCase(GrowthRate[species.growthRate]);
         const growthAux = growthReadable.replace(" ", "_");
         if (i18next.exists("growth:" + growthAux)) {
           growthReadable = i18next.t(("growth:" + growthAux) as any);
diff --git a/src/ui/settings/abstract-control-settings-ui-handler.ts b/src/ui/settings/abstract-control-settings-ui-handler.ts
index 8f7de42e4db..ee9e990ee2a 100644
--- a/src/ui/settings/abstract-control-settings-ui-handler.ts
+++ b/src/ui/settings/abstract-control-settings-ui-handler.ts
@@ -10,6 +10,7 @@ import { ScrollBar } from "#ui/scroll-bar";
 import { addTextObject } from "#ui/text";
 import { UiHandler } from "#ui/ui-handler";
 import { addWindow } from "#ui/ui-theme";
+import { toCamelCase } from "#utils/strings";
 import i18next from "i18next";
 
 export interface InputsIcons {
@@ -88,12 +89,6 @@ export abstract class AbstractControlSettingsUiHandler extends UiHandler {
     return settings;
   }
 
-  private camelize(string: string): string {
-    return string
-      .replace(/(?:^\w|[A-Z]|\b\w)/g, (word, index) => (index === 0 ? word.toLowerCase() : word.toUpperCase()))
-      .replace(/\s+/g, "");
-  }
-
   /**
    * Setup UI elements.
    */
@@ -210,14 +205,15 @@ export abstract class AbstractControlSettingsUiHandler extends UiHandler {
 
       settingFiltered.forEach((setting, s) => {
         // Convert the setting key from format 'Key_Name' to 'Key name' for display.
-        const settingName = setting.replace(/_/g, " ");
+        // TODO: IDK if this can be followed by both an underscore and a space, so leaving it as a regex matching both for now
+        const i18nKey = toCamelCase(setting.replace(/Alt(_| )/, ""));
 
         // Create and add a text object for the setting name to the scene.
         const isLock = this.settingBlacklisted.includes(this.setting[setting]);
         const labelStyle = isLock ? TextStyle.SETTINGS_LOCKED : TextStyle.SETTINGS_LABEL;
+        const isAlt = setting.includes("Alt");
         let labelText: string;
-        const i18nKey = this.camelize(settingName.replace("Alt ", ""));
-        if (settingName.toLowerCase().includes("alt")) {
+        if (isAlt) {
           labelText = `${i18next.t(`settings:${i18nKey}`)}${i18next.t("settings:alt")}`;
         } else {
           labelText = i18next.t(`settings:${i18nKey}`);
diff --git a/src/ui/settings/settings-keyboard-ui-handler.ts b/src/ui/settings/settings-keyboard-ui-handler.ts
index ad4bf47f673..295a71abe36 100644
--- a/src/ui/settings/settings-keyboard-ui-handler.ts
+++ b/src/ui/settings/settings-keyboard-ui-handler.ts
@@ -15,7 +15,8 @@ import {
 import { AbstractControlSettingsUiHandler } from "#ui/abstract-control-settings-ui-handler";
 import { NavigationManager } from "#ui/navigation-menu";
 import { addTextObject } from "#ui/text";
-import { reverseValueToKeySetting, truncateString } from "#utils/common";
+import { truncateString } from "#utils/common";
+import { toPascalSnakeCase } from "#utils/strings";
 import i18next from "i18next";
 
 /**
@@ -101,7 +102,7 @@ export class SettingsKeyboardUiHandler extends AbstractControlSettingsUiHandler
     }
     const cursor = this.cursor + this.scrollCursor; // Calculate the absolute cursor position.
     const selection = this.settingLabels[cursor].text;
-    const key = reverseValueToKeySetting(selection);
+    const key = toPascalSnakeCase(selection);
     const settingName = SettingKeyboard[key];
     const activeConfig = this.getActiveConfig();
     const success = deleteBind(this.getActiveConfig(), settingName);
diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts
index 82e19d857c5..e8f9b5e1c38 100644
--- a/src/ui/starter-select-ui-handler.ts
+++ b/src/ui/starter-select-ui-handler.ts
@@ -69,10 +69,10 @@ import {
   padInt,
   randIntRange,
   rgbHexToRgba,
-  toReadableString,
 } from "#utils/common";
 import type { StarterPreferences } from "#utils/data";
 import { loadStarterPreferences, saveStarterPreferences } from "#utils/data";
+import { toTitleCase } from "#utils/strings";
 import { argbFromRgba } from "@material/material-color-utilities";
 import i18next from "i18next";
 import type { GameObjects } from "phaser";
@@ -3527,7 +3527,7 @@ export class StarterSelectUiHandler extends MessageUiHandler {
         this.pokemonLuckLabelText.setVisible(this.pokemonLuckText.visible);
 
         //Growth translate
-        let growthReadable = toReadableString(GrowthRate[species.growthRate]);
+        let growthReadable = toTitleCase(GrowthRate[species.growthRate]);
         const growthAux = growthReadable.replace(" ", "_");
         if (i18next.exists("growth:" + growthAux)) {
           growthReadable = i18next.t(("growth:" + growthAux) as any);
diff --git a/src/ui/summary-ui-handler.ts b/src/ui/summary-ui-handler.ts
index c5c714f0b34..b51bdfdb157 100644
--- a/src/ui/summary-ui-handler.ts
+++ b/src/ui/summary-ui-handler.ts
@@ -35,9 +35,9 @@ import {
   isNullOrUndefined,
   padInt,
   rgbHexToRgba,
-  toReadableString,
 } from "#utils/common";
 import { getEnumValues } from "#utils/enums";
+import { toTitleCase } from "#utils/strings";
 import { argbFromRgba } from "@material/material-color-utilities";
 import i18next from "i18next";
 
@@ -962,8 +962,8 @@ export class SummaryUiHandler extends UiHandler {
         this.passiveContainer?.descriptionText?.setVisible(false);
 
         const closeFragment = getBBCodeFrag("", TextStyle.WINDOW_ALT);
-        const rawNature = toReadableString(Nature[this.pokemon?.getNature()!]); // TODO: is this bang correct?
-        const nature = `${getBBCodeFrag(toReadableString(getNatureName(this.pokemon?.getNature()!)), TextStyle.SUMMARY_RED)}${closeFragment}`; // TODO: is this bang correct?
+        const rawNature = toTitleCase(Nature[this.pokemon?.getNature()!]); // TODO: is this bang correct?
+        const nature = `${getBBCodeFrag(toTitleCase(getNatureName(this.pokemon?.getNature()!)), TextStyle.SUMMARY_RED)}${closeFragment}`; // TODO: is this bang correct?
 
         const memoString = i18next.t("pokemonSummary:memoString", {
           metFragment: i18next.t(
diff --git a/src/utils/common.ts b/src/utils/common.ts
index e9ba3acb5e5..66a74ed2c33 100644
--- a/src/utils/common.ts
+++ b/src/utils/common.ts
@@ -1,6 +1,5 @@
 import { pokerogueApi } from "#api/pokerogue-api";
 import { MoneyFormat } from "#enums/money-format";
-import { MoveId } from "#enums/move-id";
 import type { Variant } from "#sprites/variant";
 import i18next from "i18next";
 
@@ -10,19 +9,6 @@ export const MissingTextureKey = "__MISSING";
 
 // TODO: Draft tests for these utility functions
 // TODO: Break up this file
-/**
- * Convert a `snake_case` string in any capitalization (such as one from an enum reverse mapping)
- * into a readable `Title Case` version.
- * @param str - The snake case string to be converted.
- * @returns The result of converting `str` into title case.
- */
-export function toReadableString(str: string): string {
-  return str
-    .replace(/_/g, " ")
-    .split(" ")
-    .map(s => capitalizeFirstLetter(s.toLowerCase()))
-    .join(" ");
-}
 
 export function randomString(length: number, seeded = false) {
   const characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
@@ -278,7 +264,7 @@ export function formatMoney(format: MoneyFormat, amount: number) {
 }
 
 export function formatStat(stat: number, forHp = false): string {
-  return formatLargeNumber(stat, forHp ? 100000 : 1000000);
+  return formatLargeNumber(stat, forHp ? 100_000 : 1_000_000);
 }
 
 export function executeIf<T>(condition: boolean, promiseFunc: () => Promise<T>): Promise<T | null> {
@@ -359,31 +345,6 @@ export function fixedInt(value: number): number {
   return new FixedInt(value) as unknown as number;
 }
 
-/**
- * Formats a string to title case
- * @param unformattedText Text to be formatted
- * @returns the formatted string
- */
-export function formatText(unformattedText: string): string {
-  const text = unformattedText.split("_");
-  for (let i = 0; i < text.length; i++) {
-    text[i] = text[i].charAt(0).toUpperCase() + text[i].substring(1).toLowerCase();
-  }
-
-  return text.join(" ");
-}
-
-export function toCamelCaseString(unformattedText: string): string {
-  if (!unformattedText) {
-    return "";
-  }
-  return unformattedText
-    .split(/[_ ]/)
-    .filter(f => f)
-    .map((f, i) => (i ? `${f[0].toUpperCase()}${f.slice(1).toLowerCase()}` : f.toLowerCase()))
-    .join("");
-}
-
 export function rgbToHsv(r: number, g: number, b: number) {
   const v = Math.max(r, g, b);
   const c = v - Math.min(r, g, b);
@@ -510,41 +471,6 @@ export function truncateString(str: string, maxLength = 10) {
   return str;
 }
 
-/**
- * Convert a space-separated string into a capitalized and underscored string.
- * @param input - The string to be converted.
- * @returns The converted string with words capitalized and separated by underscores.
- */
-export function reverseValueToKeySetting(input: string) {
-  // Split the input string into an array of words
-  const words = input.split(" ");
-  // Capitalize the first letter of each word and convert the rest to lowercase
-  const capitalizedWords = words.map((word: string) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase());
-  // Join the capitalized words with underscores and return the result
-  return capitalizedWords.join("_");
-}
-
-/**
- * Capitalize a string.
- * @param str - The string to be capitalized.
- * @param sep - The separator between the words of the string.
- * @param lowerFirstChar - Whether the first character of the string should be lowercase or not.
- * @param returnWithSpaces - Whether the returned string should have spaces between the words or not.
- * @returns The capitalized string.
- */
-export function capitalizeString(str: string, sep: string, lowerFirstChar = true, returnWithSpaces = false) {
-  if (str) {
-    const splitedStr = str.toLowerCase().split(sep);
-
-    for (let i = +lowerFirstChar; i < splitedStr?.length; i++) {
-      splitedStr[i] = splitedStr[i].charAt(0).toUpperCase() + splitedStr[i].substring(1);
-    }
-
-    return returnWithSpaces ? splitedStr.join(" ") : splitedStr.join("");
-  }
-  return null;
-}
-
 /**
  * Report whether a given value is nullish (`null`/`undefined`).
  * @param val - The value whose nullishness is being checked
@@ -554,15 +480,6 @@ export function isNullOrUndefined(val: any): val is null | undefined {
   return val === null || val === undefined;
 }
 
-/**
- * Capitalize the first letter of a string.
- * @param str - The string whose first letter is being capitalized
- * @return The original string with its first letter capitalized
- */
-export function capitalizeFirstLetter(str: string) {
-  return str.charAt(0).toUpperCase() + str.slice(1);
-}
-
 /**
  * This function is used in the context of a Pokémon battle game to calculate the actual integer damage value from a float result.
  * Many damage calculation formulas involve various parameters and result in float values.
@@ -597,26 +514,6 @@ export function isBetween(num: number, min: number, max: number): boolean {
   return min <= num && num <= max;
 }
 
-/**
- * Helper method to return the animation filename for a given move
- *
- * @param move the move for which the animation filename is needed
- */
-export function animationFileName(move: MoveId): string {
-  return MoveId[move].toLowerCase().replace(/_/g, "-");
-}
-
-/**
- * Transforms a camelCase string into a kebab-case string
- * @param str The camelCase string
- * @returns A kebab-case string
- *
- * @source {@link https://stackoverflow.com/a/67243723/}
- */
-export function camelCaseToKebabCase(str: string): string {
-  return str.replace(/[A-Z]+(?![a-z])|[A-Z]/g, (s, o) => (o ? "-" : "") + s.toLowerCase());
-}
-
 /** Get the localized shiny descriptor for the provided variant
  * @param variant - The variant to get the shiny descriptor for
  * @returns The localized shiny descriptor
diff --git a/src/utils/strings.ts b/src/utils/strings.ts
new file mode 100644
index 00000000000..dfa3d7c887f
--- /dev/null
+++ b/src/utils/strings.ts
@@ -0,0 +1,179 @@
+// TODO: Standardize file and path casing to remove the need for all these different casing methods
+
+// #region Split string code
+
+// Regexps involved with splitting words in various case formats.
+// Sourced from https://www.npmjs.com/package/change-case (with slight tweaking here and there)
+
+/** Regex to split at word boundaries.*/
+const SPLIT_LOWER_UPPER_RE = /([\p{Ll}\d])(\p{Lu})/gu;
+/** Regex to split around single-letter uppercase words.*/
+const SPLIT_UPPER_UPPER_RE = /(\p{Lu})([\p{Lu}][\p{Ll}])/gu;
+/** Regexp involved with stripping non-word delimiters from the result. */
+const DELIM_STRIP_REGEXP = /[-_ ]+/giu;
+// The replacement value for splits.
+const SPLIT_REPLACE_VALUE = "$1\0$2";
+
+/**
+ * Split any cased string into an array of its constituent words.
+ * @param string - The string to be split
+ * @returns The new string, delimited at each instance of one or more spaces, underscores, hyphens
+ * or lower-to-upper boundaries.
+ * @remarks
+ * **DO NOT USE THIS FUNCTION!**
+ * Exported only to allow for testing.
+ * @todo Consider tests into [in-source testing](https://vitest.dev/guide/in-source.html) and converting this to unexported
+ */
+export function splitWords(value: string): string[] {
+  let result = value.trim();
+  result = result.replace(SPLIT_LOWER_UPPER_RE, SPLIT_REPLACE_VALUE).replace(SPLIT_UPPER_UPPER_RE, SPLIT_REPLACE_VALUE);
+  result = result.replace(DELIM_STRIP_REGEXP, "\0");
+
+  // Trim the delimiter from around the output string
+  return trimFromStartAndEnd(result, "\0").split(/\0/g);
+}
+
+/**
+ * Helper function to remove one or more sequences of characters from either end of a string.
+ * @param str - The string to replace
+ * @param charToTrim - The string to remove
+ * @returns The result of removing all instances of {@linkcode charsToTrim} from either end of {@linkcode str}.
+ */
+function trimFromStartAndEnd(str: string, charToTrim: string): string {
+  let start = 0;
+  let end = str.length;
+  const blockLength = charToTrim.length;
+
+  while (str.startsWith(charToTrim, start)) {
+    start += blockLength;
+  }
+  if (start - end === blockLength) {
+    // Occurs if the ENTIRE string is made up of charToTrim (at which point we return nothing)
+    return "";
+  }
+  while (str.endsWith(charToTrim, end)) {
+    end -= blockLength;
+  }
+  return str.slice(start, end);
+}
+
+// #endregion Split String code
+
+/**
+ * Capitalize the first letter of a string.
+ * @param str - The string whose first letter is to be capitalized
+ * @return The original string with its first letter capitalized.
+ * @example
+ * ```ts
+ * console.log(capitalizeFirstLetter("consectetur adipiscing elit")); // returns "Consectetur adipiscing elit"
+ * ```
+ */
+export function capitalizeFirstLetter(str: string) {
+  return str.charAt(0).toUpperCase() + str.slice(1);
+}
+
+/**
+ * Helper method to convert a string into `Title Case` (such as one used for console logs).
+ * @param str - The string being converted
+ * @returns The result of converting `str` into title case.
+ * @example
+ * ```ts
+ * console.log(toTitleCase("lorem ipsum dolor sit amet")); // returns "Lorem Ipsum Dolor Sit Amet"
+ * ```
+ */
+export function toTitleCase(str: string): string {
+  return splitWords(str)
+    .map(word => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase())
+    .join(" ");
+}
+
+/**
+ * Helper method to convert a string into `camelCase` (such as one used for i18n keys).
+ * @param str - The string being converted
+ * @returns The result of converting `str` into camel case.
+ * @example
+ * ```ts
+ * console.log(toCamelCase("BIG_ANGRY_TRAINER")); // returns "bigAngryTrainer"
+ * ```
+ */
+export function toCamelCase(str: string) {
+  return splitWords(str)
+    .map((word, index) => (index === 0 ? word.toLowerCase() : capitalizeFirstLetter(word)))
+    .join("");
+}
+
+/**
+ * Helper method to convert a string into `PascalCase`.
+ * @param str - The string being converted
+ * @returns The result of converting `str` into pascal case.
+ * @example
+ * ```ts
+ * console.log(toPascalCase("hi how was your day")); // returns "HiHowWasYourDay"
+ * ```
+ * @remarks
+ */
+export function toPascalCase(str: string) {
+  return splitWords(str)
+    .map(word => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase())
+    .join("");
+}
+
+/**
+ * Helper method to convert a string into `kebab-case` (such as one used for filenames).
+ * @param str - The string being converted
+ * @returns The result of converting `str` into kebab case.
+ * @example
+ * ```ts
+ * console.log(toKebabCase("not_kebab-caSe String")); // returns "not-kebab-case-string"
+ * ```
+ */
+export function toKebabCase(str: string): string {
+  return splitWords(str)
+    .map(word => word.toLowerCase())
+    .join("-");
+}
+
+/**
+ * Helper method to convert a string into `snake_case` (such as one used for filenames).
+ * @param str - The string being converted
+ * @returns The result of converting `str` into snake case.
+ * @example
+ * ```ts
+ * console.log(toSnakeCase("not-in snake_CaSe")); // returns "not_in_snake_case"
+ * ```
+ */
+export function toSnakeCase(str: string) {
+  return splitWords(str)
+    .map(word => word.toLowerCase())
+    .join("_");
+}
+
+/**
+ * Helper method to convert a string into `UPPER_SNAKE_CASE`.
+ * @param str - The string being converted
+ * @returns The result of converting `str` into upper snake case.
+ * @example
+ * ```ts
+ * console.log(toUpperSnakeCase("apples bananas_oranGes-PearS")); // returns "APPLES_BANANAS_ORANGES_PEARS"
+ * ```
+ */
+export function toUpperSnakeCase(str: string) {
+  return splitWords(str)
+    .map(word => word.toUpperCase())
+    .join("_");
+}
+
+/**
+ * Helper method to convert a string into `Pascal_Snake_Case`.
+ * @param str - The string being converted
+ * @returns The result of converting `str` into pascal snake case.
+ * @example
+ * ```ts
+ * console.log(toPascalSnakeCase("apples-bananas_oranGes Pears")); // returns "Apples_Bananas_Oranges_Pears"
+ * ```
+ */
+export function toPascalSnakeCase(str: string) {
+  return splitWords(str)
+    .map(word => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase())
+    .join("_");
+}
diff --git a/test/setting-menu/helpers/in-game-manip.ts b/test/setting-menu/helpers/in-game-manip.ts
index acc119b2cc2..2f4350bab5c 100644
--- a/test/setting-menu/helpers/in-game-manip.ts
+++ b/test/setting-menu/helpers/in-game-manip.ts
@@ -1,5 +1,6 @@
 import { getIconForLatestInput, getSettingNameWithKeycode } from "#inputs/config-handler";
 import { SettingKeyboard } from "#system/settings-keyboard";
+import { toPascalSnakeCase } from "#utils/strings";
 import { expect } from "vitest";
 
 export class InGameManip {
@@ -56,22 +57,11 @@ export class InGameManip {
     return this;
   }
 
-  normalizeSettingNameString(input) {
-    // Convert the input string to lower case
-    const lowerCasedInput = input.toLowerCase();
-
-    // Replace underscores with spaces, capitalize the first letter of each word, and join them back with underscores
-    const words = lowerCasedInput.split("_").map(word => word.charAt(0).toUpperCase() + word.slice(1));
-    const result = words.join("_");
-
-    return result;
-  }
-
   weShouldTriggerTheButton(settingName) {
     if (!settingName.includes("Button_")) {
       settingName = "Button_" + settingName;
     }
-    this.settingName = SettingKeyboard[this.normalizeSettingNameString(settingName)];
+    this.settingName = SettingKeyboard[toPascalSnakeCase(settingName)];
     expect(getSettingNameWithKeycode(this.config, this.keycode)).toEqual(this.settingName);
     return this;
   }
diff --git a/test/setting-menu/helpers/menu-manip.ts b/test/setting-menu/helpers/menu-manip.ts
index 29e096608f1..276fef2f973 100644
--- a/test/setting-menu/helpers/menu-manip.ts
+++ b/test/setting-menu/helpers/menu-manip.ts
@@ -29,6 +29,7 @@ export class MenuManip {
     this.specialCaseIcon = null;
   }
 
+  // TODO: Review this
   convertNameToButtonString(input) {
     // Check if the input starts with "Alt_Button"
     if (input.startsWith("Alt_Button")) {
diff --git a/test/test-utils/helpers/move-helper.ts b/test/test-utils/helpers/move-helper.ts
index 4fa14b573ab..15605edf31d 100644
--- a/test/test-utils/helpers/move-helper.ts
+++ b/test/test-utils/helpers/move-helper.ts
@@ -12,7 +12,8 @@ import type { CommandPhase } from "#phases/command-phase";
 import type { EnemyCommandPhase } from "#phases/enemy-command-phase";
 import { MoveEffectPhase } from "#phases/move-effect-phase";
 import { GameManagerHelper } from "#test/test-utils/helpers/game-manager-helper";
-import { coerceArray, toReadableString } from "#utils/common";
+import { coerceArray } from "#utils/common";
+import { toTitleCase } from "#utils/strings";
 import type { MockInstance } from "vitest";
 import { expect, vi } from "vitest";
 
@@ -66,12 +67,12 @@ export class MoveHelper extends GameManagerHelper {
     const movePosition = this.getMovePosition(pkmIndex, move);
     if (movePosition === -1) {
       expect.fail(
-        `MoveHelper.select called with move '${toReadableString(MoveId[move])}' not in moveset!` +
-          `\nBattler Index: ${toReadableString(BattlerIndex[pkmIndex])}` +
+        `MoveHelper.select called with move '${toTitleCase(MoveId[move])}' not in moveset!` +
+          `\nBattler Index: ${toTitleCase(BattlerIndex[pkmIndex])}` +
           `\nMoveset: [${this.game.scene
             .getPlayerParty()
             [pkmIndex].getMoveset()
-            .map(pm => toReadableString(MoveId[pm.moveId]))
+            .map(pm => toTitleCase(MoveId[pm.moveId]))
             .join(", ")}]`,
       );
     }
@@ -110,12 +111,12 @@ export class MoveHelper extends GameManagerHelper {
     const movePosition = this.getMovePosition(pkmIndex, move);
     if (movePosition === -1) {
       expect.fail(
-        `MoveHelper.selectWithTera called with move '${toReadableString(MoveId[move])}' not in moveset!` +
-          `\nBattler Index: ${toReadableString(BattlerIndex[pkmIndex])}` +
+        `MoveHelper.selectWithTera called with move '${toTitleCase(MoveId[move])}' not in moveset!` +
+          `\nBattler Index: ${toTitleCase(BattlerIndex[pkmIndex])}` +
           `\nMoveset: [${this.game.scene
             .getPlayerParty()
             [pkmIndex].getMoveset()
-            .map(pm => toReadableString(MoveId[pm.moveId]))
+            .map(pm => toTitleCase(MoveId[pm.moveId]))
             .join(", ")}]`,
       );
     }
diff --git a/test/utils/strings.test.ts b/test/utils/strings.test.ts
new file mode 100644
index 00000000000..3d6eb235ba8
--- /dev/null
+++ b/test/utils/strings.test.ts
@@ -0,0 +1,47 @@
+import { splitWords } from "#utils/strings";
+import { describe, expect, it } from "vitest";
+
+interface testCase {
+  input: string;
+  words: string[];
+}
+
+const testCases: testCase[] = [
+  {
+    input: "Lorem ipsum dolor sit amet",
+    words: ["Lorem", "ipsum", "dolor", "sit", "amet"],
+  },
+  {
+    input: "consectetur-adipiscing-elit",
+    words: ["consectetur", "adipiscing", "elit"],
+  },
+  {
+    input: "sed_do_eiusmod_tempor_incididunt_ut_labore",
+    words: ["sed", "do", "eiusmod", "tempor", "incididunt", "ut", "labore"],
+  },
+  {
+    input: "Et Dolore Magna Aliqua",
+    words: ["Et", "Dolore", "Magna", "Aliqua"],
+  },
+  {
+    input: "BIG_ANGRY_TRAINER",
+    words: ["BIG", "ANGRY", "TRAINER"],
+  },
+  {
+    input: "ApplesBananasOrangesAndAPear",
+    words: ["Apples", "Bananas", "Oranges", "And", "A", "Pear"],
+  },
+  {
+    input: "mysteryEncounters/anOfferYouCantRefuse",
+    words: ["mystery", "Encounters/an", "Offer", "You", "Cant", "Refuse"],
+  },
+];
+
+describe("Utils - Casing -", () => {
+  describe("splitWords", () => {
+    it.each(testCases)("should split a string into its constituent words - $input", ({ input, words }) => {
+      const ret = splitWords(input);
+      expect(ret).toEqual(words);
+    });
+  });
+});

From c0e755c3c3344a0d9f703cf6b78b5e267d4d8e95 Mon Sep 17 00:00:00 2001
From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Date: Sun, 27 Jul 2025 19:01:44 -0600
Subject: [PATCH 05/44] [Refactor] Prevent serialization of full species in
 pokemon summon data

https://github.com/pagefaultgames/pokerogue/pull/6145

* Prevent serialization of entire species form in pokemon summon data

* Apply suggestions from code review

Co-authored-by: Bertie690 <136088738+Bertie690@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>

* Apply Kev's suggestions from code review

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>

---------

Co-authored-by: Bertie690 <136088738+Bertie690@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
---
 src/@types/type-helpers.ts       |  11 +++
 src/data/pokemon/pokemon-data.ts | 132 ++++++++++++++++++++++++++++++-
 2 files changed, 141 insertions(+), 2 deletions(-)

diff --git a/src/@types/type-helpers.ts b/src/@types/type-helpers.ts
index 3a5c88e3f15..b3e5b1cfc07 100644
--- a/src/@types/type-helpers.ts
+++ b/src/@types/type-helpers.ts
@@ -75,3 +75,14 @@ export type NonFunctionPropertiesRecursive<Class> = {
 };
 
 export type AbstractConstructor<T> = abstract new (...args: any[]) => T;
+
+/**
+ * Type helper that iterates through the fields of the type and coerces any `null` properties to `undefined` (including in union types).
+ *
+ * @remarks
+ * This is primarily useful when an object with nullable properties wants to be serialized and have its `null`
+ * properties coerced to `undefined`.
+ */
+export type CoerceNullPropertiesToUndefined<T extends object> = {
+  [K in keyof T]: null extends T[K] ? Exclude<T[K], null> | undefined : T[K];
+};
diff --git a/src/data/pokemon/pokemon-data.ts b/src/data/pokemon/pokemon-data.ts
index 6ae86bed5e7..a2a0138a17a 100644
--- a/src/data/pokemon/pokemon-data.ts
+++ b/src/data/pokemon/pokemon-data.ts
@@ -1,18 +1,29 @@
 import { type BattlerTag, loadBattlerTag } from "#data/battler-tags";
+import { allSpecies } from "#data/data-lists";
 import type { Gender } from "#data/gender";
 import { PokemonMove } from "#data/moves/pokemon-move";
-import type { PokemonSpeciesForm } from "#data/pokemon-species";
+import { getPokemonSpeciesForm, type PokemonSpeciesForm } from "#data/pokemon-species";
 import type { TypeDamageMultiplier } from "#data/type";
 import type { AbilityId } from "#enums/ability-id";
 import type { BerryType } from "#enums/berry-type";
 import type { MoveId } from "#enums/move-id";
 import type { Nature } from "#enums/nature";
 import type { PokemonType } from "#enums/pokemon-type";
+import type { SpeciesId } from "#enums/species-id";
 import type { AttackMoveResult } from "#types/attack-move-result";
 import type { IllusionData } from "#types/illusion-data";
 import type { TurnMove } from "#types/turn-move";
+import type { CoerceNullPropertiesToUndefined } from "#types/type-helpers";
 import { isNullOrUndefined } from "#utils/common";
 
+/**
+ * The type that {@linkcode PokemonSpeciesForm} is converted to when an object containing it serializes it.
+ */
+type SerializedSpeciesForm = {
+  id: SpeciesId;
+  formIdx: number;
+};
+
 /**
  * Permanent data that can customize a Pokemon in non-standard ways from its Species.
  * Includes abilities, nature, changed types, etc.
@@ -41,9 +52,59 @@ export class CustomPokemonData {
   }
 }
 
+/**
+ * Deserialize a pokemon species form from an object containing `id` and `formIdx` properties.
+ * @param value - The value to deserialize
+ * @returns The `PokemonSpeciesForm` or `null` if the fields could not be properly discerned
+ */
+function deserializePokemonSpeciesForm(value: SerializedSpeciesForm | PokemonSpeciesForm): PokemonSpeciesForm | null {
+  // @ts-expect-error: We may be deserializing a PokemonSpeciesForm, but we catch later on
+  let { id, formIdx } = value;
+
+  if (isNullOrUndefined(id) || isNullOrUndefined(formIdx)) {
+    // @ts-expect-error: Typescript doesn't know that in block, `value` must be a PokemonSpeciesForm
+    id = value.speciesId;
+    // @ts-expect-error: Same as above (plus we are accessing a protected property)
+    formIdx = value._formIndex;
+  }
+  // If for some reason either of these fields are null/undefined, we cannot reconstruct the species form
+  if (isNullOrUndefined(id) || isNullOrUndefined(formIdx)) {
+    return null;
+  }
+  return getPokemonSpeciesForm(id, formIdx);
+}
+
+interface SerializedIllusionData extends Omit<IllusionData, "fusionSpecies"> {
+  /** The id of the illusioned fusion species, or `undefined` if not a fusion */
+  fusionSpecies?: SpeciesId;
+}
+
+interface SerializedPokemonSummonData {
+  statStages: number[];
+  moveQueue: TurnMove[];
+  tags: BattlerTag[];
+  abilitySuppressed: boolean;
+  speciesForm?: SerializedSpeciesForm;
+  fusionSpeciesForm?: SerializedSpeciesForm;
+  ability?: AbilityId;
+  passiveAbility?: AbilityId;
+  gender?: Gender;
+  fusionGender?: Gender;
+  stats: number[];
+  moveset?: PokemonMove[];
+  types: PokemonType[];
+  addedType?: PokemonType;
+  illusion?: SerializedIllusionData;
+  illusionBroken: boolean;
+  berriesEatenLast: BerryType[];
+  moveHistory: TurnMove[];
+}
+
 /**
  * Persistent in-battle data for a {@linkcode Pokemon}.
  * Resets on switch or new battle.
+ *
+ * @sealed
  */
 export class PokemonSummonData {
   /** [Atk, Def, SpAtk, SpDef, Spd, Acc, Eva] */
@@ -86,7 +147,7 @@ export class PokemonSummonData {
    */
   public moveHistory: TurnMove[] = [];
 
-  constructor(source?: PokemonSummonData | Partial<PokemonSummonData>) {
+  constructor(source?: PokemonSummonData | SerializedPokemonSummonData) {
     if (isNullOrUndefined(source)) {
       return;
     }
@@ -97,6 +158,30 @@ export class PokemonSummonData {
         continue;
       }
 
+      if (key === "speciesForm" || key === "fusionSpeciesForm") {
+        this[key] = deserializePokemonSpeciesForm(value);
+      }
+
+      if (key === "illusion" && typeof value === "object") {
+        // Make a copy so as not to mutate provided value
+        const illusionData = {
+          ...value,
+        };
+        if (!isNullOrUndefined(illusionData.fusionSpecies)) {
+          switch (typeof illusionData.fusionSpecies) {
+            case "object":
+              illusionData.fusionSpecies = allSpecies[illusionData.fusionSpecies.speciesId];
+              break;
+            case "number":
+              illusionData.fusionSpecies = allSpecies[illusionData.fusionSpecies];
+              break;
+            default:
+              illusionData.fusionSpecies = undefined;
+          }
+        }
+        this[key] = illusionData as IllusionData;
+      }
+
       if (key === "moveset") {
         this.moveset = value?.map((m: any) => PokemonMove.loadMove(m));
         continue;
@@ -110,6 +195,49 @@ export class PokemonSummonData {
       this[key] = value;
     }
   }
+
+  /**
+   * Serialize this PokemonSummonData to JSON, converting {@linkcode PokemonSpeciesForm} and {@linkcode IllusionData.fusionSpecies}
+   * into simpler types instead of serializing all of their fields.
+   *
+   * @remarks
+   * - `IllusionData.fusionSpecies` is serialized as just the species ID
+   * - `PokemonSpeciesForm` and `PokemonSpeciesForm.fusionSpeciesForm` are converted into {@linkcode SerializedSpeciesForm} objects
+   */
+  public toJSON(): SerializedPokemonSummonData {
+    // Pokemon species forms are never saved, only the species ID.
+    const illusion = this.illusion;
+    const speciesForm = this.speciesForm;
+    const fusionSpeciesForm = this.fusionSpeciesForm;
+    const illusionSpeciesForm = illusion?.fusionSpecies;
+    const t = {
+      // the "as omit" is required to avoid TS resolving the overwritten properties to "never"
+      // We coerce null to undefined in the type, as the for loop below replaces `null` with `undefined`
+      ...(this as Omit<
+        CoerceNullPropertiesToUndefined<PokemonSummonData>,
+        "speciesForm" | "fusionSpeciesForm" | "illusion"
+      >),
+      speciesForm: isNullOrUndefined(speciesForm)
+        ? undefined
+        : { id: speciesForm.speciesId, formIdx: speciesForm.formIndex },
+      fusionSpeciesForm: isNullOrUndefined(fusionSpeciesForm)
+        ? undefined
+        : { id: fusionSpeciesForm.speciesId, formIdx: fusionSpeciesForm.formIndex },
+      illusion: isNullOrUndefined(illusion)
+        ? undefined
+        : {
+            ...(this.illusion as Omit<typeof illusion, "fusionSpecies">),
+            fusionSpecies: illusionSpeciesForm?.speciesId,
+          },
+    };
+    // Replace `null` with `undefined`, as `undefined` never gets serialized
+    for (const [key, value] of Object.entries(t)) {
+      if (value === null) {
+        t[key] = undefined;
+      }
+    }
+    return t;
+  }
 }
 
 // TODO: Merge this inside `summmonData` but exclude from save if/when a save data serializer is added

From 343407832962d4e8c007663fb82d429f48392eda Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Sun, 27 Jul 2025 18:03:34 -0700
Subject: [PATCH 06/44] [Docs] Add `@module` modifier tag to `tsdoc.json`

---
 tsdoc.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tsdoc.json b/tsdoc.json
index b4cbc9a62a5..689f7a96c5c 100644
--- a/tsdoc.json
+++ b/tsdoc.json
@@ -9,6 +9,10 @@
     {
       "tagName": "@linkcode",
       "syntaxKind": "inline"
+    },
+    {
+      "tagName": "@module",
+      "syntaxKind": "modifier"
     }
   ]
 }

From 157b662f9ed719f8ef35ab13792ae7ec448f1e5c Mon Sep 17 00:00:00 2001
From: Bertie690 <136088738+Bertie690@users.noreply.github.com>
Date: Sun, 27 Jul 2025 23:17:46 -0400
Subject: [PATCH 07/44] [Bug] Fix camel case bug in `strings.ts` (#6161)

---
 src/utils/strings.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/utils/strings.ts b/src/utils/strings.ts
index dfa3d7c887f..bf5e5c6473f 100644
--- a/src/utils/strings.ts
+++ b/src/utils/strings.ts
@@ -98,7 +98,9 @@ export function toTitleCase(str: string): string {
  */
 export function toCamelCase(str: string) {
   return splitWords(str)
-    .map((word, index) => (index === 0 ? word.toLowerCase() : capitalizeFirstLetter(word)))
+    .map((word, index) =>
+      index === 0 ? word.toLowerCase() : word.charAt(0).toUpperCase() + word.slice(1).toLowerCase(),
+    )
     .join("");
 }
 

From 462b423cb8e903d150bd1d665254a97af9843b61 Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Sun, 27 Jul 2025 21:20:02 -0700
Subject: [PATCH 08/44] [Dev] Change `target` to `ES2023` in `tsconfig.json`
 (#6160)

---
 src/field/pokemon.ts     |  5 ++---
 src/field/trainer.ts     |  1 -
 src/modifier/modifier.ts | 20 ++++++++++----------
 tsconfig.json            |  8 ++++----
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 32229d80f37..fd04c007e1b 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -213,7 +213,6 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
    * TODO: Stop treating this like a unique ID and stop treating 0 as no pokemon
    */
   public id: number;
-  public name: string;
   public nickname: string;
   public species: PokemonSpecies;
   public formIndex: number;
@@ -5664,7 +5663,7 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
 }
 
 export class PlayerPokemon extends Pokemon {
-  protected battleInfo: PlayerBattleInfo;
+  protected declare battleInfo: PlayerBattleInfo;
   public compatibleTms: MoveId[];
 
   constructor(
@@ -6193,7 +6192,7 @@ export class PlayerPokemon extends Pokemon {
 }
 
 export class EnemyPokemon extends Pokemon {
-  protected battleInfo: EnemyBattleInfo;
+  protected declare battleInfo: EnemyBattleInfo;
   public trainerSlot: TrainerSlot;
   public aiType: AiType;
   public bossSegments: number;
diff --git a/src/field/trainer.ts b/src/field/trainer.ts
index a8af298e1cf..584c9310932 100644
--- a/src/field/trainer.ts
+++ b/src/field/trainer.ts
@@ -30,7 +30,6 @@ export class Trainer extends Phaser.GameObjects.Container {
   public config: TrainerConfig;
   public variant: TrainerVariant;
   public partyTemplateIndex: number;
-  public name: string;
   public partnerName: string;
   public nameKey: string;
   public partnerNameKey: string | undefined;
diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts
index f6a9ed48847..b31bee7fc69 100644
--- a/src/modifier/modifier.ts
+++ b/src/modifier/modifier.ts
@@ -462,7 +462,7 @@ export abstract class LapsingPersistentModifier extends PersistentModifier {
  * @see {@linkcode apply}
  */
 export class DoubleBattleChanceBoosterModifier extends LapsingPersistentModifier {
-  public override type: DoubleBattleChanceBoosterModifierType;
+  public declare type: DoubleBattleChanceBoosterModifierType;
 
   match(modifier: Modifier): boolean {
     return modifier instanceof DoubleBattleChanceBoosterModifier && modifier.getMaxBattles() === this.getMaxBattles();
@@ -936,7 +936,7 @@ export class EvoTrackerModifier extends PokemonHeldItemModifier {
  * Currently used by Shuckle Juice item
  */
 export class PokemonBaseStatTotalModifier extends PokemonHeldItemModifier {
-  public override type: PokemonBaseStatTotalModifierType;
+  public declare type: PokemonBaseStatTotalModifierType;
   public isTransferable = false;
   public statModifier: 10 | -15;
 
@@ -2074,7 +2074,7 @@ export abstract class ConsumablePokemonModifier extends ConsumableModifier {
 }
 
 export class TerrastalizeModifier extends ConsumablePokemonModifier {
-  public override type: TerastallizeModifierType;
+  public declare type: TerastallizeModifierType;
   public teraType: PokemonType;
 
   constructor(type: TerastallizeModifierType, pokemonId: number, teraType: PokemonType) {
@@ -2318,7 +2318,7 @@ export class PokemonLevelIncrementModifier extends ConsumablePokemonModifier {
 }
 
 export class TmModifier extends ConsumablePokemonModifier {
-  public override type: TmModifierType;
+  public declare type: TmModifierType;
 
   /**
    * Applies {@linkcode TmModifier}
@@ -2365,7 +2365,7 @@ export class RememberMoveModifier extends ConsumablePokemonModifier {
 }
 
 export class EvolutionItemModifier extends ConsumablePokemonModifier {
-  public override type: EvolutionItemModifierType;
+  public declare type: EvolutionItemModifierType;
   /**
    * Applies {@linkcode EvolutionItemModifier}
    * @param playerPokemon The {@linkcode PlayerPokemon} that should evolve via item
@@ -2530,7 +2530,7 @@ export class ExpBoosterModifier extends PersistentModifier {
 }
 
 export class PokemonExpBoosterModifier extends PokemonHeldItemModifier {
-  public override type: PokemonExpBoosterModifierType;
+  public declare type: PokemonExpBoosterModifierType;
 
   private boostMultiplier: number;
 
@@ -2627,7 +2627,7 @@ export class ExpBalanceModifier extends PersistentModifier {
 }
 
 export class PokemonFriendshipBoosterModifier extends PokemonHeldItemModifier {
-  public override type: PokemonFriendshipBoosterModifierType;
+  public declare type: PokemonFriendshipBoosterModifierType;
 
   matchType(modifier: Modifier): boolean {
     return modifier instanceof PokemonFriendshipBoosterModifier;
@@ -2684,7 +2684,7 @@ export class PokemonNatureWeightModifier extends PokemonHeldItemModifier {
 }
 
 export class PokemonMoveAccuracyBoosterModifier extends PokemonHeldItemModifier {
-  public override type: PokemonMoveAccuracyBoosterModifierType;
+  public declare type: PokemonMoveAccuracyBoosterModifierType;
   private accuracyAmount: number;
 
   constructor(type: PokemonMoveAccuracyBoosterModifierType, pokemonId: number, accuracy: number, stackCount?: number) {
@@ -2736,7 +2736,7 @@ export class PokemonMoveAccuracyBoosterModifier extends PokemonHeldItemModifier
 }
 
 export class PokemonMultiHitModifier extends PokemonHeldItemModifier {
-  public override type: PokemonMultiHitModifierType;
+  public declare type: PokemonMultiHitModifierType;
 
   matchType(modifier: Modifier): boolean {
     return modifier instanceof PokemonMultiHitModifier;
@@ -2817,7 +2817,7 @@ export class PokemonMultiHitModifier extends PokemonHeldItemModifier {
 }
 
 export class PokemonFormChangeItemModifier extends PokemonHeldItemModifier {
-  public override type: FormChangeItemModifierType;
+  public declare type: FormChangeItemModifierType;
   public formChangeItem: FormChangeItem;
   public active: boolean;
   public isTransferable = false;
diff --git a/tsconfig.json b/tsconfig.json
index 1e067dcff03..9aa06829789 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,11 +1,11 @@
 {
   "compilerOptions": {
-    "target": "ES2020",
-    "module": "ES2020",
+    "target": "ES2023",
+    "module": "ES2022",
     // Modifying this option requires all values to be set manually because the defaults get overridden
-    // Values other than "ES2024.Promise" taken from https://github.com/microsoft/TypeScript/blob/main/src/lib/es2020.full.d.ts
+    // Values other than "ES2024.Promise" taken from https://github.com/microsoft/TypeScript/blob/main/src/lib/es2023.full.d.ts
     "lib": [
-      "ES2020",
+      "ES2023",
       "ES2024.Promise",
       "DOM",
       "DOM.AsyncIterable",

From 0935d817e9ab9261a7a736be249e7d5f168ec4e8 Mon Sep 17 00:00:00 2001
From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Date: Sun, 25 May 2025 17:26:37 -0500
Subject: [PATCH 09/44] breakup fight and ball commands into their own methods

---
 src/phases/command-phase.ts | 418 +++++++++++++++++++-----------------
 1 file changed, 222 insertions(+), 196 deletions(-)

diff --git a/src/phases/command-phase.ts b/src/phases/command-phase.ts
index 14674037fbe..92c01aa4b85 100644
--- a/src/phases/command-phase.ts
+++ b/src/phases/command-phase.ts
@@ -148,206 +148,232 @@ export class CommandPhase extends FieldPhase {
   }
 
   /**
-   * TODO: Remove `args` and clean this thing up
-   * Code will need to be copied over from pkty except replacing the `virtual` and `ignorePP` args with a corresponding `MoveUseMode`.
+   *
+   * @param user - The pokemon using the move
+   * @param cursor -
    */
-  handleCommand(command: Command, cursor: number, ...args: any[]): boolean {
+  private queueFightErrorMessage(user: PlayerPokemon, cursor: number) {
+    const move = user.getMoveset()[cursor];
+    globalScene.ui.setMode(UiMode.MESSAGE);
+
+    // Decides between a Disabled, Not Implemented, or No PP translation message
+    const errorMessage = user.isMoveRestricted(move.moveId, user)
+      ? user.getRestrictingTag(move.moveId, user)!.selectionDeniedText(user, move.moveId)
+      : move.getName().endsWith(" (N)")
+        ? "battle:moveNotImplemented"
+        : "battle:moveNoPP";
+    const moveName = move.getName().replace(" (N)", ""); // Trims off the indicator
+
+    globalScene.ui.showText(
+      i18next.t(errorMessage, { moveName: moveName }),
+      null,
+      () => {
+        globalScene.ui.clearText();
+        globalScene.ui.setMode(UiMode.FIGHT, this.fieldIndex);
+      },
+      null,
+      true,
+    );
+  }
+
+  /** Helper method for {@linkcode handleFightCommand} that returns the moveID for the phase
+   * based on the move passed in or the cursor.
+   *
+   * Does not check if the move is usable or not, that should be handled by the caller.
+   */
+  private comptueMoveId(playerPokemon: PlayerPokemon, cursor: number, move?: TurnMove): MoveId {
+    return move?.move ?? (cursor > -1 ? playerPokemon.getMoveset()[cursor]?.moveId : MoveId.NONE);
+  }
+
+  /**
+   * Handle fight logic
+   * @param command - The command to handle (FIGHT or TERA)
+   * @param cursor - The index that the cursor is placed on, or -1 if no move can be selected.
+   * @param args - Any additional arguments to pass to the command
+   */
+  private handleFightCommand(
+    command: Command.FIGHT | Command.TERA,
+    cursor: number,
+    useMode: MoveUseMode = MoveUseMode.NORMAL,
+    move?: TurnMove,
+  ): boolean {
+    const playerPokemon = globalScene.getPlayerField()[this.fieldIndex];
+    const ignorePP = isIgnorePP(useMode);
+
+    /** Whether or not to display an error message instead of attempting to initiate the command selection process */
+    let canUse = cursor !== -1 || !playerPokemon.trySelectMove(cursor, ignorePP);
+
+    const useStruggle = canUse
+      ? false
+      : cursor > -1 && !playerPokemon.getMoveset().some(m => m.isUsable(playerPokemon));
+
+    canUse = canUse || useStruggle;
+
+    if (!canUse) {
+      this.queueFightErrorMessage(playerPokemon, cursor);
+      return false;
+    }
+
+    const moveId = useStruggle ? MoveId.STRUGGLE : this.comptueMoveId(playerPokemon, cursor, move);
+
+    const turnCommand: TurnCommand = {
+      command: Command.FIGHT,
+      cursor: cursor,
+      move: { move: moveId, targets: [], useMode },
+      args: [useMode, move],
+    };
+    const preTurnCommand: TurnCommand = {
+      command: command,
+      targets: [this.fieldIndex],
+      skip: command === Command.FIGHT,
+    };
+
+    const moveTargets: MoveTargetSet =
+      move === undefined
+        ? getMoveTargets(playerPokemon, moveId)
+        : {
+            targets: move.targets,
+            multiple: move.targets.length > 1,
+          };
+
+    if (!moveId) {
+      turnCommand.targets = [this.fieldIndex];
+    }
+
+    console.log(moveTargets, getPokemonNameWithAffix(playerPokemon));
+
+    if (moveTargets.multiple) {
+      globalScene.phaseManager.unshiftNew("SelectTargetPhase", this.fieldIndex);
+    }
+
+    if (turnCommand.move && (moveTargets.targets.length <= 1 || moveTargets.multiple)) {
+      turnCommand.move.targets = moveTargets.targets;
+    } else if (
+      turnCommand.move &&
+      playerPokemon.getTag(BattlerTagType.CHARGING) &&
+      playerPokemon.getMoveQueue().length >= 1
+    ) {
+      turnCommand.move.targets = playerPokemon.getMoveQueue()[0].targets;
+    } else {
+      globalScene.phaseManager.unshiftNew("SelectTargetPhase", this.fieldIndex);
+    }
+
+    globalScene.currentBattle.preTurnCommands[this.fieldIndex] = preTurnCommand;
+    globalScene.currentBattle.turnCommands[this.fieldIndex] = turnCommand;
+
+    return true;
+  }
+
+  private queueShowText(key: string) {
+    globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
+    globalScene.ui.setMode(UiMode.MESSAGE);
+
+    globalScene.ui.showText(
+      i18next.t(key),
+      null,
+      () => {
+        globalScene.ui.showText("", 0);
+        globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
+      },
+      null,
+      true,
+    );
+  }
+
+  /**
+   * Helper method for {@linkcode handleBallCommand} that checks if the pokeball can be thrown.
+   *
+   * The pokeball may not be thrown if:
+   * - It is a trainer battle
+   * - The biome is {@linkcode Biome.END} and it is not classic mode
+   * - The biome is {@linkcode Biome.END} and the fresh start challenge is active
+   * - The biome is {@linkcode Biome.END} and the player has not either caught the target before or caught all but one starter
+   * - The player is in a mystery encounter that disallows catching the pokemon
+   * @returns Whether a pokeball can be thrown
+   *
+   */
+  private checkCanUseBall(): boolean {
+    if (
+      globalScene.arena.biomeType === BiomeId.END &&
+      (!globalScene.gameMode.isClassic ||
+        globalScene.gameMode.isFreshStartChallenge() ||
+        (globalScene
+          .getEnemyField()
+          .some(p => p.isActive() && !globalScene.gameData.dexData[p.species.speciesId].caughtAttr) &&
+          globalScene.gameData.getStarterCount(d => !!d.caughtAttr) < Object.keys(speciesStarterCosts).length - 1))
+    ) {
+      this.queueShowText("battle:noPokeballForce");
+    } else if (globalScene.currentBattle.battleType === BattleType.TRAINER) {
+      this.queueShowText("battle:noPokeballTrainer");
+    } else if (
+      globalScene.currentBattle.isBattleMysteryEncounter() &&
+      !globalScene.currentBattle.mysteryEncounter!.catchAllowed
+    ) {
+      this.queueShowText("battle:noPokeballMysteryEncounter");
+    } else {
+      return true;
+    }
+
+    return false;
+  }
+
+  /**
+   * Helper method for {@linkcode handleCommand} that handles the logic when the selected command is to use a pokeball.
+   *
+   * @param cursor - The index of the pokeball to use
+   * @returns Whether the command was successfully initiated
+   */
+  handleBallCommand(cursor: number): boolean {
+    const targets = globalScene
+      .getEnemyField()
+      .filter(p => p.isActive(true))
+      .map(p => p.getBattlerIndex());
+    if (targets.length > 1) {
+      this.queueShowText("battle:noPokeballMulti");
+      return false;
+    }
+
+    if (!this.checkCanUseBall()) {
+      return false;
+    }
+
+    if (cursor < 5) {
+      const targetPokemon = globalScene.getEnemyPokemon();
+      if (
+        targetPokemon?.isBoss() &&
+        targetPokemon?.bossSegmentIndex >= 1 &&
+        // TODO: Decouple this hardcoded exception for wonder guard and just check the target...
+        !targetPokemon?.hasAbility(AbilityId.WONDER_GUARD, false, true) &&
+        cursor < PokeballType.MASTER_BALL
+      ) {
+        this.queueShowText("battle:noPokeballStrong");
+        return false;
+      }
+
+      globalScene.currentBattle.turnCommands[this.fieldIndex] = {
+        command: Command.BALL,
+        cursor: cursor,
+      };
+      globalScene.currentBattle.turnCommands[this.fieldIndex]!.targets = targets;
+      if (this.fieldIndex) {
+        globalScene.currentBattle.turnCommands[this.fieldIndex - 1]!.skip = true;
+      }
+      return true;
+    }
+
+    return false;
+  }
+
+  handleCommand(command: Command, cursor: number, useMode: MoveUseMode = MoveUseMode.NORMAL, move?: TurnMove): boolean {
     const playerPokemon = globalScene.getPlayerField()[this.fieldIndex];
     let success = false;
 
     switch (command) {
-      // TODO: We don't need 2 args for this - moveUseMode is carried over from queuedMove
       case Command.TERA:
-      case Command.FIGHT: {
-        let useStruggle = false;
-        const turnMove: TurnMove | undefined = args.length === 2 ? (args[1] as TurnMove) : undefined;
-        if (
-          cursor === -1 ||
-          playerPokemon.trySelectMove(cursor, isIgnorePP(args[0] as MoveUseMode)) ||
-          (useStruggle = cursor > -1 && !playerPokemon.getMoveset().filter(m => m.isUsable(playerPokemon)).length)
-        ) {
-          let moveId: MoveId;
-          if (useStruggle) {
-            moveId = MoveId.STRUGGLE;
-          } else if (turnMove !== undefined) {
-            moveId = turnMove.move;
-          } else if (cursor > -1) {
-            moveId = playerPokemon.getMoveset()[cursor].moveId;
-          } else {
-            moveId = MoveId.NONE;
-          }
-
-          const turnCommand: TurnCommand = {
-            command: Command.FIGHT,
-            cursor: cursor,
-            move: { move: moveId, targets: [], useMode: args[0] },
-            args: args,
-          };
-          const preTurnCommand: TurnCommand = {
-            command: command,
-            targets: [this.fieldIndex],
-            skip: command === Command.FIGHT,
-          };
-          const moveTargets: MoveTargetSet =
-            turnMove === undefined
-              ? getMoveTargets(playerPokemon, moveId)
-              : {
-                  targets: turnMove.targets,
-                  multiple: turnMove.targets.length > 1,
-                };
-          if (!moveId) {
-            turnCommand.targets = [this.fieldIndex];
-          }
-          console.log(moveTargets, getPokemonNameWithAffix(playerPokemon));
-          if (moveTargets.targets.length > 1 && moveTargets.multiple) {
-            globalScene.phaseManager.unshiftNew("SelectTargetPhase", this.fieldIndex);
-          }
-          if (turnCommand.move && (moveTargets.targets.length <= 1 || moveTargets.multiple)) {
-            turnCommand.move.targets = moveTargets.targets;
-          } else if (
-            turnCommand.move &&
-            playerPokemon.getTag(BattlerTagType.CHARGING) &&
-            playerPokemon.getMoveQueue().length >= 1
-          ) {
-            turnCommand.move.targets = playerPokemon.getMoveQueue()[0].targets;
-          } else {
-            globalScene.phaseManager.unshiftNew("SelectTargetPhase", this.fieldIndex);
-          }
-          globalScene.currentBattle.preTurnCommands[this.fieldIndex] = preTurnCommand;
-          globalScene.currentBattle.turnCommands[this.fieldIndex] = turnCommand;
-          success = true;
-        } else if (cursor < playerPokemon.getMoveset().length) {
-          const move = playerPokemon.getMoveset()[cursor];
-          globalScene.ui.setMode(UiMode.MESSAGE);
-
-          // Decides between a Disabled, Not Implemented, or No PP translation message
-          const errorMessage = playerPokemon.isMoveRestricted(move.moveId, playerPokemon)
-            ? playerPokemon
-                .getRestrictingTag(move.moveId, playerPokemon)!
-                .selectionDeniedText(playerPokemon, move.moveId)
-            : move.getName().endsWith(" (N)")
-              ? "battle:moveNotImplemented"
-              : "battle:moveNoPP";
-          const moveName = move.getName().replace(" (N)", ""); // Trims off the indicator
-
-          globalScene.ui.showText(
-            i18next.t(errorMessage, { moveName: moveName }),
-            null,
-            () => {
-              globalScene.ui.clearText();
-              globalScene.ui.setMode(UiMode.FIGHT, this.fieldIndex);
-            },
-            null,
-            true,
-          );
-        }
-        break;
-      }
-      case Command.BALL: {
-        const notInDex =
-          globalScene
-            .getEnemyField()
-            .filter(p => p.isActive(true))
-            .some(p => !globalScene.gameData.dexData[p.species.speciesId].caughtAttr) &&
-          globalScene.gameData.getStarterCount(d => !!d.caughtAttr) < Object.keys(speciesStarterCosts).length - 1;
-        if (
-          globalScene.arena.biomeType === BiomeId.END &&
-          (!globalScene.gameMode.isClassic || globalScene.gameMode.isFreshStartChallenge() || notInDex)
-        ) {
-          globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
-          globalScene.ui.setMode(UiMode.MESSAGE);
-          globalScene.ui.showText(
-            i18next.t("battle:noPokeballForce"),
-            null,
-            () => {
-              globalScene.ui.showText("", 0);
-              globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
-            },
-            null,
-            true,
-          );
-        } else if (globalScene.currentBattle.battleType === BattleType.TRAINER) {
-          globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
-          globalScene.ui.setMode(UiMode.MESSAGE);
-          globalScene.ui.showText(
-            i18next.t("battle:noPokeballTrainer"),
-            null,
-            () => {
-              globalScene.ui.showText("", 0);
-              globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
-            },
-            null,
-            true,
-          );
-        } else if (
-          globalScene.currentBattle.isBattleMysteryEncounter() &&
-          !globalScene.currentBattle.mysteryEncounter!.catchAllowed
-        ) {
-          globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
-          globalScene.ui.setMode(UiMode.MESSAGE);
-          globalScene.ui.showText(
-            i18next.t("battle:noPokeballMysteryEncounter"),
-            null,
-            () => {
-              globalScene.ui.showText("", 0);
-              globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
-            },
-            null,
-            true,
-          );
-        } else {
-          const targets = globalScene
-            .getEnemyField()
-            .filter(p => p.isActive(true))
-            .map(p => p.getBattlerIndex());
-          if (targets.length > 1) {
-            globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
-            globalScene.ui.setMode(UiMode.MESSAGE);
-            globalScene.ui.showText(
-              i18next.t("battle:noPokeballMulti"),
-              null,
-              () => {
-                globalScene.ui.showText("", 0);
-                globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
-              },
-              null,
-              true,
-            );
-          } else if (cursor < 5) {
-            const targetPokemon = globalScene.getEnemyField().find(p => p.isActive(true));
-            if (
-              targetPokemon?.isBoss() &&
-              targetPokemon?.bossSegmentIndex >= 1 &&
-              !targetPokemon?.hasAbility(AbilityId.WONDER_GUARD, false, true) &&
-              cursor < PokeballType.MASTER_BALL
-            ) {
-              globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
-              globalScene.ui.setMode(UiMode.MESSAGE);
-              globalScene.ui.showText(
-                i18next.t("battle:noPokeballStrong"),
-                null,
-                () => {
-                  globalScene.ui.showText("", 0);
-                  globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
-                },
-                null,
-                true,
-              );
-            } else {
-              globalScene.currentBattle.turnCommands[this.fieldIndex] = {
-                command: Command.BALL,
-                cursor: cursor,
-              };
-              globalScene.currentBattle.turnCommands[this.fieldIndex]!.targets = targets;
-              if (this.fieldIndex) {
-                globalScene.currentBattle.turnCommands[this.fieldIndex - 1]!.skip = true;
-              }
-              success = true;
-            }
-          }
-        }
-        break;
-      }
+      case Command.FIGHT:
+        return this.handleFightCommand(command, cursor, useMode, move);
+      case Command.BALL:
+        return this.handleBallCommand(cursor);
       case Command.POKEMON:
       case Command.RUN: {
         const isSwitch = command === Command.POKEMON;
@@ -388,11 +414,11 @@ export class CommandPhase extends FieldPhase {
             true,
           );
         } else {
-          const batonPass = isSwitch && (args[0] as boolean);
+          const batonPass = isSwitch && useMode;
           const trappedAbMessages: string[] = [];
           if (batonPass || !playerPokemon.isTrapped(trappedAbMessages)) {
             currentBattle.turnCommands[this.fieldIndex] = isSwitch
-              ? { command: Command.POKEMON, cursor: cursor, args: args }
+              ? { command: Command.POKEMON, cursor: cursor }
               : { command: Command.RUN };
             success = true;
             if (!isSwitch && this.fieldIndex) {

From 22b9a19ba65950c909328b057a8d002007cdc462 Mon Sep 17 00:00:00 2001
From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Date: Mon, 26 May 2025 11:46:53 -0500
Subject: [PATCH 10/44] Breakup run and pokemon commands

---
 src/phases/command-phase.ts | 274 +++++++++++++++++++++---------------
 1 file changed, 158 insertions(+), 116 deletions(-)

diff --git a/src/phases/command-phase.ts b/src/phases/command-phase.ts
index 92c01aa4b85..a37721ac912 100644
--- a/src/phases/command-phase.ts
+++ b/src/phases/command-phase.ts
@@ -20,15 +20,19 @@ import { UiMode } from "#enums/ui-mode";
 import type { PlayerPokemon } from "#field/pokemon";
 import type { MoveTargetSet } from "#moves/move";
 import { getMoveTargets } from "#moves/move-utils";
-import { FieldPhase } from "#phases/field-phase";
 import type { TurnMove } from "#types/turn-move";
-import { isNullOrUndefined } from "#utils/common";
 import i18next from "i18next";
+import { FieldPhase } from "./field-phase";
 
 export class CommandPhase extends FieldPhase {
   public readonly phaseName = "CommandPhase";
   protected fieldIndex: number;
 
+  /**
+   * Whether the command phase is handling a switch command
+   */
+  private isSwitch = false;
+
   constructor(fieldIndex: number) {
     super();
 
@@ -150,7 +154,7 @@ export class CommandPhase extends FieldPhase {
   /**
    *
    * @param user - The pokemon using the move
-   * @param cursor -
+   * @param cursor - The index of the move in the moveset
    */
   private queueFightErrorMessage(user: PlayerPokemon, cursor: number) {
     const move = user.getMoveset()[cursor];
@@ -264,6 +268,11 @@ export class CommandPhase extends FieldPhase {
     return true;
   }
 
+  /**
+   * Set the mode in preparation to show the text, and then show the text.
+   * Only works for parameterless i18next keys.
+   * @param key - The i18next key for the text to show
+   */
   private queueShowText(key: string) {
     globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
     globalScene.ui.setMode(UiMode.MESSAGE);
@@ -323,7 +332,7 @@ export class CommandPhase extends FieldPhase {
    * @param cursor - The index of the pokeball to use
    * @returns Whether the command was successfully initiated
    */
-  handleBallCommand(cursor: number): boolean {
+  private handleBallCommand(cursor: number): boolean {
     const targets = globalScene
       .getEnemyField()
       .filter(p => p.isActive(true))
@@ -364,125 +373,158 @@ export class CommandPhase extends FieldPhase {
     return false;
   }
 
-  handleCommand(command: Command, cursor: number, useMode: MoveUseMode = MoveUseMode.NORMAL, move?: TurnMove): boolean {
+  /**
+   * Common helper method to handle the logic for effects that prevent the pokemon from leaving the field
+   * due to trapping abilities or effects.
+   *
+   * This method queues the proper messages in the case of trapping abilities or effects
+   *
+   * @returns Whether the pokemon is currently trapped
+   */
+  private handleTrap(): boolean {
     const playerPokemon = globalScene.getPlayerField()[this.fieldIndex];
+    const trappedAbMessages: string[] = [];
+    const isSwitch = this.isSwitch;
+    if (!playerPokemon.isTrapped(trappedAbMessages)) {
+      return false;
+    }
+    if (trappedAbMessages.length > 0) {
+      if (isSwitch) {
+        globalScene.ui.setMode(UiMode.MESSAGE);
+      }
+      globalScene.ui.showText(
+        trappedAbMessages[0],
+        null,
+        () => {
+          globalScene.ui.showText("", 0);
+          if (isSwitch) {
+            globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
+          }
+        },
+        null,
+        true,
+      );
+    } else {
+      const trapTag = playerPokemon.getTag(TrappedTag);
+      const fairyLockTag = globalScene.arena.getTagOnSide(ArenaTagType.FAIRY_LOCK, ArenaTagSide.PLAYER);
+
+      if (!isSwitch) {
+        globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
+        globalScene.ui.setMode(UiMode.MESSAGE);
+      }
+      if (trapTag) {
+        this.showNoEscapeText(trapTag, false);
+      } else if (fairyLockTag) {
+        this.showNoEscapeText(fairyLockTag, false);
+      }
+    }
+
+    return true;
+  }
+
+  /**
+   * Common helper method that attempts to have the pokemon leave the field.
+   * Checks for trapping abilities and effects.
+   *
+   * @param cursor - The index of the option that the cursor is on
+   * @param isBatonSwitch - Whether the switch command is switching via the Baton item
+   * @returns whether the pokemon is able to leave the field, indicating the command phase should end
+   */
+  private tryLeaveField(cursor?: number, isBatonSwitch = false): boolean {
+    const currentBattle = globalScene.currentBattle;
+
+    if (isBatonSwitch && !this.handleTrap()) {
+      currentBattle.turnCommands[this.fieldIndex] = {
+        command: this.isSwitch ? Command.POKEMON : Command.RUN,
+        cursor: cursor,
+      };
+      if (!this.isSwitch && this.fieldIndex) {
+        currentBattle.turnCommands[this.fieldIndex - 1]!.skip = true;
+      }
+      return true;
+    }
+
+    return false;
+  }
+
+  private handleRunCommand(): boolean {
+    const { currentBattle, arena } = globalScene;
+    const mysteryEncounterFleeAllowed = currentBattle.mysteryEncounter?.fleeAllowed ?? true;
+    if (arena.biomeType === BiomeId.END || !mysteryEncounterFleeAllowed) {
+      this.queueShowText("battle:noEscapeForce");
+      return false;
+    }
+    if (
+      currentBattle.battleType === BattleType.TRAINER ||
+      currentBattle.mysteryEncounter?.encounterMode === MysteryEncounterMode.TRAINER_BATTLE
+    ) {
+      this.queueShowText("battle:noEscapeTrainer");
+      return false;
+    }
+
+    const success = this.tryLeaveField();
+
+    return success;
+  }
+
+  /**
+   * Show a message indicating that the pokemon cannot escape, and then return to the command phase.
+   */
+  private showNoEscapeText(tag: any, isSwitch: boolean): void {
+    globalScene.ui.showText(
+      i18next.t("battle:noEscapePokemon", {
+        pokemonName:
+          tag.sourceId && globalScene.getPokemonById(tag.sourceId)
+            ? getPokemonNameWithAffix(globalScene.getPokemonById(tag.sourceId)!)
+            : "",
+        moveName: tag.getMoveName(),
+        escapeVerb: i18next.t(isSwitch ? "battle:escapeVerbSwitch" : "battle:escapeVerbFlee"),
+      }),
+      null,
+      () => {
+        globalScene.ui.showText("", 0);
+        if (!isSwitch) {
+          globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
+        }
+      },
+      null,
+      true,
+    );
+  }
+
+  // Overloads for handleCommand to provide a more specific type signature for the different options
+  handleCommand(command: Command.FIGHT | Command.TERA, cursor: number, useMode?: MoveUseMode, move?: TurnMove): boolean;
+  handleCommand(command: Command.BALL, cursor: number): boolean;
+  handleCommand(command: Command.POKEMON, cursor: number, useBaton: boolean): boolean;
+  handleCommand(command: Command.RUN, cursor: number): boolean;
+  handleCommand(command: Command, cursor: number, useMode?: boolean | MoveUseMode, move?: TurnMove): boolean;
+
+  /**
+   * Process the command phase logic based on the selected command
+   *
+   * @param command - The kind of command to handle
+   * @param cursor - The index of option that the cursor is on, or -1 if no option is selected
+   * @param useMode - The mode to use for the move, if applicable. For switches, a boolean that specifies whether the switch is a Baton switch.
+   * @param move - For {@linkcode Command.FIGHT}, the move to use
+   */
+  handleCommand(command: Command, cursor: number, useMode: boolean | MoveUseMode = false, move?: TurnMove): boolean {
     let success = false;
 
     switch (command) {
       case Command.TERA:
       case Command.FIGHT:
-        return this.handleFightCommand(command, cursor, useMode, move);
-      case Command.BALL:
-        return this.handleBallCommand(cursor);
-      case Command.POKEMON:
-      case Command.RUN: {
-        const isSwitch = command === Command.POKEMON;
-        const { currentBattle, arena } = globalScene;
-        const mysteryEncounterFleeAllowed = currentBattle.mysteryEncounter?.fleeAllowed;
-        if (
-          !isSwitch &&
-          (arena.biomeType === BiomeId.END ||
-            (!isNullOrUndefined(mysteryEncounterFleeAllowed) && !mysteryEncounterFleeAllowed))
-        ) {
-          globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
-          globalScene.ui.setMode(UiMode.MESSAGE);
-          globalScene.ui.showText(
-            i18next.t("battle:noEscapeForce"),
-            null,
-            () => {
-              globalScene.ui.showText("", 0);
-              globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
-            },
-            null,
-            true,
-          );
-        } else if (
-          !isSwitch &&
-          (currentBattle.battleType === BattleType.TRAINER ||
-            currentBattle.mysteryEncounter?.encounterMode === MysteryEncounterMode.TRAINER_BATTLE)
-        ) {
-          globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
-          globalScene.ui.setMode(UiMode.MESSAGE);
-          globalScene.ui.showText(
-            i18next.t("battle:noEscapeTrainer"),
-            null,
-            () => {
-              globalScene.ui.showText("", 0);
-              globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
-            },
-            null,
-            true,
-          );
-        } else {
-          const batonPass = isSwitch && useMode;
-          const trappedAbMessages: string[] = [];
-          if (batonPass || !playerPokemon.isTrapped(trappedAbMessages)) {
-            currentBattle.turnCommands[this.fieldIndex] = isSwitch
-              ? { command: Command.POKEMON, cursor: cursor }
-              : { command: Command.RUN };
-            success = true;
-            if (!isSwitch && this.fieldIndex) {
-              currentBattle.turnCommands[this.fieldIndex - 1]!.skip = true;
-            }
-          } else if (trappedAbMessages.length > 0) {
-            if (!isSwitch) {
-              globalScene.ui.setMode(UiMode.MESSAGE);
-            }
-            globalScene.ui.showText(
-              trappedAbMessages[0],
-              null,
-              () => {
-                globalScene.ui.showText("", 0);
-                if (!isSwitch) {
-                  globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
-                }
-              },
-              null,
-              true,
-            );
-          } else {
-            const trapTag = playerPokemon.getTag(TrappedTag);
-            const fairyLockTag = globalScene.arena.getTagOnSide(ArenaTagType.FAIRY_LOCK, ArenaTagSide.PLAYER);
-
-            if (!trapTag && !fairyLockTag) {
-              i18next.t(`battle:noEscape${isSwitch ? "Switch" : "Flee"}`);
-              break;
-            }
-            if (!isSwitch) {
-              globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
-              globalScene.ui.setMode(UiMode.MESSAGE);
-            }
-            const showNoEscapeText = (tag: any) => {
-              globalScene.ui.showText(
-                i18next.t("battle:noEscapePokemon", {
-                  pokemonName:
-                    tag.sourceId && globalScene.getPokemonById(tag.sourceId)
-                      ? getPokemonNameWithAffix(globalScene.getPokemonById(tag.sourceId)!)
-                      : "",
-                  moveName: tag.getMoveName(),
-                  escapeVerb: isSwitch ? i18next.t("battle:escapeVerbSwitch") : i18next.t("battle:escapeVerbFlee"),
-                }),
-                null,
-                () => {
-                  globalScene.ui.showText("", 0);
-                  if (!isSwitch) {
-                    globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
-                  }
-                },
-                null,
-                true,
-              );
-            };
-
-            if (trapTag) {
-              showNoEscapeText(trapTag);
-            } else if (fairyLockTag) {
-              showNoEscapeText(fairyLockTag);
-            }
-          }
-        }
+        success = this.handleFightCommand(command, cursor, typeof useMode === "boolean" ? undefined : useMode, move);
         break;
-      }
+      case Command.BALL:
+        success = this.handleBallCommand(cursor);
+        break;
+      case Command.POKEMON:
+        this.isSwitch = true;
+        success = this.tryLeaveField(cursor, typeof useMode === "boolean" ? useMode : undefined);
+        this.isSwitch = false;
+        break;
+      case Command.RUN:
+        success = this.handleRunCommand();
     }
 
     if (success) {

From 958eb005665637223b22a41371a95b09d379dce8 Mon Sep 17 00:00:00 2001
From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Date: Mon, 26 May 2025 15:56:14 -0500
Subject: [PATCH 11/44] Breakup commandPhase#start

Co-authored-by: Bertie690 <136088738+Bertie690@users.noreply.github.com>
---
 src/phases/command-phase.ts | 205 ++++++++++++++++++++++--------------
 1 file changed, 125 insertions(+), 80 deletions(-)

diff --git a/src/phases/command-phase.ts b/src/phases/command-phase.ts
index a37721ac912..943eca87e5a 100644
--- a/src/phases/command-phase.ts
+++ b/src/phases/command-phase.ts
@@ -1,14 +1,13 @@
 import type { TurnCommand } from "#app/battle";
+import { BattlerTagType } from "#app/enums/battler-tag-type";
 import { globalScene } from "#app/global-scene";
 import { getPokemonNameWithAffix } from "#app/messages";
 import { speciesStarterCosts } from "#balance/starters";
-import type { EncoreTag } from "#data/battler-tags";
 import { TrappedTag } from "#data/battler-tags";
 import { AbilityId } from "#enums/ability-id";
 import { ArenaTagSide } from "#enums/arena-tag-side";
 import { ArenaTagType } from "#enums/arena-tag-type";
 import { BattleType } from "#enums/battle-type";
-import { BattlerTagType } from "#enums/battler-tag-type";
 import { BiomeId } from "#enums/biome-id";
 import { Command } from "#enums/command";
 import { FieldPosition } from "#enums/field-position";
@@ -39,11 +38,13 @@ export class CommandPhase extends FieldPhase {
     this.fieldIndex = fieldIndex;
   }
 
-  start() {
-    super.start();
-
-    globalScene.updateGameInfo();
-
+  /**
+   * Resets the cursor to the position of {@linkcode Command.FIGHT} if any of the following are true
+   * - The setting to remember the last action is not enabled
+   * - This is the first turn of a mystery encounter, trainer battle, or the END biome
+   * - The cursor is currently on the POKEMON command
+   */
+  private resetCursorIfNeeded() {
     const commandUiHandler = globalScene.ui.handlers[UiMode.COMMAND];
 
     // If one of these conditions is true, we always reset the cursor to Command.FIGHT
@@ -52,33 +53,42 @@ export class CommandPhase extends FieldPhase {
       globalScene.currentBattle.battleType === BattleType.TRAINER ||
       globalScene.arena.biomeType === BiomeId.END;
 
-    if (commandUiHandler) {
-      if (
-        (globalScene.currentBattle.turn === 1 && (!globalScene.commandCursorMemory || cursorResetEvent)) ||
-        commandUiHandler.getCursor() === Command.POKEMON
-      ) {
-        commandUiHandler.setCursor(Command.FIGHT);
-      } else {
-        commandUiHandler.setCursor(commandUiHandler.getCursor());
-      }
+    if (
+      (commandUiHandler &&
+        globalScene.currentBattle.turn === 1 &&
+        (!globalScene.commandCursorMemory || cursorResetEvent)) ||
+      commandUiHandler.getCursor() === Command.POKEMON
+    ) {
+      commandUiHandler.setCursor(Command.FIGHT);
+    }
+  }
+
+  /**
+   * Submethod of {@linkcode start} that validates field index logic for nonzero field indices.
+   * Must only be called if the field index is nonzero.
+   */
+  private handleFieldIndexLogic() {
+    // If we somehow are attempting to check the right pokemon but there's only one pokemon out
+    // Switch back to the center pokemon. This can happen rarely in double battles with mid turn switching
+    // TODO: Prevent this from happening in the first place
+    if (globalScene.getPlayerField().filter(p => p.isActive()).length === 1) {
+      this.fieldIndex = FieldPosition.CENTER;
+      return;
     }
 
-    if (this.fieldIndex) {
-      // If we somehow are attempting to check the right pokemon but there's only one pokemon out
-      // Switch back to the center pokemon. This can happen rarely in double battles with mid turn switching
-      if (globalScene.getPlayerField().filter(p => p.isActive()).length === 1) {
-        this.fieldIndex = FieldPosition.CENTER;
-      } else {
-        const allyCommand = globalScene.currentBattle.turnCommands[this.fieldIndex - 1];
-        if (allyCommand?.command === Command.BALL || allyCommand?.command === Command.RUN) {
-          globalScene.currentBattle.turnCommands[this.fieldIndex] = {
-            command: allyCommand?.command,
-            skip: true,
-          };
-        }
-      }
+    const allyCommand = globalScene.currentBattle.turnCommands[this.fieldIndex - 1];
+    if (allyCommand?.command === Command.BALL || allyCommand?.command === Command.RUN) {
+      globalScene.currentBattle.turnCommands[this.fieldIndex] = {
+        command: allyCommand?.command,
+        skip: true,
+      };
     }
+  }
 
+  /** Submethod of {@linkcode start} that sets the turn command to skip if this pokemon is commanding its ally
+   * via {@linkcode Abilities.COMMANDER}.
+   */
+  private checkCommander() {
     // If the Pokemon has applied Commander's effects to its ally, skip this command
     if (
       globalScene.currentBattle?.double &&
@@ -90,64 +100,99 @@ export class CommandPhase extends FieldPhase {
         skip: true,
       };
     }
+  }
 
-    // Checks if the Pokemon is under the effects of Encore. If so, Encore can end early if the encored move has no more PP.
-    const encoreTag = this.getPokemon().getTag(BattlerTagType.ENCORE) as EncoreTag | undefined;
-    if (encoreTag) {
-      this.getPokemon().lapseTag(BattlerTagType.ENCORE);
+  /**
+   * Clear out all unusable moves in front of the currently acting pokemon's move queue.
+   * TODO: Refactor move queue handling to ensure that this method is not necessary.
+   */
+  private clearUnusuableMoves() {
+    const playerPokemon = this.getPokemon();
+    const moveQueue = playerPokemon.getMoveQueue();
+    if (moveQueue.length === 0) {
+      return;
     }
 
+    let entriesToDelete = 0;
+    const moveset = playerPokemon.getMoveset();
+    for (const queuedMove of moveQueue) {
+      const movesetQueuedMove = moveset.find(m => m.moveId === queuedMove.move);
+      if (
+        queuedMove.move !== MoveId.NONE &&
+        !isVirtual(queuedMove.useMode) &&
+        !movesetQueuedMove?.isUsable(playerPokemon, isIgnorePP(queuedMove.useMode))
+      ) {
+        entriesToDelete++;
+      } else {
+        break;
+      }
+    }
+    if (entriesToDelete) {
+      moveQueue.splice(0, entriesToDelete);
+    }
+  }
+
+  /**
+   * Attempt to execute the first usable move in this Pokemon's move queue
+   * @returns Whether a queued move was successfully set to be executed.
+   */
+  private tryExecuteQueuedMove(): boolean {
+    this.clearUnusuableMoves();
+    const playerPokemon = globalScene.getPlayerField()[this.fieldIndex];
+    const moveQueue = playerPokemon.getMoveQueue();
+
+    if (moveQueue.length === 0) {
+      return false;
+    }
+
+    const queuedMove = moveQueue[0];
+    if (queuedMove.move === MoveId.NONE) {
+      this.handleCommand(Command.FIGHT, -1);
+      return true;
+    }
+    const moveIndex = playerPokemon.getMoveset().findIndex(m => m.moveId === queuedMove.move);
+    if (!isVirtual(queuedMove.useMode) && moveIndex === -1) {
+      globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
+    } else {
+      this.handleCommand(Command.FIGHT, moveIndex, queuedMove.useMode, queuedMove);
+    }
+
+    return true;
+  }
+
+  start() {
+    super.start();
+
+    globalScene.updateGameInfo();
+    this.resetCursorIfNeeded();
+
+    if (this.fieldIndex) {
+      this.handleFieldIndexLogic();
+    }
+
+    this.checkCommander();
+
+    const playerPokemon = this.getPokemon();
+
+    // Note: It is OK to call this if the target is not under the effect of encore; it will simply do nothing.
+    playerPokemon.lapseTag(BattlerTagType.ENCORE);
+
     if (globalScene.currentBattle.turnCommands[this.fieldIndex]?.skip) {
       return this.end();
     }
 
-    const playerPokemon = globalScene.getPlayerField()[this.fieldIndex];
-
-    const moveQueue = playerPokemon.getMoveQueue();
-
-    while (
-      moveQueue.length &&
-      moveQueue[0] &&
-      moveQueue[0].move &&
-      !isVirtual(moveQueue[0].useMode) &&
-      (!playerPokemon.getMoveset().find(m => m.moveId === moveQueue[0].move) ||
-        !playerPokemon
-          .getMoveset()
-          [playerPokemon.getMoveset().findIndex(m => m.moveId === moveQueue[0].move)].isUsable(
-            playerPokemon,
-            isIgnorePP(moveQueue[0].useMode),
-          ))
-    ) {
-      moveQueue.shift();
+    if (this.tryExecuteQueuedMove()) {
+      return;
     }
 
-    // TODO: Refactor this. I did a few simple find/replace matches but this is just ABHORRENTLY structured
-    if (moveQueue.length > 0) {
-      const queuedMove = moveQueue[0];
-      if (!queuedMove.move) {
-        this.handleCommand(Command.FIGHT, -1, MoveUseMode.NORMAL);
-      } else {
-        const moveIndex = playerPokemon.getMoveset().findIndex(m => m.moveId === queuedMove.move);
-        if (
-          (moveIndex > -1 &&
-            playerPokemon.getMoveset()[moveIndex].isUsable(playerPokemon, isIgnorePP(queuedMove.useMode))) ||
-          isVirtual(queuedMove.useMode)
-        ) {
-          this.handleCommand(Command.FIGHT, moveIndex, queuedMove.useMode, queuedMove);
-        } else {
-          globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
-        }
-      }
+    if (
+      globalScene.currentBattle.isBattleMysteryEncounter() &&
+      globalScene.currentBattle.mysteryEncounter?.skipToFightInput
+    ) {
+      globalScene.ui.clearText();
+      globalScene.ui.setMode(UiMode.FIGHT, this.fieldIndex);
     } else {
-      if (
-        globalScene.currentBattle.isBattleMysteryEncounter() &&
-        globalScene.currentBattle.mysteryEncounter?.skipToFightInput
-      ) {
-        globalScene.ui.clearText();
-        globalScene.ui.setMode(UiMode.FIGHT, this.fieldIndex);
-      } else {
-        globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
-      }
+      globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
     }
   }
 
@@ -201,7 +246,7 @@ export class CommandPhase extends FieldPhase {
     useMode: MoveUseMode = MoveUseMode.NORMAL,
     move?: TurnMove,
   ): boolean {
-    const playerPokemon = globalScene.getPlayerField()[this.fieldIndex];
+    const playerPokemon = this.getPokemon();
     const ignorePP = isIgnorePP(useMode);
 
     /** Whether or not to display an error message instead of attempting to initiate the command selection process */
@@ -382,7 +427,7 @@ export class CommandPhase extends FieldPhase {
    * @returns Whether the pokemon is currently trapped
    */
   private handleTrap(): boolean {
-    const playerPokemon = globalScene.getPlayerField()[this.fieldIndex];
+    const playerPokemon = this.getPokemon();
     const trappedAbMessages: string[] = [];
     const isSwitch = this.isSwitch;
     if (!playerPokemon.isTrapped(trappedAbMessages)) {

From 22d2b4a43665543ae386a3ca88df2834482912eb Mon Sep 17 00:00:00 2001
From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Date: Mon, 26 May 2025 16:41:58 -0500
Subject: [PATCH 12/44] Minor touchups

---
 src/phases/command-phase.ts | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/phases/command-phase.ts b/src/phases/command-phase.ts
index 943eca87e5a..34ca7bb71e5 100644
--- a/src/phases/command-phase.ts
+++ b/src/phases/command-phase.ts
@@ -249,8 +249,7 @@ export class CommandPhase extends FieldPhase {
     const playerPokemon = this.getPokemon();
     const ignorePP = isIgnorePP(useMode);
 
-    /** Whether or not to display an error message instead of attempting to initiate the command selection process */
-    let canUse = cursor !== -1 || !playerPokemon.trySelectMove(cursor, ignorePP);
+    let canUse = cursor === -1 || playerPokemon.trySelectMove(cursor, ignorePP);
 
     const useStruggle = canUse
       ? false
@@ -291,7 +290,7 @@ export class CommandPhase extends FieldPhase {
 
     console.log(moveTargets, getPokemonNameWithAffix(playerPokemon));
 
-    if (moveTargets.multiple) {
+    if (moveTargets.targets.length > 1 && moveTargets.multiple) {
       globalScene.phaseManager.unshiftNew("SelectTargetPhase", this.fieldIndex);
     }
 
@@ -419,7 +418,7 @@ export class CommandPhase extends FieldPhase {
   }
 
   /**
-   * Common helper method to handle the logic for effects that prevent the pokemon from leaving the field
+   * Helper method to handle the logic for effects that prevent the pokemon from leaving the field
    * due to trapping abilities or effects.
    *
    * This method queues the proper messages in the case of trapping abilities or effects
@@ -478,11 +477,16 @@ export class CommandPhase extends FieldPhase {
   private tryLeaveField(cursor?: number, isBatonSwitch = false): boolean {
     const currentBattle = globalScene.currentBattle;
 
-    if (isBatonSwitch && !this.handleTrap()) {
-      currentBattle.turnCommands[this.fieldIndex] = {
-        command: this.isSwitch ? Command.POKEMON : Command.RUN,
-        cursor: cursor,
-      };
+    if (isBatonSwitch || !this.handleTrap()) {
+      currentBattle.turnCommands[this.fieldIndex] = this.isSwitch
+        ? {
+            command: Command.POKEMON,
+            cursor: cursor,
+            args: [isBatonSwitch],
+          }
+        : {
+            command: Command.RUN,
+          };
       if (!this.isSwitch && this.fieldIndex) {
         currentBattle.turnCommands[this.fieldIndex - 1]!.skip = true;
       }
@@ -537,7 +541,7 @@ export class CommandPhase extends FieldPhase {
     );
   }
 
-  // Overloads for handleCommand to provide a more specific type signature for the different options
+  // Overloads for handleCommand to provide a more specific signature for the different options
   handleCommand(command: Command.FIGHT | Command.TERA, cursor: number, useMode?: MoveUseMode, move?: TurnMove): boolean;
   handleCommand(command: Command.BALL, cursor: number): boolean;
   handleCommand(command: Command.POKEMON, cursor: number, useBaton: boolean): boolean;

From 9218d35938d11813d53a44c48a1fe181cce0a105 Mon Sep 17 00:00:00 2001
From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Date: Mon, 26 May 2025 16:49:00 -0500
Subject: [PATCH 13/44] Add overload for handle command

---
 src/phases/command-phase.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/phases/command-phase.ts b/src/phases/command-phase.ts
index 34ca7bb71e5..c9a83096359 100644
--- a/src/phases/command-phase.ts
+++ b/src/phases/command-phase.ts
@@ -249,6 +249,7 @@ export class CommandPhase extends FieldPhase {
     const playerPokemon = this.getPokemon();
     const ignorePP = isIgnorePP(useMode);
 
+    let canUse = cursor === -1 || playerPokemon.trySelectMove(cursor, ignorePP);
     let canUse = cursor === -1 || playerPokemon.trySelectMove(cursor, ignorePP);
 
     const useStruggle = canUse

From adb5900497fcc1a6d6afeb892e84e508c6b899f8 Mon Sep 17 00:00:00 2001
From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Date: Mon, 26 May 2025 20:40:48 -0500
Subject: [PATCH 14/44] Fix improperly named computeMoveId method

---
 src/phases/command-phase.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/phases/command-phase.ts b/src/phases/command-phase.ts
index c9a83096359..024e54f8065 100644
--- a/src/phases/command-phase.ts
+++ b/src/phases/command-phase.ts
@@ -230,7 +230,7 @@ export class CommandPhase extends FieldPhase {
    *
    * Does not check if the move is usable or not, that should be handled by the caller.
    */
-  private comptueMoveId(playerPokemon: PlayerPokemon, cursor: number, move?: TurnMove): MoveId {
+  private computeMoveId(playerPokemon: PlayerPokemon, cursor: number, move?: TurnMove): MoveId {
     return move?.move ?? (cursor > -1 ? playerPokemon.getMoveset()[cursor]?.moveId : MoveId.NONE);
   }
 
@@ -263,7 +263,7 @@ export class CommandPhase extends FieldPhase {
       return false;
     }
 
-    const moveId = useStruggle ? MoveId.STRUGGLE : this.comptueMoveId(playerPokemon, cursor, move);
+    const moveId = useStruggle ? MoveId.STRUGGLE : this.computeMoveId(playerPokemon, cursor, move);
 
     const turnCommand: TurnCommand = {
       command: Command.FIGHT,

From e1e7287919513d9017b8e17f142e34d3cd103ef5 Mon Sep 17 00:00:00 2001
From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Date: Mon, 26 May 2025 23:13:46 -0500
Subject: [PATCH 15/44] Improve `canUse` computation

---
 src/phases/command-phase.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/phases/command-phase.ts b/src/phases/command-phase.ts
index 024e54f8065..85b919148e3 100644
--- a/src/phases/command-phase.ts
+++ b/src/phases/command-phase.ts
@@ -252,13 +252,12 @@ export class CommandPhase extends FieldPhase {
     let canUse = cursor === -1 || playerPokemon.trySelectMove(cursor, ignorePP);
     let canUse = cursor === -1 || playerPokemon.trySelectMove(cursor, ignorePP);
 
+    // Ternary here ensures we don't compute struggle conditions unless necessary
     const useStruggle = canUse
       ? false
       : cursor > -1 && !playerPokemon.getMoveset().some(m => m.isUsable(playerPokemon));
 
-    canUse = canUse || useStruggle;
-
-    if (!canUse) {
+    if (!canUse && !useStruggle) {
       this.queueFightErrorMessage(playerPokemon, cursor);
       return false;
     }

From 1df3ac096254d0dd3587d9c26a986212d24dcf60 Mon Sep 17 00:00:00 2001
From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Date: Mon, 26 May 2025 23:18:04 -0500
Subject: [PATCH 16/44] Explicitly check against Moves.NONE

Co-authored-by: Bertie690 <136088738+Bertie690@users.noreply.github.com>
---
 src/phases/command-phase.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/phases/command-phase.ts b/src/phases/command-phase.ts
index 85b919148e3..a8ea0abe5c2 100644
--- a/src/phases/command-phase.ts
+++ b/src/phases/command-phase.ts
@@ -284,7 +284,7 @@ export class CommandPhase extends FieldPhase {
             multiple: move.targets.length > 1,
           };
 
-    if (!moveId) {
+    if (moveId === Moves.NONE) {
       turnCommand.targets = [this.fieldIndex];
     }
 

From 26cbf2db8c1d6a3f1485ad53f2b007ba40c39187 Mon Sep 17 00:00:00 2001
From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Date: Fri, 6 Jun 2025 10:41:34 -0500
Subject: [PATCH 17/44] Update with Bertie's comments

Co-authored-by: Bertie690 <136088738+Bertie690@users.noreply.github.com>
---
 src/phases/command-phase.ts | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/phases/command-phase.ts b/src/phases/command-phase.ts
index a8ea0abe5c2..ce83c25d314 100644
--- a/src/phases/command-phase.ts
+++ b/src/phases/command-phase.ts
@@ -225,7 +225,8 @@ export class CommandPhase extends FieldPhase {
     );
   }
 
-  /** Helper method for {@linkcode handleFightCommand} that returns the moveID for the phase
+  /**
+   * Helper method for {@linkcode handleFightCommand} that returns the moveID for the phase
    * based on the move passed in or the cursor.
    *
    * Does not check if the move is usable or not, that should be handled by the caller.
@@ -235,10 +236,16 @@ export class CommandPhase extends FieldPhase {
   }
 
   /**
-   * Handle fight logic
+   * Process the logic for executing a fight-related command
+   *
+   * @remarks
+   * - Validates whether the move can be used, using struggle if not
+   * - Constructs the turn command and inserts it into the battle's turn commands
+   *
    * @param command - The command to handle (FIGHT or TERA)
    * @param cursor - The index that the cursor is placed on, or -1 if no move can be selected.
-   * @param args - Any additional arguments to pass to the command
+   * @param ignorePP - Whether to ignore PP when checking if the move can be used.
+   * @param move - The move to force the command to use, if any.
    */
   private handleFightCommand(
     command: Command.FIGHT | Command.TERA,
@@ -249,7 +256,6 @@ export class CommandPhase extends FieldPhase {
     const playerPokemon = this.getPokemon();
     const ignorePP = isIgnorePP(useMode);
 
-    let canUse = cursor === -1 || playerPokemon.trySelectMove(cursor, ignorePP);
     let canUse = cursor === -1 || playerPokemon.trySelectMove(cursor, ignorePP);
 
     // Ternary here ensures we don't compute struggle conditions unless necessary
@@ -257,7 +263,9 @@ export class CommandPhase extends FieldPhase {
       ? false
       : cursor > -1 && !playerPokemon.getMoveset().some(m => m.isUsable(playerPokemon));
 
-    if (!canUse && !useStruggle) {
+    canUse ||= useStruggle;
+
+    if (!canUse) {
       this.queueFightErrorMessage(playerPokemon, cursor);
       return false;
     }
@@ -284,7 +292,7 @@ export class CommandPhase extends FieldPhase {
             multiple: move.targets.length > 1,
           };
 
-    if (moveId === Moves.NONE) {
+    if (moveId === MoveId.NONE) {
       turnCommand.targets = [this.fieldIndex];
     }
 

From c0a42985bffbab5369bf797b3adb9246fa653819 Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Tue, 15 Jul 2025 22:12:19 -0700
Subject: [PATCH 18/44] Fix imports

---
 src/phases/command-phase.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/phases/command-phase.ts b/src/phases/command-phase.ts
index ce83c25d314..d44681ab12c 100644
--- a/src/phases/command-phase.ts
+++ b/src/phases/command-phase.ts
@@ -1,5 +1,4 @@
 import type { TurnCommand } from "#app/battle";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
 import { globalScene } from "#app/global-scene";
 import { getPokemonNameWithAffix } from "#app/messages";
 import { speciesStarterCosts } from "#balance/starters";
@@ -8,6 +7,7 @@ import { AbilityId } from "#enums/ability-id";
 import { ArenaTagSide } from "#enums/arena-tag-side";
 import { ArenaTagType } from "#enums/arena-tag-type";
 import { BattleType } from "#enums/battle-type";
+import { BattlerTagType } from "#enums/battler-tag-type";
 import { BiomeId } from "#enums/biome-id";
 import { Command } from "#enums/command";
 import { FieldPosition } from "#enums/field-position";
@@ -19,9 +19,9 @@ import { UiMode } from "#enums/ui-mode";
 import type { PlayerPokemon } from "#field/pokemon";
 import type { MoveTargetSet } from "#moves/move";
 import { getMoveTargets } from "#moves/move-utils";
+import { FieldPhase } from "#phases/field-phase";
 import type { TurnMove } from "#types/turn-move";
 import i18next from "i18next";
-import { FieldPhase } from "./field-phase";
 
 export class CommandPhase extends FieldPhase {
   public readonly phaseName = "CommandPhase";

From ed915dcb58c85a9c511b80dba329b65bdde609be Mon Sep 17 00:00:00 2001
From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Date: Wed, 23 Jul 2025 21:15:23 -0600
Subject: [PATCH 19/44] Apply kev's suggestions from code review

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
---
 src/phases/command-phase.ts | 115 +++++++++++++++++++++---------------
 1 file changed, 69 insertions(+), 46 deletions(-)

diff --git a/src/phases/command-phase.ts b/src/phases/command-phase.ts
index d44681ab12c..44b365146d9 100644
--- a/src/phases/command-phase.ts
+++ b/src/phases/command-phase.ts
@@ -44,19 +44,21 @@ export class CommandPhase extends FieldPhase {
    * - This is the first turn of a mystery encounter, trainer battle, or the END biome
    * - The cursor is currently on the POKEMON command
    */
-  private resetCursorIfNeeded() {
+  private resetCursorIfNeeded(): void {
     const commandUiHandler = globalScene.ui.handlers[UiMode.COMMAND];
+    const { arena, commandCursorMemory, currentBattle } = globalScene;
+    const { battleType, turn } = currentBattle;
+    const { biomeType } = arena;
 
     // If one of these conditions is true, we always reset the cursor to Command.FIGHT
     const cursorResetEvent =
-      globalScene.currentBattle.battleType === BattleType.MYSTERY_ENCOUNTER ||
-      globalScene.currentBattle.battleType === BattleType.TRAINER ||
-      globalScene.arena.biomeType === BiomeId.END;
+      battleType === BattleType.MYSTERY_ENCOUNTER || battleType === BattleType.TRAINER || biomeType === BiomeId.END;
 
+    if (!commandUiHandler) {
+      return;
+    }
     if (
-      (commandUiHandler &&
-        globalScene.currentBattle.turn === 1 &&
-        (!globalScene.commandCursorMemory || cursorResetEvent)) ||
+      (turn === 1 && (!commandCursorMemory || cursorResetEvent)) ||
       commandUiHandler.getCursor() === Command.POKEMON
     ) {
       commandUiHandler.setCursor(Command.FIGHT);
@@ -67,7 +69,7 @@ export class CommandPhase extends FieldPhase {
    * Submethod of {@linkcode start} that validates field index logic for nonzero field indices.
    * Must only be called if the field index is nonzero.
    */
-  private handleFieldIndexLogic() {
+  private handleFieldIndexLogic(): void {
     // If we somehow are attempting to check the right pokemon but there's only one pokemon out
     // Switch back to the center pokemon. This can happen rarely in double battles with mid turn switching
     // TODO: Prevent this from happening in the first place
@@ -85,10 +87,11 @@ export class CommandPhase extends FieldPhase {
     }
   }
 
-  /** Submethod of {@linkcode start} that sets the turn command to skip if this pokemon is commanding its ally
-   * via {@linkcode Abilities.COMMANDER}.
+  /**
+   * Submethod of {@linkcode start} that sets the turn command to skip if this pokemon
+   * is commanding its ally via {@linkcode AbilityId.COMMANDER}.
    */
-  private checkCommander() {
+  private checkCommander(): void {
     // If the Pokemon has applied Commander's effects to its ally, skip this command
     if (
       globalScene.currentBattle?.double &&
@@ -104,9 +107,10 @@ export class CommandPhase extends FieldPhase {
 
   /**
    * Clear out all unusable moves in front of the currently acting pokemon's move queue.
+   *
    * TODO: Refactor move queue handling to ensure that this method is not necessary.
    */
-  private clearUnusuableMoves() {
+  private clearUnusuableMoves(): void {
     const playerPokemon = this.getPokemon();
     const moveQueue = playerPokemon.getMoveQueue();
     if (moveQueue.length === 0) {
@@ -160,7 +164,7 @@ export class CommandPhase extends FieldPhase {
     return true;
   }
 
-  start() {
+  public override start(): void {
     super.start();
 
     globalScene.updateGameInfo();
@@ -178,7 +182,8 @@ export class CommandPhase extends FieldPhase {
     playerPokemon.lapseTag(BattlerTagType.ENCORE);
 
     if (globalScene.currentBattle.turnCommands[this.fieldIndex]?.skip) {
-      return this.end();
+      this.end();
+      return;
     }
 
     if (this.tryExecuteQueuedMove()) {
@@ -197,7 +202,8 @@ export class CommandPhase extends FieldPhase {
   }
 
   /**
-   *
+   * Submethod of {@linkcode handleFightCommand} responsible for queuing the appropriate
+   * error message when a move cannot be used.
    * @param user - The pokemon using the move
    * @param cursor - The index of the move in the moveset
    */
@@ -231,7 +237,7 @@ export class CommandPhase extends FieldPhase {
    *
    * Does not check if the move is usable or not, that should be handled by the caller.
    */
-  private computeMoveId(playerPokemon: PlayerPokemon, cursor: number, move?: TurnMove): MoveId {
+  private computeMoveId(playerPokemon: PlayerPokemon, cursor: number, move: TurnMove | undefined): MoveId {
     return move?.move ?? (cursor > -1 ? playerPokemon.getMoveset()[cursor]?.moveId : MoveId.NONE);
   }
 
@@ -274,12 +280,12 @@ export class CommandPhase extends FieldPhase {
 
     const turnCommand: TurnCommand = {
       command: Command.FIGHT,
-      cursor: cursor,
+      cursor,
       move: { move: moveId, targets: [], useMode },
       args: [useMode, move],
     };
     const preTurnCommand: TurnCommand = {
-      command: command,
+      command,
       targets: [this.fieldIndex],
       skip: command === Command.FIGHT,
     };
@@ -296,7 +302,14 @@ export class CommandPhase extends FieldPhase {
       turnCommand.targets = [this.fieldIndex];
     }
 
-    console.log(moveTargets, getPokemonNameWithAffix(playerPokemon));
+    console.log(
+      "Move:",
+      MoveId[moveId],
+      "Move targets:",
+      moveTargets,
+      "\nPlayer Pokemon:",
+      getPokemonNameWithAffix(playerPokemon),
+    );
 
     if (moveTargets.targets.length > 1 && moveTargets.multiple) {
       globalScene.phaseManager.unshiftNew("SelectTargetPhase", this.fieldIndex);
@@ -325,7 +338,7 @@ export class CommandPhase extends FieldPhase {
    * Only works for parameterless i18next keys.
    * @param key - The i18next key for the text to show
    */
-  private queueShowText(key: string) {
+  private queueShowText(key: string): void {
     globalScene.ui.setMode(UiMode.COMMAND, this.fieldIndex);
     globalScene.ui.setMode(UiMode.MESSAGE);
 
@@ -344,32 +357,35 @@ export class CommandPhase extends FieldPhase {
   /**
    * Helper method for {@linkcode handleBallCommand} that checks if the pokeball can be thrown.
    *
-   * The pokeball may not be thrown if:
+   * The pokeball may not be thrown if any of the following are true:
    * - It is a trainer battle
-   * - The biome is {@linkcode Biome.END} and it is not classic mode
-   * - The biome is {@linkcode Biome.END} and the fresh start challenge is active
-   * - The biome is {@linkcode Biome.END} and the player has not either caught the target before or caught all but one starter
+   * - The player is in the {@linkcode BiomeId.END | End} biome and
+   *   - it is not classic mode; or
+   *   - the fresh start challenge is active; or
+   *   - the player has not caught the target before and the player is still missing more than one starter
    * - The player is in a mystery encounter that disallows catching the pokemon
    * @returns Whether a pokeball can be thrown
-   *
    */
   private checkCanUseBall(): boolean {
+    const { arena, currentBattle, gameData, gameMode } = globalScene;
+    const { battleType } = currentBattle;
+    const { biomeType } = arena;
+    const { isClassic } = gameMode;
+    const { dexData } = gameData;
+
+    const someUncaughtSpeciesOnField = globalScene
+      .getEnemyField()
+      .some(p => p.isActive() && !dexData[p.species.speciesId].caughtAttr);
+    const missingMultipleStarters =
+      gameData.getStarterCount(d => !!d.caughtAttr) < Object.keys(speciesStarterCosts).length - 1;
     if (
-      globalScene.arena.biomeType === BiomeId.END &&
-      (!globalScene.gameMode.isClassic ||
-        globalScene.gameMode.isFreshStartChallenge() ||
-        (globalScene
-          .getEnemyField()
-          .some(p => p.isActive() && !globalScene.gameData.dexData[p.species.speciesId].caughtAttr) &&
-          globalScene.gameData.getStarterCount(d => !!d.caughtAttr) < Object.keys(speciesStarterCosts).length - 1))
+      biomeType === BiomeId.END &&
+      (!isClassic || gameMode.isFreshStartChallenge() || (someUncaughtSpeciesOnField && missingMultipleStarters))
     ) {
       this.queueShowText("battle:noPokeballForce");
-    } else if (globalScene.currentBattle.battleType === BattleType.TRAINER) {
+    } else if (battleType === BattleType.TRAINER) {
       this.queueShowText("battle:noPokeballTrainer");
-    } else if (
-      globalScene.currentBattle.isBattleMysteryEncounter() &&
-      !globalScene.currentBattle.mysteryEncounter!.catchAllowed
-    ) {
+    } else if (currentBattle.isBattleMysteryEncounter() && !currentBattle.mysteryEncounter!.catchAllowed) {
       this.queueShowText("battle:noPokeballMysteryEncounter");
     } else {
       return true;
@@ -398,7 +414,8 @@ export class CommandPhase extends FieldPhase {
       return false;
     }
 
-    if (cursor < 5) {
+    const numBallTypes = 5;
+    if (cursor < numBallTypes) {
       const targetPokemon = globalScene.getEnemyPokemon();
       if (
         targetPokemon?.isBoss() &&
@@ -489,7 +506,7 @@ export class CommandPhase extends FieldPhase {
       currentBattle.turnCommands[this.fieldIndex] = this.isSwitch
         ? {
             command: Command.POKEMON,
-            cursor: cursor,
+            cursor,
             args: [isBatonSwitch],
           }
         : {
@@ -550,12 +567,6 @@ export class CommandPhase extends FieldPhase {
   }
 
   // Overloads for handleCommand to provide a more specific signature for the different options
-  handleCommand(command: Command.FIGHT | Command.TERA, cursor: number, useMode?: MoveUseMode, move?: TurnMove): boolean;
-  handleCommand(command: Command.BALL, cursor: number): boolean;
-  handleCommand(command: Command.POKEMON, cursor: number, useBaton: boolean): boolean;
-  handleCommand(command: Command.RUN, cursor: number): boolean;
-  handleCommand(command: Command, cursor: number, useMode?: boolean | MoveUseMode, move?: TurnMove): boolean;
-
   /**
    * Process the command phase logic based on the selected command
    *
@@ -563,8 +574,20 @@ export class CommandPhase extends FieldPhase {
    * @param cursor - The index of option that the cursor is on, or -1 if no option is selected
    * @param useMode - The mode to use for the move, if applicable. For switches, a boolean that specifies whether the switch is a Baton switch.
    * @param move - For {@linkcode Command.FIGHT}, the move to use
+   * @returns Whether the command was successful
    */
-  handleCommand(command: Command, cursor: number, useMode: boolean | MoveUseMode = false, move?: TurnMove): boolean {
+  handleCommand(command: Command.FIGHT | Command.TERA, cursor: number, useMode?: MoveUseMode, move?: TurnMove): boolean;
+  handleCommand(command: Command.BALL, cursor: number): boolean;
+  handleCommand(command: Command.POKEMON, cursor: number, useBaton: boolean): boolean;
+  handleCommand(command: Command.RUN, cursor: number): boolean;
+  handleCommand(command: Command, cursor: number, useMode?: boolean | MoveUseMode, move?: TurnMove): boolean;
+
+  public handleCommand(
+    command: Command,
+    cursor: number,
+    useMode: boolean | MoveUseMode = false,
+    move?: TurnMove,
+  ): boolean {
     let success = false;
 
     switch (command) {

From 0c82b3f514d2624ea1d36e39b5a749f385fa3013 Mon Sep 17 00:00:00 2001
From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Date: Thu, 24 Jul 2025 15:14:24 -0600
Subject: [PATCH 20/44] Improve documentation

Co-authored-by: Bertie690 <136088738+Bertie690@users.noreply.github.com>
---
 src/phases/command-phase.ts | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/phases/command-phase.ts b/src/phases/command-phase.ts
index 44b365146d9..016d4ff5d3b 100644
--- a/src/phases/command-phase.ts
+++ b/src/phases/command-phase.ts
@@ -107,9 +107,8 @@ export class CommandPhase extends FieldPhase {
 
   /**
    * Clear out all unusable moves in front of the currently acting pokemon's move queue.
-   *
-   * TODO: Refactor move queue handling to ensure that this method is not necessary.
    */
+  // TODO: Refactor move queue handling to ensure that this method is not necessary.
   private clearUnusuableMoves(): void {
     const playerPokemon = this.getPokemon();
     const moveQueue = playerPokemon.getMoveQueue();
@@ -355,8 +354,10 @@ export class CommandPhase extends FieldPhase {
   }
 
   /**
-   * Helper method for {@linkcode handleBallCommand} that checks if the pokeball can be thrown.
+   * Helper method for {@linkcode handleBallCommand} that checks if a pokeball can be thrown
+   * and displays the appropriate error message.
    *
+   * @remarks
    * The pokeball may not be thrown if any of the following are true:
    * - It is a trainer battle
    * - The player is in the {@linkcode BiomeId.END | End} biome and
@@ -443,10 +444,10 @@ export class CommandPhase extends FieldPhase {
   }
 
   /**
-   * Helper method to handle the logic for effects that prevent the pokemon from leaving the field
+   * Submethod of {@linkcode tryLeaveField} to handle the logic for effects that prevent the pokemon from leaving the field
    * due to trapping abilities or effects.
    *
-   * This method queues the proper messages in the case of trapping abilities or effects
+   * This method queues the proper messages in the case of trapping abilities or effects.
    *
    * @returns Whether the pokemon is currently trapped
    */
@@ -496,8 +497,7 @@ export class CommandPhase extends FieldPhase {
    * Checks for trapping abilities and effects.
    *
    * @param cursor - The index of the option that the cursor is on
-   * @param isBatonSwitch - Whether the switch command is switching via the Baton item
-   * @returns whether the pokemon is able to leave the field, indicating the command phase should end
+   * @returns Whether the pokemon is able to leave the field, indicating the command phase should end
    */
   private tryLeaveField(cursor?: number, isBatonSwitch = false): boolean {
     const currentBattle = globalScene.currentBattle;
@@ -521,6 +521,19 @@ export class CommandPhase extends FieldPhase {
     return false;
   }
 
+  /**
+   * Helper method for {@linkcode handleCommand} that handles the logic when the selected command is RUN.
+   *
+   * @remarks
+   * Checks if the player is allowed to flee, and if not, queues the appropriate message.
+   *
+   * The player cannot flee if:
+   * - The player is in the {@linkcode BiomeId.END | End} biome
+   * - The player is in a trainer battle
+   * - The player is in a mystery encounter that disallows fleeing
+   * - The player's pokemon is trapped by an ability or effect
+   * @returns Whether the pokemon is able to leave the field, indicating the command phase should end
+   */
   private handleRunCommand(): boolean {
     const { currentBattle, arena } = globalScene;
     const mysteryEncounterFleeAllowed = currentBattle.mysteryEncounter?.fleeAllowed ?? true;

From 903fad89d9e4d25fd4665958b3cc99efab718db5 Mon Sep 17 00:00:00 2001
From: AJ Fontaine <36677462+Fontbane@users.noreply.github.com>
Date: Mon, 28 Jul 2025 01:46:11 -0400
Subject: [PATCH 21/44] [Balance][Challenge] Added expanded Fresh Start options
 (#6162)

---
 src/data/challenge.ts | 35 ++++++++++++++++++++++++++---------
 src/system/achv.ts    |  2 +-
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/data/challenge.ts b/src/data/challenge.ts
index db4ec931bc2..aaa82a7d20f 100644
--- a/src/data/challenge.ts
+++ b/src/data/challenge.ts
@@ -4,6 +4,7 @@ import { defaultStarterSpecies } from "#app/constants";
 import { globalScene } from "#app/global-scene";
 import { pokemonEvolutions } from "#balance/pokemon-evolutions";
 import { speciesStarterCosts } from "#balance/starters";
+import { getEggTierForSpecies } from "#data/egg";
 import { pokemonFormChanges } from "#data/pokemon-forms";
 import type { PokemonSpecies } from "#data/pokemon-species";
 import { getPokemonSpeciesForm } from "#data/pokemon-species";
@@ -11,6 +12,7 @@ import { BattleType } from "#enums/battle-type";
 import { ChallengeType } from "#enums/challenge-type";
 import { Challenges } from "#enums/challenges";
 import { TypeColor, TypeShadow } from "#enums/color";
+import { EggTier } from "#enums/egg-type";
 import { ClassicFixedBossWaves } from "#enums/fixed-boss-waves";
 import { ModifierTier } from "#enums/modifier-tier";
 import type { MoveId } from "#enums/move-id";
@@ -683,11 +685,14 @@ export class SingleTypeChallenge extends Challenge {
  */
 export class FreshStartChallenge extends Challenge {
   constructor() {
-    super(Challenges.FRESH_START, 1);
+    super(Challenges.FRESH_START, 3);
   }
 
   applyStarterChoice(pokemon: PokemonSpecies, valid: BooleanHolder): boolean {
-    if (!defaultStarterSpecies.includes(pokemon.speciesId)) {
+    if (
+      (this.value === 1 && !defaultStarterSpecies.includes(pokemon.speciesId)) ||
+      (this.value === 2 && getEggTierForSpecies(pokemon) >= EggTier.EPIC)
+    ) {
       valid.value = false;
       return true;
     }
@@ -695,15 +700,12 @@ export class FreshStartChallenge extends Challenge {
   }
 
   applyStarterCost(species: SpeciesId, cost: NumberHolder): boolean {
-    if (defaultStarterSpecies.includes(species)) {
-      cost.value = speciesStarterCosts[species];
-      return true;
-    }
-    return false;
+    cost.value = speciesStarterCosts[species];
+    return true;
   }
 
   applyStarterModify(pokemon: Pokemon): boolean {
-    pokemon.abilityIndex = 0; // Always base ability, not hidden ability
+    pokemon.abilityIndex = pokemon.abilityIndex % 2; // Always base ability, if you set it to hidden it wraps to first ability
     pokemon.passive = false; // Passive isn't unlocked
     pokemon.nature = Nature.HARDY; // Neutral nature
     pokemon.moveset = pokemon.species
@@ -715,7 +717,22 @@ export class FreshStartChallenge extends Challenge {
     pokemon.luck = 0; // No luck
     pokemon.shiny = false; // Not shiny
     pokemon.variant = 0; // Not shiny
-    pokemon.formIndex = 0; // Froakie should be base form
+    if (pokemon.species.speciesId === SpeciesId.ZYGARDE && pokemon.formIndex >= 2) {
+      pokemon.formIndex -= 2; // Sets 10%-PC to 10%-AB and 50%-PC to 50%-AB
+    } else if (
+      pokemon.formIndex > 0 &&
+      [
+        SpeciesId.PIKACHU,
+        SpeciesId.EEVEE,
+        SpeciesId.PICHU,
+        SpeciesId.ROTOM,
+        SpeciesId.MELOETTA,
+        SpeciesId.FROAKIE,
+        SpeciesId.ROCKRUFF,
+      ].includes(pokemon.species.speciesId)
+    ) {
+      pokemon.formIndex = 0; // These mons are set to form 0 because they're meant to be unlocks or mid-run form changes
+    }
     pokemon.ivs = [15, 15, 15, 15, 15, 15]; // Default IVs of 15 for all stats (Updated to 15 from 10 in 1.2.0)
     pokemon.teraType = pokemon.species.type1; // Always primary tera type
     return true;
diff --git a/src/system/achv.ts b/src/system/achv.ts
index abe6f264d20..69eade02e35 100644
--- a/src/system/achv.ts
+++ b/src/system/achv.ts
@@ -890,7 +890,7 @@ export const achvs = {
     100,
     c =>
       c instanceof FreshStartChallenge &&
-      c.value > 0 &&
+      c.value === 1 &&
       !globalScene.gameMode.challenges.some(
         c => [Challenges.INVERSE_BATTLE, Challenges.FLIP_STAT].includes(c.id) && c.value > 0,
       ),

From c92b895946825d1a552224810629927296614d12 Mon Sep 17 00:00:00 2001
From: Bertie690 <136088738+Bertie690@users.noreply.github.com>
Date: Mon, 28 Jul 2025 14:43:36 -0400
Subject: [PATCH 22/44] [Dev] Add `workflow-dispatch` trigger to tests github
 workflow (#6152)

Add `workflow-dispatch` trigger to github workflow

Co-authored-by: damocleas <damocleas25@gmail.com>
---
 .github/workflows/tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d3dd23eb379..764a35ace60 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,6 +11,7 @@ on:
       - beta
   merge_group:
     types: [checks_requested]
+  workflow_dispatch:
 
 jobs:
   check-path-change-filter:

From 48db9491c6a61eb871b7dc591c427a44a824b277 Mon Sep 17 00:00:00 2001
From: Bertie690 <136088738+Bertie690@users.noreply.github.com>
Date: Mon, 28 Jul 2025 14:51:43 -0400
Subject: [PATCH 23/44] [Test] Add support for custom boilerplates to
 `create-test.js` (#6158)

* Added support for custom boilerplates to test:create script

* Added support for custom boilerplates to create-test.js

* Fixed syntax error

* Update create-test.js

Co-authored-by: Amani H. <109637146+xsn34kzx@users.noreply.github.com>

* Fix pluralization error in `create-test.js`

---------

Co-authored-by: Amani H. <109637146+xsn34kzx@users.noreply.github.com>
---
 .../default.ts}                               |   0
 scripts/create-test/create-test.js            | 107 +++++++++++-------
 2 files changed, 63 insertions(+), 44 deletions(-)
 rename scripts/create-test/{test-boilerplate.ts => boilerplates/default.ts} (100%)

diff --git a/scripts/create-test/test-boilerplate.ts b/scripts/create-test/boilerplates/default.ts
similarity index 100%
rename from scripts/create-test/test-boilerplate.ts
rename to scripts/create-test/boilerplates/default.ts
diff --git a/scripts/create-test/create-test.js b/scripts/create-test/create-test.js
index c0f27f8891e..765993959d1 100644
--- a/scripts/create-test/create-test.js
+++ b/scripts/create-test/create-test.js
@@ -17,15 +17,20 @@ const version = "2.0.1";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const projectRoot = path.join(__dirname, "..", "..");
-const boilerplateFilePath = path.join(__dirname, "test-boilerplate.ts");
-const choices = [
-  { label: "Move", dir: "moves" },
-  { label: "Ability", dir: "abilities" },
-  { label: "Item", dir: "items" },
-  { label: "Mystery Encounter", dir: "mystery-encounter/encounters" },
-  { label: "Utils", dir: "utils" },
-  { label: "UI", dir: "ui" },
-];
+
+const choices = /** @type {const} */ (["Move", "Ability", "Item", "Reward", "Mystery Encounter", "Utils", "UI"]);
+/** @typedef {choices[number]} choiceType */
+
+/** @satisfies {{[k in choiceType]: string}} */
+const choicesToDirs = /** @type {const} */ ({
+  Move: "moves",
+  Ability: "abilities",
+  Item: "items",
+  Reward: "rewards",
+  "Mystery Encounter": "mystery-encounter/encounters",
+  Utils: "utils",
+  UI: "ui",
+});
 
 //#endregion
 //#region Functions
@@ -41,48 +46,47 @@ function getTestFolderPath(...folders) {
 
 /**
  * Prompts the user to select a type via list.
- * @returns {Promise<{selectedOption: {label: string, dir: string}}>} the selected type
+ * @returns {Promise<choiceType>} the selected type
  */
 async function promptTestType() {
-  const typeAnswer = await inquirer
+  /** @type {choiceType | "EXIT"} */
+  const choice = await inquirer
     .prompt([
       {
         type: "list",
         name: "selectedOption",
         message: "What type of test would you like to create?",
-        choices: [...choices.map(choice => ({ name: choice.label, value: choice })), { name: "EXIT", value: "N/A" }],
+        choices: [...choices, "EXIT"],
       },
     ])
-    .then(ans => ans.selectedOption);
+    .then(ta => ta.selectedOption);
 
-  if (typeAnswer.name === "EXIT") {
+  if (choice === "EXIT") {
     console.log("Exiting...");
     return process.exit(0);
   }
-  if (!choices.some(choice => choice.dir === typeAnswer.dir)) {
-    console.error(`Please provide a valid type: (${choices.map(choice => choice.label).join(", ")})!`);
-    return await promptTestType();
-  }
 
-  return typeAnswer;
+  return choice;
 }
 
 /**
  * Prompts the user to provide a file name.
- * @param {string} selectedType
- * @returns {Promise<{userInput: string}>} the selected file name
+ * @param {choiceType} selectedType The chosen string (used to display console logs)
+ * @returns {Promise<string>} the selected file name
  */
 async function promptFileName(selectedType) {
-  /** @type {{userInput: string}} */
-  const fileNameAnswer = await inquirer.prompt([
-    {
-      type: "input",
-      name: "userInput",
-      message: `Please provide the name of the ${selectedType}:`,
-    },
-  ]);
+  /** @type {string} */
+  const fileNameAnswer = await inquirer
+    .prompt([
+      {
+        type: "input",
+        name: "userInput",
+        message: `Please provide the name of the ${selectedType}.`,
+      },
+    ])
+    .then(fa => fa.userInput);
 
-  if (!fileNameAnswer.userInput || fileNameAnswer.userInput.trim().length === 0) {
+  if (fileNameAnswer.trim().length === 0) {
     console.error("Please provide a valid file name!");
     return await promptFileName(selectedType);
   }
@@ -90,51 +94,66 @@ async function promptFileName(selectedType) {
   return fileNameAnswer;
 }
 
+/**
+ * Obtain the path to the boilerplate file based on the current option.
+ * @param {choiceType} choiceType The choice selected
+ * @returns {string} The path to the boilerplate file
+ */
+function getBoilerplatePath(choiceType) {
+  switch (choiceType) {
+    // case "Reward":
+    //   return path.join(__dirname, "boilerplates/reward.ts");
+    default:
+      return path.join(__dirname, "boilerplates/default.ts");
+  }
+}
+
 /**
  * Runs the interactive test:create "CLI"
  * @returns {Promise<void>}
  */
 async function runInteractive() {
-  console.group(chalk.grey(`Create Test - v${version}\n`));
+  console.group(chalk.grey(`🧪 Create Test - v${version}\n`));
 
   try {
-    const typeAnswer = await promptTestType();
-    const fileNameAnswer = await promptFileName(typeAnswer.selectedOption.label);
+    const choice = await promptTestType();
+    const fileNameAnswer = await promptFileName(choice);
 
-    const type = typeAnswer.selectedOption;
     // Convert fileName from snake_case or camelCase to kebab-case
-    const fileName = fileNameAnswer.userInput
+    const fileName = fileNameAnswer
       .replace(/_+/g, "-") // Convert snake_case (underscore) to kebab-case (dashes)
       .replace(/([a-z])([A-Z])/g, "$1-$2") // Convert camelCase to kebab-case
       .replace(/\s+/g, "-") // Replace spaces with dashes
       .toLowerCase(); // Ensure all lowercase
-    // Format the description for the test case
 
+    // Format the description for the test case in Title Case
     const formattedName = fileName.replace(/-/g, " ").replace(/\b\w/g, char => char.toUpperCase());
+    const description = `${choice} - ${formattedName}`;
+
     // Determine the directory based on the type
-    const dir = getTestFolderPath(type.dir);
-    const description = `${type.label} - ${formattedName}`;
+    const localDir = choicesToDirs[choice];
+    const absoluteDir = getTestFolderPath(localDir);
 
     // Define the content template
-    const content = fs.readFileSync(boilerplateFilePath, "utf8").replace("{{description}}", description);
+    const content = fs.readFileSync(getBoilerplatePath(choice), "utf8").replace("{{description}}", description);
 
     // Ensure the directory exists
-    if (!fs.existsSync(dir)) {
-      fs.mkdirSync(dir, { recursive: true });
+    if (!fs.existsSync(absoluteDir)) {
+      fs.mkdirSync(absoluteDir, { recursive: true });
     }
 
     // Create the file with the given name
-    const filePath = path.join(dir, `${fileName}.test.ts`);
+    const filePath = path.join(absoluteDir, `${fileName}.test.ts`);
 
     if (fs.existsSync(filePath)) {
-      console.error(chalk.red.bold(`\n✗ File "${fileName}.test.ts" already exists!\n`));
+      console.error(chalk.red.bold(`✗ File "${fileName}.test.ts" already exists!\n`));
       process.exit(1);
     }
 
     // Write the template content to the file
     fs.writeFileSync(filePath, content, "utf8");
 
-    console.log(chalk.green.bold(`\n✔ File created at: test/${type.dir}/${fileName}.test.ts\n`));
+    console.log(chalk.green.bold(`✔ File created at: test/${localDir}/${fileName}.test.ts\n`));
     console.groupEnd();
   } catch (err) {
     console.error(chalk.red("✗ Error: ", err.message));

From 0517d5704aa63f09a92002ba06e4f95e0c8939d2 Mon Sep 17 00:00:00 2001
From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Date: Mon, 28 Jul 2025 20:13:10 -0600
Subject: [PATCH 24/44] [Refactor] Mark nickname in pokemon as optional (#6168)

Mark nickname in pokemon as optional
---
 src/@types/illusion-data.ts | 2 +-
 src/field/pokemon.ts        | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/@types/illusion-data.ts b/src/@types/illusion-data.ts
index b152e3fdf59..5bf86d23ac2 100644
--- a/src/@types/illusion-data.ts
+++ b/src/@types/illusion-data.ts
@@ -11,7 +11,7 @@ export interface IllusionData {
   /** The name of pokemon featured in the illusion */
   name: string;
   /** The nickname of the pokemon featured in the illusion */
-  nickname: string;
+  nickname?: string;
   /** Whether the pokemon featured in the illusion is shiny or not */
   shiny: boolean;
   /** The variant of the pokemon featured in the illusion */
diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index fd04c007e1b..7aecc0c8e75 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -213,7 +213,11 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
    * TODO: Stop treating this like a unique ID and stop treating 0 as no pokemon
    */
   public id: number;
-  public nickname: string;
+  /**
+   * The Pokemon's current nickname, or `undefined` if it currently lacks one.
+   * If omitted, references to this should refer to the default name for this Pokemon's species.
+   */
+  public nickname?: string;
   public species: PokemonSpecies;
   public formIndex: number;
   public abilityIndex: number;
@@ -443,7 +447,7 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
   getNameToRender(useIllusion = true) {
     const illusion = this.summonData.illusion;
     const name = useIllusion ? (illusion?.name ?? this.name) : this.name;
-    const nickname: string = useIllusion ? (illusion?.nickname ?? this.nickname) : this.nickname;
+    const nickname: string | undefined = useIllusion ? illusion?.nickname : this.nickname;
     try {
       if (nickname) {
         return decodeURIComponent(escape(atob(nickname))); // TODO: Remove `atob` and `escape`... eventually...

From 9f74bfff943190e365b6900dc6bb9211f711ac62 Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Tue, 29 Jul 2025 08:59:41 -0700
Subject: [PATCH 25/44] [Dev] Update Vite from 6.3.5 to 7.0.6 (#6163)

---
 package.json   |   8 +-
 pnpm-lock.yaml | 918 ++++++++++++++++++++++---------------------------
 2 files changed, 418 insertions(+), 508 deletions(-)

diff --git a/package.json b/package.json
index 02d063389b7..71a8b1ae334 100644
--- a/package.json
+++ b/package.json
@@ -30,19 +30,19 @@
     "@biomejs/biome": "2.0.0",
     "@ls-lint/ls-lint": "2.3.1",
     "@types/jsdom": "^21.1.7",
-    "@types/node": "^22.16.3",
+    "@types/node": "^22.16.5",
     "@vitest/coverage-istanbul": "^3.2.4",
     "@vitest/expect": "^3.2.4",
     "chalk": "^5.4.1",
     "dependency-cruiser": "^16.10.4",
-    "inquirer": "^12.7.0",
+    "inquirer": "^12.8.2",
     "jsdom": "^26.1.0",
     "lefthook": "^1.12.2",
     "msw": "^2.10.4",
     "phaser3spectorjs": "^0.0.8",
-    "typedoc": "^0.28.7",
+    "typedoc": "^0.28.8",
     "typescript": "^5.8.3",
-    "vite": "^6.3.5",
+    "vite": "^7.0.6",
     "vite-tsconfig-paths": "^5.1.4",
     "vitest": "^3.2.4",
     "vitest-canvas-mock": "^0.3.3"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 86a7bb904a1..900be6fd76e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -52,11 +52,11 @@ importers:
         specifier: ^21.1.7
         version: 21.1.7
       '@types/node':
-        specifier: ^22.16.3
-        version: 22.16.3
+        specifier: ^22.16.5
+        version: 22.16.5
       '@vitest/coverage-istanbul':
         specifier: ^3.2.4
-        version: 3.2.4(vitest@3.2.4(@types/node@22.16.3)(jsdom@26.1.0)(msw@2.10.4(@types/node@22.16.3)(typescript@5.8.3))(yaml@2.8.0))
+        version: 3.2.4(vitest@3.2.4(@types/node@22.16.5)(jsdom@26.1.0)(msw@2.10.4(@types/node@22.16.5)(typescript@5.8.3))(yaml@2.8.0))
       '@vitest/expect':
         specifier: ^3.2.4
         version: 3.2.4
@@ -67,8 +67,8 @@ importers:
         specifier: ^16.10.4
         version: 16.10.4
       inquirer:
-        specifier: ^12.7.0
-        version: 12.7.0(@types/node@22.16.3)
+        specifier: ^12.8.2
+        version: 12.8.2(@types/node@22.16.5)
       jsdom:
         specifier: ^26.1.0
         version: 26.1.0
@@ -77,28 +77,28 @@ importers:
         version: 1.12.2
       msw:
         specifier: ^2.10.4
-        version: 2.10.4(@types/node@22.16.3)(typescript@5.8.3)
+        version: 2.10.4(@types/node@22.16.5)(typescript@5.8.3)
       phaser3spectorjs:
         specifier: ^0.0.8
         version: 0.0.8
       typedoc:
-        specifier: ^0.28.7
-        version: 0.28.7(typescript@5.8.3)
+        specifier: ^0.28.8
+        version: 0.28.8(typescript@5.8.3)
       typescript:
         specifier: ^5.8.3
         version: 5.8.3
       vite:
-        specifier: ^6.3.5
-        version: 6.3.5(@types/node@22.16.3)(yaml@2.8.0)
+        specifier: ^7.0.6
+        version: 7.0.6(@types/node@22.16.5)(yaml@2.8.0)
       vite-tsconfig-paths:
         specifier: ^5.1.4
-        version: 5.1.4(typescript@5.8.3)(vite@6.3.5(@types/node@22.16.3)(yaml@2.8.0))
+        version: 5.1.4(typescript@5.8.3)(vite@7.0.6(@types/node@22.16.5)(yaml@2.8.0))
       vitest:
         specifier: ^3.2.4
-        version: 3.2.4(@types/node@22.16.3)(jsdom@26.1.0)(msw@2.10.4(@types/node@22.16.3)(typescript@5.8.3))(yaml@2.8.0)
+        version: 3.2.4(@types/node@22.16.5)(jsdom@26.1.0)(msw@2.10.4(@types/node@22.16.5)(typescript@5.8.3))(yaml@2.8.0)
       vitest-canvas-mock:
         specifier: ^0.3.3
-        version: 0.3.3(vitest@3.2.4(@types/node@22.16.3)(jsdom@26.1.0)(msw@2.10.4(@types/node@22.16.3)(typescript@5.8.3))(yaml@2.8.0))
+        version: 0.3.3(vitest@3.2.4(@types/node@22.16.5)(jsdom@26.1.0)(msw@2.10.4(@types/node@22.16.5)(typescript@5.8.3))(yaml@2.8.0))
 
 packages:
 
@@ -155,8 +155,8 @@ packages:
     resolution: {integrity: sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helpers@7.27.6':
-    resolution: {integrity: sha512-muE8Tt8M22638HU31A3CgfSUciwz1fhATfoVai05aPXGor//CdWDCbnlY1yvBPo07njuVOCNGCSp/GTt12lIug==}
+  '@babel/helpers@7.28.2':
+    resolution: {integrity: sha512-/V9771t+EgXz62aCcyofnQhGM8DQACbRhvzKFsXKC9QM+5MadF8ZmIm0crDMaz3+o0h0zXfJnd4EhbYbxsrcFw==}
     engines: {node: '>=6.9.0'}
 
   '@babel/parser@7.28.0':
@@ -164,8 +164,8 @@ packages:
     engines: {node: '>=6.0.0'}
     hasBin: true
 
-  '@babel/runtime@7.27.6':
-    resolution: {integrity: sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q==}
+  '@babel/runtime@7.28.2':
+    resolution: {integrity: sha512-KHp2IflsnGywDjBWDkR9iEqiWSpc8GIi0lgTT3mOElT0PP1tG26P4tmFI2YvAdzgq9RGyoHZQEIEdZy6Ec5xCA==}
     engines: {node: '>=6.9.0'}
 
   '@babel/template@7.27.2':
@@ -176,8 +176,8 @@ packages:
     resolution: {integrity: sha512-mGe7UK5wWyh0bKRfupsUchrQGqvDbZDbKJw+kcRGSmdHVYrv+ltd0pnpDTVpiTqnaBru9iEvA8pz8W46v0Amwg==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/types@7.28.1':
-    resolution: {integrity: sha512-x0LvFTekgSX+83TI28Y9wYPUfzrnl2aT5+5QLnO6v7mSJYtEEevuDRN0F0uSHRk1G1IWZC43o00Y0xDDrpBGPQ==}
+  '@babel/types@7.28.2':
+    resolution: {integrity: sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==}
     engines: {node: '>=6.9.0'}
 
   '@biomejs/biome@2.0.0':
@@ -270,167 +270,167 @@ packages:
     resolution: {integrity: sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==}
     engines: {node: '>=18'}
 
-  '@esbuild/aix-ppc64@0.25.6':
-    resolution: {integrity: sha512-ShbM/3XxwuxjFiuVBHA+d3j5dyac0aEVVq1oluIDf71hUw0aRF59dV/efUsIwFnR6m8JNM2FjZOzmaZ8yG61kw==}
+  '@esbuild/aix-ppc64@0.25.8':
+    resolution: {integrity: sha512-urAvrUedIqEiFR3FYSLTWQgLu5tb+m0qZw0NBEasUeo6wuqatkMDaRT+1uABiGXEu5vqgPd7FGE1BhsAIy9QVA==}
     engines: {node: '>=18'}
     cpu: [ppc64]
     os: [aix]
 
-  '@esbuild/android-arm64@0.25.6':
-    resolution: {integrity: sha512-hd5zdUarsK6strW+3Wxi5qWws+rJhCCbMiC9QZyzoxfk5uHRIE8T287giQxzVpEvCwuJ9Qjg6bEjcRJcgfLqoA==}
+  '@esbuild/android-arm64@0.25.8':
+    resolution: {integrity: sha512-OD3p7LYzWpLhZEyATcTSJ67qB5D+20vbtr6vHlHWSQYhKtzUYrETuWThmzFpZtFsBIxRvhO07+UgVA9m0i/O1w==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [android]
 
-  '@esbuild/android-arm@0.25.6':
-    resolution: {integrity: sha512-S8ToEOVfg++AU/bHwdksHNnyLyVM+eMVAOf6yRKFitnwnbwwPNqKr3srzFRe7nzV69RQKb5DgchIX5pt3L53xg==}
+  '@esbuild/android-arm@0.25.8':
+    resolution: {integrity: sha512-RONsAvGCz5oWyePVnLdZY/HHwA++nxYWIX1atInlaW6SEkwq6XkP3+cb825EUcRs5Vss/lGh/2YxAb5xqc07Uw==}
     engines: {node: '>=18'}
     cpu: [arm]
     os: [android]
 
-  '@esbuild/android-x64@0.25.6':
-    resolution: {integrity: sha512-0Z7KpHSr3VBIO9A/1wcT3NTy7EB4oNC4upJ5ye3R7taCc2GUdeynSLArnon5G8scPwaU866d3H4BCrE5xLW25A==}
+  '@esbuild/android-x64@0.25.8':
+    resolution: {integrity: sha512-yJAVPklM5+4+9dTeKwHOaA+LQkmrKFX96BM0A/2zQrbS6ENCmxc4OVoBs5dPkCCak2roAD+jKCdnmOqKszPkjA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [android]
 
-  '@esbuild/darwin-arm64@0.25.6':
-    resolution: {integrity: sha512-FFCssz3XBavjxcFxKsGy2DYK5VSvJqa6y5HXljKzhRZ87LvEi13brPrf/wdyl/BbpbMKJNOr1Sd0jtW4Ge1pAA==}
+  '@esbuild/darwin-arm64@0.25.8':
+    resolution: {integrity: sha512-Jw0mxgIaYX6R8ODrdkLLPwBqHTtYHJSmzzd+QeytSugzQ0Vg4c5rDky5VgkoowbZQahCbsv1rT1KW72MPIkevw==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [darwin]
 
-  '@esbuild/darwin-x64@0.25.6':
-    resolution: {integrity: sha512-GfXs5kry/TkGM2vKqK2oyiLFygJRqKVhawu3+DOCk7OxLy/6jYkWXhlHwOoTb0WqGnWGAS7sooxbZowy+pK9Yg==}
+  '@esbuild/darwin-x64@0.25.8':
+    resolution: {integrity: sha512-Vh2gLxxHnuoQ+GjPNvDSDRpoBCUzY4Pu0kBqMBDlK4fuWbKgGtmDIeEC081xi26PPjn+1tct+Bh8FjyLlw1Zlg==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [darwin]
 
-  '@esbuild/freebsd-arm64@0.25.6':
-    resolution: {integrity: sha512-aoLF2c3OvDn2XDTRvn8hN6DRzVVpDlj2B/F66clWd/FHLiHaG3aVZjxQX2DYphA5y/evbdGvC6Us13tvyt4pWg==}
+  '@esbuild/freebsd-arm64@0.25.8':
+    resolution: {integrity: sha512-YPJ7hDQ9DnNe5vxOm6jaie9QsTwcKedPvizTVlqWG9GBSq+BuyWEDazlGaDTC5NGU4QJd666V0yqCBL2oWKPfA==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [freebsd]
 
-  '@esbuild/freebsd-x64@0.25.6':
-    resolution: {integrity: sha512-2SkqTjTSo2dYi/jzFbU9Plt1vk0+nNg8YC8rOXXea+iA3hfNJWebKYPs3xnOUf9+ZWhKAaxnQNUf2X9LOpeiMQ==}
+  '@esbuild/freebsd-x64@0.25.8':
+    resolution: {integrity: sha512-MmaEXxQRdXNFsRN/KcIimLnSJrk2r5H8v+WVafRWz5xdSVmWLoITZQXcgehI2ZE6gioE6HirAEToM/RvFBeuhw==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [freebsd]
 
-  '@esbuild/linux-arm64@0.25.6':
-    resolution: {integrity: sha512-b967hU0gqKd9Drsh/UuAm21Khpoh6mPBSgz8mKRq4P5mVK8bpA+hQzmm/ZwGVULSNBzKdZPQBRT3+WuVavcWsQ==}
+  '@esbuild/linux-arm64@0.25.8':
+    resolution: {integrity: sha512-WIgg00ARWv/uYLU7lsuDK00d/hHSfES5BzdWAdAig1ioV5kaFNrtK8EqGcUBJhYqotlUByUKz5Qo6u8tt7iD/w==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [linux]
 
-  '@esbuild/linux-arm@0.25.6':
-    resolution: {integrity: sha512-SZHQlzvqv4Du5PrKE2faN0qlbsaW/3QQfUUc6yO2EjFcA83xnwm91UbEEVx4ApZ9Z5oG8Bxz4qPE+HFwtVcfyw==}
+  '@esbuild/linux-arm@0.25.8':
+    resolution: {integrity: sha512-FuzEP9BixzZohl1kLf76KEVOsxtIBFwCaLupVuk4eFVnOZfU+Wsn+x5Ryam7nILV2pkq2TqQM9EZPsOBuMC+kg==}
     engines: {node: '>=18'}
     cpu: [arm]
     os: [linux]
 
-  '@esbuild/linux-ia32@0.25.6':
-    resolution: {integrity: sha512-aHWdQ2AAltRkLPOsKdi3xv0mZ8fUGPdlKEjIEhxCPm5yKEThcUjHpWB1idN74lfXGnZ5SULQSgtr5Qos5B0bPw==}
+  '@esbuild/linux-ia32@0.25.8':
+    resolution: {integrity: sha512-A1D9YzRX1i+1AJZuFFUMP1E9fMaYY+GnSQil9Tlw05utlE86EKTUA7RjwHDkEitmLYiFsRd9HwKBPEftNdBfjg==}
     engines: {node: '>=18'}
     cpu: [ia32]
     os: [linux]
 
-  '@esbuild/linux-loong64@0.25.6':
-    resolution: {integrity: sha512-VgKCsHdXRSQ7E1+QXGdRPlQ/e08bN6WMQb27/TMfV+vPjjTImuT9PmLXupRlC90S1JeNNW5lzkAEO/McKeJ2yg==}
+  '@esbuild/linux-loong64@0.25.8':
+    resolution: {integrity: sha512-O7k1J/dwHkY1RMVvglFHl1HzutGEFFZ3kNiDMSOyUrB7WcoHGf96Sh+64nTRT26l3GMbCW01Ekh/ThKM5iI7hQ==}
     engines: {node: '>=18'}
     cpu: [loong64]
     os: [linux]
 
-  '@esbuild/linux-mips64el@0.25.6':
-    resolution: {integrity: sha512-WViNlpivRKT9/py3kCmkHnn44GkGXVdXfdc4drNmRl15zVQ2+D2uFwdlGh6IuK5AAnGTo2qPB1Djppj+t78rzw==}
+  '@esbuild/linux-mips64el@0.25.8':
+    resolution: {integrity: sha512-uv+dqfRazte3BzfMp8PAQXmdGHQt2oC/y2ovwpTteqrMx2lwaksiFZ/bdkXJC19ttTvNXBuWH53zy/aTj1FgGw==}
     engines: {node: '>=18'}
     cpu: [mips64el]
     os: [linux]
 
-  '@esbuild/linux-ppc64@0.25.6':
-    resolution: {integrity: sha512-wyYKZ9NTdmAMb5730I38lBqVu6cKl4ZfYXIs31Baf8aoOtB4xSGi3THmDYt4BTFHk7/EcVixkOV2uZfwU3Q2Jw==}
+  '@esbuild/linux-ppc64@0.25.8':
+    resolution: {integrity: sha512-GyG0KcMi1GBavP5JgAkkstMGyMholMDybAf8wF5A70CALlDM2p/f7YFE7H92eDeH/VBtFJA5MT4nRPDGg4JuzQ==}
     engines: {node: '>=18'}
     cpu: [ppc64]
     os: [linux]
 
-  '@esbuild/linux-riscv64@0.25.6':
-    resolution: {integrity: sha512-KZh7bAGGcrinEj4qzilJ4hqTY3Dg2U82c8bv+e1xqNqZCrCyc+TL9AUEn5WGKDzm3CfC5RODE/qc96OcbIe33w==}
+  '@esbuild/linux-riscv64@0.25.8':
+    resolution: {integrity: sha512-rAqDYFv3yzMrq7GIcen3XP7TUEG/4LK86LUPMIz6RT8A6pRIDn0sDcvjudVZBiiTcZCY9y2SgYX2lgK3AF+1eg==}
     engines: {node: '>=18'}
     cpu: [riscv64]
     os: [linux]
 
-  '@esbuild/linux-s390x@0.25.6':
-    resolution: {integrity: sha512-9N1LsTwAuE9oj6lHMyyAM+ucxGiVnEqUdp4v7IaMmrwb06ZTEVCIs3oPPplVsnjPfyjmxwHxHMF8b6vzUVAUGw==}
+  '@esbuild/linux-s390x@0.25.8':
+    resolution: {integrity: sha512-Xutvh6VjlbcHpsIIbwY8GVRbwoviWT19tFhgdA7DlenLGC/mbc3lBoVb7jxj9Z+eyGqvcnSyIltYUrkKzWqSvg==}
     engines: {node: '>=18'}
     cpu: [s390x]
     os: [linux]
 
-  '@esbuild/linux-x64@0.25.6':
-    resolution: {integrity: sha512-A6bJB41b4lKFWRKNrWoP2LHsjVzNiaurf7wyj/XtFNTsnPuxwEBWHLty+ZE0dWBKuSK1fvKgrKaNjBS7qbFKig==}
+  '@esbuild/linux-x64@0.25.8':
+    resolution: {integrity: sha512-ASFQhgY4ElXh3nDcOMTkQero4b1lgubskNlhIfJrsH5OKZXDpUAKBlNS0Kx81jwOBp+HCeZqmoJuihTv57/jvQ==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [linux]
 
-  '@esbuild/netbsd-arm64@0.25.6':
-    resolution: {integrity: sha512-IjA+DcwoVpjEvyxZddDqBY+uJ2Snc6duLpjmkXm/v4xuS3H+3FkLZlDm9ZsAbF9rsfP3zeA0/ArNDORZgrxR/Q==}
+  '@esbuild/netbsd-arm64@0.25.8':
+    resolution: {integrity: sha512-d1KfruIeohqAi6SA+gENMuObDbEjn22olAR7egqnkCD9DGBG0wsEARotkLgXDu6c4ncgWTZJtN5vcgxzWRMzcw==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [netbsd]
 
-  '@esbuild/netbsd-x64@0.25.6':
-    resolution: {integrity: sha512-dUXuZr5WenIDlMHdMkvDc1FAu4xdWixTCRgP7RQLBOkkGgwuuzaGSYcOpW4jFxzpzL1ejb8yF620UxAqnBrR9g==}
+  '@esbuild/netbsd-x64@0.25.8':
+    resolution: {integrity: sha512-nVDCkrvx2ua+XQNyfrujIG38+YGyuy2Ru9kKVNyh5jAys6n+l44tTtToqHjino2My8VAY6Lw9H7RI73XFi66Cg==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [netbsd]
 
-  '@esbuild/openbsd-arm64@0.25.6':
-    resolution: {integrity: sha512-l8ZCvXP0tbTJ3iaqdNf3pjaOSd5ex/e6/omLIQCVBLmHTlfXW3zAxQ4fnDmPLOB1x9xrcSi/xtCWFwCZRIaEwg==}
+  '@esbuild/openbsd-arm64@0.25.8':
+    resolution: {integrity: sha512-j8HgrDuSJFAujkivSMSfPQSAa5Fxbvk4rgNAS5i3K+r8s1X0p1uOO2Hl2xNsGFppOeHOLAVgYwDVlmxhq5h+SQ==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [openbsd]
 
-  '@esbuild/openbsd-x64@0.25.6':
-    resolution: {integrity: sha512-hKrmDa0aOFOr71KQ/19JC7az1P0GWtCN1t2ahYAf4O007DHZt/dW8ym5+CUdJhQ/qkZmI1HAF8KkJbEFtCL7gw==}
+  '@esbuild/openbsd-x64@0.25.8':
+    resolution: {integrity: sha512-1h8MUAwa0VhNCDp6Af0HToI2TJFAn1uqT9Al6DJVzdIBAd21m/G0Yfc77KDM3uF3T/YaOgQq3qTJHPbTOInaIQ==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [openbsd]
 
-  '@esbuild/openharmony-arm64@0.25.6':
-    resolution: {integrity: sha512-+SqBcAWoB1fYKmpWoQP4pGtx+pUUC//RNYhFdbcSA16617cchuryuhOCRpPsjCblKukAckWsV+aQ3UKT/RMPcA==}
+  '@esbuild/openharmony-arm64@0.25.8':
+    resolution: {integrity: sha512-r2nVa5SIK9tSWd0kJd9HCffnDHKchTGikb//9c7HX+r+wHYCpQrSgxhlY6KWV1nFo1l4KFbsMlHk+L6fekLsUg==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [openharmony]
 
-  '@esbuild/sunos-x64@0.25.6':
-    resolution: {integrity: sha512-dyCGxv1/Br7MiSC42qinGL8KkG4kX0pEsdb0+TKhmJZgCUDBGmyo1/ArCjNGiOLiIAgdbWgmWgib4HoCi5t7kA==}
+  '@esbuild/sunos-x64@0.25.8':
+    resolution: {integrity: sha512-zUlaP2S12YhQ2UzUfcCuMDHQFJyKABkAjvO5YSndMiIkMimPmxA+BYSBikWgsRpvyxuRnow4nS5NPnf9fpv41w==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [sunos]
 
-  '@esbuild/win32-arm64@0.25.6':
-    resolution: {integrity: sha512-42QOgcZeZOvXfsCBJF5Afw73t4veOId//XD3i+/9gSkhSV6Gk3VPlWncctI+JcOyERv85FUo7RxuxGy+z8A43Q==}
+  '@esbuild/win32-arm64@0.25.8':
+    resolution: {integrity: sha512-YEGFFWESlPva8hGL+zvj2z/SaK+pH0SwOM0Nc/d+rVnW7GSTFlLBGzZkuSU9kFIGIo8q9X3ucpZhu8PDN5A2sQ==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [win32]
 
-  '@esbuild/win32-ia32@0.25.6':
-    resolution: {integrity: sha512-4AWhgXmDuYN7rJI6ORB+uU9DHLq/erBbuMoAuB4VWJTu5KtCgcKYPynF0YI1VkBNuEfjNlLrFr9KZPJzrtLkrQ==}
+  '@esbuild/win32-ia32@0.25.8':
+    resolution: {integrity: sha512-hiGgGC6KZ5LZz58OL/+qVVoZiuZlUYlYHNAmczOm7bs2oE1XriPFi5ZHHrS8ACpV5EjySrnoCKmcbQMN+ojnHg==}
     engines: {node: '>=18'}
     cpu: [ia32]
     os: [win32]
 
-  '@esbuild/win32-x64@0.25.6':
-    resolution: {integrity: sha512-NgJPHHbEpLQgDH2MjQu90pzW/5vvXIZ7KOnPyNBm92A6WgZ/7b6fJyUBjoumLqeOQQGqY2QjQxRo97ah4Sj0cA==}
+  '@esbuild/win32-x64@0.25.8':
+    resolution: {integrity: sha512-cn3Yr7+OaaZq1c+2pe+8yxC8E144SReCQjN6/2ynubzYjvyqZjTXfQJpAcQpsdJq3My7XADANiYGHoFC69pLQw==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [win32]
 
-  '@gerrit0/mini-shiki@3.7.0':
-    resolution: {integrity: sha512-7iY9wg4FWXmeoFJpUL2u+tsmh0d0jcEJHAIzVxl3TG4KL493JNnisdLAILZ77zcD+z3J0keEXZ+lFzUgzQzPDg==}
+  '@gerrit0/mini-shiki@3.8.1':
+    resolution: {integrity: sha512-HVZW+8pxoOExr5ZMPK15U79jQAZTO/S6i5byQyyZGjtNj+qaYd82cizTncwFzTQgiLo8uUBym6vh+/1tfJklTw==}
 
-  '@inquirer/checkbox@4.1.9':
-    resolution: {integrity: sha512-DBJBkzI5Wx4jFaYm221LHvAhpKYkhVS0k9plqHwaHhofGNxvYB7J3Bz8w+bFJ05zaMb0sZNHo4KdmENQFlNTuQ==}
+  '@inquirer/checkbox@4.2.0':
+    resolution: {integrity: sha512-fdSw07FLJEU5vbpOPzXo5c6xmMGDzbZE2+niuDHX5N6mc6V0Ebso/q3xiHra4D73+PMsC8MJmcaZKuAAoaQsSA==}
     engines: {node: '>=18'}
     peerDependencies:
       '@types/node': '>=18'
@@ -438,8 +438,8 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/confirm@5.1.13':
-    resolution: {integrity: sha512-EkCtvp67ICIVVzjsquUiVSd+V5HRGOGQfsqA4E4vMWhYnB7InUL0pa0TIWt1i+OfP16Gkds8CdIu6yGZwOM1Yw==}
+  '@inquirer/confirm@5.1.14':
+    resolution: {integrity: sha512-5yR4IBfe0kXe59r1YCTG8WXkUbl7Z35HK87Sw+WUyGD8wNUx7JvY7laahzeytyE1oLn74bQnL7hstctQxisQ8Q==}
     engines: {node: '>=18'}
     peerDependencies:
       '@types/node': '>=18'
@@ -447,8 +447,8 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/core@10.1.14':
-    resolution: {integrity: sha512-Ma+ZpOJPewtIYl6HZHZckeX1STvDnHTCB2GVINNUlSEn2Am6LddWwfPkIGY0IUFVjUUrr/93XlBwTK6mfLjf0A==}
+  '@inquirer/core@10.1.15':
+    resolution: {integrity: sha512-8xrp836RZvKkpNbVvgWUlxjT4CraKk2q+I3Ksy+seI2zkcE+y6wNs1BVhgcv8VyImFecUhdQrYLdW32pAjwBdA==}
     engines: {node: '>=18'}
     peerDependencies:
       '@types/node': '>=18'
@@ -456,8 +456,8 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/editor@4.2.14':
-    resolution: {integrity: sha512-yd2qtLl4QIIax9DTMZ1ZN2pFrrj+yL3kgIWxm34SS6uwCr0sIhsNyudUjAo5q3TqI03xx4SEBkUJqZuAInp9uA==}
+  '@inquirer/editor@4.2.15':
+    resolution: {integrity: sha512-wst31XT8DnGOSS4nNJDIklGKnf+8shuauVrWzgKegWUe28zfCftcWZ2vktGdzJgcylWSS2SrDnYUb6alZcwnCQ==}
     engines: {node: '>=18'}
     peerDependencies:
       '@types/node': '>=18'
@@ -465,8 +465,8 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/expand@4.0.16':
-    resolution: {integrity: sha512-oiDqafWzMtofeJyyGkb1CTPaxUkjIcSxePHHQCfif8t3HV9pHcw1Kgdw3/uGpDvaFfeTluwQtWiqzPVjAqS3zA==}
+  '@inquirer/expand@4.0.17':
+    resolution: {integrity: sha512-PSqy9VmJx/VbE3CT453yOfNa+PykpKg/0SYP7odez1/NWBGuDXgPhp4AeGYYKjhLn5lUUavVS/JbeYMPdH50Mw==}
     engines: {node: '>=18'}
     peerDependencies:
       '@types/node': '>=18'
@@ -474,12 +474,12 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/figures@1.0.12':
-    resolution: {integrity: sha512-MJttijd8rMFcKJC8NYmprWr6hD3r9Gd9qUC0XwPNwoEPWSMVJwA2MlXxF+nhZZNMY+HXsWa+o7KY2emWYIn0jQ==}
+  '@inquirer/figures@1.0.13':
+    resolution: {integrity: sha512-lGPVU3yO9ZNqA7vTYz26jny41lE7yoQansmqdMLBEfqaGsmdg7V3W9mK9Pvb5IL4EVZ9GnSDGMO/cJXud5dMaw==}
     engines: {node: '>=18'}
 
-  '@inquirer/input@4.2.0':
-    resolution: {integrity: sha512-opqpHPB1NjAmDISi3uvZOTrjEEU5CWVu/HBkDby8t93+6UxYX0Z7Ps0Ltjm5sZiEbWenjubwUkivAEYQmy9xHw==}
+  '@inquirer/input@4.2.1':
+    resolution: {integrity: sha512-tVC+O1rBl0lJpoUZv4xY+WGWY8V5b0zxU1XDsMsIHYregdh7bN5X5QnIONNBAl0K765FYlAfNHS2Bhn7SSOVow==}
     engines: {node: '>=18'}
     peerDependencies:
       '@types/node': '>=18'
@@ -487,8 +487,8 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/number@3.0.16':
-    resolution: {integrity: sha512-kMrXAaKGavBEoBYUCgualbwA9jWUx2TjMA46ek+pEKy38+LFpL9QHlTd8PO2kWPUgI/KB+qi02o4y2rwXbzr3Q==}
+  '@inquirer/number@3.0.17':
+    resolution: {integrity: sha512-GcvGHkyIgfZgVnnimURdOueMk0CztycfC8NZTiIY9arIAkeOgt6zG57G+7vC59Jns3UX27LMkPKnKWAOF5xEYg==}
     engines: {node: '>=18'}
     peerDependencies:
       '@types/node': '>=18'
@@ -496,8 +496,8 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/password@4.0.16':
-    resolution: {integrity: sha512-g8BVNBj5Zeb5/Y3cSN+hDUL7CsIFDIuVxb9EPty3lkxBaYpjL5BNRKSYOF9yOLe+JOcKFd+TSVeADQ4iSY7rbg==}
+  '@inquirer/password@4.0.17':
+    resolution: {integrity: sha512-DJolTnNeZ00E1+1TW+8614F7rOJJCM4y4BAGQ3Gq6kQIG+OJ4zr3GLjIjVVJCbKsk2jmkmv6v2kQuN/vriHdZA==}
     engines: {node: '>=18'}
     peerDependencies:
       '@types/node': '>=18'
@@ -505,8 +505,8 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/prompts@7.6.0':
-    resolution: {integrity: sha512-jAhL7tyMxB3Gfwn4HIJ0yuJ5pvcB5maYUcouGcgd/ub79f9MqZ+aVnBtuFf+VC2GTkCBF+R+eo7Vi63w5VZlzw==}
+  '@inquirer/prompts@7.7.1':
+    resolution: {integrity: sha512-XDxPrEWeWUBy8scAXzXuFY45r/q49R0g72bUzgQXZ1DY/xEFX+ESDMkTQolcb5jRBzaNJX2W8XQl6krMNDTjaA==}
     engines: {node: '>=18'}
     peerDependencies:
       '@types/node': '>=18'
@@ -514,8 +514,8 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/rawlist@4.1.4':
-    resolution: {integrity: sha512-5GGvxVpXXMmfZNtvWw4IsHpR7RzqAR624xtkPd1NxxlV5M+pShMqzL4oRddRkg8rVEOK9fKdJp1jjVML2Lr7TQ==}
+  '@inquirer/rawlist@4.1.5':
+    resolution: {integrity: sha512-R5qMyGJqtDdi4Ht521iAkNqyB6p2UPuZUbMifakg1sWtu24gc2Z8CJuw8rP081OckNDMgtDCuLe42Q2Kr3BolA==}
     engines: {node: '>=18'}
     peerDependencies:
       '@types/node': '>=18'
@@ -523,8 +523,8 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/search@3.0.16':
-    resolution: {integrity: sha512-POCmXo+j97kTGU6aeRjsPyuCpQQfKcMXdeTMw708ZMtWrj5aykZvlUxH4Qgz3+Y1L/cAVZsSpA+UgZCu2GMOMg==}
+  '@inquirer/search@3.0.17':
+    resolution: {integrity: sha512-CuBU4BAGFqRYors4TNCYzy9X3DpKtgIW4Boi0WNkm4Ei1hvY9acxKdBdyqzqBCEe4YxSdaQQsasJlFlUJNgojw==}
     engines: {node: '>=18'}
     peerDependencies:
       '@types/node': '>=18'
@@ -532,8 +532,8 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/select@4.2.4':
-    resolution: {integrity: sha512-unTppUcTjmnbl/q+h8XeQDhAqIOmwWYWNyiiP2e3orXrg6tOaa5DHXja9PChCSbChOsktyKgOieRZFnajzxoBg==}
+  '@inquirer/select@4.3.1':
+    resolution: {integrity: sha512-Gfl/5sqOF5vS/LIrSndFgOh7jgoe0UXEizDqahFRkq5aJBLegZ6WjuMh/hVEJwlFQjyLq1z9fRtvUMkb7jM1LA==}
     engines: {node: '>=18'}
     peerDependencies:
       '@types/node': '>=18'
@@ -541,8 +541,8 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/type@3.0.7':
-    resolution: {integrity: sha512-PfunHQcjwnju84L+ycmcMKB/pTPIngjUJvfnRhKY6FKPuYXlM4aQCb/nIdTFR6BEhMjFvngzvng/vBAJMZpLSA==}
+  '@inquirer/type@3.0.8':
+    resolution: {integrity: sha512-lg9Whz8onIHRthWaN1Q9EGLa/0LFJjyM8mEUbL1eTi6yMGvBf8gvyDLtxSXztQsxMvhxxNpJYrwa1YHdq+w4Jw==}
     engines: {node: '>=18'}
     peerDependencies:
       '@types/node': '>=18'
@@ -580,8 +580,8 @@ packages:
   '@material/material-color-utilities@0.2.7':
     resolution: {integrity: sha512-0FCeqG6WvK4/Cc06F/xXMd/pv4FeisI0c1tUpBbfhA2n9Y8eZEv4Karjbmf2ZqQCPUWMrGp8A571tCjizxoTiQ==}
 
-  '@mswjs/interceptors@0.39.2':
-    resolution: {integrity: sha512-RuzCup9Ct91Y7V79xwCb146RaBRHZ7NBbrIUySumd1rpKqHL5OonaqrGIbug5hNwP/fRyxFMA6ISgw4FTtYFYg==}
+  '@mswjs/interceptors@0.39.4':
+    resolution: {integrity: sha512-B82DbrGVCIBrNEfRJbqUFB0eNz0wVzqbenEpmbE71XLVU4yKZbDnRBuxz+7udc/uM7LDWDD4sRJ5tISzHf2QkQ==}
     engines: {node: '>=18'}
 
   '@open-draft/deferred-promise@2.2.0':
@@ -593,161 +593,121 @@ packages:
   '@open-draft/until@2.1.0':
     resolution: {integrity: sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==}
 
-  '@oxlint/darwin-arm64@1.6.0':
-    resolution: {integrity: sha512-m3wyqBh1TOHjpr/dXeIZY7OoX+MQazb+bMHQdDtwUvefrafUx+5YHRvulYh1sZSQ449nQ3nk3qj5qj535vZRjg==}
-    cpu: [arm64]
-    os: [darwin]
-
-  '@oxlint/darwin-x64@1.6.0':
-    resolution: {integrity: sha512-75fJfF/9xNypr7cnOYoZBhfmG1yP7ex3pUOeYGakmtZRffO9z1i1quLYhjZsmaDXsAIZ3drMhenYHMmFKS3SRg==}
-    cpu: [x64]
-    os: [darwin]
-
-  '@oxlint/linux-arm64-gnu@1.6.0':
-    resolution: {integrity: sha512-YhXGf0FXa72bEt4F7eTVKx5X3zWpbAOPnaA/dZ6/g8tGhw1m9IFjrabVHFjzcx3dQny4MgA59EhyElkDvpUe8A==}
-    cpu: [arm64]
-    os: [linux]
-
-  '@oxlint/linux-arm64-musl@1.6.0':
-    resolution: {integrity: sha512-T3JDhx8mjGjvh5INsPZJrlKHmZsecgDYvtvussKRdkc1Nnn7WC+jH9sh5qlmYvwzvmetlPVNezAoNvmGO9vtMg==}
-    cpu: [arm64]
-    os: [linux]
-
-  '@oxlint/linux-x64-gnu@1.6.0':
-    resolution: {integrity: sha512-Dx7ghtAl8aXBdqofJpi338At6lkeCtTfoinTYQXd9/TEJx+f+zCGNlQO6nJz3ydJBX48FDuOFKkNC+lUlWrd8w==}
-    cpu: [x64]
-    os: [linux]
-
-  '@oxlint/linux-x64-musl@1.6.0':
-    resolution: {integrity: sha512-7KvMGdWmAZtAtg6IjoEJHKxTXdAcrHnUnqfgs0JpXst7trquV2mxBeRZusQXwxpu4HCSomKMvJfsp1qKaqSFDg==}
-    cpu: [x64]
-    os: [linux]
-
-  '@oxlint/win32-arm64@1.6.0':
-    resolution: {integrity: sha512-iSGC9RwX+dl7o5KFr5aH7Gq3nFbkq/3Gda6mxNPMvNkWrgXdIyiINxpyD8hJu566M+QSv1wEAu934BZotFDyoQ==}
-    cpu: [arm64]
-    os: [win32]
-
-  '@oxlint/win32-x64@1.6.0':
-    resolution: {integrity: sha512-jOj3L/gfLc0IwgOTkZMiZ5c673i/hbAmidlaylT0gE6H18hln9HxPgp5GCf4E4y6mwEJlW8QC5hQi221+9otdA==}
-    cpu: [x64]
-    os: [win32]
-
   '@pkgjs/parseargs@0.11.0':
     resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
     engines: {node: '>=14'}
 
-  '@rollup/rollup-android-arm-eabi@4.45.0':
-    resolution: {integrity: sha512-2o/FgACbji4tW1dzXOqAV15Eu7DdgbKsF2QKcxfG4xbh5iwU7yr5RRP5/U+0asQliSYv5M4o7BevlGIoSL0LXg==}
+  '@rollup/rollup-android-arm-eabi@4.46.1':
+    resolution: {integrity: sha512-oENme6QxtLCqjChRUUo3S6X8hjCXnWmJWnedD7VbGML5GUtaOtAyx+fEEXnBXVf0CBZApMQU0Idwi0FmyxzQhw==}
     cpu: [arm]
     os: [android]
 
-  '@rollup/rollup-android-arm64@4.45.0':
-    resolution: {integrity: sha512-PSZ0SvMOjEAxwZeTx32eI/j5xSYtDCRxGu5k9zvzoY77xUNssZM+WV6HYBLROpY5CkXsbQjvz40fBb7WPwDqtQ==}
+  '@rollup/rollup-android-arm64@4.46.1':
+    resolution: {integrity: sha512-OikvNT3qYTl9+4qQ9Bpn6+XHM+ogtFadRLuT2EXiFQMiNkXFLQfNVppi5o28wvYdHL2s3fM0D/MZJ8UkNFZWsw==}
     cpu: [arm64]
     os: [android]
 
-  '@rollup/rollup-darwin-arm64@4.45.0':
-    resolution: {integrity: sha512-BA4yPIPssPB2aRAWzmqzQ3y2/KotkLyZukVB7j3psK/U3nVJdceo6qr9pLM2xN6iRP/wKfxEbOb1yrlZH6sYZg==}
+  '@rollup/rollup-darwin-arm64@4.46.1':
+    resolution: {integrity: sha512-EFYNNGij2WllnzljQDQnlFTXzSJw87cpAs4TVBAWLdkvic5Uh5tISrIL6NRcxoh/b2EFBG/TK8hgRrGx94zD4A==}
     cpu: [arm64]
     os: [darwin]
 
-  '@rollup/rollup-darwin-x64@4.45.0':
-    resolution: {integrity: sha512-Pr2o0lvTwsiG4HCr43Zy9xXrHspyMvsvEw4FwKYqhli4FuLE5FjcZzuQ4cfPe0iUFCvSQG6lACI0xj74FDZKRA==}
+  '@rollup/rollup-darwin-x64@4.46.1':
+    resolution: {integrity: sha512-ZaNH06O1KeTug9WI2+GRBE5Ujt9kZw4a1+OIwnBHal92I8PxSsl5KpsrPvthRynkhMck4XPdvY0z26Cym/b7oA==}
     cpu: [x64]
     os: [darwin]
 
-  '@rollup/rollup-freebsd-arm64@4.45.0':
-    resolution: {integrity: sha512-lYE8LkE5h4a/+6VnnLiL14zWMPnx6wNbDG23GcYFpRW1V9hYWHAw9lBZ6ZUIrOaoK7NliF1sdwYGiVmziUF4vA==}
+  '@rollup/rollup-freebsd-arm64@4.46.1':
+    resolution: {integrity: sha512-n4SLVebZP8uUlJ2r04+g2U/xFeiQlw09Me5UFqny8HGbARl503LNH5CqFTb5U5jNxTouhRjai6qPT0CR5c/Iig==}
     cpu: [arm64]
     os: [freebsd]
 
-  '@rollup/rollup-freebsd-x64@4.45.0':
-    resolution: {integrity: sha512-PVQWZK9sbzpvqC9Q0GlehNNSVHR+4m7+wET+7FgSnKG3ci5nAMgGmr9mGBXzAuE5SvguCKJ6mHL6vq1JaJ/gvw==}
+  '@rollup/rollup-freebsd-x64@4.46.1':
+    resolution: {integrity: sha512-8vu9c02F16heTqpvo3yeiu7Vi1REDEC/yES/dIfq3tSXe6mLndiwvYr3AAvd1tMNUqE9yeGYa5w7PRbI5QUV+w==}
     cpu: [x64]
     os: [freebsd]
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.45.0':
-    resolution: {integrity: sha512-hLrmRl53prCcD+YXTfNvXd776HTxNh8wPAMllusQ+amcQmtgo3V5i/nkhPN6FakW+QVLoUUr2AsbtIRPFU3xIA==}
+  '@rollup/rollup-linux-arm-gnueabihf@4.46.1':
+    resolution: {integrity: sha512-K4ncpWl7sQuyp6rWiGUvb6Q18ba8mzM0rjWJ5JgYKlIXAau1db7hZnR0ldJvqKWWJDxqzSLwGUhA4jp+KqgDtQ==}
     cpu: [arm]
     os: [linux]
 
-  '@rollup/rollup-linux-arm-musleabihf@4.45.0':
-    resolution: {integrity: sha512-XBKGSYcrkdiRRjl+8XvrUR3AosXU0NvF7VuqMsm7s5nRy+nt58ZMB19Jdp1RdqewLcaYnpk8zeVs/4MlLZEJxw==}
+  '@rollup/rollup-linux-arm-musleabihf@4.46.1':
+    resolution: {integrity: sha512-YykPnXsjUjmXE6j6k2QBBGAn1YsJUix7pYaPLK3RVE0bQL2jfdbfykPxfF8AgBlqtYbfEnYHmLXNa6QETjdOjQ==}
     cpu: [arm]
     os: [linux]
 
-  '@rollup/rollup-linux-arm64-gnu@4.45.0':
-    resolution: {integrity: sha512-fRvZZPUiBz7NztBE/2QnCS5AtqLVhXmUOPj9IHlfGEXkapgImf4W9+FSkL8cWqoAjozyUzqFmSc4zh2ooaeF6g==}
+  '@rollup/rollup-linux-arm64-gnu@4.46.1':
+    resolution: {integrity: sha512-kKvqBGbZ8i9pCGW3a1FH3HNIVg49dXXTsChGFsHGXQaVJPLA4f/O+XmTxfklhccxdF5FefUn2hvkoGJH0ScWOA==}
     cpu: [arm64]
     os: [linux]
 
-  '@rollup/rollup-linux-arm64-musl@4.45.0':
-    resolution: {integrity: sha512-Btv2WRZOcUGi8XU80XwIvzTg4U6+l6D0V6sZTrZx214nrwxw5nAi8hysaXj/mctyClWgesyuxbeLylCBNauimg==}
+  '@rollup/rollup-linux-arm64-musl@4.46.1':
+    resolution: {integrity: sha512-zzX5nTw1N1plmqC9RGC9vZHFuiM7ZP7oSWQGqpbmfjK7p947D518cVK1/MQudsBdcD84t6k70WNczJOct6+hdg==}
     cpu: [arm64]
     os: [linux]
 
-  '@rollup/rollup-linux-loongarch64-gnu@4.45.0':
-    resolution: {integrity: sha512-Li0emNnwtUZdLwHjQPBxn4VWztcrw/h7mgLyHiEI5Z0MhpeFGlzaiBHpSNVOMB/xucjXTTcO+dhv469Djr16KA==}
+  '@rollup/rollup-linux-loongarch64-gnu@4.46.1':
+    resolution: {integrity: sha512-O8CwgSBo6ewPpktFfSDgB6SJN9XDcPSvuwxfejiddbIC/hn9Tg6Ai0f0eYDf3XvB/+PIWzOQL+7+TZoB8p9Yuw==}
     cpu: [loong64]
     os: [linux]
 
-  '@rollup/rollup-linux-powerpc64le-gnu@4.45.0':
-    resolution: {integrity: sha512-sB8+pfkYx2kvpDCfd63d5ScYT0Fz1LO6jIb2zLZvmK9ob2D8DeVqrmBDE0iDK8KlBVmsTNzrjr3G1xV4eUZhSw==}
+  '@rollup/rollup-linux-ppc64-gnu@4.46.1':
+    resolution: {integrity: sha512-JnCfFVEKeq6G3h3z8e60kAp8Rd7QVnWCtPm7cxx+5OtP80g/3nmPtfdCXbVl063e3KsRnGSKDHUQMydmzc/wBA==}
     cpu: [ppc64]
     os: [linux]
 
-  '@rollup/rollup-linux-riscv64-gnu@4.45.0':
-    resolution: {integrity: sha512-5GQ6PFhh7E6jQm70p1aW05G2cap5zMOvO0se5JMecHeAdj5ZhWEHbJ4hiKpfi1nnnEdTauDXxPgXae/mqjow9w==}
+  '@rollup/rollup-linux-riscv64-gnu@4.46.1':
+    resolution: {integrity: sha512-dVxuDqS237eQXkbYzQQfdf/njgeNw6LZuVyEdUaWwRpKHhsLI+y4H/NJV8xJGU19vnOJCVwaBFgr936FHOnJsQ==}
     cpu: [riscv64]
     os: [linux]
 
-  '@rollup/rollup-linux-riscv64-musl@4.45.0':
-    resolution: {integrity: sha512-N/euLsBd1rekWcuduakTo/dJw6U6sBP3eUq+RXM9RNfPuWTvG2w/WObDkIvJ2KChy6oxZmOSC08Ak2OJA0UiAA==}
+  '@rollup/rollup-linux-riscv64-musl@4.46.1':
+    resolution: {integrity: sha512-CvvgNl2hrZrTR9jXK1ye0Go0HQRT6ohQdDfWR47/KFKiLd5oN5T14jRdUVGF4tnsN8y9oSfMOqH6RuHh+ck8+w==}
     cpu: [riscv64]
     os: [linux]
 
-  '@rollup/rollup-linux-s390x-gnu@4.45.0':
-    resolution: {integrity: sha512-2l9sA7d7QdikL0xQwNMO3xURBUNEWyHVHfAsHsUdq+E/pgLTUcCE+gih5PCdmyHmfTDeXUWVhqL0WZzg0nua3g==}
+  '@rollup/rollup-linux-s390x-gnu@4.46.1':
+    resolution: {integrity: sha512-x7ANt2VOg2565oGHJ6rIuuAon+A8sfe1IeUx25IKqi49OjSr/K3awoNqr9gCwGEJo9OuXlOn+H2p1VJKx1psxA==}
     cpu: [s390x]
     os: [linux]
 
-  '@rollup/rollup-linux-x64-gnu@4.45.0':
-    resolution: {integrity: sha512-XZdD3fEEQcwG2KrJDdEQu7NrHonPxxaV0/w2HpvINBdcqebz1aL+0vM2WFJq4DeiAVT6F5SUQas65HY5JDqoPw==}
+  '@rollup/rollup-linux-x64-gnu@4.46.1':
+    resolution: {integrity: sha512-9OADZYryz/7E8/qt0vnaHQgmia2Y0wrjSSn1V/uL+zw/i7NUhxbX4cHXdEQ7dnJgzYDS81d8+tf6nbIdRFZQoQ==}
     cpu: [x64]
     os: [linux]
 
-  '@rollup/rollup-linux-x64-musl@4.45.0':
-    resolution: {integrity: sha512-7ayfgvtmmWgKWBkCGg5+xTQ0r5V1owVm67zTrsEY1008L5ro7mCyGYORomARt/OquB9KY7LpxVBZes+oSniAAQ==}
+  '@rollup/rollup-linux-x64-musl@4.46.1':
+    resolution: {integrity: sha512-NuvSCbXEKY+NGWHyivzbjSVJi68Xfq1VnIvGmsuXs6TCtveeoDRKutI5vf2ntmNnVq64Q4zInet0UDQ+yMB6tA==}
     cpu: [x64]
     os: [linux]
 
-  '@rollup/rollup-win32-arm64-msvc@4.45.0':
-    resolution: {integrity: sha512-B+IJgcBnE2bm93jEW5kHisqvPITs4ddLOROAcOc/diBgrEiQJJ6Qcjby75rFSmH5eMGrqJryUgJDhrfj942apQ==}
+  '@rollup/rollup-win32-arm64-msvc@4.46.1':
+    resolution: {integrity: sha512-mWz+6FSRb82xuUMMV1X3NGiaPFqbLN9aIueHleTZCc46cJvwTlvIh7reQLk4p97dv0nddyewBhwzryBHH7wtPw==}
     cpu: [arm64]
     os: [win32]
 
-  '@rollup/rollup-win32-ia32-msvc@4.45.0':
-    resolution: {integrity: sha512-+CXwwG66g0/FpWOnP/v1HnrGVSOygK/osUbu3wPRy8ECXjoYKjRAyfxYpDQOfghC5qPJYLPH0oN4MCOjwgdMug==}
+  '@rollup/rollup-win32-ia32-msvc@4.46.1':
+    resolution: {integrity: sha512-7Thzy9TMXDw9AU4f4vsLNBxh7/VOKuXi73VH3d/kHGr0tZ3x/ewgL9uC7ojUKmH1/zvmZe2tLapYcZllk3SO8Q==}
     cpu: [ia32]
     os: [win32]
 
-  '@rollup/rollup-win32-x64-msvc@4.45.0':
-    resolution: {integrity: sha512-SRf1cytG7wqcHVLrBc9VtPK4pU5wxiB/lNIkNmW2ApKXIg+RpqwHfsaEK+e7eH4A1BpI6BX/aBWXxZCIrJg3uA==}
+  '@rollup/rollup-win32-x64-msvc@4.46.1':
+    resolution: {integrity: sha512-7GVB4luhFmGUNXXJhH2jJwZCFB3pIOixv2E3s17GQHBFUOQaISlt7aGcQgqvCaDSxTZJUzlK/QJ1FN8S94MrzQ==}
     cpu: [x64]
     os: [win32]
 
-  '@shikijs/engine-oniguruma@3.7.0':
-    resolution: {integrity: sha512-5BxcD6LjVWsGu4xyaBC5bu8LdNgPCVBnAkWTtOCs/CZxcB22L8rcoWfv7Hh/3WooVjBZmFtyxhgvkQFedPGnFw==}
+  '@shikijs/engine-oniguruma@3.8.1':
+    resolution: {integrity: sha512-KGQJZHlNY7c656qPFEQpIoqOuC4LrxjyNndRdzk5WKB/Ie87+NJCF1xo9KkOUxwxylk7rT6nhlZyTGTC4fCe1g==}
 
-  '@shikijs/langs@3.7.0':
-    resolution: {integrity: sha512-1zYtdfXLr9xDKLTGy5kb7O0zDQsxXiIsw1iIBcNOO8Yi5/Y1qDbJ+0VsFoqTlzdmneO8Ij35g7QKF8kcLyznCQ==}
+  '@shikijs/langs@3.8.1':
+    resolution: {integrity: sha512-TjOFg2Wp1w07oKnXjs0AUMb4kJvujML+fJ1C5cmEj45lhjbUXtziT1x2bPQb9Db6kmPhkG5NI2tgYW1/DzhUuQ==}
 
-  '@shikijs/themes@3.7.0':
-    resolution: {integrity: sha512-VJx8497iZPy5zLiiCTSIaOChIcKQwR0FebwE9S3rcN0+J/GTWwQ1v/bqhTbpbY3zybPKeO8wdammqkpXc4NVjQ==}
+  '@shikijs/themes@3.8.1':
+    resolution: {integrity: sha512-Vu3t3BBLifc0GB0UPg2Pox1naTemrrvyZv2lkiSw3QayVV60me1ujFQwPZGgUTmwXl1yhCPW8Lieesm0CYruLQ==}
 
-  '@shikijs/types@3.7.0':
-    resolution: {integrity: sha512-MGaLeaRlSWpnP0XSAum3kP3a8vtcTsITqoEPYdt3lQG3YCdQH4DnEhodkYcNMcU0uW0RffhoD1O3e0vG5eSBBg==}
+  '@shikijs/types@3.8.1':
+    resolution: {integrity: sha512-5C39Q8/8r1I26suLh+5TPk1DTrbY/kn3IdWA5HdizR0FhlhD05zx5nKCqhzSfDHH3p4S0ZefxWd77DLV+8FhGg==}
 
   '@shikijs/vscode-textmate@10.0.2':
     resolution: {integrity: sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==}
@@ -770,8 +730,8 @@ packages:
   '@types/jsdom@21.1.7':
     resolution: {integrity: sha512-yOriVnggzrnQ3a9OKOCxaVuSug3w3/SbOj5i7VwXWZEyUNl3bLF9V3MfxGbZKuwqJOQyRfqXyROBB1CoZLFWzA==}
 
-  '@types/node@22.16.3':
-    resolution: {integrity: sha512-sr4Xz74KOUeYadexo1r8imhRtlVXcs+j3XK3TcoiYk7B1t3YRVJgtaD3cwX73NYb71pmVuMLNRhJ9XKdoDB74g==}
+  '@types/node@22.16.5':
+    resolution: {integrity: sha512-bJFoMATwIGaxxx8VJPeM8TonI8t579oRvgAuT8zFugJsJZgzqv0Fu8Mhp68iecjzG7cnN3mO2dJQ5uUM2EFrgQ==}
 
   '@types/statuses@2.0.6':
     resolution: {integrity: sha512-xMAgYwceFhRA2zY+XbEA7mxYbA093wdiW8Vu6gZPGWy9cmOyU9XesH1tNcEWsKFd5Vzrqx5T3D38PWx1FIIXkA==}
@@ -1008,8 +968,8 @@ packages:
   eastasianwidth@0.2.0:
     resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
 
-  electron-to-chromium@1.5.182:
-    resolution: {integrity: sha512-Lv65Btwv9W4J9pyODI6EWpdnhfvrve/us5h1WspW8B2Fb0366REPtY3hX7ounk1CkV/TBjWCEvCBBbYbmV0qCA==}
+  electron-to-chromium@1.5.191:
+    resolution: {integrity: sha512-xcwe9ELcuxYLUFqZZxL19Z6HVKcvNkIwhbHUz7L3us6u12yR+7uY89dSl570f/IqNthx8dAw3tojG7i4Ni4tDA==}
 
   emoji-regex@8.0.0:
     resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
@@ -1044,8 +1004,8 @@ packages:
     resolution: {integrity: sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==}
     engines: {node: '>= 0.4'}
 
-  esbuild@0.25.6:
-    resolution: {integrity: sha512-GVuzuUwtdsghE3ocJ9Bs8PNoF13HNQ5TXbEi2AhvVb8xU1Iwt9Fos9FEamfoee+u/TOsn7GUWc04lz46n2bbTg==}
+  esbuild@0.25.8:
+    resolution: {integrity: sha512-vVC0USHGtMi8+R4Kz8rt6JhEWLxsv9Rnu/lGYbPR8u47B+DCBksq9JarW0zOO7bs37hyOK1l2/oqtbciutL5+Q==}
     engines: {node: '>=18'}
     hasBin: true
 
@@ -1229,8 +1189,8 @@ packages:
     resolution: {integrity: sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
 
-  inquirer@12.7.0:
-    resolution: {integrity: sha512-KKFRc++IONSyE2UYw9CJ1V0IWx5yQKomwB+pp3cWomWs+v2+ZsG11G2OVfAjFS6WWCppKw+RfKmpqGfSzD5QBQ==}
+  inquirer@12.8.2:
+    resolution: {integrity: sha512-oBDL9f4+cDambZVJdfJu2M5JQfvaug9lbo6fKDlFV40i8t3FGA1Db67ov5Hp5DInG4zmXhHWTSnlXBntnJ7GMA==}
     engines: {node: '>=18'}
     peerDependencies:
       '@types/node': '>=18'
@@ -1408,8 +1368,8 @@ packages:
   lodash@4.17.21:
     resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
 
-  loupe@3.1.4:
-    resolution: {integrity: sha512-wJzkKwJrheKtknCOKNEtDK4iqg/MxmZheEMtSTYvnzRdEYaZzmgH976nenp8WdJRdx5Vc1X/9MO0Oszl6ezeXg==}
+  loupe@3.2.0:
+    resolution: {integrity: sha512-2NCfZcT5VGVNX9mSZIxLRkEAegDGBpuQZBy13desuHeVORmBDyAET4TkJr4SjqQy3A8JDofMN6LpkK8Xcm/dlw==}
 
   lru-cache@10.4.3:
     resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}
@@ -1501,8 +1461,8 @@ packages:
   node-releases@2.0.19:
     resolution: {integrity: sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==}
 
-  nwsapi@2.2.20:
-    resolution: {integrity: sha512-/ieB+mDe4MrrKMT8z+mQL8klXydZWGR5Dowt4RAGKbJ3kIGEx3X4ljUo+6V73IXtUPWgfOlU5B9MlGxFO5T+cA==}
+  nwsapi@2.2.21:
+    resolution: {integrity: sha512-o6nIY3qwiSXl7/LuOU0Dmuctd34Yay0yeuZRLFmDPrrdHpXKFndPj3hM+YEPVHYC5fx2otBx4Ilc/gyYSAUaIA==}
 
   object-keys@1.1.1:
     resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
@@ -1518,11 +1478,6 @@ packages:
   outvariant@1.4.3:
     resolution: {integrity: sha512-+Sl2UErvtsoajRDKCE5/dBz4DIvHXQQnAxtQTF04OJxY0+DyZXSo5P5Bb7XYWOh81syohlYL24hbDwxedPUJCA==}
 
-  oxlint@1.6.0:
-    resolution: {integrity: sha512-jtaD65PqzIa1udvSxxscTKBxYKuZoFXyKGLiU1Qjo1ulq3uv/fQDtoV1yey1FrQZrQjACGPi1Widsy1TucC7Jg==}
-    engines: {node: '>=8.*'}
-    hasBin: true
-
   package-json-from-dist@1.0.1:
     resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==}
 
@@ -1568,19 +1523,14 @@ packages:
   picocolors@1.1.1:
     resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
 
-  picomatch@4.0.2:
-    resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==}
+  picomatch@4.0.3:
+    resolution: {integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==}
     engines: {node: '>=12'}
 
   postcss@8.5.6:
     resolution: {integrity: sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==}
     engines: {node: ^10 || ^12 || >=14}
 
-  prettier@3.6.2:
-    resolution: {integrity: sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==}
-    engines: {node: '>=14'}
-    hasBin: true
-
   process-nextick-args@2.0.1:
     resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
 
@@ -1629,16 +1579,16 @@ packages:
     engines: {node: '>= 0.4'}
     hasBin: true
 
-  rollup@4.45.0:
-    resolution: {integrity: sha512-WLjEcJRIo7i3WDDgOIJqVI2d+lAC3EwvOGy+Xfq6hs+GQuAA4Di/H72xmXkOhrIWFg2PFYSKZYfH0f4vfKXN4A==}
+  rollup@4.46.1:
+    resolution: {integrity: sha512-33xGNBsDJAkzt0PvninskHlWnTIPgDtTwhg0U38CUoNP/7H6wI2Cz6dUeoNPbjdTdsYTGuiFFASuUOWovH0SyQ==}
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
   rrweb-cssom@0.8.0:
     resolution: {integrity: sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==}
 
-  run-async@4.0.4:
-    resolution: {integrity: sha512-2cgeRHnV11lSXBEhq7sN7a5UVjTKm9JTb9x8ApIT//16D7QL96AgnNeWSGoB4gIHc0iYw/Ha0Z+waBaCYZVNhg==}
+  run-async@4.0.5:
+    resolution: {integrity: sha512-oN9GTgxUNDBumHTTDmQ8dep6VIJbgj9S3dPP+9XylVLIK4xB9XTXtKWROd5pnhdXR9k0EgO1JRcNh0T+Ny2FsA==}
     engines: {node: '>=0.12.0'}
 
   rxjs@7.8.2:
@@ -1833,8 +1783,8 @@ packages:
     resolution: {integrity: sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==}
     engines: {node: '>=16'}
 
-  typedoc@0.28.7:
-    resolution: {integrity: sha512-lpz0Oxl6aidFkmS90VQDQjk/Qf2iw0IUvFqirdONBdj7jPSN9mGXhy66BcGNDxx5ZMyKKiBVAREvPEzT6Uxipw==}
+  typedoc@0.28.8:
+    resolution: {integrity: sha512-16GfLopc8icHfdvqZDqdGBoS2AieIRP2rpf9mU+MgN+gGLyEQvAO0QgOa6NJ5QNmQi0LFrDY9in4F2fUNKgJKA==}
     engines: {node: '>= 18', pnpm: '>= 10'}
     hasBin: true
     peerDependencies:
@@ -1880,19 +1830,19 @@ packages:
       vite:
         optional: true
 
-  vite@6.3.5:
-    resolution: {integrity: sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==}
-    engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
+  vite@7.0.6:
+    resolution: {integrity: sha512-MHFiOENNBd+Bd9uvc8GEsIzdkn1JxMmEeYX35tI3fv0sJBUTfW5tQsoaOwuY4KhBI09A3dUJ/DXf2yxPVPUceg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
     peerDependencies:
-      '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0
+      '@types/node': ^20.19.0 || >=22.12.0
       jiti: '>=1.21.0'
-      less: '*'
+      less: ^4.0.0
       lightningcss: ^1.21.0
-      sass: '*'
-      sass-embedded: '*'
-      stylus: '*'
-      sugarss: '*'
+      sass: ^1.70.0
+      sass-embedded: ^1.70.0
+      stylus: '>=0.54.8'
+      sugarss: ^5.0.0
       terser: ^5.16.0
       tsx: ^4.8.1
       yaml: ^2.4.2
@@ -2082,11 +2032,11 @@ snapshots:
       '@babel/generator': 7.28.0
       '@babel/helper-compilation-targets': 7.27.2
       '@babel/helper-module-transforms': 7.27.3(@babel/core@7.28.0)
-      '@babel/helpers': 7.27.6
+      '@babel/helpers': 7.28.2
       '@babel/parser': 7.28.0
       '@babel/template': 7.27.2
       '@babel/traverse': 7.28.0
-      '@babel/types': 7.28.1
+      '@babel/types': 7.28.2
       convert-source-map: 2.0.0
       debug: 4.4.1
       gensync: 1.0.0-beta.2
@@ -2098,7 +2048,7 @@ snapshots:
   '@babel/generator@7.28.0':
     dependencies:
       '@babel/parser': 7.28.0
-      '@babel/types': 7.28.1
+      '@babel/types': 7.28.2
       '@jridgewell/gen-mapping': 0.3.12
       '@jridgewell/trace-mapping': 0.3.29
       jsesc: 3.1.0
@@ -2116,7 +2066,7 @@ snapshots:
   '@babel/helper-module-imports@7.27.1':
     dependencies:
       '@babel/traverse': 7.28.0
-      '@babel/types': 7.28.1
+      '@babel/types': 7.28.2
     transitivePeerDependencies:
       - supports-color
 
@@ -2135,22 +2085,22 @@ snapshots:
 
   '@babel/helper-validator-option@7.27.1': {}
 
-  '@babel/helpers@7.27.6':
+  '@babel/helpers@7.28.2':
     dependencies:
       '@babel/template': 7.27.2
-      '@babel/types': 7.28.1
+      '@babel/types': 7.28.2
 
   '@babel/parser@7.28.0':
     dependencies:
-      '@babel/types': 7.28.1
+      '@babel/types': 7.28.2
 
-  '@babel/runtime@7.27.6': {}
+  '@babel/runtime@7.28.2': {}
 
   '@babel/template@7.27.2':
     dependencies:
       '@babel/code-frame': 7.27.1
       '@babel/parser': 7.28.0
-      '@babel/types': 7.28.1
+      '@babel/types': 7.28.2
 
   '@babel/traverse@7.28.0':
     dependencies:
@@ -2159,12 +2109,12 @@ snapshots:
       '@babel/helper-globals': 7.28.0
       '@babel/parser': 7.28.0
       '@babel/template': 7.27.2
-      '@babel/types': 7.28.1
+      '@babel/types': 7.28.2
       debug: 4.4.1
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/types@7.28.1':
+  '@babel/types@7.28.2':
     dependencies:
       '@babel/helper-string-parser': 7.27.1
       '@babel/helper-validator-identifier': 7.27.1
@@ -2237,113 +2187,113 @@ snapshots:
 
   '@csstools/css-tokenizer@3.0.4': {}
 
-  '@esbuild/aix-ppc64@0.25.6':
+  '@esbuild/aix-ppc64@0.25.8':
     optional: true
 
-  '@esbuild/android-arm64@0.25.6':
+  '@esbuild/android-arm64@0.25.8':
     optional: true
 
-  '@esbuild/android-arm@0.25.6':
+  '@esbuild/android-arm@0.25.8':
     optional: true
 
-  '@esbuild/android-x64@0.25.6':
+  '@esbuild/android-x64@0.25.8':
     optional: true
 
-  '@esbuild/darwin-arm64@0.25.6':
+  '@esbuild/darwin-arm64@0.25.8':
     optional: true
 
-  '@esbuild/darwin-x64@0.25.6':
+  '@esbuild/darwin-x64@0.25.8':
     optional: true
 
-  '@esbuild/freebsd-arm64@0.25.6':
+  '@esbuild/freebsd-arm64@0.25.8':
     optional: true
 
-  '@esbuild/freebsd-x64@0.25.6':
+  '@esbuild/freebsd-x64@0.25.8':
     optional: true
 
-  '@esbuild/linux-arm64@0.25.6':
+  '@esbuild/linux-arm64@0.25.8':
     optional: true
 
-  '@esbuild/linux-arm@0.25.6':
+  '@esbuild/linux-arm@0.25.8':
     optional: true
 
-  '@esbuild/linux-ia32@0.25.6':
+  '@esbuild/linux-ia32@0.25.8':
     optional: true
 
-  '@esbuild/linux-loong64@0.25.6':
+  '@esbuild/linux-loong64@0.25.8':
     optional: true
 
-  '@esbuild/linux-mips64el@0.25.6':
+  '@esbuild/linux-mips64el@0.25.8':
     optional: true
 
-  '@esbuild/linux-ppc64@0.25.6':
+  '@esbuild/linux-ppc64@0.25.8':
     optional: true
 
-  '@esbuild/linux-riscv64@0.25.6':
+  '@esbuild/linux-riscv64@0.25.8':
     optional: true
 
-  '@esbuild/linux-s390x@0.25.6':
+  '@esbuild/linux-s390x@0.25.8':
     optional: true
 
-  '@esbuild/linux-x64@0.25.6':
+  '@esbuild/linux-x64@0.25.8':
     optional: true
 
-  '@esbuild/netbsd-arm64@0.25.6':
+  '@esbuild/netbsd-arm64@0.25.8':
     optional: true
 
-  '@esbuild/netbsd-x64@0.25.6':
+  '@esbuild/netbsd-x64@0.25.8':
     optional: true
 
-  '@esbuild/openbsd-arm64@0.25.6':
+  '@esbuild/openbsd-arm64@0.25.8':
     optional: true
 
-  '@esbuild/openbsd-x64@0.25.6':
+  '@esbuild/openbsd-x64@0.25.8':
     optional: true
 
-  '@esbuild/openharmony-arm64@0.25.6':
+  '@esbuild/openharmony-arm64@0.25.8':
     optional: true
 
-  '@esbuild/sunos-x64@0.25.6':
+  '@esbuild/sunos-x64@0.25.8':
     optional: true
 
-  '@esbuild/win32-arm64@0.25.6':
+  '@esbuild/win32-arm64@0.25.8':
     optional: true
 
-  '@esbuild/win32-ia32@0.25.6':
+  '@esbuild/win32-ia32@0.25.8':
     optional: true
 
-  '@esbuild/win32-x64@0.25.6':
+  '@esbuild/win32-x64@0.25.8':
     optional: true
 
-  '@gerrit0/mini-shiki@3.7.0':
+  '@gerrit0/mini-shiki@3.8.1':
     dependencies:
-      '@shikijs/engine-oniguruma': 3.7.0
-      '@shikijs/langs': 3.7.0
-      '@shikijs/themes': 3.7.0
-      '@shikijs/types': 3.7.0
+      '@shikijs/engine-oniguruma': 3.8.1
+      '@shikijs/langs': 3.8.1
+      '@shikijs/themes': 3.8.1
+      '@shikijs/types': 3.8.1
       '@shikijs/vscode-textmate': 10.0.2
 
-  '@inquirer/checkbox@4.1.9(@types/node@22.16.3)':
+  '@inquirer/checkbox@4.2.0(@types/node@22.16.5)':
     dependencies:
-      '@inquirer/core': 10.1.14(@types/node@22.16.3)
-      '@inquirer/figures': 1.0.12
-      '@inquirer/type': 3.0.7(@types/node@22.16.3)
+      '@inquirer/core': 10.1.15(@types/node@22.16.5)
+      '@inquirer/figures': 1.0.13
+      '@inquirer/type': 3.0.8(@types/node@22.16.5)
       ansi-escapes: 4.3.2
       yoctocolors-cjs: 2.1.2
     optionalDependencies:
-      '@types/node': 22.16.3
+      '@types/node': 22.16.5
 
-  '@inquirer/confirm@5.1.13(@types/node@22.16.3)':
+  '@inquirer/confirm@5.1.14(@types/node@22.16.5)':
     dependencies:
-      '@inquirer/core': 10.1.14(@types/node@22.16.3)
-      '@inquirer/type': 3.0.7(@types/node@22.16.3)
+      '@inquirer/core': 10.1.15(@types/node@22.16.5)
+      '@inquirer/type': 3.0.8(@types/node@22.16.5)
     optionalDependencies:
-      '@types/node': 22.16.3
+      '@types/node': 22.16.5
 
-  '@inquirer/core@10.1.14(@types/node@22.16.3)':
+  '@inquirer/core@10.1.15(@types/node@22.16.5)':
     dependencies:
-      '@inquirer/figures': 1.0.12
-      '@inquirer/type': 3.0.7(@types/node@22.16.3)
+      '@inquirer/figures': 1.0.13
+      '@inquirer/type': 3.0.8(@types/node@22.16.5)
       ansi-escapes: 4.3.2
       cli-width: 4.1.0
       mute-stream: 2.0.0
@@ -2351,93 +2301,93 @@ snapshots:
       wrap-ansi: 6.2.0
       yoctocolors-cjs: 2.1.2
     optionalDependencies:
-      '@types/node': 22.16.3
+      '@types/node': 22.16.5
 
-  '@inquirer/editor@4.2.14(@types/node@22.16.3)':
+  '@inquirer/editor@4.2.15(@types/node@22.16.5)':
     dependencies:
-      '@inquirer/core': 10.1.14(@types/node@22.16.3)
-      '@inquirer/type': 3.0.7(@types/node@22.16.3)
+      '@inquirer/core': 10.1.15(@types/node@22.16.5)
+      '@inquirer/type': 3.0.8(@types/node@22.16.5)
       external-editor: 3.1.0
     optionalDependencies:
-      '@types/node': 22.16.3
+      '@types/node': 22.16.5
 
-  '@inquirer/expand@4.0.16(@types/node@22.16.3)':
+  '@inquirer/expand@4.0.17(@types/node@22.16.5)':
     dependencies:
-      '@inquirer/core': 10.1.14(@types/node@22.16.3)
-      '@inquirer/type': 3.0.7(@types/node@22.16.3)
+      '@inquirer/core': 10.1.15(@types/node@22.16.5)
+      '@inquirer/type': 3.0.8(@types/node@22.16.5)
       yoctocolors-cjs: 2.1.2
     optionalDependencies:
-      '@types/node': 22.16.3
+      '@types/node': 22.16.5
 
-  '@inquirer/figures@1.0.12': {}
+  '@inquirer/figures@1.0.13': {}
 
-  '@inquirer/input@4.2.0(@types/node@22.16.3)':
+  '@inquirer/input@4.2.1(@types/node@22.16.5)':
     dependencies:
-      '@inquirer/core': 10.1.14(@types/node@22.16.3)
-      '@inquirer/type': 3.0.7(@types/node@22.16.3)
+      '@inquirer/core': 10.1.15(@types/node@22.16.5)
+      '@inquirer/type': 3.0.8(@types/node@22.16.5)
     optionalDependencies:
-      '@types/node': 22.16.3
+      '@types/node': 22.16.5
 
-  '@inquirer/number@3.0.16(@types/node@22.16.3)':
+  '@inquirer/number@3.0.17(@types/node@22.16.5)':
     dependencies:
-      '@inquirer/core': 10.1.14(@types/node@22.16.3)
-      '@inquirer/type': 3.0.7(@types/node@22.16.3)
+      '@inquirer/core': 10.1.15(@types/node@22.16.5)
+      '@inquirer/type': 3.0.8(@types/node@22.16.5)
     optionalDependencies:
-      '@types/node': 22.16.3
+      '@types/node': 22.16.5
 
-  '@inquirer/password@4.0.16(@types/node@22.16.3)':
+  '@inquirer/password@4.0.17(@types/node@22.16.5)':
     dependencies:
-      '@inquirer/core': 10.1.14(@types/node@22.16.3)
-      '@inquirer/type': 3.0.7(@types/node@22.16.3)
+      '@inquirer/core': 10.1.15(@types/node@22.16.5)
+      '@inquirer/type': 3.0.8(@types/node@22.16.5)
       ansi-escapes: 4.3.2
     optionalDependencies:
-      '@types/node': 22.16.3
+      '@types/node': 22.16.5
 
-  '@inquirer/prompts@7.6.0(@types/node@22.16.3)':
+  '@inquirer/prompts@7.7.1(@types/node@22.16.5)':
     dependencies:
-      '@inquirer/checkbox': 4.1.9(@types/node@22.16.3)
-      '@inquirer/confirm': 5.1.13(@types/node@22.16.3)
-      '@inquirer/editor': 4.2.14(@types/node@22.16.3)
-      '@inquirer/expand': 4.0.16(@types/node@22.16.3)
-      '@inquirer/input': 4.2.0(@types/node@22.16.3)
-      '@inquirer/number': 3.0.16(@types/node@22.16.3)
-      '@inquirer/password': 4.0.16(@types/node@22.16.3)
-      '@inquirer/rawlist': 4.1.4(@types/node@22.16.3)
-      '@inquirer/search': 3.0.16(@types/node@22.16.3)
-      '@inquirer/select': 4.2.4(@types/node@22.16.3)
+      '@inquirer/checkbox': 4.2.0(@types/node@22.16.5)
+      '@inquirer/confirm': 5.1.14(@types/node@22.16.5)
+      '@inquirer/editor': 4.2.15(@types/node@22.16.5)
+      '@inquirer/expand': 4.0.17(@types/node@22.16.5)
+      '@inquirer/input': 4.2.1(@types/node@22.16.5)
+      '@inquirer/number': 3.0.17(@types/node@22.16.5)
+      '@inquirer/password': 4.0.17(@types/node@22.16.5)
+      '@inquirer/rawlist': 4.1.5(@types/node@22.16.5)
+      '@inquirer/search': 3.0.17(@types/node@22.16.5)
+      '@inquirer/select': 4.3.1(@types/node@22.16.5)
     optionalDependencies:
-      '@types/node': 22.16.3
+      '@types/node': 22.16.5
 
-  '@inquirer/rawlist@4.1.4(@types/node@22.16.3)':
+  '@inquirer/rawlist@4.1.5(@types/node@22.16.5)':
     dependencies:
-      '@inquirer/core': 10.1.14(@types/node@22.16.3)
-      '@inquirer/type': 3.0.7(@types/node@22.16.3)
+      '@inquirer/core': 10.1.15(@types/node@22.16.5)
+      '@inquirer/type': 3.0.8(@types/node@22.16.5)
       yoctocolors-cjs: 2.1.2
     optionalDependencies:
-      '@types/node': 22.16.3
+      '@types/node': 22.16.5
 
-  '@inquirer/search@3.0.16(@types/node@22.16.3)':
+  '@inquirer/search@3.0.17(@types/node@22.16.5)':
     dependencies:
-      '@inquirer/core': 10.1.14(@types/node@22.16.3)
-      '@inquirer/figures': 1.0.12
-      '@inquirer/type': 3.0.7(@types/node@22.16.3)
+      '@inquirer/core': 10.1.15(@types/node@22.16.5)
+      '@inquirer/figures': 1.0.13
+      '@inquirer/type': 3.0.8(@types/node@22.16.5)
       yoctocolors-cjs: 2.1.2
     optionalDependencies:
-      '@types/node': 22.16.3
+      '@types/node': 22.16.5
 
-  '@inquirer/select@4.2.4(@types/node@22.16.3)':
+  '@inquirer/select@4.3.1(@types/node@22.16.5)':
     dependencies:
-      '@inquirer/core': 10.1.14(@types/node@22.16.3)
-      '@inquirer/figures': 1.0.12
-      '@inquirer/type': 3.0.7(@types/node@22.16.3)
+      '@inquirer/core': 10.1.15(@types/node@22.16.5)
+      '@inquirer/figures': 1.0.13
+      '@inquirer/type': 3.0.8(@types/node@22.16.5)
       ansi-escapes: 4.3.2
       yoctocolors-cjs: 2.1.2
     optionalDependencies:
-      '@types/node': 22.16.3
+      '@types/node': 22.16.5
 
-  '@inquirer/type@3.0.7(@types/node@22.16.3)':
+  '@inquirer/type@3.0.8(@types/node@22.16.5)':
     optionalDependencies:
-      '@types/node': 22.16.3
+      '@types/node': 22.16.5
 
   '@isaacs/cliui@8.0.2':
     dependencies:
@@ -2468,7 +2418,7 @@ snapshots:
 
   '@material/material-color-utilities@0.2.7': {}
 
-  '@mswjs/interceptors@0.39.2':
+  '@mswjs/interceptors@0.39.4':
     dependencies:
       '@open-draft/deferred-promise': 2.2.0
       '@open-draft/logger': 0.3.0
@@ -2486,107 +2436,83 @@ snapshots:
 
   '@open-draft/until@2.1.0': {}
 
-  '@oxlint/darwin-arm64@1.6.0':
-    optional: true
-
-  '@oxlint/darwin-x64@1.6.0':
-    optional: true
-
-  '@oxlint/linux-arm64-gnu@1.6.0':
-    optional: true
-
-  '@oxlint/linux-arm64-musl@1.6.0':
-    optional: true
-
-  '@oxlint/linux-x64-gnu@1.6.0':
-    optional: true
-
-  '@oxlint/linux-x64-musl@1.6.0':
-    optional: true
-
-  '@oxlint/win32-arm64@1.6.0':
-    optional: true
-
-  '@oxlint/win32-x64@1.6.0':
-    optional: true
-
   '@pkgjs/parseargs@0.11.0':
     optional: true
 
-  '@rollup/rollup-android-arm-eabi@4.45.0':
+  '@rollup/rollup-android-arm-eabi@4.46.1':
     optional: true
 
-  '@rollup/rollup-android-arm64@4.45.0':
+  '@rollup/rollup-android-arm64@4.46.1':
     optional: true
 
-  '@rollup/rollup-darwin-arm64@4.45.0':
+  '@rollup/rollup-darwin-arm64@4.46.1':
     optional: true
 
-  '@rollup/rollup-darwin-x64@4.45.0':
+  '@rollup/rollup-darwin-x64@4.46.1':
     optional: true
 
-  '@rollup/rollup-freebsd-arm64@4.45.0':
+  '@rollup/rollup-freebsd-arm64@4.46.1':
     optional: true
 
-  '@rollup/rollup-freebsd-x64@4.45.0':
+  '@rollup/rollup-freebsd-x64@4.46.1':
     optional: true
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.45.0':
+  '@rollup/rollup-linux-arm-gnueabihf@4.46.1':
     optional: true
 
-  '@rollup/rollup-linux-arm-musleabihf@4.45.0':
+  '@rollup/rollup-linux-arm-musleabihf@4.46.1':
     optional: true
 
-  '@rollup/rollup-linux-arm64-gnu@4.45.0':
+  '@rollup/rollup-linux-arm64-gnu@4.46.1':
     optional: true
 
-  '@rollup/rollup-linux-arm64-musl@4.45.0':
+  '@rollup/rollup-linux-arm64-musl@4.46.1':
     optional: true
 
-  '@rollup/rollup-linux-loongarch64-gnu@4.45.0':
+  '@rollup/rollup-linux-loongarch64-gnu@4.46.1':
     optional: true
 
-  '@rollup/rollup-linux-powerpc64le-gnu@4.45.0':
+  '@rollup/rollup-linux-ppc64-gnu@4.46.1':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-gnu@4.45.0':
+  '@rollup/rollup-linux-riscv64-gnu@4.46.1':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-musl@4.45.0':
+  '@rollup/rollup-linux-riscv64-musl@4.46.1':
     optional: true
 
-  '@rollup/rollup-linux-s390x-gnu@4.45.0':
+  '@rollup/rollup-linux-s390x-gnu@4.46.1':
     optional: true
 
-  '@rollup/rollup-linux-x64-gnu@4.45.0':
+  '@rollup/rollup-linux-x64-gnu@4.46.1':
     optional: true
 
-  '@rollup/rollup-linux-x64-musl@4.45.0':
+  '@rollup/rollup-linux-x64-musl@4.46.1':
     optional: true
 
-  '@rollup/rollup-win32-arm64-msvc@4.45.0':
+  '@rollup/rollup-win32-arm64-msvc@4.46.1':
     optional: true
 
-  '@rollup/rollup-win32-ia32-msvc@4.45.0':
+  '@rollup/rollup-win32-ia32-msvc@4.46.1':
     optional: true
 
-  '@rollup/rollup-win32-x64-msvc@4.45.0':
+  '@rollup/rollup-win32-x64-msvc@4.46.1':
     optional: true
 
-  '@shikijs/engine-oniguruma@3.7.0':
+  '@shikijs/engine-oniguruma@3.8.1':
     dependencies:
-      '@shikijs/types': 3.7.0
+      '@shikijs/types': 3.8.1
       '@shikijs/vscode-textmate': 10.0.2
 
-  '@shikijs/langs@3.7.0':
+  '@shikijs/langs@3.8.1':
     dependencies:
-      '@shikijs/types': 3.7.0
+      '@shikijs/types': 3.8.1
 
-  '@shikijs/themes@3.7.0':
+  '@shikijs/themes@3.8.1':
     dependencies:
-      '@shikijs/types': 3.7.0
+      '@shikijs/types': 3.8.1
 
-  '@shikijs/types@3.7.0':
+  '@shikijs/types@3.8.1':
     dependencies:
       '@shikijs/vscode-textmate': 10.0.2
       '@types/hast': 3.0.4
@@ -2609,11 +2535,11 @@ snapshots:
 
   '@types/jsdom@21.1.7':
     dependencies:
-      '@types/node': 22.16.3
+      '@types/node': 22.16.5
       '@types/tough-cookie': 4.0.5
       parse5: 7.3.0
 
-  '@types/node@22.16.3':
+  '@types/node@22.16.5':
     dependencies:
       undici-types: 6.21.0
 
@@ -2623,7 +2549,7 @@ snapshots:
 
   '@types/unist@3.0.3': {}
 
-  '@vitest/coverage-istanbul@3.2.4(vitest@3.2.4(@types/node@22.16.3)(jsdom@26.1.0)(msw@2.10.4(@types/node@22.16.3)(typescript@5.8.3))(yaml@2.8.0))':
+  '@vitest/coverage-istanbul@3.2.4(vitest@3.2.4(@types/node@22.16.5)(jsdom@26.1.0)(msw@2.10.4(@types/node@22.16.5)(typescript@5.8.3))(yaml@2.8.0))':
     dependencies:
       '@istanbuljs/schema': 0.1.3
       debug: 4.4.1
@@ -2635,7 +2561,7 @@ snapshots:
       magicast: 0.3.5
       test-exclude: 7.0.1
       tinyrainbow: 2.0.0
-      vitest: 3.2.4(@types/node@22.16.3)(jsdom@26.1.0)(msw@2.10.4(@types/node@22.16.3)(typescript@5.8.3))(yaml@2.8.0)
+      vitest: 3.2.4(@types/node@22.16.5)(jsdom@26.1.0)(msw@2.10.4(@types/node@22.16.5)(typescript@5.8.3))(yaml@2.8.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -2647,14 +2573,14 @@ snapshots:
       chai: 5.2.1
       tinyrainbow: 2.0.0
 
-  '@vitest/mocker@3.2.4(msw@2.10.4(@types/node@22.16.3)(typescript@5.8.3))(vite@6.3.5(@types/node@22.16.3)(yaml@2.8.0))':
+  '@vitest/mocker@3.2.4(msw@2.10.4(@types/node@22.16.5)(typescript@5.8.3))(vite@7.0.6(@types/node@22.16.5)(yaml@2.8.0))':
     dependencies:
       '@vitest/spy': 3.2.4
       estree-walker: 3.0.3
       magic-string: 0.30.17
     optionalDependencies:
-      msw: 2.10.4(@types/node@22.16.3)(typescript@5.8.3)
-      vite: 6.3.5(@types/node@22.16.3)(yaml@2.8.0)
+      msw: 2.10.4(@types/node@22.16.5)(typescript@5.8.3)
+      vite: 7.0.6(@types/node@22.16.5)(yaml@2.8.0)
 
   '@vitest/pretty-format@3.2.4':
     dependencies:
@@ -2679,7 +2605,7 @@ snapshots:
   '@vitest/utils@3.2.4':
     dependencies:
       '@vitest/pretty-format': 3.2.4
-      loupe: 3.1.4
+      loupe: 3.2.0
       tinyrainbow: 2.0.0
 
   acorn-jsx-walk@2.0.0: {}
@@ -2734,7 +2660,7 @@ snapshots:
   browserslist@4.25.1:
     dependencies:
       caniuse-lite: 1.0.30001727
-      electron-to-chromium: 1.5.182
+      electron-to-chromium: 1.5.191
       node-releases: 2.0.19
       update-browserslist-db: 1.1.3(browserslist@4.25.1)
 
@@ -2764,7 +2690,7 @@ snapshots:
       assertion-error: 2.0.1
       check-error: 2.1.1
       deep-eql: 5.0.2
-      loupe: 3.1.4
+      loupe: 3.2.0
       pathval: 2.0.1
 
   chalk@4.1.2:
@@ -2863,7 +2789,7 @@ snapshots:
       json5: 2.2.3
       memoize: 10.1.0
       picocolors: 1.1.1
-      picomatch: 4.0.2
+      picomatch: 4.0.3
       prompts: 2.4.2
       rechoir: 0.8.0
       safe-regex: 2.1.1
@@ -2880,7 +2806,7 @@ snapshots:
 
   eastasianwidth@0.2.0: {}
 
-  electron-to-chromium@1.5.182: {}
+  electron-to-chromium@1.5.191: {}
 
   emoji-regex@8.0.0: {}
 
@@ -2905,34 +2831,34 @@ snapshots:
     dependencies:
       es-errors: 1.3.0
 
-  esbuild@0.25.6:
+  esbuild@0.25.8:
     optionalDependencies:
-      '@esbuild/aix-ppc64': 0.25.6
-      '@esbuild/android-arm': 0.25.6
-      '@esbuild/android-arm64': 0.25.6
-      '@esbuild/android-x64': 0.25.6
-      '@esbuild/darwin-arm64': 0.25.6
-      '@esbuild/darwin-x64': 0.25.6
-      '@esbuild/freebsd-arm64': 0.25.6
-      '@esbuild/freebsd-x64': 0.25.6
-      '@esbuild/linux-arm': 0.25.6
-      '@esbuild/linux-arm64': 0.25.6
-      '@esbuild/linux-ia32': 0.25.6
-      '@esbuild/linux-loong64': 0.25.6
-      '@esbuild/linux-mips64el': 0.25.6
-      '@esbuild/linux-ppc64': 0.25.6
-      '@esbuild/linux-riscv64': 0.25.6
-      '@esbuild/linux-s390x': 0.25.6
-      '@esbuild/linux-x64': 0.25.6
-      '@esbuild/netbsd-arm64': 0.25.6
-      '@esbuild/netbsd-x64': 0.25.6
-      '@esbuild/openbsd-arm64': 0.25.6
-      '@esbuild/openbsd-x64': 0.25.6
-      '@esbuild/openharmony-arm64': 0.25.6
-      '@esbuild/sunos-x64': 0.25.6
-      '@esbuild/win32-arm64': 0.25.6
-      '@esbuild/win32-ia32': 0.25.6
-      '@esbuild/win32-x64': 0.25.6
+      '@esbuild/aix-ppc64': 0.25.8
+      '@esbuild/android-arm': 0.25.8
+      '@esbuild/android-arm64': 0.25.8
+      '@esbuild/android-x64': 0.25.8
+      '@esbuild/darwin-arm64': 0.25.8
+      '@esbuild/darwin-x64': 0.25.8
+      '@esbuild/freebsd-arm64': 0.25.8
+      '@esbuild/freebsd-x64': 0.25.8
+      '@esbuild/linux-arm': 0.25.8
+      '@esbuild/linux-arm64': 0.25.8
+      '@esbuild/linux-ia32': 0.25.8
+      '@esbuild/linux-loong64': 0.25.8
+      '@esbuild/linux-mips64el': 0.25.8
+      '@esbuild/linux-ppc64': 0.25.8
+      '@esbuild/linux-riscv64': 0.25.8
+      '@esbuild/linux-s390x': 0.25.8
+      '@esbuild/linux-x64': 0.25.8
+      '@esbuild/netbsd-arm64': 0.25.8
+      '@esbuild/netbsd-x64': 0.25.8
+      '@esbuild/openbsd-arm64': 0.25.8
+      '@esbuild/openbsd-x64': 0.25.8
+      '@esbuild/openharmony-arm64': 0.25.8
+      '@esbuild/sunos-x64': 0.25.8
+      '@esbuild/win32-arm64': 0.25.8
+      '@esbuild/win32-ia32': 0.25.8
+      '@esbuild/win32-x64': 0.25.8
 
   escalade@3.2.0: {}
 
@@ -2958,9 +2884,9 @@ snapshots:
 
   fast-uri@3.0.6: {}
 
-  fdir@6.4.6(picomatch@4.0.2):
+  fdir@6.4.6(picomatch@4.0.3):
     optionalDependencies:
-      picomatch: 4.0.2
+      picomatch: 4.0.3
 
   foreground-child@3.3.1:
     dependencies:
@@ -3063,7 +2989,7 @@ snapshots:
 
   i18next-browser-languagedetector@8.2.0:
     dependencies:
-      '@babel/runtime': 7.27.6
+      '@babel/runtime': 7.28.2
 
   i18next-http-backend@2.7.3:
     dependencies:
@@ -3083,11 +3009,11 @@ snapshots:
 
   i18next@22.5.1:
     dependencies:
-      '@babel/runtime': 7.27.6
+      '@babel/runtime': 7.28.2
 
   i18next@24.2.3(typescript@5.8.3):
     dependencies:
-      '@babel/runtime': 7.27.6
+      '@babel/runtime': 7.28.2
     optionalDependencies:
       typescript: 5.8.3
 
@@ -3107,17 +3033,17 @@ snapshots:
 
   ini@4.1.1: {}
 
-  inquirer@12.7.0(@types/node@22.16.3):
+  inquirer@12.8.2(@types/node@22.16.5):
     dependencies:
-      '@inquirer/core': 10.1.14(@types/node@22.16.3)
-      '@inquirer/prompts': 7.6.0(@types/node@22.16.3)
-      '@inquirer/type': 3.0.7(@types/node@22.16.3)
+      '@inquirer/core': 10.1.15(@types/node@22.16.5)
+      '@inquirer/prompts': 7.7.1(@types/node@22.16.5)
+      '@inquirer/type': 3.0.8(@types/node@22.16.5)
       ansi-escapes: 4.3.2
       mute-stream: 2.0.0
-      run-async: 4.0.4
+      run-async: 4.0.5
       rxjs: 7.8.2
     optionalDependencies:
-      '@types/node': 22.16.3
+      '@types/node': 22.16.5
 
   interpret@3.1.1: {}
 
@@ -3203,7 +3129,7 @@ snapshots:
       http-proxy-agent: 7.0.2
       https-proxy-agent: 7.0.6
       is-potential-custom-element-name: 1.0.1
-      nwsapi: 2.2.20
+      nwsapi: 2.2.21
       parse5: 7.3.0
       rrweb-cssom: 0.8.0
       saxes: 6.0.0
@@ -3299,7 +3225,7 @@ snapshots:
 
   lodash@4.17.21: {}
 
-  loupe@3.1.4: {}
+  loupe@3.2.0: {}
 
   lru-cache@10.4.3: {}
 
@@ -3316,7 +3242,7 @@ snapshots:
   magicast@0.3.5:
     dependencies:
       '@babel/parser': 7.28.0
-      '@babel/types': 7.28.1
+      '@babel/types': 7.28.2
       source-map-js: 1.2.1
 
   make-dir@4.0.0:
@@ -3356,13 +3282,13 @@ snapshots:
 
   ms@2.1.3: {}
 
-  msw@2.10.4(@types/node@22.16.3)(typescript@5.8.3):
+  msw@2.10.4(@types/node@22.16.5)(typescript@5.8.3):
     dependencies:
       '@bundled-es-modules/cookie': 2.0.1
       '@bundled-es-modules/statuses': 1.0.1
       '@bundled-es-modules/tough-cookie': 0.1.6
-      '@inquirer/confirm': 5.1.13(@types/node@22.16.3)
-      '@mswjs/interceptors': 0.39.2
+      '@inquirer/confirm': 5.1.14(@types/node@22.16.5)
+      '@mswjs/interceptors': 0.39.4
       '@open-draft/deferred-promise': 2.2.0
       '@open-draft/until': 2.1.0
       '@types/cookie': 0.6.0
@@ -3393,7 +3319,7 @@ snapshots:
 
   node-releases@2.0.19: {}
 
-  nwsapi@2.2.20: {}
+  nwsapi@2.2.21: {}
 
   object-keys@1.1.1: {}
 
@@ -3403,17 +3329,6 @@ snapshots:
 
   outvariant@1.4.3: {}
 
-  oxlint@1.6.0:
-    optionalDependencies:
-      '@oxlint/darwin-arm64': 1.6.0
-      '@oxlint/darwin-x64': 1.6.0
-      '@oxlint/linux-arm64-gnu': 1.6.0
-      '@oxlint/linux-arm64-musl': 1.6.0
-      '@oxlint/linux-x64-gnu': 1.6.0
-      '@oxlint/linux-x64-musl': 1.6.0
-      '@oxlint/win32-arm64': 1.6.0
-      '@oxlint/win32-x64': 1.6.0
-
   package-json-from-dist@1.0.1: {}
 
   pako@1.0.11: {}
@@ -3462,7 +3377,7 @@ snapshots:
 
   picocolors@1.1.1: {}
 
-  picomatch@4.0.2: {}
+  picomatch@4.0.3: {}
 
   postcss@8.5.6:
     dependencies:
@@ -3470,8 +3385,6 @@ snapshots:
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
-  prettier@3.6.2: {}
-
   process-nextick-args@2.0.1: {}
 
   prompts@2.4.2:
@@ -3517,38 +3430,35 @@ snapshots:
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
 
-  rollup@4.45.0:
+  rollup@4.46.1:
     dependencies:
       '@types/estree': 1.0.8
     optionalDependencies:
-      '@rollup/rollup-android-arm-eabi': 4.45.0
-      '@rollup/rollup-android-arm64': 4.45.0
-      '@rollup/rollup-darwin-arm64': 4.45.0
-      '@rollup/rollup-darwin-x64': 4.45.0
-      '@rollup/rollup-freebsd-arm64': 4.45.0
-      '@rollup/rollup-freebsd-x64': 4.45.0
-      '@rollup/rollup-linux-arm-gnueabihf': 4.45.0
-      '@rollup/rollup-linux-arm-musleabihf': 4.45.0
-      '@rollup/rollup-linux-arm64-gnu': 4.45.0
-      '@rollup/rollup-linux-arm64-musl': 4.45.0
-      '@rollup/rollup-linux-loongarch64-gnu': 4.45.0
-      '@rollup/rollup-linux-powerpc64le-gnu': 4.45.0
-      '@rollup/rollup-linux-riscv64-gnu': 4.45.0
-      '@rollup/rollup-linux-riscv64-musl': 4.45.0
-      '@rollup/rollup-linux-s390x-gnu': 4.45.0
-      '@rollup/rollup-linux-x64-gnu': 4.45.0
-      '@rollup/rollup-linux-x64-musl': 4.45.0
-      '@rollup/rollup-win32-arm64-msvc': 4.45.0
-      '@rollup/rollup-win32-ia32-msvc': 4.45.0
-      '@rollup/rollup-win32-x64-msvc': 4.45.0
+      '@rollup/rollup-android-arm-eabi': 4.46.1
+      '@rollup/rollup-android-arm64': 4.46.1
+      '@rollup/rollup-darwin-arm64': 4.46.1
+      '@rollup/rollup-darwin-x64': 4.46.1
+      '@rollup/rollup-freebsd-arm64': 4.46.1
+      '@rollup/rollup-freebsd-x64': 4.46.1
+      '@rollup/rollup-linux-arm-gnueabihf': 4.46.1
+      '@rollup/rollup-linux-arm-musleabihf': 4.46.1
+      '@rollup/rollup-linux-arm64-gnu': 4.46.1
+      '@rollup/rollup-linux-arm64-musl': 4.46.1
+      '@rollup/rollup-linux-loongarch64-gnu': 4.46.1
+      '@rollup/rollup-linux-ppc64-gnu': 4.46.1
+      '@rollup/rollup-linux-riscv64-gnu': 4.46.1
+      '@rollup/rollup-linux-riscv64-musl': 4.46.1
+      '@rollup/rollup-linux-s390x-gnu': 4.46.1
+      '@rollup/rollup-linux-x64-gnu': 4.46.1
+      '@rollup/rollup-linux-x64-musl': 4.46.1
+      '@rollup/rollup-win32-arm64-msvc': 4.46.1
+      '@rollup/rollup-win32-ia32-msvc': 4.46.1
+      '@rollup/rollup-win32-x64-msvc': 4.46.1
       fsevents: 2.3.3
 
   rrweb-cssom@0.8.0: {}
 
-  run-async@4.0.4:
-    dependencies:
-      oxlint: 1.6.0
-      prettier: 3.6.2
+  run-async@4.0.5: {}
 
   rxjs@7.8.2:
     dependencies:
@@ -3657,8 +3567,8 @@ snapshots:
 
   tinyglobby@0.2.14:
     dependencies:
-      fdir: 6.4.6(picomatch@4.0.2)
-      picomatch: 4.0.2
+      fdir: 6.4.6(picomatch@4.0.3)
+      picomatch: 4.0.3
 
   tinypool@1.1.1: {}
 
@@ -3716,9 +3626,9 @@ snapshots:
 
   type-fest@4.41.0: {}
 
-  typedoc@0.28.7(typescript@5.8.3):
+  typedoc@0.28.8(typescript@5.8.3):
     dependencies:
-      '@gerrit0/mini-shiki': 3.7.0
+      '@gerrit0/mini-shiki': 3.8.1
       lunr: 2.3.9
       markdown-it: 14.1.0
       minimatch: 9.0.5
@@ -3746,13 +3656,13 @@ snapshots:
 
   util-deprecate@1.0.2: {}
 
-  vite-node@3.2.4(@types/node@22.16.3)(yaml@2.8.0):
+  vite-node@3.2.4(@types/node@22.16.5)(yaml@2.8.0):
     dependencies:
       cac: 6.7.14
       debug: 4.4.1
       es-module-lexer: 1.7.0
       pathe: 2.0.3
-      vite: 6.3.5(@types/node@22.16.3)(yaml@2.8.0)
+      vite: 7.0.6(@types/node@22.16.5)(yaml@2.8.0)
     transitivePeerDependencies:
       - '@types/node'
       - jiti
@@ -3767,40 +3677,40 @@ snapshots:
       - tsx
       - yaml
 
-  vite-tsconfig-paths@5.1.4(typescript@5.8.3)(vite@6.3.5(@types/node@22.16.3)(yaml@2.8.0)):
+  vite-tsconfig-paths@5.1.4(typescript@5.8.3)(vite@7.0.6(@types/node@22.16.5)(yaml@2.8.0)):
     dependencies:
       debug: 4.4.1
       globrex: 0.1.2
       tsconfck: 3.1.6(typescript@5.8.3)
     optionalDependencies:
-      vite: 6.3.5(@types/node@22.16.3)(yaml@2.8.0)
+      vite: 7.0.6(@types/node@22.16.5)(yaml@2.8.0)
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  vite@6.3.5(@types/node@22.16.3)(yaml@2.8.0):
+  vite@7.0.6(@types/node@22.16.5)(yaml@2.8.0):
     dependencies:
-      esbuild: 0.25.6
-      fdir: 6.4.6(picomatch@4.0.2)
-      picomatch: 4.0.2
+      esbuild: 0.25.8
+      fdir: 6.4.6(picomatch@4.0.3)
+      picomatch: 4.0.3
       postcss: 8.5.6
-      rollup: 4.45.0
+      rollup: 4.46.1
       tinyglobby: 0.2.14
     optionalDependencies:
-      '@types/node': 22.16.3
+      '@types/node': 22.16.5
       fsevents: 2.3.3
       yaml: 2.8.0
 
-  vitest-canvas-mock@0.3.3(vitest@3.2.4(@types/node@22.16.3)(jsdom@26.1.0)(msw@2.10.4(@types/node@22.16.3)(typescript@5.8.3))(yaml@2.8.0)):
+  vitest-canvas-mock@0.3.3(vitest@3.2.4(@types/node@22.16.5)(jsdom@26.1.0)(msw@2.10.4(@types/node@22.16.5)(typescript@5.8.3))(yaml@2.8.0)):
     dependencies:
       jest-canvas-mock: 2.5.2
-      vitest: 3.2.4(@types/node@22.16.3)(jsdom@26.1.0)(msw@2.10.4(@types/node@22.16.3)(typescript@5.8.3))(yaml@2.8.0)
+      vitest: 3.2.4(@types/node@22.16.5)(jsdom@26.1.0)(msw@2.10.4(@types/node@22.16.5)(typescript@5.8.3))(yaml@2.8.0)
 
-  vitest@3.2.4(@types/node@22.16.3)(jsdom@26.1.0)(msw@2.10.4(@types/node@22.16.3)(typescript@5.8.3))(yaml@2.8.0):
+  vitest@3.2.4(@types/node@22.16.5)(jsdom@26.1.0)(msw@2.10.4(@types/node@22.16.5)(typescript@5.8.3))(yaml@2.8.0):
     dependencies:
       '@types/chai': 5.2.2
       '@vitest/expect': 3.2.4
-      '@vitest/mocker': 3.2.4(msw@2.10.4(@types/node@22.16.3)(typescript@5.8.3))(vite@6.3.5(@types/node@22.16.3)(yaml@2.8.0))
+      '@vitest/mocker': 3.2.4(msw@2.10.4(@types/node@22.16.5)(typescript@5.8.3))(vite@7.0.6(@types/node@22.16.5)(yaml@2.8.0))
       '@vitest/pretty-format': 3.2.4
       '@vitest/runner': 3.2.4
       '@vitest/snapshot': 3.2.4
@@ -3811,18 +3721,18 @@ snapshots:
       expect-type: 1.2.2
       magic-string: 0.30.17
       pathe: 2.0.3
-      picomatch: 4.0.2
+      picomatch: 4.0.3
       std-env: 3.9.0
       tinybench: 2.9.0
       tinyexec: 0.3.2
       tinyglobby: 0.2.14
       tinypool: 1.1.1
       tinyrainbow: 2.0.0
-      vite: 6.3.5(@types/node@22.16.3)(yaml@2.8.0)
-      vite-node: 3.2.4(@types/node@22.16.3)(yaml@2.8.0)
+      vite: 7.0.6(@types/node@22.16.5)(yaml@2.8.0)
+      vite-node: 3.2.4(@types/node@22.16.5)(yaml@2.8.0)
       why-is-node-running: 2.3.0
     optionalDependencies:
-      '@types/node': 22.16.3
+      '@types/node': 22.16.5
       jsdom: 26.1.0
     transitivePeerDependencies:
       - jiti

From b1561ce741f1a9b3c93bd09e7e6bd353bb083a3a Mon Sep 17 00:00:00 2001
From: AJ Fontaine <36677462+Fontbane@users.noreply.github.com>
Date: Tue, 29 Jul 2025 16:15:17 -0400
Subject: [PATCH 26/44] [ME] [Bug] Disable trades in GTS ME with only 1 valid
 party member

https://github.com/pagefaultgames/pokerogue/pull/6167
---
 .../encounters/global-trade-system-encounter.ts            | 7 +++++--
 .../encounters/global-trade-system-encounter.test.ts       | 4 ++--
 2 files changed, 7 insertions(+), 4 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 b914927123a..347092fe0b4 100644
--- a/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts
+++ b/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts
@@ -39,6 +39,7 @@ import { addPokemonDataToDexAndValidateAchievements } from "#mystery-encounters/
 import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter";
 import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
 import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
+import { PartySizeRequirement } from "#mystery-encounters/mystery-encounter-requirements";
 import { PokemonData } from "#system/pokemon-data";
 import { MusicPreference } from "#system/settings";
 import type { OptionSelectItem } from "#ui/abstact-option-select-ui-handler";
@@ -151,7 +152,8 @@ export const GlobalTradeSystemEncounter: MysteryEncounter = MysteryEncounterBuil
     return true;
   })
   .withOption(
-    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
+      .withSceneRequirement(new PartySizeRequirement([2, 6], true)) // Requires 2 valid party members
       .withHasDexProgress(true)
       .withDialogue({
         buttonLabel: `${namespace}:option.1.label`,
@@ -257,7 +259,8 @@ export const GlobalTradeSystemEncounter: MysteryEncounter = MysteryEncounterBuil
       .build(),
   )
   .withOption(
-    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DEFAULT)
+    MysteryEncounterOptionBuilder.newOptionWithMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT)
+      .withSceneRequirement(new PartySizeRequirement([2, 6], true)) // Requires 2 valid party members
       .withHasDexProgress(true)
       .withDialogue({
         buttonLabel: `${namespace}:option.2.label`,
diff --git a/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts b/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts
index 2ac55dabe1c..867a33f6ab6 100644
--- a/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts
+++ b/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts
@@ -93,7 +93,7 @@ describe("Global Trade System - Mystery Encounter", () => {
   describe("Option 1 - Check Trade Offers", () => {
     it("should have the correct properties", () => {
       const option = GlobalTradeSystemEncounter.options[0];
-      expect(option.optionMode).toBe(MysteryEncounterOptionMode.DEFAULT);
+      expect(option.optionMode).toBe(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT);
       expect(option.dialogue).toBeDefined();
       expect(option.dialogue).toStrictEqual({
         buttonLabel: `${namespace}:option.1.label`,
@@ -154,7 +154,7 @@ describe("Global Trade System - Mystery Encounter", () => {
   describe("Option 2 - Wonder Trade", () => {
     it("should have the correct properties", () => {
       const option = GlobalTradeSystemEncounter.options[1];
-      expect(option.optionMode).toBe(MysteryEncounterOptionMode.DEFAULT);
+      expect(option.optionMode).toBe(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT);
       expect(option.dialogue).toBeDefined();
       expect(option.dialogue).toStrictEqual({
         buttonLabel: `${namespace}:option.2.label`,

From 32faab05d5605e28042eba992422d33fdfccdcd1 Mon Sep 17 00:00:00 2001
From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Date: Tue, 29 Jul 2025 15:47:24 -0600
Subject: [PATCH 27/44] [Refactor] Minor refactor of battler tags (#6129)

* Minor refactor battler tags

* Improve documentation

* Update type when loading in pokemon-data constructor for battler tags

* Fix issues in tsdoc comments with Wlowscha's suggestions

Co-authored-by: Wlowscha <54003515+Wlowscha@users.noreply.github.com>

* Apply bertie's suggestions from code review

Co-authored-by: Bertie690 <136088738+Bertie690@users.noreply.github.com>

* Remove unnecessary as const from tagType

* Remove missed `as const`

* Apply kev's suggestions from code review

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>

* Update src/data/battler-tags.ts

Co-authored-by: Bertie690 <136088738+Bertie690@users.noreply.github.com>

* Update src/data/battler-tags.ts

Co-authored-by: Bertie690 <136088738+Bertie690@users.noreply.github.com>

---------

Co-authored-by: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
Co-authored-by: Bertie690 <136088738+Bertie690@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
---
 src/@types/battler-tags.ts       | 119 +++++
 src/data/battler-tags.ts         | 881 ++++++++++++++++++-------------
 src/data/moves/move.ts           |   2 +-
 src/data/pokemon/pokemon-data.ts |  11 +-
 src/enums/battler-tag-type.ts    |   1 -
 5 files changed, 643 insertions(+), 371 deletions(-)
 create mode 100644 src/@types/battler-tags.ts

diff --git a/src/@types/battler-tags.ts b/src/@types/battler-tags.ts
new file mode 100644
index 00000000000..d1ff93e0400
--- /dev/null
+++ b/src/@types/battler-tags.ts
@@ -0,0 +1,119 @@
+// biome-ignore-start lint/correctness/noUnusedImports: Used in a TSDoc comment
+import type { AbilityBattlerTag, BattlerTagTypeMap, SerializableBattlerTag, TypeBoostTag } from "#data/battler-tags";
+import type { AbilityId } from "#enums/ability-id";
+// biome-ignore-end lint/correctness/noUnusedImports: end
+import type { BattlerTagType } from "#enums/battler-tag-type";
+
+/**
+ * Subset of {@linkcode BattlerTagType}s that restrict the use of moves.
+ */
+export type MoveRestrictionBattlerTagType =
+  | BattlerTagType.THROAT_CHOPPED
+  | BattlerTagType.TORMENT
+  | BattlerTagType.TAUNT
+  | BattlerTagType.IMPRISON
+  | BattlerTagType.HEAL_BLOCK
+  | BattlerTagType.ENCORE
+  | BattlerTagType.DISABLED
+  | BattlerTagType.GORILLA_TACTICS;
+
+/**
+ * Subset of {@linkcode BattlerTagType}s that block damage from moves.
+ */
+export type FormBlockDamageBattlerTagType = BattlerTagType.ICE_FACE | BattlerTagType.DISGUISE;
+
+/**
+ * Subset of {@linkcode BattlerTagType}s that are related to trapping effects.
+ */
+export type TrappingBattlerTagType =
+  | BattlerTagType.BIND
+  | BattlerTagType.WRAP
+  | BattlerTagType.FIRE_SPIN
+  | BattlerTagType.WHIRLPOOL
+  | BattlerTagType.CLAMP
+  | BattlerTagType.SAND_TOMB
+  | BattlerTagType.MAGMA_STORM
+  | BattlerTagType.SNAP_TRAP
+  | BattlerTagType.THUNDER_CAGE
+  | BattlerTagType.INFESTATION
+  | BattlerTagType.INGRAIN
+  | BattlerTagType.OCTOLOCK
+  | BattlerTagType.NO_RETREAT;
+
+/**
+ * Subset of {@linkcode BattlerTagType}s that are related to protection effects.
+ */
+export type ProtectionBattlerTagType = BattlerTagType.PROTECTED | BattlerTagType.SPIKY_SHIELD | DamageProtectedTagType;
+/**
+ * Subset of {@linkcode BattlerTagType}s related to protection effects that block damage but not status moves.
+ */
+export type DamageProtectedTagType = ContactSetStatusProtectedTagType | ContactStatStageChangeProtectedTagType;
+
+/**
+ * Subset of {@linkcode BattlerTagType}s related to protection effects that set a status effect on the attacker.
+ */
+export type ContactSetStatusProtectedTagType = BattlerTagType.BANEFUL_BUNKER | BattlerTagType.BURNING_BULWARK;
+
+/**
+ * Subset of {@linkcode BattlerTagType}s related to protection effects that change stat stages of the attacker.
+ */
+export type ContactStatStageChangeProtectedTagType =
+  | BattlerTagType.KINGS_SHIELD
+  | BattlerTagType.SILK_TRAP
+  | BattlerTagType.OBSTRUCT;
+
+/** Subset of {@linkcode BattlerTagType}s that provide the Endure effect */
+export type EndureTagType = BattlerTagType.ENDURE_TOKEN | BattlerTagType.ENDURING;
+
+/**
+ * Subset of {@linkcode BattlerTagType}s that are related to semi-invulnerable states.
+ */
+export type SemiInvulnerableTagType =
+  | BattlerTagType.FLYING
+  | BattlerTagType.UNDERGROUND
+  | BattlerTagType.UNDERWATER
+  | BattlerTagType.HIDDEN;
+
+/**
+ * Subset of {@linkcode BattlerTagType}s corresponding to {@linkcode AbilityBattlerTag}s
+ *
+ * @remarks
+ * ⚠️ {@linkcode AbilityId.FLASH_FIRE | Flash Fire}'s {@linkcode BattlerTagType.FIRE_BOOST} is not included as it
+ * subclasses {@linkcode TypeBoostTag} and not `AbilityBattlerTag`.
+ */
+export type AbilityBattlerTagType =
+  | BattlerTagType.PROTOSYNTHESIS
+  | BattlerTagType.QUARK_DRIVE
+  | BattlerTagType.UNBURDEN
+  | BattlerTagType.SLOW_START
+  | BattlerTagType.TRUANT;
+
+/**
+ * Subset of {@linkcode BattlerTagType}s related to abilities that boost the highest stat.
+ */
+export type HighestStatBoostTagType =
+  | BattlerTagType.QUARK_DRIVE // formatting
+  | BattlerTagType.PROTOSYNTHESIS;
+/**
+ * Subset of {@linkcode BattlerTagType}s that are able to persist between turns and should therefore be serialized
+ */
+export type SerializableBattlerTagType = keyof {
+  [K in keyof BattlerTagTypeMap as BattlerTagTypeMap[K] extends SerializableBattlerTag
+    ? K
+    : never]: BattlerTagTypeMap[K];
+};
+
+/**
+ * Subset of {@linkcode BattlerTagType}s that are not able to persist across waves and should therefore not be serialized
+ */
+export type NonSerializableBattlerTagType = Exclude<BattlerTagType, SerializableBattlerTagType>;
+
+/**
+ * Dummy, typescript-only declaration to ensure that
+ * {@linkcode BattlerTagTypeMap} has an entry for all `BattlerTagType`s.
+ *
+ * If a battler tag is missing from the map, Typescript will throw an error on this statement.
+ *
+ * ⚠️ Does not actually exist at runtime, so it must not be used!
+ */
+declare const EnsureAllBattlerTagTypesAreMapped: BattlerTagTypeMap[BattlerTagType] & never;
diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts
index c8ddfe32f0b..79c14f860b6 100644
--- a/src/data/battler-tags.ts
+++ b/src/data/battler-tags.ts
@@ -8,6 +8,7 @@ import { SpeciesFormChangeAbilityTrigger } from "#data/form-change-triggers";
 import { getStatusEffectHealText } from "#data/status-effect";
 import { TerrainType } from "#data/terrain";
 import { AbilityId } from "#enums/ability-id";
+import type { BattlerIndex } from "#enums/battler-index";
 import { BattlerTagLapseType } from "#enums/battler-tag-lapse-type";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { HitResult } from "#enums/hit-result";
@@ -31,41 +32,107 @@ import type { MoveEffectPhase } from "#phases/move-effect-phase";
 import type { MovePhase } from "#phases/move-phase";
 import type { StatStageChangeCallback } from "#phases/stat-stage-change-phase";
 import i18next from "#plugins/i18n";
+import type {
+  AbilityBattlerTagType,
+  ContactSetStatusProtectedTagType,
+  ContactStatStageChangeProtectedTagType,
+  DamageProtectedTagType,
+  EndureTagType,
+  HighestStatBoostTagType,
+  MoveRestrictionBattlerTagType,
+  ProtectionBattlerTagType,
+  SemiInvulnerableTagType,
+  TrappingBattlerTagType,
+} from "#types/battler-tags";
+import type { Mutable, NonFunctionProperties } from "#types/type-helpers";
 import { BooleanHolder, coerceArray, getFrameMs, isNullOrUndefined, NumberHolder, toDmgValue } from "#utils/common";
 
+/*
+@module
+BattlerTags are used to represent semi-persistent effects that can be attached to a Pokemon.
+Note that before serialization, a new tag object is created, and then `loadTag` is called on the
+tag with the object that was serialized.
+
+This means it is straightforward to avoid serializing fields.
+Fields that are not set in the constructor and not set in `loadTag` will thus not be serialized.
+
+Any battler tag that can persist across sessions must extend SerializableBattlerTag in its class definition signature.
+Only tags that persist across waves (meaning their effect can last >1 turn) should be considered
+serializable.
+
+Serializable battler tags have strict requirements for their fields.
+Properties that are not necessary to reconstruct the tag must not be serialized. This can be avoided
+by using a private property. If access to the property is needed outside of the class, then
+a getter (and potentially, a setter) should be used instead.
+
+If a property that is intended to be private must be serialized, then it should instead
+be declared as a public readonly propety. Then, in the `loadTag` method (or any method inside the class that needs to adjust the property)
+use `(this as Mutable<this>).propertyName = value;`
+These rules ensure that Typescript is aware of the shape of the serialized version of the class.
+*/
+
+/** Interface containing the serializable fields of BattlerTag */
+interface BaseBattlerTag {
+  /** The tag's remaining duration */
+  turnCount: number;
+  /** The {@linkcode MoveId} that created this tag, or `undefined` if not set by a move */
+  sourceMove?: MoveId;
+  /** The {@linkcode Pokemon.id | PID} of the Pokemon that added this tag, or `undefined` if not set by a pokemon */
+  sourceId?: number;
+}
+
 /**
  * A {@linkcode BattlerTag} represents a semi-persistent effect that can be attached to a {@linkcode Pokemon}.
  * Tags can trigger various effects throughout a turn, and are cleared on switching out
  * or through their respective {@linkcode BattlerTag.lapse | lapse} methods.
  */
-export class BattlerTag {
-  public tagType: BattlerTagType;
-  public lapseTypes: BattlerTagLapseType[];
+export class BattlerTag implements BaseBattlerTag {
+  public readonly tagType: BattlerTagType;
+
   public turnCount: number;
-  public sourceMove: MoveId;
+  public sourceMove?: MoveId;
   public sourceId?: number;
-  public isBatonPassable: boolean;
+
+  //#region non-serializable fields
+  // Fields that should never be serialized, as they must not change after instantiation
+  #isBatonPassable = false;
+  public get isBatonPassable(): boolean {
+    return this.#isBatonPassable;
+  }
+
+  #lapseTypes: readonly [BattlerTagLapseType, ...BattlerTagLapseType[]];
+  public get lapseTypes(): readonly BattlerTagLapseType[] {
+    return this.#lapseTypes;
+  }
+  //#endregion non-serializable fields
 
   constructor(
     tagType: BattlerTagType,
-    lapseType: BattlerTagLapseType | BattlerTagLapseType[],
+    lapseType: BattlerTagLapseType | [BattlerTagLapseType, ...BattlerTagLapseType[]],
     turnCount: number,
     sourceMove?: MoveId,
     sourceId?: number,
     isBatonPassable = false,
   ) {
     this.tagType = tagType;
-    this.lapseTypes = coerceArray(lapseType);
+    this.#lapseTypes = coerceArray(lapseType);
     this.turnCount = turnCount;
-    this.sourceMove = sourceMove!; // TODO: is this bang correct?
+    // We intentionally don't want to set source move to `MoveId.NONE` here, so a raw boolean comparison is OK.
+    if (sourceMove) {
+      this.sourceMove = sourceMove;
+    }
     this.sourceId = sourceId;
-    this.isBatonPassable = isBatonPassable;
+    this.#isBatonPassable = isBatonPassable;
   }
 
   canAdd(_pokemon: Pokemon): boolean {
     return true;
   }
 
+  /**
+   * Apply effects that occur when the tag is added to a {@linkcode Pokemon}
+   * @param _pokemon - The {@linkcode Pokemon} the tag was added to
+   */
   onAdd(_pokemon: Pokemon): void {}
 
   onRemove(_pokemon: Pokemon): void {}
@@ -99,9 +166,9 @@ export class BattlerTag {
   /**
    * Load the data for a given {@linkcode BattlerTag} or JSON representation thereof.
    * Should be inherited from by any battler tag with custom attributes.
-   * @param source The battler tag to load
+   * @param source - An object containing the fields needed to reconstruct this tag.
    */
-  loadTag(source: BattlerTag | any): void {
+  loadTag(source: BaseBattlerTag): void {
     this.turnCount = source.turnCount;
     this.sourceMove = source.sourceMove;
     this.sourceId = source.sourceId;
@@ -116,12 +183,9 @@ export class BattlerTag {
   }
 }
 
-export interface WeatherBattlerTag {
-  weatherTypes: WeatherType[];
-}
-
-export interface TerrainBattlerTag {
-  terrainTypes: TerrainType[];
+export abstract class SerializableBattlerTag extends BattlerTag {
+  /** Nonexistent, dummy field to allow typescript to distinguish this class from `BattlerTag` */
+  private declare __SerializableBattlerTag: never;
 }
 
 /**
@@ -132,8 +196,8 @@ export interface TerrainBattlerTag {
  * match a condition. A restricted move gets cancelled before it is used.
  * Players and enemies should not be allowed to select restricted moves.
  */
-export abstract class MoveRestrictionBattlerTag extends BattlerTag {
-  /** @override */
+export abstract class MoveRestrictionBattlerTag extends SerializableBattlerTag {
+  public declare readonly tagType: MoveRestrictionBattlerTagType;
   override lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
     if (lapseType === BattlerTagLapseType.PRE_MOVE) {
       // Cancel the affected pokemon's selected move
@@ -154,32 +218,32 @@ export abstract class MoveRestrictionBattlerTag extends BattlerTag {
   }
 
   /**
-   * Gets whether this tag is restricting a move.
+   * Determine whether a move's usage is restricted by this tag
    *
-   * @param move - {@linkcode MoveId} ID to check restriction for.
+   * @param move - The {@linkcode MoveId} being checked
    * @param user - The {@linkcode Pokemon} involved
    * @returns `true` if the move is restricted by this tag, otherwise `false`.
    */
   public abstract isMoveRestricted(move: MoveId, user?: Pokemon): boolean;
 
   /**
-   * Checks if this tag is restricting a move based on a user's decisions during the target selection phase
+   * Check if this tag is restricting a move based on a user's decisions during the target selection phase
    *
-   * @param {MoveId} _move {@linkcode MoveId} move ID to check restriction for
-   * @param {Pokemon} _user {@linkcode Pokemon} the user of the above move
-   * @param {Pokemon} _target {@linkcode Pokemon} the target of the above move
-   * @returns {boolean} `false` unless overridden by the child tag
+   * @param _move - {@linkcode MoveId} to check restriction for
+   * @param _user - The user of the move
+   * @param _target - The pokemon targeted by the move
+   * @returns Whether the move is restricted by this tag
    */
   isMoveTargetRestricted(_move: MoveId, _user: Pokemon, _target: Pokemon): boolean {
     return false;
   }
 
   /**
-   * Gets the text to display when the player attempts to select a move that is restricted by this tag.
+   * Get the text to display when the player attempts to select a move that is restricted by this tag.
    *
-   * @param {Pokemon} pokemon {@linkcode Pokemon} for which the player is attempting to select the restricted move
-   * @param {MoveId} move {@linkcode MoveId} ID of the move that is having its selection denied
-   * @returns {string} text to display when the player attempts to select the restricted move
+   * @param pokemon - The pokemon for which the player is attempting to select the restricted move
+   * @param move - The {@linkcode MoveId | ID} of the Move that is having its selection denied
+   * @returns The text to display when the player attempts to select the restricted move
    */
   abstract selectionDeniedText(pokemon: Pokemon, move: MoveId): string;
 
@@ -188,9 +252,9 @@ export abstract class MoveRestrictionBattlerTag extends BattlerTag {
    * Because restriction effects also prevent selection of the move, this situation can only arise if a
    * pokemon first selects a move, then gets outsped by a pokemon using a move that restricts the selected move.
    *
-   * @param {Pokemon} _pokemon {@linkcode Pokemon} attempting to use the restricted move
-   * @param {MoveId} _move {@linkcode MoveId} ID of the move being interrupted
-   * @returns {string} text to display when the move is interrupted
+   * @param _pokemon - The pokemon attempting to use the restricted move
+   * @param _move - The {@linkcode MoveId | ID} of the move being interrupted
+   * @returns The text to display when the move is interrupted
    */
   interruptedText(_pokemon: Pokemon, _move: MoveId): string {
     return "";
@@ -200,9 +264,10 @@ export abstract class MoveRestrictionBattlerTag extends BattlerTag {
 /**
  * Tag representing the "Throat Chop" effect. Pokemon with this tag cannot use sound-based moves.
  * @see {@link https://bulbapedia.bulbagarden.net/wiki/Throat_Chop_(move) | Throat Chop}
- * @extends MoveRestrictionBattlerTag
+ * @sealed
  */
 export class ThroatChoppedTag extends MoveRestrictionBattlerTag {
+  public override readonly tagType = BattlerTagType.THROAT_CHOPPED;
   constructor() {
     super(
       BattlerTagType.THROAT_CHOPPED,
@@ -213,10 +278,9 @@ export class ThroatChoppedTag extends MoveRestrictionBattlerTag {
   }
 
   /**
-   * Checks if a {@linkcode MoveId | move} is restricted by Throat Chop.
-   * @override
-   * @param {MoveId} move the {@linkcode MoveId | move} to check for sound-based restriction
-   * @returns true if the move is sound-based
+   * Check if a move is restricted by Throat Chop.
+   * @param move - The {@linkcode MoveId | ID } of the move to check for sound-based restriction
+   * @returns Whether the move is sound based
    */
   override isMoveRestricted(move: MoveId): boolean {
     return allMoves[move].hasFlag(MoveFlags.SOUND_BASED);
@@ -224,10 +288,9 @@ export class ThroatChoppedTag extends MoveRestrictionBattlerTag {
 
   /**
    * Shows a message when the player attempts to select a move that is restricted by Throat Chop.
-   * @override
-   * @param {Pokemon} _pokemon the {@linkcode Pokemon} that is attempting to select the restricted move
-   * @param {MoveId} move the {@linkcode MoveId | move} that is being restricted
-   * @returns the message to display when the player attempts to select the restricted move
+   * @param _pokemon - The {@linkcode Pokemon} that is attempting to select the restricted move
+   * @param move - The {@linkcode MoveId | move} that is being restricted
+   * @returns The message to display when the player attempts to select the restricted move
    */
   override selectionDeniedText(_pokemon: Pokemon, move: MoveId): string {
     return i18next.t("battle:moveCannotBeSelected", {
@@ -237,10 +300,9 @@ export class ThroatChoppedTag extends MoveRestrictionBattlerTag {
 
   /**
    * Shows a message when a move is interrupted by Throat Chop.
-   * @override
-   * @param {Pokemon} pokemon the interrupted {@linkcode Pokemon}
-   * @param {MoveId} _move the {@linkcode MoveId | move} that was interrupted
-   * @returns the message to display when the move is interrupted
+   * @param pokemon - The interrupted {@linkcode Pokemon}
+   * @param _move - The {@linkcode MoveId | ID } of the move that was interrupted
+   * @returns The message to display when the move is interrupted
    */
   override interruptedText(pokemon: Pokemon, _move: MoveId): string {
     return i18next.t("battle:throatChopInterruptedMove", {
@@ -252,10 +314,13 @@ export class ThroatChoppedTag extends MoveRestrictionBattlerTag {
 /**
  * Tag representing the "disabling" effect performed by {@linkcode MoveId.DISABLE} and {@linkcode AbilityId.CURSED_BODY}.
  * When the tag is added, the last-used move of the tag holder is set as the disabled move.
+ *
+ * @sealed
  */
 export class DisabledTag extends MoveRestrictionBattlerTag {
+  public override readonly tagType = BattlerTagType.DISABLED;
   /** The move being disabled. Gets set when {@linkcode onAdd} is called for this tag. */
-  private moveId: MoveId = MoveId.NONE;
+  public readonly moveId: MoveId = MoveId.NONE;
 
   constructor(sourceId: number) {
     super(
@@ -267,14 +332,11 @@ export class DisabledTag extends MoveRestrictionBattlerTag {
     );
   }
 
-  /** @override */
   override isMoveRestricted(move: MoveId): boolean {
     return move === this.moveId;
   }
 
   /**
-   * @override
-   *
    * Attempt to disable the target's last move by setting this tag's {@linkcode moveId}
    * and showing a message.
    */
@@ -287,7 +349,7 @@ export class DisabledTag extends MoveRestrictionBattlerTag {
     }
 
     super.onAdd(pokemon);
-    this.moveId = move.move;
+    (this as Mutable<this>).moveId = move.move;
 
     globalScene.phaseManager.queueMessage(
       i18next.t("battlerTags:disabledOnAdd", {
@@ -297,7 +359,6 @@ export class DisabledTag extends MoveRestrictionBattlerTag {
     );
   }
 
-  /** @override */
   override onRemove(pokemon: Pokemon): void {
     super.onRemove(pokemon);
 
@@ -309,16 +370,14 @@ export class DisabledTag extends MoveRestrictionBattlerTag {
     );
   }
 
-  /** @override */
   override selectionDeniedText(_pokemon: Pokemon, move: MoveId): string {
     return i18next.t("battle:moveDisabled", { moveName: allMoves[move].name });
   }
 
   /**
-   * @override
-   * @param {Pokemon} pokemon {@linkcode Pokemon} attempting to use the restricted move
-   * @param {MoveId} move {@linkcode MoveId} ID of the move being interrupted
-   * @returns {string} text to display when the move is interrupted
+   * @param pokemon - {@linkcode Pokemon} attempting to use the restricted move
+   * @param move - {@linkcode MoveId | ID} of the move being interrupted
+   * @returns The text to display when the move is interrupted
    */
   override interruptedText(pokemon: Pokemon, move: MoveId): string {
     return i18next.t("battle:disableInterruptedMove", {
@@ -327,18 +386,21 @@ export class DisabledTag extends MoveRestrictionBattlerTag {
     });
   }
 
-  /** @override */
-  override loadTag(source: BattlerTag | any): void {
+  override loadTag(source: NonFunctionProperties<DisabledTag>): void {
     super.loadTag(source);
-    this.moveId = source.moveId;
+    (this as Mutable<this>).moveId = source.moveId;
   }
 }
 
 /**
  * Tag used by Gorilla Tactics to restrict the user to using only one move.
+ *
+ * @sealed
  */
 export class GorillaTacticsTag extends MoveRestrictionBattlerTag {
-  private moveId = MoveId.NONE;
+  public override readonly tagType = BattlerTagType.GORILLA_TACTICS;
+  /** ID of the move that the user is locked into using*/
+  public readonly moveId: MoveId = MoveId.NONE;
 
   constructor() {
     super(BattlerTagType.GORILLA_TACTICS, BattlerTagLapseType.CUSTOM, 0);
@@ -367,18 +429,17 @@ export class GorillaTacticsTag extends MoveRestrictionBattlerTag {
     super.onAdd(pokemon);
 
     // Bang is justified as tag is not added if prior move doesn't exist
-    this.moveId = pokemon.getLastNonVirtualMove()!.move;
+    (this as Mutable<GorillaTacticsTag>).moveId = pokemon.getLastNonVirtualMove()!.move;
     pokemon.setStat(Stat.ATK, pokemon.getStat(Stat.ATK, false) * 1.5, false);
   }
 
   /**
    * Loads the Gorilla Tactics Battler Tag along with its unique class variable moveId
-   * @override
-   * @param source Gorilla Tactics' {@linkcode BattlerTag} information
+   * @param source - Object containing the fields needed to reconstruct this tag.
    */
-  public override loadTag(source: BattlerTag | any): void {
+  override loadTag(source: NonFunctionProperties<GorillaTacticsTag>): void {
     super.loadTag(source);
-    this.moveId = source.moveId;
+    (this as Mutable<GorillaTacticsTag>).moveId = source.moveId;
   }
 
   /**
@@ -397,7 +458,8 @@ export class GorillaTacticsTag extends MoveRestrictionBattlerTag {
 /**
  * BattlerTag that represents the "recharge" effects of moves like Hyper Beam.
  */
-export class RechargingTag extends BattlerTag {
+export class RechargingTag extends SerializableBattlerTag {
+  public override readonly tagType = BattlerTagType.RECHARGING;
   constructor(sourceMove: MoveId) {
     super(BattlerTagType.RECHARGING, [BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END], 2, sourceMove);
   }
@@ -430,6 +492,8 @@ export class RechargingTag extends BattlerTag {
  * @see {@link https://bulbapedia.bulbagarden.net/wiki/Beak_Blast_(move) | Beak Blast}
  */
 export class BeakBlastChargingTag extends BattlerTag {
+  public override readonly tagType = BattlerTagType.BEAK_BLAST_CHARGING;
+  public declare readonly sourceMove: MoveId.BEAK_BLAST;
   constructor() {
     super(
       BattlerTagType.BEAK_BLAST_CHARGING,
@@ -454,8 +518,8 @@ export class BeakBlastChargingTag extends BattlerTag {
   /**
    * Inflicts `BURN` status on attackers that make contact, and causes this tag
    * to be removed after the source makes a move (or the turn ends, whichever comes first)
-   * @param pokemon {@linkcode Pokemon} the owner of this tag
-   * @param lapseType {@linkcode BattlerTagLapseType} the type of functionality invoked in battle
+   * @param pokemon - The owner of this tag
+   * @param lapseType - The type of functionality invoked in battle
    * @returns `true` if invoked with the `AFTER_HIT` lapse type
    */
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
@@ -498,8 +562,8 @@ export class ShellTrapTag extends BattlerTag {
 
   /**
    * "Activates" the shell trap, causing the tag owner to move next.
-   * @param pokemon {@linkcode Pokemon} the owner of this tag
-   * @param lapseType {@linkcode BattlerTagLapseType} the type of functionality invoked in battle
+   * @param pokemon - The owner of this tag
+   * @param lapseType - The type of functionality invoked in battle
    * @returns `true` if invoked with the `AFTER_HIT` lapse type
    */
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
@@ -529,7 +593,8 @@ export class ShellTrapTag extends BattlerTag {
   }
 }
 
-export class TrappedTag extends BattlerTag {
+export class TrappedTag extends SerializableBattlerTag {
+  public declare readonly tagType: TrappingBattlerTagType;
   constructor(
     tagType: BattlerTagType,
     lapseType: BattlerTagLapseType,
@@ -546,13 +611,13 @@ export class TrappedTag extends BattlerTag {
       console.warn(`Failed to get source Pokemon for TrappedTag canAdd; id: ${this.sourceId}`);
       return false;
     }
-
-    const move = allMoves[this.sourceMove];
+    if (this.sourceMove && allMoves[this.sourceMove]?.hitsSubstitute(source, pokemon)) {
+      return false;
+    }
     const isGhost = pokemon.isOfType(PokemonType.GHOST);
     const isTrapped = pokemon.getTag(TrappedTag);
-    const hasSubstitute = move.hitsSubstitute(source, pokemon);
 
-    return !isTrapped && !isGhost && !hasSubstitute;
+    return !isTrapped && !isGhost;
   }
 
   onAdd(pokemon: Pokemon): void {
@@ -591,9 +656,9 @@ export class TrappedTag extends BattlerTag {
  * BattlerTag implementing No Retreat's trapping effect.
  * This is treated separately from other trapping effects to prevent
  * Ghost-type Pokemon from being able to reuse the move.
- * @extends TrappedTag
  */
 class NoRetreatTag extends TrappedTag {
+  public override readonly tagType = BattlerTagType.NO_RETREAT;
   constructor(sourceId: number) {
     super(BattlerTagType.NO_RETREAT, BattlerTagLapseType.CUSTOM, 0, MoveId.NO_RETREAT, sourceId);
   }
@@ -608,6 +673,7 @@ class NoRetreatTag extends TrappedTag {
  * BattlerTag that represents the {@link https://bulbapedia.bulbagarden.net/wiki/Flinch Flinch} status condition
  */
 export class FlinchedTag extends BattlerTag {
+  public override readonly tagType = BattlerTagType.FLINCHED;
   constructor(sourceMove: MoveId) {
     super(BattlerTagType.FLINCHED, [BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END], 1, sourceMove);
   }
@@ -639,6 +705,7 @@ export class FlinchedTag extends BattlerTag {
 }
 
 export class InterruptedTag extends BattlerTag {
+  public override readonly tagType = BattlerTagType.INTERRUPTED;
   constructor(sourceMove: MoveId) {
     super(BattlerTagType.INTERRUPTED, BattlerTagLapseType.PRE_MOVE, 0, sourceMove);
   }
@@ -668,7 +735,8 @@ export class InterruptedTag extends BattlerTag {
 /**
  * BattlerTag that represents the {@link https://bulbapedia.bulbagarden.net/wiki/Confusion_(status_condition) Confusion} status condition
  */
-export class ConfusedTag extends BattlerTag {
+export class ConfusedTag extends SerializableBattlerTag {
+  public override readonly tagType = BattlerTagType.CONFUSED;
   constructor(turnCount: number, sourceMove: MoveId) {
     super(BattlerTagType.CONFUSED, BattlerTagLapseType.MOVE, turnCount, sourceMove, undefined, true);
   }
@@ -752,10 +820,10 @@ export class ConfusedTag extends BattlerTag {
 
 /**
  * Tag applied to the {@linkcode Move.DESTINY_BOND} user.
- * @extends BattlerTag
  * @see {@linkcode apply}
  */
-export class DestinyBondTag extends BattlerTag {
+export class DestinyBondTag extends SerializableBattlerTag {
+  public readonly tagType = BattlerTagType.DESTINY_BOND;
   constructor(sourceMove: MoveId, sourceId: number) {
     super(BattlerTagType.DESTINY_BOND, BattlerTagLapseType.PRE_MOVE, 1, sourceMove, sourceId, true);
   }
@@ -765,9 +833,9 @@ export class DestinyBondTag extends BattlerTag {
    * or after receiving fatal damage. When the damage is fatal,
    * the attacking Pokemon is taken down as well, unless it's a boss.
    *
-   * @param {Pokemon} pokemon Pokemon that is attacking the Destiny Bond user.
-   * @param {BattlerTagLapseType} lapseType CUSTOM or PRE_MOVE
-   * @returns false if the tag source fainted or one turn has passed since the application
+   * @param pokemon - The Pokemon that is attacking the Destiny Bond user.
+   * @param lapseType - CUSTOM or PRE_MOVE
+   * @returns `false` if the tag source fainted or one turn has passed since the application
    */
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
     if (lapseType !== BattlerTagLapseType.CUSTOM) {
@@ -811,7 +879,9 @@ export class DestinyBondTag extends BattlerTag {
   }
 }
 
-export class InfatuatedTag extends BattlerTag {
+// Technically serializable as in a double battle, a pokemon could be infatuated by its ally
+export class InfatuatedTag extends SerializableBattlerTag {
+  public override readonly tagType = BattlerTagType.INFATUATED;
   constructor(sourceMove: number, sourceId: number) {
     super(BattlerTagType.INFATUATED, BattlerTagLapseType.MOVE, 1, sourceMove, sourceId);
   }
@@ -901,8 +971,9 @@ export class InfatuatedTag extends BattlerTag {
   }
 }
 
-export class SeedTag extends BattlerTag {
-  private sourceIndex: number;
+export class SeedTag extends SerializableBattlerTag {
+  public override readonly tagType = BattlerTagType.SEEDED;
+  public readonly sourceIndex: BattlerIndex;
 
   constructor(sourceId: number) {
     super(BattlerTagType.SEEDED, BattlerTagLapseType.TURN_END, 1, MoveId.LEECH_SEED, sourceId, true);
@@ -910,11 +981,11 @@ export class SeedTag extends BattlerTag {
 
   /**
    * When given a battler tag or json representing one, load the data for it.
-   * @param {BattlerTag | any} source A battler tag
+   * @param source - An object containing the fields needed to reconstruct this tag.
    */
-  loadTag(source: BattlerTag | any): void {
+  override loadTag(source: NonFunctionProperties<SeedTag>): void {
     super.loadTag(source);
-    this.sourceIndex = source.sourceIndex;
+    (this as Mutable<this>).sourceIndex = source.sourceIndex;
   }
 
   canAdd(pokemon: Pokemon): boolean {
@@ -935,7 +1006,7 @@ export class SeedTag extends BattlerTag {
         pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
       }),
     );
-    this.sourceIndex = source.getBattlerIndex();
+    (this as Mutable<this>).sourceIndex = source.getBattlerIndex();
   }
 
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
@@ -990,9 +1061,10 @@ export class SeedTag extends BattlerTag {
 /**
  * BattlerTag representing the effects of {@link https://bulbapedia.bulbagarden.net/wiki/Powder_(move) | Powder}.
  * When the afflicted Pokemon uses a Fire-type move, the move is cancelled, and the
- * Pokemon takes damage equal to 1/4 of it's maximum HP (rounded down).
+ * Pokemon takes damage equal to 1/4 of its maximum HP (rounded down).
  */
 export class PowderTag extends BattlerTag {
+  public override readonly tagType = BattlerTagType.POWDER;
   constructor() {
     super(BattlerTagType.POWDER, [BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END], 1);
   }
@@ -1051,7 +1123,7 @@ export class PowderTag extends BattlerTag {
   }
 }
 
-export class NightmareTag extends BattlerTag {
+export class NightmareTag extends SerializableBattlerTag {
   constructor() {
     super(BattlerTagType.NIGHTMARE, BattlerTagLapseType.TURN_END, 1, MoveId.NIGHTMARE);
   }
@@ -1104,7 +1176,7 @@ export class NightmareTag extends BattlerTag {
   }
 }
 
-export class FrenzyTag extends BattlerTag {
+export class FrenzyTag extends SerializableBattlerTag {
   constructor(turnCount: number, sourceMove: MoveId, sourceId: number) {
     super(BattlerTagType.FRENZY, BattlerTagLapseType.CUSTOM, turnCount, sourceMove, sourceId);
   }
@@ -1124,6 +1196,8 @@ export class FrenzyTag extends BattlerTag {
  * Encore forces the target Pokemon to use its most-recent move for 3 turns.
  */
 export class EncoreTag extends MoveRestrictionBattlerTag {
+  public override readonly tagType = BattlerTagType.ENCORE;
+  /** The ID of the move the user is locked into using */
   public moveId: MoveId;
 
   constructor(sourceId: number) {
@@ -1136,12 +1210,12 @@ export class EncoreTag extends MoveRestrictionBattlerTag {
     );
   }
 
-  loadTag(source: BattlerTag | any): void {
+  override loadTag(source: NonFunctionProperties<EncoreTag>): void {
     super.loadTag(source);
-    this.moveId = source.moveId as MoveId;
+    this.moveId = source.moveId;
   }
 
-  canAdd(pokemon: Pokemon): boolean {
+  override canAdd(pokemon: Pokemon): boolean {
     const lastMove = pokemon.getLastNonVirtualMove();
     if (!lastMove) {
       return false;
@@ -1156,10 +1230,7 @@ export class EncoreTag extends MoveRestrictionBattlerTag {
     return true;
   }
 
-  onAdd(pokemon: Pokemon): void {
-    // TODO: shouldn't this be `onAdd`?
-    super.onRemove(pokemon);
-
+  override onAdd(pokemon: Pokemon): void {
     globalScene.phaseManager.queueMessage(
       i18next.t("battlerTags:encoreOnAdd", {
         pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
@@ -1199,7 +1270,7 @@ export class EncoreTag extends MoveRestrictionBattlerTag {
 
   /**
    * Checks if the move matches the moveId stored within the tag and returns a boolean value
-   * @param move {@linkcode MoveId} the move selected
+   * @param move - The ID of the move selected
    * @param user N/A
    * @returns `true` if the move does not match with the moveId stored and as a result, restricted
    */
@@ -1223,6 +1294,7 @@ export class EncoreTag extends MoveRestrictionBattlerTag {
 }
 
 export class HelpingHandTag extends BattlerTag {
+  public override readonly tagType = BattlerTagType.HELPING_HAND;
   constructor(sourceId: number) {
     super(BattlerTagType.HELPING_HAND, BattlerTagLapseType.TURN_END, 1, MoveId.HELPING_HAND, sourceId);
   }
@@ -1245,16 +1317,16 @@ export class HelpingHandTag extends BattlerTag {
 
 /**
  * Applies the Ingrain tag to a pokemon
- * @extends TrappedTag
  */
 export class IngrainTag extends TrappedTag {
+  public override readonly tagType = BattlerTagType.INGRAIN;
   constructor(sourceId: number) {
     super(BattlerTagType.INGRAIN, BattlerTagLapseType.TURN_END, 1, MoveId.INGRAIN, sourceId);
   }
 
   /**
    * Check if the Ingrain tag can be added to the pokemon
-   * @param pokemon {@linkcode Pokemon} The pokemon to check if the tag can be added to
+   * @param pokemon - The pokemon to check if the tag can be added to
    * @returns boolean True if the tag can be added, false otherwise
    */
   canAdd(pokemon: Pokemon): boolean {
@@ -1295,6 +1367,7 @@ export class IngrainTag extends TrappedTag {
  * end of each turn.
  */
 export class OctolockTag extends TrappedTag {
+  public override readonly tagType = BattlerTagType.OCTOLOCK;
   constructor(sourceId: number) {
     super(BattlerTagType.OCTOLOCK, BattlerTagLapseType.TURN_END, 1, MoveId.OCTOLOCK, sourceId);
   }
@@ -1317,7 +1390,8 @@ export class OctolockTag extends TrappedTag {
   }
 }
 
-export class AquaRingTag extends BattlerTag {
+export class AquaRingTag extends SerializableBattlerTag {
+  public override readonly tagType = BattlerTagType.AQUA_RING;
   constructor() {
     super(BattlerTagType.AQUA_RING, BattlerTagLapseType.TURN_END, 1, MoveId.AQUA_RING, undefined, true);
   }
@@ -1353,7 +1427,8 @@ export class AquaRingTag extends BattlerTag {
 }
 
 /** Tag used to allow moves that interact with {@link MoveId.MINIMIZE} to function */
-export class MinimizeTag extends BattlerTag {
+export class MinimizeTag extends SerializableBattlerTag {
+  public override readonly tagType = BattlerTagType.MINIMIZED;
   constructor() {
     super(BattlerTagType.MINIMIZED, BattlerTagLapseType.TURN_END, 1, MoveId.MINIMIZE);
   }
@@ -1371,7 +1446,8 @@ export class MinimizeTag extends BattlerTag {
   }
 }
 
-export class DrowsyTag extends BattlerTag {
+export class DrowsyTag extends SerializableBattlerTag {
+  public override readonly tagType = BattlerTagType.DROWSY;
   constructor() {
     super(BattlerTagType.DROWSY, BattlerTagLapseType.TURN_END, 2, MoveId.YAWN);
   }
@@ -1405,7 +1481,9 @@ export class DrowsyTag extends BattlerTag {
 }
 
 export abstract class DamagingTrapTag extends TrappedTag {
-  private commonAnim: CommonAnim;
+  public declare readonly tagType: TrappingBattlerTagType;
+  /** The animation to play during the damage sequence */
+  #commonAnim: CommonAnim;
 
   constructor(
     tagType: BattlerTagType,
@@ -1416,16 +1494,7 @@ export abstract class DamagingTrapTag extends TrappedTag {
   ) {
     super(tagType, BattlerTagLapseType.TURN_END, turnCount, sourceMove, sourceId);
 
-    this.commonAnim = commonAnim;
-  }
-
-  /**
-   * When given a battler tag or json representing one, load the data for it.
-   * @param {BattlerTag | any} source A battler tag
-   */
-  loadTag(source: BattlerTag | any): void {
-    super.loadTag(source);
-    this.commonAnim = source.commonAnim as CommonAnim;
+    this.#commonAnim = commonAnim;
   }
 
   canAdd(pokemon: Pokemon): boolean {
@@ -1443,7 +1512,7 @@ export abstract class DamagingTrapTag extends TrappedTag {
           moveName: this.getMoveName(),
         }),
       );
-      phaseManager.unshiftNew("CommonAnimPhase", pokemon.getBattlerIndex(), undefined, this.commonAnim);
+      phaseManager.unshiftNew("CommonAnimPhase", pokemon.getBattlerIndex(), undefined, this.#commonAnim);
 
       const cancelled = new BooleanHolder(false);
       applyAbAttrs("BlockNonDirectDamageAbAttr", { pokemon, cancelled });
@@ -1459,6 +1528,7 @@ export abstract class DamagingTrapTag extends TrappedTag {
 
 // TODO: Condense all these tags into 1 singular tag with a modified message func
 export class BindTag extends DamagingTrapTag {
+  public override readonly tagType = BattlerTagType.BIND;
   constructor(turnCount: number, sourceId: number) {
     super(BattlerTagType.BIND, CommonAnim.BIND, turnCount, MoveId.BIND, sourceId);
   }
@@ -1479,6 +1549,7 @@ export class BindTag extends DamagingTrapTag {
 }
 
 export class WrapTag extends DamagingTrapTag {
+  public override readonly tagType = BattlerTagType.WRAP;
   constructor(turnCount: number, sourceId: number) {
     super(BattlerTagType.WRAP, CommonAnim.WRAP, turnCount, MoveId.WRAP, sourceId);
   }
@@ -1507,18 +1578,21 @@ export abstract class VortexTrapTag extends DamagingTrapTag {
 }
 
 export class FireSpinTag extends VortexTrapTag {
+  public override readonly tagType = BattlerTagType.FIRE_SPIN;
   constructor(turnCount: number, sourceId: number) {
     super(BattlerTagType.FIRE_SPIN, CommonAnim.FIRE_SPIN, turnCount, MoveId.FIRE_SPIN, sourceId);
   }
 }
 
 export class WhirlpoolTag extends VortexTrapTag {
+  public override readonly tagType = BattlerTagType.WHIRLPOOL;
   constructor(turnCount: number, sourceId: number) {
     super(BattlerTagType.WHIRLPOOL, CommonAnim.WHIRLPOOL, turnCount, MoveId.WHIRLPOOL, sourceId);
   }
 }
 
 export class ClampTag extends DamagingTrapTag {
+  public override readonly tagType = BattlerTagType.CLAMP;
   constructor(turnCount: number, sourceId: number) {
     super(BattlerTagType.CLAMP, CommonAnim.CLAMP, turnCount, MoveId.CLAMP, sourceId);
   }
@@ -1538,6 +1612,7 @@ export class ClampTag extends DamagingTrapTag {
 }
 
 export class SandTombTag extends DamagingTrapTag {
+  public override readonly tagType = BattlerTagType.SAND_TOMB;
   constructor(turnCount: number, sourceId: number) {
     super(BattlerTagType.SAND_TOMB, CommonAnim.SAND_TOMB, turnCount, MoveId.SAND_TOMB, sourceId);
   }
@@ -1551,6 +1626,7 @@ export class SandTombTag extends DamagingTrapTag {
 }
 
 export class MagmaStormTag extends DamagingTrapTag {
+  public override readonly tagType = BattlerTagType.MAGMA_STORM;
   constructor(turnCount: number, sourceId: number) {
     super(BattlerTagType.MAGMA_STORM, CommonAnim.MAGMA_STORM, turnCount, MoveId.MAGMA_STORM, sourceId);
   }
@@ -1563,6 +1639,7 @@ export class MagmaStormTag extends DamagingTrapTag {
 }
 
 export class SnapTrapTag extends DamagingTrapTag {
+  public override readonly tagType = BattlerTagType.SNAP_TRAP;
   constructor(turnCount: number, sourceId: number) {
     super(BattlerTagType.SNAP_TRAP, CommonAnim.SNAP_TRAP, turnCount, MoveId.SNAP_TRAP, sourceId);
   }
@@ -1575,6 +1652,7 @@ export class SnapTrapTag extends DamagingTrapTag {
 }
 
 export class ThunderCageTag extends DamagingTrapTag {
+  public override readonly tagType = BattlerTagType.THUNDER_CAGE;
   constructor(turnCount: number, sourceId: number) {
     super(BattlerTagType.THUNDER_CAGE, CommonAnim.THUNDER_CAGE, turnCount, MoveId.THUNDER_CAGE, sourceId);
   }
@@ -1594,6 +1672,7 @@ export class ThunderCageTag extends DamagingTrapTag {
 }
 
 export class InfestationTag extends DamagingTrapTag {
+  public override readonly tagType = BattlerTagType.INFESTATION;
   constructor(turnCount: number, sourceId: number) {
     super(BattlerTagType.INFESTATION, CommonAnim.INFESTATION, turnCount, MoveId.INFESTATION, sourceId);
   }
@@ -1613,7 +1692,8 @@ export class InfestationTag extends DamagingTrapTag {
 }
 
 export class ProtectedTag extends BattlerTag {
-  constructor(sourceMove: MoveId, tagType: BattlerTagType = BattlerTagType.PROTECTED) {
+  public declare readonly tagType: ProtectionBattlerTagType;
+  constructor(sourceMove: MoveId, tagType: ProtectionBattlerTagType = BattlerTagType.PROTECTED) {
     super(tagType, BattlerTagLapseType.TURN_END, 0, sourceMove);
   }
 
@@ -1649,14 +1729,13 @@ export class ProtectedTag extends BattlerTag {
 }
 
 /** Class for `BattlerTag`s that apply some effect when hit by a contact move */
-export class ContactProtectedTag extends ProtectedTag {
+export abstract class ContactProtectedTag extends ProtectedTag {
   /**
    * Function to call when a contact move hits the pokemon with this tag.
    * @param _attacker - The pokemon using the contact move
    * @param _user - The pokemon that is being attacked and has the tag
-   * @param _move - The move used by the attacker
    */
-  onContact(_attacker: Pokemon, _user: Pokemon) {}
+  abstract onContact(_attacker: Pokemon, _user: Pokemon): void;
 
   /**
    * Lapse the tag and apply `onContact` if the move makes contact and
@@ -1686,22 +1765,16 @@ export class ContactProtectedTag extends ProtectedTag {
 /**
  * `BattlerTag` class for moves that block damaging moves damage the enemy if the enemy's move makes contact
  * Used by {@linkcode MoveId.SPIKY_SHIELD}
+ *
+ * @sealed
  */
 export class ContactDamageProtectedTag extends ContactProtectedTag {
-  private damageRatio: number;
+  public override readonly tagType = BattlerTagType.SPIKY_SHIELD;
+  #damageRatio: number;
 
   constructor(sourceMove: MoveId, damageRatio: number) {
     super(sourceMove, BattlerTagType.SPIKY_SHIELD);
-    this.damageRatio = damageRatio;
-  }
-
-  /**
-   * When given a battler tag or json representing one, load the data for it.
-   * @param {BattlerTag | any} source A battler tag
-   */
-  loadTag(source: BattlerTag | any): void {
-    super.loadTag(source);
-    this.damageRatio = source.damageRatio;
+    this.#damageRatio = damageRatio;
   }
 
   /**
@@ -1713,7 +1786,7 @@ export class ContactDamageProtectedTag extends ContactProtectedTag {
     const cancelled = new BooleanHolder(false);
     applyAbAttrs("BlockNonDirectDamageAbAttr", { pokemon: user, cancelled });
     if (!cancelled.value) {
-      attacker.damageAndUpdate(toDmgValue(attacker.getMaxHp() * (1 / this.damageRatio)), {
+      attacker.damageAndUpdate(toDmgValue(attacker.getMaxHp() * (1 / this.#damageRatio)), {
         result: HitResult.INDIRECT,
       });
     }
@@ -1721,20 +1794,22 @@ export class ContactDamageProtectedTag extends ContactProtectedTag {
 }
 
 /** Base class for `BattlerTag`s that block damaging moves but not status moves */
-export class DamageProtectedTag extends ContactProtectedTag {}
+export abstract class DamageProtectedTag extends ContactProtectedTag {
+  public declare readonly tagType: DamageProtectedTagType;
+}
 
 export class ContactSetStatusProtectedTag extends DamageProtectedTag {
+  public declare readonly tagType: ContactSetStatusProtectedTagType;
+  /** The status effect applied to attackers */
+  #statusEffect: StatusEffect;
   /**
-   * @param sourceMove The move that caused the tag to be applied
-   * @param tagType The type of the tag
-   * @param statusEffect The status effect to apply to the attacker
+   * @param sourceMove - The move that caused the tag to be applied
+   * @param tagType - The type of the tag
+   * @param statusEffect - The status effect applied to attackers
    */
-  constructor(
-    sourceMove: MoveId,
-    tagType: BattlerTagType,
-    private statusEffect: StatusEffect,
-  ) {
+  constructor(sourceMove: MoveId, tagType: ContactSetStatusProtectedTagType, statusEffect: StatusEffect) {
     super(sourceMove, tagType);
+    this.#statusEffect = statusEffect;
   }
 
   /**
@@ -1743,7 +1818,7 @@ export class ContactSetStatusProtectedTag extends DamageProtectedTag {
    * @param user - The pokemon that is being attacked and has the tag
    */
   override onContact(attacker: Pokemon, user: Pokemon): void {
-    attacker.trySetStatus(this.statusEffect, true, user);
+    attacker.trySetStatus(this.#statusEffect, true, user);
   }
 }
 
@@ -1752,24 +1827,15 @@ export class ContactSetStatusProtectedTag extends DamageProtectedTag {
  * Used by {@linkcode MoveId.KINGS_SHIELD}, {@linkcode MoveId.OBSTRUCT}, {@linkcode MoveId.SILK_TRAP}
  */
 export class ContactStatStageChangeProtectedTag extends DamageProtectedTag {
-  private stat: BattleStat;
-  private levels: number;
+  public declare readonly tagType: ContactStatStageChangeProtectedTagType;
+  #stat: BattleStat;
+  #levels: number;
 
-  constructor(sourceMove: MoveId, tagType: BattlerTagType, stat: BattleStat, levels: number) {
+  constructor(sourceMove: MoveId, tagType: ContactStatStageChangeProtectedTagType, stat: BattleStat, levels: number) {
     super(sourceMove, tagType);
 
-    this.stat = stat;
-    this.levels = levels;
-  }
-
-  /**
-   * When given a battler tag or json representing one, load the data for it.
-   * @param {BattlerTag | any} source A battler tag
-   */
-  override loadTag(source: BattlerTag | any): void {
-    super.loadTag(source);
-    this.stat = source.stat;
-    this.levels = source.levels;
+    this.#stat = stat;
+    this.#levels = levels;
   }
 
   /**
@@ -1782,19 +1848,19 @@ export class ContactStatStageChangeProtectedTag extends DamageProtectedTag {
       "StatStageChangePhase",
       attacker.getBattlerIndex(),
       false,
-      [this.stat],
-      this.levels,
+      [this.#stat],
+      this.#levels,
     );
   }
 }
 
 /**
  * `BattlerTag` class for effects that cause the affected Pokemon to survive lethal attacks at 1 HP.
- * Used for {@link https://bulbapedia.bulbagarden.net/wiki/Endure_(move) | Endure} and
- * Endure Tokens.
+ * Used for {@link https://bulbapedia.bulbagarden.net/wiki/Endure_(move) | Endure} and endure tokens.
  */
 export class EnduringTag extends BattlerTag {
-  constructor(tagType: BattlerTagType, lapseType: BattlerTagLapseType, sourceMove: MoveId) {
+  public declare readonly tagType: EndureTagType;
+  constructor(tagType: EndureTagType, lapseType: BattlerTagLapseType, sourceMove: MoveId) {
     super(tagType, lapseType, 0, sourceMove);
   }
 
@@ -1823,6 +1889,7 @@ export class EnduringTag extends BattlerTag {
 }
 
 export class SturdyTag extends BattlerTag {
+  public override readonly tagType = BattlerTagType.STURDY;
   constructor(sourceMove: MoveId) {
     super(BattlerTagType.STURDY, BattlerTagLapseType.TURN_END, 0, sourceMove);
   }
@@ -1841,7 +1908,8 @@ export class SturdyTag extends BattlerTag {
   }
 }
 
-export class PerishSongTag extends BattlerTag {
+export class PerishSongTag extends SerializableBattlerTag {
+  public override readonly tagType = BattlerTagType.PERISH_SONG;
   constructor(turnCount: number) {
     super(BattlerTagType.PERISH_SONG, BattlerTagLapseType.TURN_END, turnCount, MoveId.PERISH_SONG, undefined, true);
   }
@@ -1873,6 +1941,7 @@ export class PerishSongTag extends BattlerTag {
  * @see {@link https://bulbapedia.bulbagarden.net/wiki/Center_of_attention | Center of Attention}
  */
 export class CenterOfAttentionTag extends BattlerTag {
+  public override readonly tagType = BattlerTagType.CENTER_OF_ATTENTION;
   public powder: boolean;
 
   constructor(sourceMove: MoveId) {
@@ -1899,30 +1968,26 @@ export class CenterOfAttentionTag extends BattlerTag {
   }
 }
 
-export class AbilityBattlerTag extends BattlerTag {
-  public ability: AbilityId;
-
-  constructor(tagType: BattlerTagType, ability: AbilityId, lapseType: BattlerTagLapseType, turnCount: number) {
-    super(tagType, lapseType, turnCount);
-
-    this.ability = ability;
+export class AbilityBattlerTag extends SerializableBattlerTag {
+  public declare readonly tagType: AbilityBattlerTagType;
+  #ability: AbilityId;
+  /** The ability that the tag corresponds to */
+  public get ability(): AbilityId {
+    return this.#ability;
   }
 
-  /**
-   * When given a battler tag or json representing one, load the data for it.
-   * @param {BattlerTag | any} source A battler tag
-   */
-  loadTag(source: BattlerTag | any): void {
-    super.loadTag(source);
-    this.ability = source.ability as AbilityId;
+  constructor(tagType: AbilityBattlerTagType, ability: AbilityId, lapseType: BattlerTagLapseType, turnCount: number) {
+    super(tagType, lapseType, turnCount);
+
+    this.#ability = ability;
   }
 }
 
 /**
  * Tag used by Unburden to double speed
- * @extends AbilityBattlerTag
  */
 export class UnburdenTag extends AbilityBattlerTag {
+  public override readonly tagType = BattlerTagType.UNBURDEN;
   constructor() {
     super(BattlerTagType.UNBURDEN, AbilityId.UNBURDEN, BattlerTagLapseType.CUSTOM, 1);
   }
@@ -1935,6 +2000,7 @@ export class UnburdenTag extends AbilityBattlerTag {
 }
 
 export class TruantTag extends AbilityBattlerTag {
+  public override readonly tagType = BattlerTagType.TRUANT;
   constructor() {
     super(BattlerTagType.TRUANT, AbilityId.TRUANT, BattlerTagLapseType.MOVE, 1);
   }
@@ -1969,6 +2035,7 @@ export class TruantTag extends AbilityBattlerTag {
 }
 
 export class SlowStartTag extends AbilityBattlerTag {
+  public override readonly tagType = BattlerTagType.SLOW_START;
   constructor() {
     super(BattlerTagType.SLOW_START, AbilityId.SLOW_START, BattlerTagLapseType.TURN_END, 5);
   }
@@ -2006,18 +2073,19 @@ export class SlowStartTag extends AbilityBattlerTag {
 }
 
 export class HighestStatBoostTag extends AbilityBattlerTag {
+  public declare readonly tagType: HighestStatBoostTagType;
   public stat: Stat;
   public multiplier: number;
 
-  constructor(tagType: BattlerTagType, ability: AbilityId) {
+  constructor(tagType: HighestStatBoostTagType, ability: AbilityId) {
     super(tagType, ability, BattlerTagLapseType.CUSTOM, 1);
   }
 
   /**
    * When given a battler tag or json representing one, load the data for it.
-   * @param {BattlerTag | any} source A battler tag
+   * @param source - An object containing the fields needed to reconstruct this tag.
    */
-  loadTag(source: BattlerTag | any): void {
+  loadTag(source: NonFunctionProperties<HighestStatBoostTag>): void {
     super.loadTag(source);
     this.stat = source.stat as Stat;
     this.multiplier = source.multiplier;
@@ -2065,43 +2133,32 @@ export class HighestStatBoostTag extends AbilityBattlerTag {
   }
 }
 
-export class WeatherHighestStatBoostTag extends HighestStatBoostTag implements WeatherBattlerTag {
-  public weatherTypes: WeatherType[];
-
-  constructor(tagType: BattlerTagType, ability: AbilityId, ...weatherTypes: WeatherType[]) {
-    super(tagType, ability);
-    this.weatherTypes = weatherTypes;
+export class WeatherHighestStatBoostTag extends HighestStatBoostTag {
+  #weatherTypes: WeatherType[];
+  public get weatherTypes(): WeatherType[] {
+    return this.#weatherTypes;
   }
 
-  /**
-   * When given a battler tag or json representing one, load the data for it.
-   * @param {BattlerTag | any} source A battler tag
-   */
-  loadTag(source: BattlerTag | any): void {
-    super.loadTag(source);
-    this.weatherTypes = source.weatherTypes.map(w => w as WeatherType);
+  constructor(tagType: HighestStatBoostTagType, ability: AbilityId, ...weatherTypes: WeatherType[]) {
+    super(tagType, ability);
+    this.#weatherTypes = weatherTypes;
   }
 }
 
-export class TerrainHighestStatBoostTag extends HighestStatBoostTag implements TerrainBattlerTag {
-  public terrainTypes: TerrainType[];
-
-  constructor(tagType: BattlerTagType, ability: AbilityId, ...terrainTypes: TerrainType[]) {
-    super(tagType, ability);
-    this.terrainTypes = terrainTypes;
+export class TerrainHighestStatBoostTag extends HighestStatBoostTag {
+  #terrainTypes: TerrainType[];
+  public get terrainTypes(): TerrainType[] {
+    return this.#terrainTypes;
   }
 
-  /**
-   * When given a battler tag or json representing one, load the data for it.
-   * @param {BattlerTag | any} source A battler tag
-   */
-  loadTag(source: BattlerTag | any): void {
-    super.loadTag(source);
-    this.terrainTypes = source.terrainTypes.map(w => w as TerrainType);
+  constructor(tagType: HighestStatBoostTagType, ability: AbilityId, ...terrainTypes: TerrainType[]) {
+    super(tagType, ability);
+    this.#terrainTypes = terrainTypes;
   }
 }
 
-export class SemiInvulnerableTag extends BattlerTag {
+export class SemiInvulnerableTag extends SerializableBattlerTag {
+  public declare readonly tagType: SemiInvulnerableTagType;
   constructor(tagType: BattlerTagType, turnCount: number, sourceMove: MoveId) {
     super(tagType, BattlerTagLapseType.MOVE_EFFECT, turnCount, sourceMove);
   }
@@ -2121,22 +2178,16 @@ export class SemiInvulnerableTag extends BattlerTag {
   }
 }
 
-export class TypeImmuneTag extends BattlerTag {
-  public immuneType: PokemonType;
+export class TypeImmuneTag extends SerializableBattlerTag {
+  #immuneType: PokemonType;
+  public get immuneType(): PokemonType {
+    return this.#immuneType;
+  }
 
   constructor(tagType: BattlerTagType, sourceMove: MoveId, immuneType: PokemonType, length = 1) {
     super(tagType, BattlerTagLapseType.TURN_END, length, sourceMove, undefined, true);
 
-    this.immuneType = immuneType;
-  }
-
-  /**
-   * When given a battler tag or json representing one, load the data for it.
-   * @param {BattlerTag | any} source A battler tag
-   */
-  loadTag(source: BattlerTag | any): void {
-    super.loadTag(source);
-    this.immuneType = source.immuneType as PokemonType;
+    this.#immuneType = immuneType;
   }
 }
 
@@ -2174,10 +2225,20 @@ export class FloatingTag extends TypeImmuneTag {
   }
 }
 
-export class TypeBoostTag extends BattlerTag {
-  public boostedType: PokemonType;
-  public boostValue: number;
-  public oneUse: boolean;
+export class TypeBoostTag extends SerializableBattlerTag {
+  #boostedType: PokemonType;
+  #boostValue: number;
+  #oneUse: boolean;
+
+  public get boostedType(): PokemonType {
+    return this.#boostedType;
+  }
+  public get boostValue(): number {
+    return this.#boostValue;
+  }
+  public get oneUse(): boolean {
+    return this.#oneUse;
+  }
 
   constructor(
     tagType: BattlerTagType,
@@ -2188,20 +2249,9 @@ export class TypeBoostTag extends BattlerTag {
   ) {
     super(tagType, BattlerTagLapseType.TURN_END, 1, sourceMove);
 
-    this.boostedType = boostedType;
-    this.boostValue = boostValue;
-    this.oneUse = oneUse;
-  }
-
-  /**
-   * When given a battler tag or json representing one, load the data for it.
-   * @param {BattlerTag | any} source A battler tag
-   */
-  loadTag(source: BattlerTag | any): void {
-    super.loadTag(source);
-    this.boostedType = source.boostedType as PokemonType;
-    this.boostValue = source.boostValue;
-    this.oneUse = source.oneUse;
+    this.#boostedType = boostedType;
+    this.#boostValue = boostValue;
+    this.#oneUse = oneUse;
   }
 
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
@@ -2224,7 +2274,7 @@ export class TypeBoostTag extends BattlerTag {
   }
 }
 
-export class CritBoostTag extends BattlerTag {
+export class CritBoostTag extends SerializableBattlerTag {
   constructor(tagType: BattlerTagType, sourceMove: MoveId) {
     super(tagType, BattlerTagLapseType.TURN_END, 1, sourceMove, undefined, true);
   }
@@ -2256,7 +2306,6 @@ export class CritBoostTag extends BattlerTag {
 
 /**
  * Tag for the effects of Dragon Cheer, which boosts the critical hit ratio of the user's allies.
- * @extends {CritBoostTag}
  */
 export class DragonCheerTag extends CritBoostTag {
   /** The types of the user's ally when the tag is added */
@@ -2273,22 +2322,12 @@ export class DragonCheerTag extends CritBoostTag {
   }
 }
 
-export class SaltCuredTag extends BattlerTag {
-  private sourceIndex: number;
-
+export class SaltCuredTag extends SerializableBattlerTag {
+  public override readonly tagType = BattlerTagType.SALT_CURED;
   constructor(sourceId: number) {
     super(BattlerTagType.SALT_CURED, BattlerTagLapseType.TURN_END, 1, MoveId.SALT_CURE, sourceId);
   }
 
-  /**
-   * When given a battler tag or json representing one, load the data for it.
-   * @param {BattlerTag | any} source A battler tag
-   */
-  loadTag(source: BattlerTag | any): void {
-    super.loadTag(source);
-    this.sourceIndex = source.sourceIndex;
-  }
-
   onAdd(pokemon: Pokemon): void {
     const source = this.getSourcePokemon();
     if (!source) {
@@ -2302,7 +2341,6 @@ export class SaltCuredTag extends BattlerTag {
         pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
       }),
     );
-    this.sourceIndex = source.getBattlerIndex();
   }
 
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
@@ -2338,22 +2376,11 @@ export class SaltCuredTag extends BattlerTag {
   }
 }
 
-export class CursedTag extends BattlerTag {
-  private sourceIndex: number;
-
+export class CursedTag extends SerializableBattlerTag {
   constructor(sourceId: number) {
     super(BattlerTagType.CURSED, BattlerTagLapseType.TURN_END, 1, MoveId.CURSE, sourceId, true);
   }
 
-  /**
-   * When given a battler tag or json representing one, load the data for it.
-   * @param {BattlerTag | any} source A battler tag
-   */
-  loadTag(source: BattlerTag | any): void {
-    super.loadTag(source);
-    this.sourceIndex = source.sourceIndex;
-  }
-
   onAdd(pokemon: Pokemon): void {
     const source = this.getSourcePokemon();
     if (!source) {
@@ -2362,7 +2389,6 @@ export class CursedTag extends BattlerTag {
     }
 
     super.onAdd(pokemon);
-    this.sourceIndex = source.getBattlerIndex();
   }
 
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
@@ -2392,10 +2418,11 @@ export class CursedTag extends BattlerTag {
     return ret;
   }
 }
+
 /**
  * Battler tag for attacks that remove a type post use.
  */
-export class RemovedTypeTag extends BattlerTag {
+export class RemovedTypeTag extends SerializableBattlerTag {
   constructor(tagType: BattlerTagType, lapseType: BattlerTagLapseType, sourceMove: MoveId) {
     super(tagType, lapseType, 1, sourceMove);
   }
@@ -2405,7 +2432,7 @@ export class RemovedTypeTag extends BattlerTag {
  * Battler tag for effects that ground the source, allowing Ground-type moves to hit them.
  * @description `IGNORE_FLYING`: Persistent grounding effects (i.e. from Smack Down and Thousand Waves)
  */
-export class GroundedTag extends BattlerTag {
+export class GroundedTag extends SerializableBattlerTag {
   constructor(tagType: BattlerTagType, lapseType: BattlerTagLapseType, sourceMove: MoveId) {
     super(tagType, lapseType, 1, sourceMove);
   }
@@ -2478,15 +2505,16 @@ export class RoostedTag extends BattlerTag {
 }
 
 /** Common attributes of form change abilities that block damage */
-export class FormBlockDamageTag extends BattlerTag {
-  constructor(tagType: BattlerTagType) {
+export class FormBlockDamageTag extends SerializableBattlerTag {
+  public declare readonly tagType: BattlerTagType.ICE_FACE | BattlerTagType.DISGUISE;
+  constructor(tagType: BattlerTagType.ICE_FACE | BattlerTagType.DISGUISE) {
     super(tagType, BattlerTagLapseType.CUSTOM, 1);
   }
 
   /**
    * Determines if the tag can be added to the Pokémon.
-   * @param {Pokemon} pokemon The Pokémon to which the tag might be added.
-   * @returns {boolean} True if the tag can be added, false otherwise.
+   * @param pokemon - The Pokémon to which the tag might be added.
+   * @returns `true` if the tag can be added, `false` otherwise.
    */
   canAdd(pokemon: Pokemon): boolean {
     return pokemon.formIndex === 0;
@@ -2508,7 +2536,7 @@ export class FormBlockDamageTag extends BattlerTag {
   /**
    * Removes the tag from the Pokémon.
    * Triggers a form change when the tag is removed.
-   * @param {Pokemon} pokemon The Pokémon from which the tag is removed.
+   * @param pokemon - The Pokémon from which the tag is removed.
    */
   onRemove(pokemon: Pokemon): void {
     super.onRemove(pokemon);
@@ -2516,12 +2544,14 @@ export class FormBlockDamageTag extends BattlerTag {
     globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeAbilityTrigger);
   }
 }
+
 /** Provides the additional weather-based effects of the Ice Face ability */
 export class IceFaceBlockDamageTag extends FormBlockDamageTag {
+  public override readonly tagType = BattlerTagType.ICE_FACE;
   /**
    * Determines if the tag can be added to the Pokémon.
-   * @param {Pokemon} pokemon The Pokémon to which the tag might be added.
-   * @returns {boolean} True if the tag can be added, false otherwise.
+   * @param pokemon - The Pokémon to which the tag might be added.
+   * @returns `true` if the tag can be added, `false` otherwise.
    */
   canAdd(pokemon: Pokemon): boolean {
     const weatherType = globalScene.arena.weather?.weatherType;
@@ -2535,20 +2565,17 @@ export class IceFaceBlockDamageTag extends FormBlockDamageTag {
  * Battler tag indicating a Tatsugiri with {@link https://bulbapedia.bulbagarden.net/wiki/Commander_(Ability) | Commander}
  * has entered the tagged Pokemon's mouth.
  */
-export class CommandedTag extends BattlerTag {
-  private _tatsugiriFormKey: string;
+export class CommandedTag extends SerializableBattlerTag {
+  public override readonly tagType = BattlerTagType.COMMANDED;
+  public readonly tatsugiriFormKey: string;
 
   constructor(sourceId: number) {
     super(BattlerTagType.COMMANDED, BattlerTagLapseType.CUSTOM, 0, MoveId.NONE, sourceId);
   }
 
-  public get tatsugiriFormKey(): string {
-    return this._tatsugiriFormKey;
-  }
-
   /** Caches the Tatsugiri's form key and sharply boosts the tagged Pokemon's stats */
   override onAdd(pokemon: Pokemon): void {
-    this._tatsugiriFormKey = this.getSourcePokemon()?.getFormKey() ?? "curly";
+    (this as Mutable<this>).tatsugiriFormKey = this.getSourcePokemon()?.getFormKey() ?? "curly";
     globalScene.phaseManager.unshiftNew(
       "StatStageChangePhase",
       pokemon.getBattlerIndex(),
@@ -2565,9 +2592,9 @@ export class CommandedTag extends BattlerTag {
     }
   }
 
-  override loadTag(source: BattlerTag | any): void {
+  override loadTag(source: NonFunctionProperties<CommandedTag>): void {
     super.loadTag(source);
-    this._tatsugiriFormKey = source._tatsugiriFormKey;
+    (this as Mutable<this>).tatsugiriFormKey = source.tatsugiriFormKey;
   }
 }
 
@@ -2581,7 +2608,8 @@ export class CommandedTag extends BattlerTag {
  *   - Removing stacks decreases DEF and SPDEF, independently, by one stage for each stack that successfully changed
  *     the stat when added.
  */
-export class StockpilingTag extends BattlerTag {
+export class StockpilingTag extends SerializableBattlerTag {
+  public override readonly tagType = BattlerTagType.STOCKPILING;
   public stockpiledCount = 0;
   public statChangeCounts: { [Stat.DEF]: number; [Stat.SPDEF]: number } = {
     [Stat.DEF]: 0,
@@ -2604,7 +2632,7 @@ export class StockpilingTag extends BattlerTag {
     }
   };
 
-  loadTag(source: BattlerTag | any): void {
+  override loadTag(source: NonFunctionProperties<StockpilingTag>): void {
     super.loadTag(source);
     this.stockpiledCount = source.stockpiledCount || 0;
     this.statChangeCounts = {
@@ -2687,10 +2715,10 @@ export class StockpilingTag extends BattlerTag {
 
 /**
  * Battler tag for Gulp Missile used by Cramorant.
- * @extends BattlerTag
  */
-export class GulpMissileTag extends BattlerTag {
-  constructor(tagType: BattlerTagType, sourceMove: MoveId) {
+export class GulpMissileTag extends SerializableBattlerTag {
+  public declare readonly tagType: BattlerTagType.GULP_MISSILE_ARROKUDA | BattlerTagType.GULP_MISSILE_PIKACHU;
+  constructor(tagType: BattlerTagType.GULP_MISSILE_ARROKUDA | BattlerTagType.GULP_MISSILE_PIKACHU, sourceMove: MoveId) {
     super(tagType, BattlerTagLapseType.HIT, 0, sourceMove);
   }
 
@@ -2729,11 +2757,12 @@ export class GulpMissileTag extends BattlerTag {
 
   /**
    * Gulp Missile's initial form changes are triggered by using Surf and Dive.
-   * @param {Pokemon} pokemon The Pokemon with Gulp Missile ability.
+   * @param pokemon - The Pokemon with Gulp Missile ability.
    * @returns Whether the BattlerTag can be added.
    */
   canAdd(pokemon: Pokemon): boolean {
-    const isSurfOrDive = [MoveId.SURF, MoveId.DIVE].includes(this.sourceMove);
+    // Bang here is OK as if sourceMove was undefined, this would just evaluate to false
+    const isSurfOrDive = [MoveId.SURF, MoveId.DIVE].includes(this.sourceMove!);
     const isNormalForm =
       pokemon.formIndex === 0 &&
       !pokemon.getTag(BattlerTagType.GULP_MISSILE_ARROKUDA) &&
@@ -2755,52 +2784,46 @@ export class GulpMissileTag extends BattlerTag {
 }
 
 /**
- * Tag that makes the target drop all of it type immunities
+ * Tag that makes the target drop the immunities granted by a particular type
  * and all accuracy checks ignore its evasiveness stat.
  *
  * Applied by moves: {@linkcode MoveId.ODOR_SLEUTH | Odor Sleuth},
  * {@linkcode MoveId.MIRACLE_EYE | Miracle Eye} and {@linkcode MoveId.FORESIGHT | Foresight}.
  *
- * @extends BattlerTag
  * @see {@linkcode ignoreImmunity}
  */
-export class ExposedTag extends BattlerTag {
-  private defenderType: PokemonType;
-  private allowedTypes: PokemonType[];
+export class ExposedTag extends SerializableBattlerTag {
+  public declare readonly tagType: BattlerTagType.IGNORE_DARK | BattlerTagType.IGNORE_GHOST;
+  #defenderType: PokemonType;
+  #allowedTypes: readonly PokemonType[];
 
-  constructor(tagType: BattlerTagType, sourceMove: MoveId, defenderType: PokemonType, allowedTypes: PokemonType[]) {
+  constructor(
+    tagType: BattlerTagType.IGNORE_DARK | BattlerTagType.IGNORE_GHOST,
+    sourceMove: MoveId,
+    defenderType: PokemonType,
+    allowedTypes: PokemonType[],
+  ) {
     super(tagType, BattlerTagLapseType.CUSTOM, 1, sourceMove);
-    this.defenderType = defenderType;
-    this.allowedTypes = allowedTypes;
+    this.#defenderType = defenderType;
+    this.#allowedTypes = allowedTypes;
   }
 
   /**
-   * When given a battler tag or json representing one, load the data for it.
-   * @param {BattlerTag | any} source A battler tag
-   */
-  loadTag(source: BattlerTag | any): void {
-    super.loadTag(source);
-    this.defenderType = source.defenderType as PokemonType;
-    this.allowedTypes = source.allowedTypes as PokemonType[];
-  }
-
-  /**
-   * @param types {@linkcode PokemonType} of the defending Pokemon
-   * @param moveType {@linkcode PokemonType} of the move targetting it
+   * @param type - The defending type to check against
+   * @param moveType - The pokemon type of the move being used
    * @returns `true` if the move should be allowed to target the defender.
    */
   ignoreImmunity(type: PokemonType, moveType: PokemonType): boolean {
-    return type === this.defenderType && this.allowedTypes.includes(moveType);
+    return type === this.#defenderType && this.#allowedTypes.includes(moveType);
   }
 }
 
 /**
  * Tag that prevents HP recovery from held items and move effects. It also blocks the usage of recovery moves.
  * Applied by moves:  {@linkcode MoveId.HEAL_BLOCK | Heal Block (5 turns)}, {@linkcode MoveId.PSYCHIC_NOISE | Psychic Noise (2 turns)}
- *
- * @extends MoveRestrictionBattlerTag
  */
 export class HealBlockTag extends MoveRestrictionBattlerTag {
+  public override readonly tagType = BattlerTagType.HEAL_BLOCK;
   constructor(turnCount: number, sourceMove: MoveId) {
     super(
       BattlerTagType.HEAL_BLOCK,
@@ -2818,7 +2841,7 @@ export class HealBlockTag extends MoveRestrictionBattlerTag {
 
   /**
    * Checks if a move is disabled under Heal Block
-   * @param {MoveId} move {@linkcode MoveId} the move ID
+   * @param move - {@linkcode MoveId | ID} of the move being used
    * @returns `true` if the move has a TRIAGE_MOVE flag and is a status move
    */
   override isMoveRestricted(move: MoveId): boolean {
@@ -2828,9 +2851,9 @@ export class HealBlockTag extends MoveRestrictionBattlerTag {
   /**
    * Checks if a move is disabled under Heal Block because of its choice of target
    * Implemented b/c of Pollen Puff
-   * @param {MoveId} move {@linkcode MoveId} the move ID
-   * @param {Pokemon} user {@linkcode Pokemon} the move user
-   * @param {Pokemon} target {@linkcode Pokemon} the target of the move
+   * @param move - {@linkcode MoveId | ID} of the move being used
+   * @param user - The pokemon using the move
+   * @param target - The target of the move
    * @returns `true` if the move cannot be used because the target is an ally
    */
   override isMoveTargetRestricted(move: MoveId, user: Pokemon, target: Pokemon) {
@@ -2851,10 +2874,9 @@ export class HealBlockTag extends MoveRestrictionBattlerTag {
   }
 
   /**
-   * @override
-   * @param {Pokemon} pokemon {@linkcode Pokemon} attempting to use the restricted move
-   * @param {MoveId} move {@linkcode MoveId} ID of the move being interrupted
-   * @returns {string} text to display when the move is interrupted
+   * @param pokemon - {@linkcode Pokemon} attempting to use the restricted move
+   * @param move - {@linkcode MoveId | ID} of the move being interrupted
+   * @returns Text to display when the move is interrupted
    */
   override interruptedText(pokemon: Pokemon, move: MoveId): string {
     return i18next.t("battle:moveDisabledHealBlock", {
@@ -2880,17 +2902,17 @@ export class HealBlockTag extends MoveRestrictionBattlerTag {
 
 /**
  * Tag that doubles the type effectiveness of Fire-type moves.
- * @extends BattlerTag
  */
-export class TarShotTag extends BattlerTag {
+export class TarShotTag extends SerializableBattlerTag {
+  public override readonly tagType = BattlerTagType.TAR_SHOT;
   constructor() {
     super(BattlerTagType.TAR_SHOT, BattlerTagLapseType.CUSTOM, 0);
   }
 
   /**
    * If the Pokemon is terastallized, the tag cannot be added.
-   * @param {Pokemon} pokemon the {@linkcode Pokemon} to which the tag is added
-   * @returns whether the tag is applied
+   * @param pokemon - The pokemon to check
+   * @returns Whether the tag can be added
    */
   override canAdd(pokemon: Pokemon): boolean {
     return !pokemon.isTerastallized;
@@ -2910,6 +2932,7 @@ export class TarShotTag extends BattlerTag {
  * While this tag is in effect, the afflicted Pokemon's moves are changed to Electric type.
  */
 export class ElectrifiedTag extends BattlerTag {
+  public override readonly tagType = BattlerTagType.ELECTRIFIED;
   constructor() {
     super(BattlerTagType.ELECTRIFIED, BattlerTagLapseType.TURN_END, 1, MoveId.ELECTRIFY);
   }
@@ -2928,7 +2951,8 @@ export class ElectrifiedTag extends BattlerTag {
  * Battler Tag that keeps track of how many times the user has Autotomized
  * Each count of Autotomization reduces the weight by 100kg
  */
-export class AutotomizedTag extends BattlerTag {
+export class AutotomizedTag extends SerializableBattlerTag {
+  public override readonly tagType = BattlerTagType.AUTOTOMIZED;
   public autotomizeCount = 0;
   constructor(sourceMove: MoveId = MoveId.AUTOTOMIZE) {
     super(BattlerTagType.AUTOTOMIZED, BattlerTagLapseType.CUSTOM, 1, sourceMove);
@@ -2954,20 +2978,45 @@ export class AutotomizedTag extends BattlerTag {
   onOverlap(pokemon: Pokemon): void {
     this.onAdd(pokemon);
   }
+
+  loadTag(source: NonFunctionProperties<AutotomizedTag>): void {
+    super.loadTag(source);
+    this.autotomizeCount = source.autotomizeCount;
+  }
 }
 
 /**
  * Tag implementing the {@link https://bulbapedia.bulbagarden.net/wiki/Substitute_(doll)#Effect | Substitute Doll} effect,
  * for use with the moves Substitute and Shed Tail. Pokemon with this tag deflect most forms of received attack damage
  * onto the tag. This tag also grants immunity to most Status moves and several move effects.
+ *
+ * @sealed
  */
-export class SubstituteTag extends BattlerTag {
+export class SubstituteTag extends SerializableBattlerTag {
+  public override readonly tagType = BattlerTagType.SUBSTITUTE;
   /** The substitute's remaining HP. If HP is depleted, the Substitute fades. */
   public hp: number;
+
+  //#region non-serializable properties
   /** A reference to the sprite representing the Substitute doll */
-  public sprite: Phaser.GameObjects.Sprite;
+  #sprite: Phaser.GameObjects.Sprite;
+  /** A reference to the sprite representing the Substitute doll */
+  public get sprite(): Phaser.GameObjects.Sprite {
+    return this.#sprite;
+  }
+  public set sprite(value: Phaser.GameObjects.Sprite) {
+    this.#sprite = value;
+  }
   /** Is the source Pokemon "in focus," i.e. is it fully visible on the field? */
-  public sourceInFocus: boolean;
+  #sourceInFocus: boolean;
+  /** Is the source Pokemon "in focus," i.e. is it fully visible on the field? */
+  public get sourceInFocus(): boolean {
+    return this.#sourceInFocus;
+  }
+  public set sourceInFocus(value: boolean) {
+    this.#sourceInFocus = value;
+  }
+  //#endregion non-serializable properties
 
   constructor(sourceMove: MoveId, sourceId: number) {
     super(
@@ -3078,9 +3127,9 @@ export class SubstituteTag extends BattlerTag {
 
   /**
    * When given a battler tag or json representing one, load the data for it.
-   * @param {BattlerTag | any} source A battler tag
+   * @param source - An object containing the necessary properties to load the tag
    */
-  loadTag(source: BattlerTag | any): void {
+  override loadTag(source: NonFunctionProperties<SubstituteTag>): void {
     super.loadTag(source);
     this.hp = source.hp;
   }
@@ -3093,6 +3142,7 @@ export class SubstituteTag extends BattlerTag {
  * Currently used only in MysteryEncounters to provide start of fight stat buffs.
  */
 export class MysteryEncounterPostSummonTag extends BattlerTag {
+  public override readonly tagType = BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON;
   constructor() {
     super(BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON, BattlerTagLapseType.CUSTOM, 1);
   }
@@ -3126,15 +3176,11 @@ export class MysteryEncounterPostSummonTag extends BattlerTag {
  * Torment does not interrupt the move if the move is performed consecutively in the same turn and right after Torment is applied
  */
 export class TormentTag extends MoveRestrictionBattlerTag {
+  public override readonly tagType = BattlerTagType.TORMENT;
   constructor(sourceId: number) {
     super(BattlerTagType.TORMENT, BattlerTagLapseType.AFTER_MOVE, 1, MoveId.TORMENT, sourceId);
   }
 
-  /**
-   * Adds the battler tag to the target Pokemon and defines the private class variable 'target'
-   * 'Target' is used to track the Pokemon's current status
-   * @param {Pokemon} pokemon the Pokemon tormented
-   */
   override onAdd(pokemon: Pokemon) {
     super.onAdd(pokemon);
     globalScene.phaseManager.queueMessage(
@@ -3147,7 +3193,7 @@ export class TormentTag extends MoveRestrictionBattlerTag {
 
   /**
    * Torment only ends when the affected Pokemon leaves the battle field
-   * @param {Pokemon} pokemon the Pokemon under the effects of Torment
+   * @param pokemon - The Pokemon under the effects of Torment
    * @param _tagType
    * @returns `true` if still present | `false` if not
    */
@@ -3156,8 +3202,8 @@ export class TormentTag extends MoveRestrictionBattlerTag {
   }
 
   /**
-   * This checks if the current move used is identical to the last used move with a {@linkcode MoveResult} of `SUCCESS`/`MISS`
-   * @param {MoveId} move the move under investigation
+   * Check if the current move used is identical to the last used move with a {@linkcode MoveResult} of `SUCCESS`/`MISS`
+   * @param move - The move under investigation
    * @returns `true` if there is valid consecutive usage | `false` if the moves are different from each other
    */
   public override isMoveRestricted(move: MoveId, user: Pokemon): boolean {
@@ -3189,6 +3235,7 @@ export class TormentTag extends MoveRestrictionBattlerTag {
  * The tag is removed after 4 turns.
  */
 export class TauntTag extends MoveRestrictionBattlerTag {
+  public override readonly tagType = BattlerTagType.TAUNT;
   constructor() {
     super(BattlerTagType.TAUNT, [BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.AFTER_MOVE], 4, MoveId.TAUNT);
   }
@@ -3214,8 +3261,8 @@ export class TauntTag extends MoveRestrictionBattlerTag {
   }
 
   /**
-   * Checks if a move is a status move and determines its restriction status on that basis
-   * @param {MoveId} move the move under investigation
+   * Check if a move is a status move and determines its restriction status on that basis
+   * @param move - The move under investigation
    * @returns `true` if the move is a status move
    */
   override isMoveRestricted(move: MoveId): boolean {
@@ -3243,6 +3290,7 @@ export class TauntTag extends MoveRestrictionBattlerTag {
  * The tag is only removed when the source-user is removed from the field.
  */
 export class ImprisonTag extends MoveRestrictionBattlerTag {
+  public override readonly tagType = BattlerTagType.IMPRISON;
   constructor(sourceId: number) {
     super(
       BattlerTagType.IMPRISON,
@@ -3255,8 +3303,7 @@ export class ImprisonTag extends MoveRestrictionBattlerTag {
 
   /**
    * Checks if the source of Imprison is still active
-   * @override
-   * @param pokemon The pokemon this tag is attached to
+   * @param pokemon - The pokemon this tag is attached to
    * @returns `true` if the source is still active
    */
   public override lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
@@ -3273,8 +3320,7 @@ export class ImprisonTag extends MoveRestrictionBattlerTag {
 
   /**
    * Checks if the source of the tag has the parameter move in its moveset and that the source is still active
-   * @override
-   * @param {MoveId} move the move under investigation
+   * @param move - The move under investigation
    * @returns `false` if either condition is not met
    */
   public override isMoveRestricted(move: MoveId, _user: Pokemon): boolean {
@@ -3306,7 +3352,8 @@ export class ImprisonTag extends MoveRestrictionBattlerTag {
  * For three turns, starting from the turn of hit, at the end of each turn, the target Pokemon's speed will decrease by 1.
  * The tag can also expire by taking the target Pokemon off the field, or the Pokemon that originally used the move.
  */
-export class SyrupBombTag extends BattlerTag {
+export class SyrupBombTag extends SerializableBattlerTag {
+  public override readonly tagType = BattlerTagType.SYRUP_BOMB;
   constructor(sourceId: number) {
     super(BattlerTagType.SYRUP_BOMB, BattlerTagLapseType.TURN_END, 3, MoveId.SYRUP_BOMB, sourceId);
   }
@@ -3368,7 +3415,8 @@ export class SyrupBombTag extends BattlerTag {
  * The effects of Telekinesis can be baton passed to a teammate.
  * @see {@link https://bulbapedia.bulbagarden.net/wiki/Telekinesis_(move) | MoveId.TELEKINESIS}
  */
-export class TelekinesisTag extends BattlerTag {
+export class TelekinesisTag extends SerializableBattlerTag {
+  public override readonly tagType = BattlerTagType.TELEKINESIS;
   constructor(sourceMove: MoveId) {
     super(
       BattlerTagType.TELEKINESIS,
@@ -3391,9 +3439,9 @@ export class TelekinesisTag extends BattlerTag {
 
 /**
  * Tag that swaps the user's base ATK stat with its base DEF stat.
- * @extends BattlerTag
  */
-export class PowerTrickTag extends BattlerTag {
+export class PowerTrickTag extends SerializableBattlerTag {
+  public override readonly tagType = BattlerTagType.POWER_TRICK;
   constructor(sourceMove: MoveId, sourceId: number) {
     super(BattlerTagType.POWER_TRICK, BattlerTagLapseType.CUSTOM, 0, sourceMove, sourceId, true);
   }
@@ -3418,7 +3466,7 @@ export class PowerTrickTag extends BattlerTag {
 
   /**
    * Removes the Power Trick tag and reverts any stat changes if the tag is already applied.
-   * @param {Pokemon} pokemon The {@linkcode Pokemon} that already has the Power Trick tag.
+   * @param pokemon - The {@linkcode Pokemon} that already has the Power Trick tag.
    */
   onOverlap(pokemon: Pokemon): void {
     pokemon.removeTag(this.tagType);
@@ -3426,7 +3474,7 @@ export class PowerTrickTag extends BattlerTag {
 
   /**
    * Swaps the user's base ATK stat with its base DEF stat.
-   * @param {Pokemon} pokemon The {@linkcode Pokemon} whose stats will be swapped.
+   * @param pokemon - The {@linkcode Pokemon} whose stats will be swapped.
    */
   swapStat(pokemon: Pokemon): void {
     const temp = pokemon.getStat(Stat.ATK, false);
@@ -3440,7 +3488,8 @@ export class PowerTrickTag extends BattlerTag {
  * If this tag is active when the bearer faints from an opponent's move, the tag reduces that move's PP to 0.
  * Otherwise, it lapses when the bearer makes another move.
  */
-export class GrudgeTag extends BattlerTag {
+export class GrudgeTag extends SerializableBattlerTag {
+  public override readonly tagType = BattlerTagType.GRUDGE;
   constructor() {
     super(BattlerTagType.GRUDGE, [BattlerTagLapseType.CUSTOM, BattlerTagLapseType.PRE_MOVE], 1, MoveId.GRUDGE);
   }
@@ -3458,7 +3507,7 @@ export class GrudgeTag extends BattlerTag {
    * Activates Grudge's special effect on the attacking Pokemon and lapses the tag.
    * @param pokemon
    * @param lapseType
-   * @param sourcePokemon {@linkcode Pokemon} the source of the move that fainted the tag's bearer
+   * @param sourcePokemon - The source of the move that fainted the tag's bearer
    * @returns `false` if Grudge activates its effect or lapses
    */
   override lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType, sourcePokemon?: Pokemon): boolean {
@@ -3486,6 +3535,7 @@ export class GrudgeTag extends BattlerTag {
  * Tag used to heal the user of Psycho Shift of its status effect if Psycho Shift succeeds in transferring its status effect to the target Pokemon
  */
 export class PsychoShiftTag extends BattlerTag {
+  public override readonly tagType = BattlerTagType.PSYCHO_SHIFT;
   constructor() {
     super(BattlerTagType.PSYCHO_SHIFT, BattlerTagLapseType.AFTER_MOVE, 1, MoveId.PSYCHO_SHIFT);
   }
@@ -3510,6 +3560,7 @@ export class PsychoShiftTag extends BattlerTag {
  * Tag associated with the move Magic Coat.
  */
 export class MagicCoatTag extends BattlerTag {
+  public override readonly tagType = BattlerTagType.MAGIC_COAT;
   constructor() {
     super(BattlerTagType.MAGIC_COAT, BattlerTagLapseType.TURN_END, 1, MoveId.MAGIC_COAT);
   }
@@ -3729,19 +3780,18 @@ export function getBattlerTag(
       return new PsychoShiftTag();
     case BattlerTagType.MAGIC_COAT:
       return new MagicCoatTag();
-    case BattlerTagType.NONE:
-    default:
-      return new BattlerTag(tagType, BattlerTagLapseType.CUSTOM, turnCount, sourceMove, sourceId);
   }
 }
 
 /**
  * When given a battler tag or json representing one, creates an actual BattlerTag object with the same data.
- * @param {BattlerTag | any} source A battler tag
- * @return {BattlerTag} The valid battler tag
+ * @param source - An object containing the data necessary to reconstruct the BattlerTag.
+ * @returns The valid battler tag
  */
-export function loadBattlerTag(source: BattlerTag | any): BattlerTag {
-  const tag = getBattlerTag(source.tagType, source.turnCount, source.sourceMove, source.sourceId);
+export function loadBattlerTag(source: SerializableBattlerTag): BattlerTag {
+  // TODO: Remove this bang by fixing the signature of `getBattlerTag`
+  // to allow undefined sourceIds and sourceMoves (with appropriate fallback for tags that require it)
+  const tag = getBattlerTag(source.tagType, source.turnCount, source.sourceMove!, source.sourceId!);
   tag.loadTag(source);
   return tag;
 }
@@ -3749,8 +3799,8 @@ export function loadBattlerTag(source: BattlerTag | any): BattlerTag {
 /**
  * Helper function to verify that the current phase is a MoveEffectPhase and provide quick access to commonly used fields
  *
- * @param _pokemon {@linkcode Pokemon} The Pokémon used to access the current phase
- * @returns null if current phase is not MoveEffectPhase, otherwise Object containing the {@linkcode MoveEffectPhase}, and its
+ * @param _pokemon - The Pokémon used to access the current phase (unused)
+ * @returns `null` if current phase is not MoveEffectPhase, otherwise Object containing the {@linkcode MoveEffectPhase}, and its
  * corresponding {@linkcode Move} and user {@linkcode Pokemon}
  */
 function getMoveEffectPhaseData(_pokemon: Pokemon): { phase: MoveEffectPhase; attacker: Pokemon; move: Move } | null {
@@ -3764,3 +3814,104 @@ function getMoveEffectPhaseData(_pokemon: Pokemon): { phase: MoveEffectPhase; at
   }
   return null;
 }
+
+/**
+ * Map from {@linkcode BattlerTagType} to the corresponding {@linkcode BattlerTag} class.
+ */
+export type BattlerTagTypeMap = {
+  [BattlerTagType.RECHARGING]: RechargingTag;
+  [BattlerTagType.SHELL_TRAP]: ShellTrapTag;
+  [BattlerTagType.FLINCHED]: FlinchedTag;
+  [BattlerTagType.INTERRUPTED]: InterruptedTag;
+  [BattlerTagType.CONFUSED]: ConfusedTag;
+  [BattlerTagType.INFATUATED]: InfatuatedTag;
+  [BattlerTagType.SEEDED]: SeedTag;
+  [BattlerTagType.POWDER]: PowderTag;
+  [BattlerTagType.NIGHTMARE]: NightmareTag;
+  [BattlerTagType.FRENZY]: FrenzyTag;
+  [BattlerTagType.CHARGING]: BattlerTag;
+  [BattlerTagType.ENCORE]: EncoreTag;
+  [BattlerTagType.HELPING_HAND]: HelpingHandTag;
+  [BattlerTagType.INGRAIN]: IngrainTag;
+  [BattlerTagType.AQUA_RING]: AquaRingTag;
+  [BattlerTagType.DROWSY]: DrowsyTag;
+  [BattlerTagType.TRAPPED]: TrappedTag;
+  [BattlerTagType.NO_RETREAT]: NoRetreatTag;
+  [BattlerTagType.BIND]: BindTag;
+  [BattlerTagType.WRAP]: WrapTag;
+  [BattlerTagType.FIRE_SPIN]: FireSpinTag;
+  [BattlerTagType.WHIRLPOOL]: WhirlpoolTag;
+  [BattlerTagType.CLAMP]: ClampTag;
+  [BattlerTagType.SAND_TOMB]: SandTombTag;
+  [BattlerTagType.MAGMA_STORM]: MagmaStormTag;
+  [BattlerTagType.SNAP_TRAP]: SnapTrapTag;
+  [BattlerTagType.THUNDER_CAGE]: ThunderCageTag;
+  [BattlerTagType.INFESTATION]: InfestationTag;
+  [BattlerTagType.PROTECTED]: ProtectedTag;
+  [BattlerTagType.SPIKY_SHIELD]: ContactDamageProtectedTag;
+  [BattlerTagType.KINGS_SHIELD]: ContactStatStageChangeProtectedTag;
+  [BattlerTagType.OBSTRUCT]: ContactStatStageChangeProtectedTag;
+  [BattlerTagType.SILK_TRAP]: ContactStatStageChangeProtectedTag;
+  [BattlerTagType.BANEFUL_BUNKER]: ContactSetStatusProtectedTag;
+  [BattlerTagType.BURNING_BULWARK]: ContactSetStatusProtectedTag;
+  [BattlerTagType.ENDURING]: EnduringTag;
+  [BattlerTagType.ENDURE_TOKEN]: EnduringTag;
+  [BattlerTagType.STURDY]: SturdyTag;
+  [BattlerTagType.PERISH_SONG]: PerishSongTag;
+  [BattlerTagType.CENTER_OF_ATTENTION]: CenterOfAttentionTag;
+  [BattlerTagType.TRUANT]: TruantTag;
+  [BattlerTagType.SLOW_START]: SlowStartTag;
+  [BattlerTagType.PROTOSYNTHESIS]: WeatherHighestStatBoostTag;
+  [BattlerTagType.QUARK_DRIVE]: TerrainHighestStatBoostTag;
+  [BattlerTagType.FLYING]: SemiInvulnerableTag;
+  [BattlerTagType.UNDERGROUND]: SemiInvulnerableTag;
+  [BattlerTagType.UNDERWATER]: SemiInvulnerableTag;
+  [BattlerTagType.HIDDEN]: SemiInvulnerableTag;
+  [BattlerTagType.FIRE_BOOST]: TypeBoostTag;
+  [BattlerTagType.CRIT_BOOST]: CritBoostTag;
+  [BattlerTagType.DRAGON_CHEER]: DragonCheerTag;
+  [BattlerTagType.ALWAYS_CRIT]: BattlerTag;
+  [BattlerTagType.IGNORE_ACCURACY]: BattlerTag;
+  [BattlerTagType.ALWAYS_GET_HIT]: BattlerTag;
+  [BattlerTagType.RECEIVE_DOUBLE_DAMAGE]: BattlerTag;
+  [BattlerTagType.BYPASS_SLEEP]: BattlerTag;
+  [BattlerTagType.IGNORE_FLYING]: GroundedTag;
+  [BattlerTagType.ROOSTED]: RoostedTag;
+  [BattlerTagType.BURNED_UP]: RemovedTypeTag;
+  [BattlerTagType.DOUBLE_SHOCKED]: RemovedTypeTag;
+  [BattlerTagType.SALT_CURED]: SaltCuredTag;
+  [BattlerTagType.CURSED]: CursedTag;
+  [BattlerTagType.CHARGED]: TypeBoostTag;
+  [BattlerTagType.FLOATING]: FloatingTag;
+  [BattlerTagType.MINIMIZED]: MinimizeTag;
+  [BattlerTagType.DESTINY_BOND]: DestinyBondTag;
+  [BattlerTagType.ICE_FACE]: IceFaceBlockDamageTag;
+  [BattlerTagType.DISGUISE]: FormBlockDamageTag;
+  [BattlerTagType.COMMANDED]: CommandedTag;
+  [BattlerTagType.STOCKPILING]: StockpilingTag;
+  [BattlerTagType.OCTOLOCK]: OctolockTag;
+  [BattlerTagType.DISABLED]: DisabledTag;
+  [BattlerTagType.IGNORE_GHOST]: ExposedTag;
+  [BattlerTagType.IGNORE_DARK]: ExposedTag;
+  [BattlerTagType.GULP_MISSILE_ARROKUDA]: GulpMissileTag;
+  [BattlerTagType.GULP_MISSILE_PIKACHU]: GulpMissileTag;
+  [BattlerTagType.BEAK_BLAST_CHARGING]: BeakBlastChargingTag;
+  [BattlerTagType.TAR_SHOT]: TarShotTag;
+  [BattlerTagType.ELECTRIFIED]: ElectrifiedTag;
+  [BattlerTagType.THROAT_CHOPPED]: ThroatChoppedTag;
+  [BattlerTagType.GORILLA_TACTICS]: GorillaTacticsTag;
+  [BattlerTagType.UNBURDEN]: UnburdenTag;
+  [BattlerTagType.SUBSTITUTE]: SubstituteTag;
+  [BattlerTagType.AUTOTOMIZED]: AutotomizedTag;
+  [BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON]: MysteryEncounterPostSummonTag;
+  [BattlerTagType.HEAL_BLOCK]: HealBlockTag;
+  [BattlerTagType.TORMENT]: TormentTag;
+  [BattlerTagType.TAUNT]: TauntTag;
+  [BattlerTagType.IMPRISON]: ImprisonTag;
+  [BattlerTagType.SYRUP_BOMB]: SyrupBombTag;
+  [BattlerTagType.TELEKINESIS]: TelekinesisTag;
+  [BattlerTagType.POWER_TRICK]: PowerTrickTag;
+  [BattlerTagType.GRUDGE]: GrudgeTag;
+  [BattlerTagType.PSYCHO_SHIFT]: PsychoShiftTag;
+  [BattlerTagType.MAGIC_COAT]: MagicCoatTag;
+};
diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts
index 965ab23a692..e6673f31826 100644
--- a/src/data/moves/move.ts
+++ b/src/data/moves/move.ts
@@ -10800,7 +10800,7 @@ export function initMoves() {
     new SelfStatusMove(MoveId.NO_RETREAT, PokemonType.FIGHTING, -1, 5, -1, 0, 8)
       .attr(StatStageChangeAttr, [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ], 1, true)
       .attr(AddBattlerTagAttr, BattlerTagType.NO_RETREAT, true, false)
-      .condition((user, target, move) => user.getTag(TrappedTag)?.sourceMove !== MoveId.NO_RETREAT), // fails if the user is currently trapped by No Retreat
+      .condition((user, target, move) => user.getTag(TrappedTag)?.tagType !== BattlerTagType.NO_RETREAT), // fails if the user is currently trapped by No Retreat
     new StatusMove(MoveId.TAR_SHOT, PokemonType.ROCK, 100, 15, -1, 0, 8)
       .attr(StatStageChangeAttr, [ Stat.SPD ], -1)
       .attr(AddBattlerTagAttr, BattlerTagType.TAR_SHOT, false)
diff --git a/src/data/pokemon/pokemon-data.ts b/src/data/pokemon/pokemon-data.ts
index a2a0138a17a..972d7627bcd 100644
--- a/src/data/pokemon/pokemon-data.ts
+++ b/src/data/pokemon/pokemon-data.ts
@@ -1,4 +1,5 @@
-import { type BattlerTag, loadBattlerTag } from "#data/battler-tags";
+import type { BattlerTag } from "#data/battler-tags";
+import { loadBattlerTag, SerializableBattlerTag } from "#data/battler-tags";
 import { allSpecies } from "#data/data-lists";
 import type { Gender } from "#data/gender";
 import { PokemonMove } from "#data/moves/pokemon-move";
@@ -187,9 +188,11 @@ export class PokemonSummonData {
         continue;
       }
 
-      if (key === "tags") {
-        // load battler tags
-        this.tags = value.map((t: BattlerTag) => loadBattlerTag(t));
+      if (key === "tags" && Array.isArray(value)) {
+        // load battler tags, discarding any that are not serializable
+        this.tags = value
+          .map((t: SerializableBattlerTag) => loadBattlerTag(t))
+          .filter((t): t is SerializableBattlerTag => t instanceof SerializableBattlerTag);
         continue;
       }
       this[key] = value;
diff --git a/src/enums/battler-tag-type.ts b/src/enums/battler-tag-type.ts
index 719b08c5b81..6d9d2dd4a92 100644
--- a/src/enums/battler-tag-type.ts
+++ b/src/enums/battler-tag-type.ts
@@ -1,5 +1,4 @@
 export enum BattlerTagType {
-  NONE = "NONE",
   RECHARGING = "RECHARGING",
   FLINCHED = "FLINCHED",
   INTERRUPTED = "INTERRUPTED",

From ede2a947cacb07700515dfb941230b781f57f659 Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Tue, 29 Jul 2025 15:31:44 -0700
Subject: [PATCH 28/44] [Docs] Adjust `@module` doc comment in
 `battler-tags.ts`

Note that currently Typedoc is not parsing `@module` docs,
but this comment adjustment would be required if and when
it gets fixed
---
 src/data/battler-tags.ts | 46 ++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts
index 79c14f860b6..9dfd43eccb3 100644
--- a/src/data/battler-tags.ts
+++ b/src/data/battler-tags.ts
@@ -47,29 +47,29 @@ import type {
 import type { Mutable, NonFunctionProperties } from "#types/type-helpers";
 import { BooleanHolder, coerceArray, getFrameMs, isNullOrUndefined, NumberHolder, toDmgValue } from "#utils/common";
 
-/*
-@module
-BattlerTags are used to represent semi-persistent effects that can be attached to a Pokemon.
-Note that before serialization, a new tag object is created, and then `loadTag` is called on the
-tag with the object that was serialized.
-
-This means it is straightforward to avoid serializing fields.
-Fields that are not set in the constructor and not set in `loadTag` will thus not be serialized.
-
-Any battler tag that can persist across sessions must extend SerializableBattlerTag in its class definition signature.
-Only tags that persist across waves (meaning their effect can last >1 turn) should be considered
-serializable.
-
-Serializable battler tags have strict requirements for their fields.
-Properties that are not necessary to reconstruct the tag must not be serialized. This can be avoided
-by using a private property. If access to the property is needed outside of the class, then
-a getter (and potentially, a setter) should be used instead.
-
-If a property that is intended to be private must be serialized, then it should instead
-be declared as a public readonly propety. Then, in the `loadTag` method (or any method inside the class that needs to adjust the property)
-use `(this as Mutable<this>).propertyName = value;`
-These rules ensure that Typescript is aware of the shape of the serialized version of the class.
-*/
+/**
+ * @module
+ * BattlerTags are used to represent semi-persistent effects that can be attached to a Pokemon.
+ * Note that before serialization, a new tag object is created, and then `loadTag` is called on the
+ * tag with the object that was serialized.
+ *
+ * This means it is straightforward to avoid serializing fields.
+ * Fields that are not set in the constructor and not set in `loadTag` will thus not be serialized.
+ *
+ * Any battler tag that can persist across sessions must extend SerializableBattlerTag in its class definition signature.
+ * Only tags that persist across waves (meaning their effect can last >1 turn) should be considered
+ * serializable.
+ *
+ * Serializable battler tags have strict requirements for their fields.
+ * Properties that are not necessary to reconstruct the tag must not be serialized. This can be avoided
+ * by using a private property. If access to the property is needed outside of the class, then
+ * a getter (and potentially, a setter) should be used instead.
+ *
+ * If a property that is intended to be private must be serialized, then it should instead
+ * be declared as a public readonly propety. Then, in the `loadTag` method (or any method inside the class that needs to adjust the property)
+ * use `(this as Mutable<this>).propertyName = value;`
+ * These rules ensure that Typescript is aware of the shape of the serialized version of the class.
+ */
 
 /** Interface containing the serializable fields of BattlerTag */
 interface BaseBattlerTag {

From 10b9cfcdb0b30db35e452117b3ca25f6f26da2f2 Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Tue, 29 Jul 2025 15:50:57 -0700
Subject: [PATCH 29/44] [Balance] End of turn triggers won't occur when you end
 a biome (#6169)

* [Balance] End of turn triggers won't occur when you end a biome

* Add tests

* Move phase manipulation logic into `PhaseManager`

* Rename "biome end" to "interlude"

* Rename `TurnEndPhase#endOfBiome` to `upcomingInterlude`

---------

Co-authored-by: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
---
 src/phase-manager.ts                      | 13 +++++
 src/phases/check-interlude-phase.ts       | 18 +++++++
 src/phases/turn-end-phase.ts              |  8 ++-
 src/phases/turn-start-phase.ts            |  9 ++--
 test/phases/check-biome-end-phase.test.ts | 62 +++++++++++++++++++++++
 5 files changed, 104 insertions(+), 6 deletions(-)
 create mode 100644 src/phases/check-interlude-phase.ts
 create mode 100644 test/phases/check-biome-end-phase.test.ts

diff --git a/src/phase-manager.ts b/src/phase-manager.ts
index 73ea373904f..c56afe446ed 100644
--- a/src/phase-manager.ts
+++ b/src/phase-manager.ts
@@ -9,6 +9,7 @@ import { AttemptCapturePhase } from "#phases/attempt-capture-phase";
 import { AttemptRunPhase } from "#phases/attempt-run-phase";
 import { BattleEndPhase } from "#phases/battle-end-phase";
 import { BerryPhase } from "#phases/berry-phase";
+import { CheckInterludePhase } from "#phases/check-interlude-phase";
 import { CheckStatusEffectPhase } from "#phases/check-status-effect-phase";
 import { CheckSwitchPhase } from "#phases/check-switch-phase";
 import { CommandPhase } from "#phases/command-phase";
@@ -121,6 +122,7 @@ const PHASES = Object.freeze({
   AttemptRunPhase,
   BattleEndPhase,
   BerryPhase,
+  CheckInterludePhase,
   CheckStatusEffectPhase,
   CheckSwitchPhase,
   CommandPhase,
@@ -665,4 +667,15 @@ export class PhaseManager {
   ): void {
     this.startDynamicPhase(this.create(phase, ...args));
   }
+
+  /** Prevents end of turn effects from triggering when transitioning to a new biome on a X0 wave */
+  public onInterlude(): void {
+    const phasesToRemove = ["WeatherEffectPhase", "BerryPhase", "CheckStatusEffectPhase"];
+    this.phaseQueue = this.phaseQueue.filter(p => !phasesToRemove.includes(p.phaseName));
+
+    const turnEndPhase = this.findPhase<TurnEndPhase>(p => p.phaseName === "TurnEndPhase");
+    if (turnEndPhase) {
+      turnEndPhase.upcomingInterlude = true;
+    }
+  }
 }
diff --git a/src/phases/check-interlude-phase.ts b/src/phases/check-interlude-phase.ts
new file mode 100644
index 00000000000..1589f74f058
--- /dev/null
+++ b/src/phases/check-interlude-phase.ts
@@ -0,0 +1,18 @@
+import { globalScene } from "#app/global-scene";
+import { Phase } from "#app/phase";
+
+export class CheckInterludePhase extends Phase {
+  public override readonly phaseName = "CheckInterludePhase";
+
+  public override start(): void {
+    super.start();
+    const { phaseManager } = globalScene;
+    const { waveIndex } = globalScene.currentBattle;
+
+    if (waveIndex % 10 === 0 && globalScene.getEnemyParty().every(p => p.isFainted())) {
+      phaseManager.onInterlude();
+    }
+
+    this.end();
+  }
+}
diff --git a/src/phases/turn-end-phase.ts b/src/phases/turn-end-phase.ts
index ce3b2958c23..463f26e73a2 100644
--- a/src/phases/turn-end-phase.ts
+++ b/src/phases/turn-end-phase.ts
@@ -18,6 +18,8 @@ import i18next from "i18next";
 
 export class TurnEndPhase extends FieldPhase {
   public readonly phaseName = "TurnEndPhase";
+  public upcomingInterlude = false;
+
   start() {
     super.start();
 
@@ -59,9 +61,11 @@ export class TurnEndPhase extends FieldPhase {
       pokemon.tempSummonData.waveTurnCount++;
     };
 
-    this.executeForAll(handlePokemon);
+    if (!this.upcomingInterlude) {
+      this.executeForAll(handlePokemon);
 
-    globalScene.arena.lapseTags();
+      globalScene.arena.lapseTags();
+    }
 
     if (globalScene.arena.weather && !globalScene.arena.weather.lapse()) {
       globalScene.arena.trySetWeather(WeatherType.NONE);
diff --git a/src/phases/turn-start-phase.ts b/src/phases/turn-start-phase.ts
index 0fc126801ec..9fdac65bb10 100644
--- a/src/phases/turn-start-phase.ts
+++ b/src/phases/turn-start-phase.ts
@@ -218,6 +218,7 @@ export class TurnStartPhase extends FieldPhase {
           break;
       }
     }
+    phaseManager.pushNew("CheckInterludePhase");
 
     phaseManager.pushNew("WeatherEffectPhase");
     phaseManager.pushNew("BerryPhase");
@@ -227,10 +228,10 @@ export class TurnStartPhase extends FieldPhase {
 
     phaseManager.pushNew("TurnEndPhase");
 
-    /**
-     * this.end() will call shiftPhase(), which dumps everything from PrependQueue (aka everything that is unshifted()) to the front
-     * of the queue and dequeues to start the next phase
-     * this is important since stuff like SwitchSummon, AttemptRun, AttemptCapture Phases break the "flow" and should take precedence
+    /*
+     * `this.end()` will call `PhaseManager#shiftPhase()`, which dumps everything from `phaseQueuePrepend`
+     * (aka everything that is queued via `unshift()`) to the front of the queue and dequeues to start the next phase.
+     * This is important since stuff like `SwitchSummonPhase`, `AttemptRunPhase`, and `AttemptCapturePhase` break the "flow" and should take precedence
      */
     this.end();
   }
diff --git a/test/phases/check-biome-end-phase.test.ts b/test/phases/check-biome-end-phase.test.ts
new file mode 100644
index 00000000000..06957af9011
--- /dev/null
+++ b/test/phases/check-biome-end-phase.test.ts
@@ -0,0 +1,62 @@
+import { AbilityId } from "#enums/ability-id";
+import { BerryType } from "#enums/berry-type";
+import { MoveId } from "#enums/move-id";
+import { SpeciesId } from "#enums/species-id";
+import { WeatherType } from "#enums/weather-type";
+import { GameManager } from "#test/test-utils/game-manager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Check Biome End Phase", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .enemySpecies(SpeciesId.MAGIKARP)
+      .enemyMoveset(MoveId.SPLASH)
+      .enemyAbility(AbilityId.BALL_FETCH)
+      .ability(AbilityId.BALL_FETCH)
+      .startingLevel(100);
+  });
+
+  it("should not trigger end of turn effects when defeating the final pokemon of a biome in classic", async () => {
+    game.override
+      .startingWave(10)
+      .weather(WeatherType.SANDSTORM)
+      .startingHeldItems([{ name: "BERRY", type: BerryType.SITRUS }]);
+    await game.classicMode.startBattle([SpeciesId.FEEBAS]);
+
+    const player = game.field.getPlayerPokemon();
+
+    player.hp = 1;
+
+    game.move.use(MoveId.EXTREME_SPEED);
+    await game.toEndOfTurn();
+
+    expect(player.hp).toBe(1);
+  });
+
+  it("should not prevent end of turn effects when transitioning waves within a biome", async () => {
+    game.override.weather(WeatherType.SANDSTORM);
+    await game.classicMode.startBattle([SpeciesId.FEEBAS]);
+
+    const player = game.field.getPlayerPokemon();
+
+    game.move.use(MoveId.EXTREME_SPEED);
+    await game.toEndOfTurn();
+
+    expect(player.hp).toBeLessThan(player.getMaxHp());
+  });
+});

From 6ae2bd70cfbe6d97cae4941d4d27fa61403c36a0 Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Tue, 29 Jul 2025 20:02:30 -0700
Subject: [PATCH 30/44] [Test] Add missing single battle override to
 `CheckInterludePhase` test

---
 ...k-biome-end-phase.test.ts => check-interlude-phase.test.ts} | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 rename test/phases/{check-biome-end-phase.test.ts => check-interlude-phase.test.ts} (97%)

diff --git a/test/phases/check-biome-end-phase.test.ts b/test/phases/check-interlude-phase.test.ts
similarity index 97%
rename from test/phases/check-biome-end-phase.test.ts
rename to test/phases/check-interlude-phase.test.ts
index 06957af9011..d5413d1db35 100644
--- a/test/phases/check-biome-end-phase.test.ts
+++ b/test/phases/check-interlude-phase.test.ts
@@ -28,7 +28,8 @@ describe("Check Biome End Phase", () => {
       .enemyMoveset(MoveId.SPLASH)
       .enemyAbility(AbilityId.BALL_FETCH)
       .ability(AbilityId.BALL_FETCH)
-      .startingLevel(100);
+      .startingLevel(100)
+      .battleStyle("single");
   });
 
   it("should not trigger end of turn effects when defeating the final pokemon of a biome in classic", async () => {

From 17eeceb4f348b87582986f77a6129874cb3ad53d Mon Sep 17 00:00:00 2001
From: fabske0 <192151969+fabske0@users.noreply.github.com>
Date: Wed, 30 Jul 2025 19:58:10 +0200
Subject: [PATCH 31/44] [UI/UX] Fix button and input field overlaps (#6013)

* [Fix] Fix button overlap

* [Fix] Fix input field overlaps

* use getWidth to determine if label should be shortened

---------

Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Co-authored-by: damocleas <damocleas25@gmail.com>
---
 src/ui/form-modal-ui-handler.ts        | 20 ++++++++++++----
 src/ui/modal-ui-handler.ts             | 19 +++++++++++----
 src/ui/pokedex-scan-ui-handler.ts      |  7 ++++--
 src/ui/registration-form-ui-handler.ts | 32 +++-----------------------
 4 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/src/ui/form-modal-ui-handler.ts b/src/ui/form-modal-ui-handler.ts
index 7ae545a7292..203d98a86c7 100644
--- a/src/ui/form-modal-ui-handler.ts
+++ b/src/ui/form-modal-ui-handler.ts
@@ -72,6 +72,10 @@ export abstract class FormModalUiHandler extends ModalUiHandler {
       (hasTitle ? 31 : 5) + 20 * (config.length - 1) + 16 + this.getButtonTopMargin(),
       "",
       TextStyle.TOOLTIP_CONTENT,
+      {
+        fontSize: "42px",
+        wordWrap: { width: 850 },
+      },
     );
     this.errorMessage.setColor(this.getTextColor(TextStyle.SUMMARY_PINK));
     this.errorMessage.setShadowColor(this.getTextColor(TextStyle.SUMMARY_PINK, true));
@@ -84,20 +88,28 @@ export abstract class FormModalUiHandler extends ModalUiHandler {
     this.inputs = [];
     this.formLabels = [];
     fieldsConfig.forEach((config, f) => {
-      const label = addTextObject(10, (hasTitle ? 31 : 5) + 20 * f, config.label, TextStyle.TOOLTIP_CONTENT);
+      // The Pokédex Scan Window uses width `300` instead of `160` like the other forms
+      // Therefore, the label does not need to be shortened
+      const label = addTextObject(
+        10,
+        (hasTitle ? 31 : 5) + 20 * f,
+        config.label.length > 25 && this.getWidth() < 200 ? config.label.slice(0, 20) + "..." : config.label,
+        TextStyle.TOOLTIP_CONTENT,
+      );
       label.name = "formLabel" + f;
 
       this.formLabels.push(label);
       this.modalContainer.add(this.formLabels[this.formLabels.length - 1]);
 
-      const inputContainer = globalScene.add.container(70, (hasTitle ? 28 : 2) + 20 * f);
+      const inputWidth = label.width < 320 ? 80 : 80 - (label.width - 320) / 5.5;
+      const inputContainer = globalScene.add.container(70 + (80 - inputWidth), (hasTitle ? 28 : 2) + 20 * f);
       inputContainer.setVisible(false);
 
-      const inputBg = addWindow(0, 0, 80, 16, false, false, 0, 0, WindowVariant.XTHIN);
+      const inputBg = addWindow(0, 0, inputWidth, 16, false, false, 0, 0, WindowVariant.XTHIN);
 
       const isPassword = config?.isPassword;
       const isReadOnly = config?.isReadOnly;
-      const input = addTextInputObject(4, -2, 440, 116, TextStyle.TOOLTIP_CONTENT, {
+      const input = addTextInputObject(4, -2, inputWidth * 5.5, 116, TextStyle.TOOLTIP_CONTENT, {
         type: isPassword ? "password" : "text",
         maxLength: isPassword ? 64 : 20,
         readOnly: isReadOnly,
diff --git a/src/ui/modal-ui-handler.ts b/src/ui/modal-ui-handler.ts
index c93b713831e..228d80968b9 100644
--- a/src/ui/modal-ui-handler.ts
+++ b/src/ui/modal-ui-handler.ts
@@ -152,7 +152,12 @@ export abstract class ModalUiHandler extends UiHandler {
   updateContainer(config?: ModalConfig): void {
     const [marginTop, marginRight, marginBottom, marginLeft] = this.getMargin(config);
 
-    const [width, height] = [this.getWidth(config), this.getHeight(config)];
+    /**
+     * If the total amount of characters for the 2 buttons exceeds ~30 characters,
+     * the width in `registration-form-ui-handler.ts` and `login-form-ui-handler.ts` needs to be increased.
+     */
+    const width = this.getWidth(config);
+    const height = this.getHeight(config);
     this.modalContainer.setPosition(
       (globalScene.game.canvas.width / 6 - (width + (marginRight - marginLeft))) / 2,
       (-globalScene.game.canvas.height / 6 - (height + (marginBottom - marginTop))) / 2,
@@ -166,10 +171,14 @@ export abstract class ModalUiHandler extends UiHandler {
     this.titleText.setX(width / 2);
     this.titleText.setVisible(!!title);
 
-    for (let b = 0; b < this.buttonContainers.length; b++) {
-      const sliceWidth = width / (this.buttonContainers.length + 1);
-
-      this.buttonContainers[b].setPosition(sliceWidth * (b + 1), this.modalBg.height - (this.buttonBgs[b].height + 8));
+    if (this.buttonContainers.length > 0) {
+      const spacing = 12;
+      const totalWidth = this.buttonBgs.reduce((sum, bg) => sum + bg.width, 0) + spacing * (this.buttonBgs.length - 1);
+      let x = (this.modalBg.width - totalWidth) / 2;
+      this.buttonContainers.forEach((container, i) => {
+        container.setPosition(x + this.buttonBgs[i].width / 2, this.modalBg.height - (this.buttonBgs[i].height + 8));
+        x += this.buttonBgs[i].width + spacing;
+      });
     }
   }
 
diff --git a/src/ui/pokedex-scan-ui-handler.ts b/src/ui/pokedex-scan-ui-handler.ts
index bcf869f6f39..ab3258a03de 100644
--- a/src/ui/pokedex-scan-ui-handler.ts
+++ b/src/ui/pokedex-scan-ui-handler.ts
@@ -158,8 +158,11 @@ export class PokedexScanUiHandler extends FormModalUiHandler {
 
     if (super.show(args)) {
       const config = args[0] as ModalConfig;
-      this.inputs[0].resize(1150, 116);
-      this.inputContainers[0].list[0].width = 200;
+      const label = this.formLabels[0];
+
+      const inputWidth = label.width < 420 ? 200 : 200 - (label.width - 420) / 5.75;
+      this.inputs[0].resize(inputWidth * 5.75, 116);
+      this.inputContainers[0].list[0].width = inputWidth;
       if (args[1] && typeof (args[1] as PlayerPokemon).getNameToRender === "function") {
         this.inputs[0].text = (args[1] as PlayerPokemon).getNameToRender();
       } else {
diff --git a/src/ui/registration-form-ui-handler.ts b/src/ui/registration-form-ui-handler.ts
index 60f8d1d987f..2c8080d534d 100644
--- a/src/ui/registration-form-ui-handler.ts
+++ b/src/ui/registration-form-ui-handler.ts
@@ -8,19 +8,6 @@ import type { ModalConfig } from "#ui/modal-ui-handler";
 import { addTextObject } from "#ui/text";
 import i18next from "i18next";
 
-interface LanguageSetting {
-  inputFieldFontSize?: string;
-  warningMessageFontSize?: string;
-  errorMessageFontSize?: string;
-}
-
-const languageSettings: { [key: string]: LanguageSetting } = {
-  "es-ES": {
-    inputFieldFontSize: "50px",
-    errorMessageFontSize: "40px",
-  },
-};
-
 export class RegistrationFormUiHandler extends FormModalUiHandler {
   getModalTitle(_config?: ModalConfig): string {
     return i18next.t("menu:register");
@@ -35,7 +22,7 @@ export class RegistrationFormUiHandler extends FormModalUiHandler {
   }
 
   getButtonTopMargin(): number {
-    return 8;
+    return 12;
   }
 
   getButtonLabels(_config?: ModalConfig): string[] {
@@ -76,18 +63,9 @@ export class RegistrationFormUiHandler extends FormModalUiHandler {
   setup(): void {
     super.setup();
 
-    this.modalContainer.list.forEach((child: Phaser.GameObjects.GameObject) => {
-      if (child instanceof Phaser.GameObjects.Text && child !== this.titleText) {
-        const inputFieldFontSize = languageSettings[i18next.resolvedLanguage!]?.inputFieldFontSize;
-        if (inputFieldFontSize) {
-          child.setFontSize(inputFieldFontSize);
-        }
-      }
-    });
-
-    const warningMessageFontSize = languageSettings[i18next.resolvedLanguage!]?.warningMessageFontSize ?? "42px";
     const label = addTextObject(10, 87, i18next.t("menu:registrationAgeWarning"), TextStyle.TOOLTIP_CONTENT, {
-      fontSize: warningMessageFontSize,
+      fontSize: "42px",
+      wordWrap: { width: 850 },
     });
 
     this.modalContainer.add(label);
@@ -107,10 +85,6 @@ export class RegistrationFormUiHandler extends FormModalUiHandler {
           const onFail = error => {
             globalScene.ui.setMode(UiMode.REGISTRATION_FORM, Object.assign(config, { errorMessage: error?.trim() }));
             globalScene.ui.playError();
-            const errorMessageFontSize = languageSettings[i18next.resolvedLanguage!]?.errorMessageFontSize;
-            if (errorMessageFontSize) {
-              this.errorMessage.setFontSize(errorMessageFontSize);
-            }
           };
           if (!this.inputs[0].text) {
             return onFail(i18next.t("menu:emptyUsername"));

From 1ae69a4183bca6deffbf0a2356a6b47477670d1b Mon Sep 17 00:00:00 2001
From: Bertie690 <136088738+Bertie690@users.noreply.github.com>
Date: Wed, 30 Jul 2025 21:17:17 -0400
Subject: [PATCH 32/44] [Dev] Moved type helpers to separate directory; (#6123)

* [Dev] Moved type helpers to separate directory; renamed `EnumValues` to `ObjectValues` and enforced usage

* Update tsconfig.json

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>

* Fixed import issue

* Updated documentation slightly

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Dean <69436131+emdeann@users.noreply.github.com>
---
 src/@types/arena-tags.ts                 |  2 +-
 src/@types/{ => helpers}/enum-types.ts   | 10 ++---
 src/@types/{ => helpers}/type-helpers.ts | 18 +++++---
 src/@types/modifier-types.ts             |  3 +-
 src/@types/phase-types.ts                |  3 +-
 src/enums/ability-attr.ts                |  4 +-
 src/enums/dex-attr.ts                    |  4 +-
 src/enums/gacha-types.ts                 |  4 +-
 src/enums/hit-check-result.ts            |  4 +-
 src/utils/enums.ts                       |  6 +--
 test/types/enum-types.test-d.ts          | 53 +++++++++++++++---------
 tsconfig.json                            |  2 +-
 12 files changed, 70 insertions(+), 43 deletions(-)
 rename src/@types/{ => helpers}/enum-types.ts (68%)
 rename src/@types/{ => helpers}/type-helpers.ts (81%)

diff --git a/src/@types/arena-tags.ts b/src/@types/arena-tags.ts
index ab4339b2fef..9ccccb1df5c 100644
--- a/src/@types/arena-tags.ts
+++ b/src/@types/arena-tags.ts
@@ -1,6 +1,6 @@
 import type { ArenaTagTypeMap } from "#data/arena-tag";
 import type { ArenaTagType } from "#enums/arena-tag-type";
-import type { NonFunctionProperties } from "./type-helpers";
+import type { NonFunctionProperties } from "#types/type-helpers";
 
 /** Subset of {@linkcode ArenaTagType}s that apply some negative effect to pokemon that switch in ({@link https://bulbapedia.bulbagarden.net/wiki/List_of_moves_that_cause_entry_hazards#List_of_traps | entry hazards} and Imprison. */
 export type ArenaTrapTagType =
diff --git a/src/@types/enum-types.ts b/src/@types/helpers/enum-types.ts
similarity index 68%
rename from src/@types/enum-types.ts
rename to src/@types/helpers/enum-types.ts
index 84df0a96505..2461f900c6b 100644
--- a/src/@types/enum-types.ts
+++ b/src/@types/helpers/enum-types.ts
@@ -1,18 +1,14 @@
+import type { ObjectValues } from "#types/type-helpers";
+
 /** Union type accepting any TS Enum or `const object`, with or without reverse mapping. */
 export type EnumOrObject = Record<string | number, string | number>;
 
-/**
- * Utility type to extract the enum values from a `const object`,
- * or convert an `enum` interface produced by `typeof Enum` into the union type representing its values.
- */
-export type EnumValues<E> = E[keyof E];
-
 /**
  * Generic type constraint representing a TS numeric enum with reverse mappings.
  * @example
  * TSNumericEnum<typeof WeatherType>
  */
-export type TSNumericEnum<T extends EnumOrObject> = number extends EnumValues<T> ? T : never;
+export type TSNumericEnum<T extends EnumOrObject> = number extends ObjectValues<T> ? T : never;
 
 /** Generic type constraint representing a non reverse-mapped TS enum or `const object`. */
 export type NormalEnum<T extends EnumOrObject> = Exclude<T, TSNumericEnum<T>>;
diff --git a/src/@types/type-helpers.ts b/src/@types/helpers/type-helpers.ts
similarity index 81%
rename from src/@types/type-helpers.ts
rename to src/@types/helpers/type-helpers.ts
index b3e5b1cfc07..37f97fcf08c 100644
--- a/src/@types/type-helpers.ts
+++ b/src/@types/helpers/type-helpers.ts
@@ -6,8 +6,6 @@
 import type { AbAttr } from "#abilities/ability";
 // biome-ignore-end lint/correctness/noUnusedImports: Used in a tsdoc comment
 
-import type { EnumValues } from "#types/enum-types";
-
 /**
  * Exactly matches the type of the argument, preventing adding additional properties.
  *
@@ -37,16 +35,25 @@ export type Mutable<T> = {
 };
 
 /**
- * Type helper to obtain the keys associated with a given value inside a `const object`.
+ * Type helper to obtain the keys associated with a given value inside an object.
  * @typeParam O - The type of the object
  * @typeParam V - The type of one of O's values
  */
-export type InferKeys<O extends Record<keyof any, unknown>, V extends EnumValues<O>> = {
+export type InferKeys<O extends object, V extends ObjectValues<O>> = {
   [K in keyof O]: O[K] extends V ? K : never;
 }[keyof O];
 
 /**
- * Type helper that matches any `Function` type. Equivalent to `Function`, but will not raise a warning from Biome.
+ * Utility type to obtain the values of a given object. \
+ * Functions similar to `keyof E`, except producing the values instead of the keys.
+ * @remarks
+ * This can be used to convert an `enum` interface produced by `typeof Enum` into the union type representing its members.
+ */
+export type ObjectValues<E extends object> = E[keyof E];
+
+/**
+ * Type helper that matches any `Function` type.
+ * Equivalent to `Function`, but will not raise a warning from Biome.
  */
 export type AnyFn = (...args: any[]) => any;
 
@@ -65,6 +72,7 @@ export type NonFunctionProperties<T> = {
 
 /**
  * Type helper to extract out non-function properties from a type, recursively applying to nested properties.
+ * This can be used to mimic the effects of JSON serialization and de-serialization on a given type.
  */
 export type NonFunctionPropertiesRecursive<Class> = {
   [K in keyof Class as Class[K] extends AnyFn ? never : K]: Class[K] extends Array<infer U>
diff --git a/src/@types/modifier-types.ts b/src/@types/modifier-types.ts
index 28b39d1a151..13a84a984e2 100644
--- a/src/@types/modifier-types.ts
+++ b/src/@types/modifier-types.ts
@@ -3,6 +3,7 @@
 import type { Pokemon } from "#field/pokemon";
 import type { ModifierConstructorMap } from "#modifiers/modifier";
 import type { ModifierType, WeightedModifierType } from "#modifiers/modifier-type";
+import type { ObjectValues } from "#types/type-helpers";
 
 export type ModifierTypeFunc = () => ModifierType;
 export type WeightedModifierTypeWeightFunc = (party: Pokemon[], rerollCount?: number) => number;
@@ -19,7 +20,7 @@ export type ModifierInstanceMap = {
 /**
  * Union type of all modifier constructors.
  */
-export type ModifierClass = ModifierConstructorMap[keyof ModifierConstructorMap];
+export type ModifierClass = ObjectValues<ModifierConstructorMap>;
 
 /**
  * Union type of all modifier names as strings.
diff --git a/src/@types/phase-types.ts b/src/@types/phase-types.ts
index 1d68c7921dd..91673053747 100644
--- a/src/@types/phase-types.ts
+++ b/src/@types/phase-types.ts
@@ -1,4 +1,5 @@
 import type { PhaseConstructorMap } from "#app/phase-manager";
+import type { ObjectValues } from "#types/type-helpers";
 
 // Intentionally export the types of everything in phase-manager, as this file is meant to be
 // the centralized place for type definitions for the phase system.
@@ -17,7 +18,7 @@ export type PhaseMap = {
 /**
  * Union type of all phase constructors.
  */
-export type PhaseClass = PhaseConstructorMap[keyof PhaseConstructorMap];
+export type PhaseClass = ObjectValues<PhaseConstructorMap>;
 
 /**
  * Union type of all phase names as strings.
diff --git a/src/enums/ability-attr.ts b/src/enums/ability-attr.ts
index 5f7d107f2d1..a3b9511ad02 100644
--- a/src/enums/ability-attr.ts
+++ b/src/enums/ability-attr.ts
@@ -1,3 +1,5 @@
+import type { ObjectValues } from "#types/type-helpers";
+
 /**
  * Not to be confused with an Ability Attribute.
  * This is an object literal storing the slot that an ability can occupy.
@@ -8,4 +10,4 @@ export const AbilityAttr = Object.freeze({
   ABILITY_HIDDEN: 4,
 });
 
-export type AbilityAttr = typeof AbilityAttr[keyof typeof AbilityAttr];
\ No newline at end of file
+export type AbilityAttr = ObjectValues<typeof AbilityAttr>;
\ No newline at end of file
diff --git a/src/enums/dex-attr.ts b/src/enums/dex-attr.ts
index ee5ceb43ef2..1a98167b4a1 100644
--- a/src/enums/dex-attr.ts
+++ b/src/enums/dex-attr.ts
@@ -1,3 +1,5 @@
+import type { ObjectValues } from "#types/type-helpers";
+
 export const DexAttr = Object.freeze({
   NON_SHINY: 1n,
   SHINY: 2n,
@@ -8,4 +10,4 @@ export const DexAttr = Object.freeze({
   VARIANT_3: 64n,
   DEFAULT_FORM: 128n,
 });
-export type DexAttr = typeof DexAttr[keyof typeof DexAttr];
+export type DexAttr = ObjectValues<typeof DexAttr>;
diff --git a/src/enums/gacha-types.ts b/src/enums/gacha-types.ts
index cd0bc67eae0..08f147b27b1 100644
--- a/src/enums/gacha-types.ts
+++ b/src/enums/gacha-types.ts
@@ -1,7 +1,9 @@
+import type { ObjectValues } from "#types/type-helpers";
+
 export const GachaType = Object.freeze({
     MOVE: 0,
     LEGENDARY: 1,
     SHINY: 2
 });
 
-export type GachaType = typeof GachaType[keyof typeof GachaType];
+export type GachaType = ObjectValues<typeof GachaType>;
diff --git a/src/enums/hit-check-result.ts b/src/enums/hit-check-result.ts
index cf8a2b17194..0866050341e 100644
--- a/src/enums/hit-check-result.ts
+++ b/src/enums/hit-check-result.ts
@@ -1,3 +1,5 @@
+import type { ObjectValues } from "#types/type-helpers";
+
 /** The result of a hit check calculation */
 export const HitCheckResult = {
   /** Hit checks haven't been evaluated yet in this pass */
@@ -20,4 +22,4 @@ export const HitCheckResult = {
   ERROR: 8,
 } as const;
 
-export type HitCheckResult = typeof HitCheckResult[keyof typeof HitCheckResult];
+export type HitCheckResult = ObjectValues<typeof HitCheckResult>;
diff --git a/src/utils/enums.ts b/src/utils/enums.ts
index 98cb4272ee9..25ee864794c 100644
--- a/src/utils/enums.ts
+++ b/src/utils/enums.ts
@@ -1,5 +1,5 @@
-import type { EnumOrObject, EnumValues, NormalEnum, TSNumericEnum } from "#app/@types/enum-types";
-import type { InferKeys } from "#app/@types/type-helpers";
+import type { EnumOrObject, NormalEnum, TSNumericEnum } from "#types/enum-types";
+import type { InferKeys, ObjectValues } from "#types/type-helpers";
 
 /**
  * Return the string keys of an Enum object, excluding reverse-mapped numbers.
@@ -61,7 +61,7 @@ export function getEnumValues<E extends EnumOrObject>(enumType: TSNumericEnum<E>
  * If multiple keys map to the same value, the first one (in insertion order) will be retrieved,
  * but the return type will be the union of ALL their corresponding keys.
  */
-export function enumValueToKey<T extends EnumOrObject, V extends EnumValues<T>>(
+export function enumValueToKey<T extends EnumOrObject, V extends ObjectValues<T>>(
   object: NormalEnum<T>,
   val: V,
 ): InferKeys<T, V> {
diff --git a/test/types/enum-types.test-d.ts b/test/types/enum-types.test-d.ts
index 396c479e85a..3d03098c2ad 100644
--- a/test/types/enum-types.test-d.ts
+++ b/test/types/enum-types.test-d.ts
@@ -1,5 +1,6 @@
-import type { EnumOrObject, EnumValues, NormalEnum, TSNumericEnum } from "#app/@types/enum-types";
 import type { enumValueToKey, getEnumKeys, getEnumValues } from "#app/utils/enums";
+import type { EnumOrObject, NormalEnum, TSNumericEnum } from "#types/enum-types";
+import type { ObjectValues } from "#types/type-helpers";
 import { describe, expectTypeOf, it } from "vitest";
 
 enum testEnumNum {
@@ -16,21 +17,33 @@ const testObjNum = { testON1: 1, testON2: 2 } as const;
 
 const testObjString = { testOS1: "apple", testOS2: "banana" } as const;
 
-describe("Enum Type Helpers", () => {
-  describe("EnumValues", () => {
-    it("should go from enum object type to value type", () => {
-      expectTypeOf<EnumValues<typeof testEnumNum>>().toEqualTypeOf<testEnumNum>();
-      expectTypeOf<EnumValues<typeof testEnumNum>>().branded.toEqualTypeOf<1 | 2>();
+interface testObject {
+  key_1: "1";
+  key_2: "2";
+  key_3: "3";
+}
 
-      expectTypeOf<EnumValues<typeof testEnumString>>().toEqualTypeOf<testEnumString>();
-      expectTypeOf<EnumValues<typeof testEnumString>>().toEqualTypeOf<testEnumString.testS1 | testEnumString.testS2>();
-      expectTypeOf<EnumValues<typeof testEnumString>>().toMatchTypeOf<"apple" | "banana">();
+describe("Enum Type Helpers", () => {
+  describe("ObjectValues", () => {
+    it("should produce a union of an object's values", () => {
+      expectTypeOf<ObjectValues<testObject>>().toEqualTypeOf<"1" | "2" | "3">();
+    });
+
+    it("should go from enum object type to value type", () => {
+      expectTypeOf<ObjectValues<typeof testEnumNum>>().toEqualTypeOf<testEnumNum>();
+      expectTypeOf<ObjectValues<typeof testEnumNum>>().branded.toEqualTypeOf<1 | 2>();
+
+      expectTypeOf<ObjectValues<typeof testEnumString>>().toEqualTypeOf<testEnumString>();
+      expectTypeOf<ObjectValues<typeof testEnumString>>().toEqualTypeOf<
+        testEnumString.testS1 | testEnumString.testS2
+      >();
+
+      expectTypeOf<ObjectValues<typeof testEnumString>>().toExtend<"apple" | "banana">();
     });
 
     it("should produce union of const object values as type", () => {
-      expectTypeOf<EnumValues<typeof testObjNum>>().toEqualTypeOf<1 | 2>();
-
-      expectTypeOf<EnumValues<typeof testObjString>>().toEqualTypeOf<"apple" | "banana">();
+      expectTypeOf<ObjectValues<typeof testObjNum>>().toEqualTypeOf<1 | 2>();
+      expectTypeOf<ObjectValues<typeof testObjString>>().toEqualTypeOf<"apple" | "banana">();
     });
   });
 
@@ -38,7 +51,6 @@ describe("Enum Type Helpers", () => {
     it("should match numeric enums", () => {
       expectTypeOf<TSNumericEnum<typeof testEnumNum>>().toEqualTypeOf<typeof testEnumNum>();
     });
-
     it("should not match string enums or const objects", () => {
       expectTypeOf<TSNumericEnum<typeof testEnumString>>().toBeNever();
       expectTypeOf<TSNumericEnum<typeof testObjNum>>().toBeNever();
@@ -59,19 +71,19 @@ describe("Enum Type Helpers", () => {
 
   describe("EnumOrObject", () => {
     it("should match any enum or const object", () => {
-      expectTypeOf<typeof testEnumNum>().toMatchTypeOf<EnumOrObject>();
-      expectTypeOf<typeof testEnumString>().toMatchTypeOf<EnumOrObject>();
-      expectTypeOf<typeof testObjNum>().toMatchTypeOf<EnumOrObject>();
-      expectTypeOf<typeof testObjString>().toMatchTypeOf<EnumOrObject>();
+      expectTypeOf<typeof testEnumNum>().toExtend<EnumOrObject>();
+      expectTypeOf<typeof testEnumString>().toExtend<EnumOrObject>();
+      expectTypeOf<typeof testObjNum>().toExtend<EnumOrObject>();
+      expectTypeOf<typeof testObjString>().toExtend<EnumOrObject>();
     });
 
     it("should not match an enum value union w/o typeof", () => {
-      expectTypeOf<testEnumNum>().not.toMatchTypeOf<EnumOrObject>();
-      expectTypeOf<testEnumString>().not.toMatchTypeOf<EnumOrObject>();
+      expectTypeOf<testEnumNum>().not.toExtend<EnumOrObject>();
+      expectTypeOf<testEnumString>().not.toExtend<EnumOrObject>();
     });
 
     it("should be equivalent to `TSNumericEnum | NormalEnum`", () => {
-      expectTypeOf<EnumOrObject>().branded.toEqualTypeOf<TSNumericEnum<EnumOrObject> | NormalEnum<EnumOrObject>>();
+      expectTypeOf<EnumOrObject>().toEqualTypeOf<TSNumericEnum<EnumOrObject> | NormalEnum<EnumOrObject>>();
     });
   });
 });
@@ -80,6 +92,7 @@ describe("Enum Functions", () => {
   describe("getEnumKeys", () => {
     it("should retrieve keys of numeric enum", () => {
       expectTypeOf<typeof getEnumKeys<typeof testEnumNum>>().returns.toEqualTypeOf<("testN1" | "testN2")[]>();
+      expectTypeOf<typeof getEnumKeys<typeof testObjNum>>().returns.toEqualTypeOf<("testON1" | "testON2")[]>();
     });
   });
 
diff --git a/tsconfig.json b/tsconfig.json
index 9aa06829789..dcbf7456df8 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -49,7 +49,7 @@
         "./system/*.ts"
       ],
       "#trainers/*": ["./data/trainers/*.ts"],
-      "#types/*": ["./@types/*.ts", "./typings/phaser/*.ts"],
+      "#types/*": ["./@types/helpers/*.ts", "./@types/*.ts", "./typings/phaser/*.ts"],
       "#ui/*": ["./ui/battle-info/*.ts", "./ui/settings/*.ts", "./ui/*.ts"],
       "#utils/*": ["./utils/*.ts"],
       "#data/*": ["./data/pokemon-forms/*.ts", "./data/pokemon/*.ts", "./data/*.ts"],

From 9475505cd221d87cf3774bae4a1830d1201b4ffa Mon Sep 17 00:00:00 2001
From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Date: Wed, 30 Jul 2025 20:59:14 -0600
Subject: [PATCH 33/44] [Misc] Improve type signatures of serialized
 arena/battler tags (#6180)

* Improve type signatures of serialized arena/battler tags

* Minor adjustments to tsdocs from code review

Co-authored-by: Bertie690 <136088738+Bertie690@users.noreply.github.com>

---------

Co-authored-by: Bertie690 <136088738+Bertie690@users.noreply.github.com>
---
 src/@types/arena-tags.ts   |  9 ++--
 src/@types/battler-tags.ts |  9 ++++
 src/data/arena-tag.ts      | 90 ++++++++++++++++++++++++--------------
 src/data/battler-tags.ts   | 45 +++++++++++++++----
 4 files changed, 105 insertions(+), 48 deletions(-)

diff --git a/src/@types/arena-tags.ts b/src/@types/arena-tags.ts
index 9ccccb1df5c..cfdce4350da 100644
--- a/src/@types/arena-tags.ts
+++ b/src/@types/arena-tags.ts
@@ -1,6 +1,5 @@
 import type { ArenaTagTypeMap } from "#data/arena-tag";
 import type { ArenaTagType } from "#enums/arena-tag-type";
-import type { NonFunctionProperties } from "#types/type-helpers";
 
 /** Subset of {@linkcode ArenaTagType}s that apply some negative effect to pokemon that switch in ({@link https://bulbapedia.bulbagarden.net/wiki/List_of_moves_that_cause_entry_hazards#List_of_traps | entry hazards} and Imprison. */
 export type ArenaTrapTagType =
@@ -30,13 +29,13 @@ export type NonSerializableArenaTagType = ArenaTagType.NONE | TurnProtectArenaTa
 export type SerializableArenaTagType = Exclude<ArenaTagType, NonSerializableArenaTagType>;
 
 /**
- * Type-safe representation of the serializable data of an ArenaTag
+ * Type-safe representation of an arbitrary, serialized Arena Tag
  */
-export type ArenaTagTypeData = NonFunctionProperties<
+export type ArenaTagTypeData = Parameters<
   ArenaTagTypeMap[keyof {
     [K in keyof ArenaTagTypeMap as K extends SerializableArenaTagType ? K : never]: ArenaTagTypeMap[K];
-  }]
->;
+  }]["loadTag"]
+>[0];
 
 /** Dummy, typescript-only declaration to ensure that
  * {@linkcode ArenaTagTypeMap} has a map for all ArenaTagTypes.
diff --git a/src/@types/battler-tags.ts b/src/@types/battler-tags.ts
index d1ff93e0400..0057280e4e5 100644
--- a/src/@types/battler-tags.ts
+++ b/src/@types/battler-tags.ts
@@ -108,6 +108,15 @@ export type SerializableBattlerTagType = keyof {
  */
 export type NonSerializableBattlerTagType = Exclude<BattlerTagType, SerializableBattlerTagType>;
 
+/**
+ * Type-safe representation of an arbitrary, serialized Battler Tag
+ */
+export type BattlerTagTypeData = Parameters<
+  BattlerTagTypeMap[keyof {
+    [K in keyof BattlerTagTypeMap as K extends SerializableBattlerTagType ? K : never]: BattlerTagTypeMap[K];
+  }]["loadTag"]
+>[0];
+
 /**
  * Dummy, typescript-only declaration to ensure that
  * {@linkcode BattlerTagTypeMap} has an entry for all `BattlerTagType`s.
diff --git a/src/data/arena-tag.ts b/src/data/arena-tag.ts
index 2c4c8a04282..b24fd17e0e3 100644
--- a/src/data/arena-tag.ts
+++ b/src/data/arena-tag.ts
@@ -26,38 +26,58 @@ import type {
   ArenaTrapTagType,
   SerializableArenaTagType,
 } from "#types/arena-tags";
-import type { Mutable, NonFunctionProperties } from "#types/type-helpers";
+import type { Mutable } from "#types/type-helpers";
 import { BooleanHolder, isNullOrUndefined, NumberHolder, toDmgValue } from "#utils/common";
 import i18next from "i18next";
 
-/*
-ArenaTags are are meant for effects that are tied to the arena (as opposed to a specific pokemon).
-Examples include (but are not limited to)
-- Cross-turn effects that persist even if the user/target switches out, such as Wish, Future Sight, and Happy Hour
-- Effects that are applied to a specific side of the field, such as Crafty Shield, Reflect, and Spikes
-- Field-Effects, like Gravity and Trick Room
-
-Any arena tag that persists across turns *must* extend from `SerializableArenaTag` in the class definition signature.
-
-Serializable ArenaTags have strict rules for their fields.
-These rules ensure that only the data necessary to reconstruct the tag is serialized, and that the
-session loader is able to deserialize saved tags correctly.
-
-If the data is static (i.e. it is always the same for all instances of the class, such as the 
-type that is weakened by Mud Sport/Water Sport), then it must not be defined as a field, and must
-instead be defined as a getter.
-A static property is also acceptable, though static properties are less ergonomic with inheritance.
-
-If the data is mutable (i.e. it can change over the course of the tag's lifetime), then it *must*
-be defined as a field, and it must be set in the `loadTag` method.
-Such fields cannot be marked as `private/protected`, as if they were, typescript would omit them from
-types that are based off of the class, namely, `ArenaTagTypeData`. It is preferrable to trade the
-type-safety of private/protected fields for the type safety when deserializing arena tags from save data.
-
-For data that is mutable only within a turn (e.g. SuppressAbilitiesTag's beingRemoved field),
-where it does not make sense to be serialized, the field should use ES2020's private field syntax (a `#` prepended to the field name).
-If the field should be accessible outside of the class, then a public getter should be used.
-*/
+/**
+ * @module
+ * ArenaTags are are meant for effects that are tied to the arena (as opposed to a specific pokemon).
+ * Examples include (but are not limited to)
+ * - Cross-turn effects that persist even if the user/target switches out, such as Wish, Future Sight, and Happy Hour
+ * - Effects that are applied to a specific side of the field, such as Crafty Shield, Reflect, and Spikes
+ * - Field-Effects, like Gravity and Trick Room
+ *
+ * Any arena tag that persists across turns *must* extend from `SerializableArenaTag` in the class definition signature.
+ *
+ * Serializable ArenaTags have strict rules for their fields.
+ * These rules ensure that only the data necessary to reconstruct the tag is serialized, and that the
+ * session loader is able to deserialize saved tags correctly.
+ *
+ * If the data is static (i.e. it is always the same for all instances of the class, such as the
+ * type that is weakened by Mud Sport/Water Sport), then it must not be defined as a field, and must
+ * instead be defined as a getter.
+ * A static property is also acceptable, though static properties are less ergonomic with inheritance.
+ *
+ * If the data is mutable (i.e. it can change over the course of the tag's lifetime), then it *must*
+ * be defined as a field, and it must be set in the `loadTag` method.
+ * Such fields cannot be marked as `private`/`protected`; if they were, Typescript would omit them from
+ * types that are based off of the class, namely, `ArenaTagTypeData`. It is preferrable to trade the
+ * type-safety of private/protected fields for the type safety when deserializing arena tags from save data.
+ *
+ * For data that is mutable only within a turn (e.g. SuppressAbilitiesTag's beingRemoved field),
+ * where it does not make sense to be serialized, the field should use ES2020's
+ * [private field syntax](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Classes/Private_elements#private_fields).
+ * If the field should be accessible outside of the class, then a public getter should be used.
+ *
+ *  If any new serializable fields *are* added, then the class *must* override the
+ * `loadTag` method to set the new fields. Its signature *must* match the example below,
+ * ```
+ * class ExampleTag extends SerializableArenaTag {
+ *   // Example, if we add 2 new fields that should be serialized:
+ *   public a: string;
+ *   public b: number;
+ *   // Then we must also define a loadTag method with one of the following signatures
+ *   public override loadTag(source: BaseArenaTag & Pick<ExampleTag, "tagType" | "a" | "b"): void;
+ *   public override loadTag<const T extends this>(source: BaseArenaTag & Pick<T, "tagType" | "a" | "b">): void;
+ *   public override loadTag(source: NonFunctionProperties<ExampleTag>): void;
+ * }
+ * ```
+ * Notes
+ * - If the class has any subclasses, then the second form of `loadTag` *must* be used.
+ * - The third form *must not* be used if the class has any getters, as typescript would expect such fields to be
+ *   present in `source`.
+ */
 
 /** Interface containing the serializable fields of ArenaTagData. */
 interface BaseArenaTag {
@@ -141,9 +161,9 @@ export abstract class ArenaTag implements BaseArenaTag {
   /**
    * When given a arena tag or json representing one, load the data for it.
    * This is meant to be inherited from by any arena tag with custom attributes
-   * @param source - The {@linkcode BaseArenaTag} being loaded
+   * @param source - The arena tag being loaded
    */
-  loadTag(source: BaseArenaTag): void {
+  loadTag<const T extends this>(source: BaseArenaTag & Pick<T, "tagType">): void {
     this.turnCount = source.turnCount;
     this.sourceMove = source.sourceMove;
     this.sourceId = source.sourceId;
@@ -646,7 +666,9 @@ class WishTag extends SerializableArenaTag {
     }
   }
 
-  override loadTag(source: NonFunctionProperties<WishTag>): void {
+  public override loadTag<const T extends this>(
+    source: BaseArenaTag & Pick<T, "tagType" | "healHp" | "sourceName" | "battlerIndex">,
+  ): void {
     super.loadTag(source);
     (this as Mutable<this>).battlerIndex = source.battlerIndex;
     (this as Mutable<this>).healHp = source.healHp;
@@ -813,7 +835,7 @@ export abstract class ArenaTrapTag extends SerializableArenaTag {
       : Phaser.Math.Linear(0, 1 / Math.pow(2, this.layers), Math.min(pokemon.getHpRatio(), 0.5) * 2);
   }
 
-  loadTag(source: NonFunctionProperties<ArenaTrapTag>): void {
+  public loadTag<T extends this>(source: BaseArenaTag & Pick<T, "tagType" | "layers" | "maxLayers">): void {
     super.loadTag(source);
     this.layers = source.layers;
     this.maxLayers = source.maxLayers;
@@ -1581,7 +1603,7 @@ export class SuppressAbilitiesTag extends SerializableArenaTag {
     this.#beingRemoved = false;
   }
 
-  public override loadTag(source: NonFunctionProperties<SuppressAbilitiesTag>): void {
+  public override loadTag(source: BaseArenaTag & Pick<SuppressAbilitiesTag, "tagType" | "sourceCount">): void {
     super.loadTag(source);
     (this as Mutable<this>).sourceCount = source.sourceCount;
   }
diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts
index 9dfd43eccb3..e21065c184f 100644
--- a/src/data/battler-tags.ts
+++ b/src/data/battler-tags.ts
@@ -69,6 +69,24 @@ import { BooleanHolder, coerceArray, getFrameMs, isNullOrUndefined, NumberHolder
  * be declared as a public readonly propety. Then, in the `loadTag` method (or any method inside the class that needs to adjust the property)
  * use `(this as Mutable<this>).propertyName = value;`
  * These rules ensure that Typescript is aware of the shape of the serialized version of the class.
+ *
+ * If any new serializable fields *are* added, then the class *must* override the
+ * `loadTag` method to set the new fields. Its signature *must* match the example below:
+ * ```
+ * class ExampleTag extends SerializableBattlerTag {
+ *   // Example, if we add 2 new fields that should be serialized:
+ *   public a: string;
+ *   public b: number;
+ *   // Then we must also define a loadTag method with one of the following signatures
+ *   public override loadTag(source: BaseBattlerTag & Pick<ExampleTag, "tagType" | "a" | "b"): void;
+ *   public override loadTag<const T extends this>(source: BaseBattlerTag & Pick<T, "tagType" | "a" | "b">): void;
+ *   public override loadTag(source: NonFunctionProperties<ExampleTag>): void;
+ * }
+ * ```
+ * Notes
+ * - If the class has any subclasses, then the second form of `loadTag` *must* be used.
+ * - The third form *must not* be used if the class has any getters, as typescript would expect such fields to be
+ *   present in `source`.
  */
 
 /** Interface containing the serializable fields of BattlerTag */
@@ -168,7 +186,7 @@ export class BattlerTag implements BaseBattlerTag {
    * Should be inherited from by any battler tag with custom attributes.
    * @param source - An object containing the fields needed to reconstruct this tag.
    */
-  loadTag(source: BaseBattlerTag): void {
+  public loadTag<const T extends this>(source: BaseBattlerTag & Pick<T, "tagType">): void {
     this.turnCount = source.turnCount;
     this.sourceMove = source.sourceMove;
     this.sourceId = source.sourceId;
@@ -386,7 +404,7 @@ export class DisabledTag extends MoveRestrictionBattlerTag {
     });
   }
 
-  override loadTag(source: NonFunctionProperties<DisabledTag>): void {
+  public override loadTag(source: BaseBattlerTag & Pick<DisabledTag, "tagType" | "moveId">): void {
     super.loadTag(source);
     (this as Mutable<this>).moveId = source.moveId;
   }
@@ -437,7 +455,7 @@ export class GorillaTacticsTag extends MoveRestrictionBattlerTag {
    * Loads the Gorilla Tactics Battler Tag along with its unique class variable moveId
    * @param source - Object containing the fields needed to reconstruct this tag.
    */
-  override loadTag(source: NonFunctionProperties<GorillaTacticsTag>): void {
+  public override loadTag(source: BaseBattlerTag & Pick<GorillaTacticsTag, "tagType" | "moveId">): void {
     super.loadTag(source);
     (this as Mutable<GorillaTacticsTag>).moveId = source.moveId;
   }
@@ -971,6 +989,12 @@ export class InfatuatedTag extends SerializableBattlerTag {
   }
 }
 
+/**
+ * Battler tag for the "Seeded" effect applied by {@linkcode MoveId.LEECH_SEED | Leech Seed} and
+ * {@linkcode MoveId.SAPPY_SEED | Sappy Seed}
+ *
+ * @sealed
+ */
 export class SeedTag extends SerializableBattlerTag {
   public override readonly tagType = BattlerTagType.SEEDED;
   public readonly sourceIndex: BattlerIndex;
@@ -983,7 +1007,7 @@ export class SeedTag extends SerializableBattlerTag {
    * When given a battler tag or json representing one, load the data for it.
    * @param source - An object containing the fields needed to reconstruct this tag.
    */
-  override loadTag(source: NonFunctionProperties<SeedTag>): void {
+  public override loadTag(source: BaseBattlerTag & Pick<SeedTag, "tagType" | "sourceIndex">): void {
     super.loadTag(source);
     (this as Mutable<this>).sourceIndex = source.sourceIndex;
   }
@@ -1194,6 +1218,7 @@ export class FrenzyTag extends SerializableBattlerTag {
 /**
  * Applies the effects of {@linkcode MoveId.ENCORE} onto the target Pokemon.
  * Encore forces the target Pokemon to use its most-recent move for 3 turns.
+ * @sealed
  */
 export class EncoreTag extends MoveRestrictionBattlerTag {
   public override readonly tagType = BattlerTagType.ENCORE;
@@ -1210,7 +1235,7 @@ export class EncoreTag extends MoveRestrictionBattlerTag {
     );
   }
 
-  override loadTag(source: NonFunctionProperties<EncoreTag>): void {
+  public override loadTag(source: NonFunctionProperties<EncoreTag>): void {
     super.loadTag(source);
     this.moveId = source.moveId;
   }
@@ -2085,7 +2110,7 @@ export class HighestStatBoostTag extends AbilityBattlerTag {
    * When given a battler tag or json representing one, load the data for it.
    * @param source - An object containing the fields needed to reconstruct this tag.
    */
-  loadTag(source: NonFunctionProperties<HighestStatBoostTag>): void {
+  public override loadTag<T extends this>(source: BaseBattlerTag & Pick<T, "tagType" | "stat" | "multiplier">): void {
     super.loadTag(source);
     this.stat = source.stat as Stat;
     this.multiplier = source.multiplier;
@@ -2564,6 +2589,7 @@ export class IceFaceBlockDamageTag extends FormBlockDamageTag {
 /**
  * Battler tag indicating a Tatsugiri with {@link https://bulbapedia.bulbagarden.net/wiki/Commander_(Ability) | Commander}
  * has entered the tagged Pokemon's mouth.
+ * @sealed
  */
 export class CommandedTag extends SerializableBattlerTag {
   public override readonly tagType = BattlerTagType.COMMANDED;
@@ -2607,6 +2633,7 @@ export class CommandedTag extends SerializableBattlerTag {
  * - Stat changes on removal of (all) stacks.
  *   - Removing stacks decreases DEF and SPDEF, independently, by one stage for each stack that successfully changed
  *     the stat when added.
+ * @sealed
  */
 export class StockpilingTag extends SerializableBattlerTag {
   public override readonly tagType = BattlerTagType.STOCKPILING;
@@ -2632,7 +2659,7 @@ export class StockpilingTag extends SerializableBattlerTag {
     }
   };
 
-  override loadTag(source: NonFunctionProperties<StockpilingTag>): void {
+  public override loadTag(source: NonFunctionProperties<StockpilingTag>): void {
     super.loadTag(source);
     this.stockpiledCount = source.stockpiledCount || 0;
     this.statChangeCounts = {
@@ -2979,7 +3006,7 @@ export class AutotomizedTag extends SerializableBattlerTag {
     this.onAdd(pokemon);
   }
 
-  loadTag(source: NonFunctionProperties<AutotomizedTag>): void {
+  public override loadTag(source: NonFunctionProperties<AutotomizedTag>): void {
     super.loadTag(source);
     this.autotomizeCount = source.autotomizeCount;
   }
@@ -3129,7 +3156,7 @@ export class SubstituteTag extends SerializableBattlerTag {
    * When given a battler tag or json representing one, load the data for it.
    * @param source - An object containing the necessary properties to load the tag
    */
-  override loadTag(source: NonFunctionProperties<SubstituteTag>): void {
+  public override loadTag(source: BaseBattlerTag & Pick<SubstituteTag, "tagType" | "hp">): void {
     super.loadTag(source);
     this.hp = source.hp;
   }

From 12acaa959048e0604fe3529a3be2ba0f53bf8184 Mon Sep 17 00:00:00 2001
From: Bertie690 <136088738+Bertie690@users.noreply.github.com>
Date: Wed, 30 Jul 2025 23:55:52 -0400
Subject: [PATCH 34/44] [Balance] Updated SF/Triage interactions for moves
 (#6179)

* Fixed move flags

* Disabled order up interactionn with sheer force

* Update src/data/moves/move.ts

* Removed order up test that no longer applies

shouldn't have been there in the first place
---
 src/data/moves/move.ts      | 24 ++++++++++++------------
 src/enums/move-flags.ts     | 14 +++++++++-----
 test/moves/order-up.test.ts | 19 -------------------
 3 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts
index e6673f31826..8557768bc03 100644
--- a/src/data/moves/move.ts
+++ b/src/data/moves/move.ts
@@ -423,9 +423,8 @@ export abstract class Move implements Localizable {
 
   /**
    * Sets the {@linkcode MoveFlags.MAKES_CONTACT} flag for the calling Move
-   * @param setFlag Default `true`, set to `false` if the move doesn't make contact
-   * @see {@linkcode AbilityId.STATIC}
-   * @returns The {@linkcode Move} that called this function
+   * @param setFlag - Whether the move should make contact; default `true`
+   * @returns `this`
    */
   makesContact(setFlag: boolean = true): this {
     this.setFlag(MoveFlags.MAKES_CONTACT, setFlag);
@@ -3576,8 +3575,7 @@ export class CutHpStatStageBoostAttr extends StatStageChangeAttr {
 /**
  * Attribute implementing the stat boosting effect of {@link https://bulbapedia.bulbagarden.net/wiki/Order_Up_(move) | Order Up}.
  * If the user has a Pokemon with {@link https://bulbapedia.bulbagarden.net/wiki/Commander_(Ability) | Commander} in their mouth,
- * one of the user's stats are increased by 1 stage, depending on the "commanding" Pokemon's form. This effect does not respect
- * effect chance, but Order Up itself may be boosted by Sheer Force.
+ * one of the user's stats are increased by 1 stage, depending on the "commanding" Pokemon's form.
  */
 export class OrderUpStatBoostAttr extends MoveEffectAttr {
   constructor() {
@@ -9228,7 +9226,7 @@ export function initMoves() {
     new SelfStatusMove(MoveId.STOCKPILE, PokemonType.NORMAL, -1, 20, -1, 0, 3)
       .condition(user => (user.getTag(StockpilingTag)?.stockpiledCount ?? 0) < 3)
       .attr(AddBattlerTagAttr, BattlerTagType.STOCKPILING, true),
-    new AttackMove(MoveId.SPIT_UP, PokemonType.NORMAL, MoveCategory.SPECIAL, -1, -1, 10, -1, 0, 3)
+    new AttackMove(MoveId.SPIT_UP, PokemonType.NORMAL, MoveCategory.SPECIAL, -1, 100, 10, -1, 0, 3)
       .condition(hasStockpileStacksCondition)
       .attr(SpitUpPowerAttr, 100)
       .attr(RemoveBattlerTagAttr, [ BattlerTagType.STOCKPILING ], true),
@@ -9471,7 +9469,7 @@ export function initMoves() {
     new AttackMove(MoveId.SAND_TOMB, PokemonType.GROUND, MoveCategory.PHYSICAL, 35, 85, 15, -1, 0, 3)
       .attr(TrapAttr, BattlerTagType.SAND_TOMB)
       .makesContact(false),
-    new AttackMove(MoveId.SHEER_COLD, PokemonType.ICE, MoveCategory.SPECIAL, 200, 20, 5, -1, 0, 3)
+    new AttackMove(MoveId.SHEER_COLD, PokemonType.ICE, MoveCategory.SPECIAL, 200, 30, 5, -1, 0, 3)
       .attr(IceNoEffectTypeAttr)
       .attr(OneHitKOAttr)
       .attr(SheerColdAccuracyAttr),
@@ -10393,7 +10391,7 @@ export function initMoves() {
       .attr(RemoveBattlerTagAttr, [ BattlerTagType.FLYING, BattlerTagType.FLOATING, BattlerTagType.TELEKINESIS ])
       .makesContact(false)
       .target(MoveTarget.ALL_NEAR_ENEMIES),
-    new AttackMove(MoveId.THOUSAND_WAVES, PokemonType.GROUND, MoveCategory.PHYSICAL, 90, 100, 10, -1, 0, 6)
+    new AttackMove(MoveId.THOUSAND_WAVES, PokemonType.GROUND, MoveCategory.PHYSICAL, 90, 100, 10, 100, 0, 6)
       .attr(AddBattlerTagAttr, BattlerTagType.TRAPPED, false, false, 1, 1, true)
       .makesContact(false)
       .target(MoveTarget.ALL_NEAR_ENEMIES),
@@ -10928,7 +10926,8 @@ export function initMoves() {
     new StatusMove(MoveId.LIFE_DEW, PokemonType.WATER, -1, 10, -1, 0, 8)
       .attr(HealAttr, 0.25, true, false)
       .target(MoveTarget.USER_AND_ALLIES)
-      .ignoresProtect(),
+      .ignoresProtect()
+      .triageMove(),
     new SelfStatusMove(MoveId.OBSTRUCT, PokemonType.DARK, 100, 10, -1, 4, 8)
       .attr(ProtectAttr, BattlerTagType.OBSTRUCT)
       .condition(failIfLastCondition),
@@ -11006,7 +11005,8 @@ export function initMoves() {
     new StatusMove(MoveId.JUNGLE_HEALING, PokemonType.GRASS, -1, 10, -1, 0, 8)
       .attr(HealAttr, 0.25, true, false)
       .attr(HealStatusEffectAttr, false, getNonVolatileStatusEffects())
-      .target(MoveTarget.USER_AND_ALLIES),
+      .target(MoveTarget.USER_AND_ALLIES)
+      .triageMove(),
     new AttackMove(MoveId.WICKED_BLOW, PokemonType.DARK, MoveCategory.PHYSICAL, 75, 100, 5, -1, 0, 8)
       .attr(CritOnlyAttr)
       .punchingMove(),
@@ -11234,7 +11234,7 @@ export function initMoves() {
       .makesContact(false),
     new AttackMove(MoveId.LUMINA_CRASH, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 80, 100, 10, 100, 0, 9)
       .attr(StatStageChangeAttr, [ Stat.SPDEF ], -2),
-    new AttackMove(MoveId.ORDER_UP, PokemonType.DRAGON, MoveCategory.PHYSICAL, 80, 100, 10, 100, 0, 9)
+    new AttackMove(MoveId.ORDER_UP, PokemonType.DRAGON, MoveCategory.PHYSICAL, 80, 100, 10, -1, 0, 9)
       .attr(OrderUpStatBoostAttr)
       .makesContact(false),
     new AttackMove(MoveId.JET_PUNCH, PokemonType.WATER, MoveCategory.PHYSICAL, 60, 100, 15, -1, 1, 9)
@@ -11417,7 +11417,7 @@ export function initMoves() {
       .attr(IvyCudgelTypeAttr)
       .attr(HighCritAttr)
       .makesContact(false),
-    new ChargingAttackMove(MoveId.ELECTRO_SHOT, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 130, 100, 10, 100, 0, 9)
+    new ChargingAttackMove(MoveId.ELECTRO_SHOT, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 130, 100, 10, -1, 0, 9)
       .chargeText(i18next.t("moveTriggers:absorbedElectricity", { pokemonName: "{USER}" }))
       .chargeAttr(StatStageChangeAttr, [ Stat.SPATK ], 1, true)
       .chargeAttr(WeatherInstantChargeAttr, [ WeatherType.RAIN, WeatherType.HEAVY_RAIN ]),
diff --git a/src/enums/move-flags.ts b/src/enums/move-flags.ts
index 06de265df09..6cdc1e5f8cc 100644
--- a/src/enums/move-flags.ts
+++ b/src/enums/move-flags.ts
@@ -4,15 +4,19 @@
  */
 export enum MoveFlags {
   NONE = 0,
+  /**
+   * Whether the move makes contact.
+   * Set by default on all contact moves, and unset by default on all special moves.
+   */
   MAKES_CONTACT = 1 << 0,
   IGNORE_PROTECT = 1 << 1,
   /**
    * Sound-based moves have the following effects:
-   * - Pokemon with the {@linkcode AbilityId.SOUNDPROOF Soundproof Ability} are unaffected by other Pokemon's sound-based moves.
-   * - Pokemon affected by {@linkcode MoveId.THROAT_CHOP Throat Chop} cannot use sound-based moves for two turns.
-   * - Sound-based moves used by a Pokemon with {@linkcode AbilityId.LIQUID_VOICE Liquid Voice} become Water-type moves.
-   * - Sound-based moves used by a Pokemon with {@linkcode AbilityId.PUNK_ROCK Punk Rock} are boosted by 30%. Pokemon with Punk Rock also take half damage from sound-based moves.
-   * - All sound-based moves (except Howl) can hit Pokemon behind an active {@linkcode MoveId.SUBSTITUTE Substitute}.
+   * - Pokemon with the {@linkcode AbilityId.SOUNDPROOF | Soundproof}  Ability are unaffected by other Pokemon's sound-based moves.
+   * - Pokemon affected by {@linkcode MoveId.THROAT_CHOP | Throat Chop} cannot use sound-based moves for two turns.
+   * - Sound-based moves used by a Pokemon with {@linkcode AbilityId.LIQUID_VOICE | Liquid Voice} become Water-type moves.
+   * - Sound-based moves used by a Pokemon with {@linkcode AbilityId.PUNK_ROCK | Punk Rock} are boosted by 30%. Pokemon with Punk Rock also take half damage from sound-based moves.
+   * - All sound-based moves (except Howl) can hit Pokemon behind an active {@linkcode MoveId.SUBSTITUTE | Substitute}.
    *
    * cf https://bulbapedia.bulbagarden.net/wiki/Sound-based_move
    */
diff --git a/test/moves/order-up.test.ts b/test/moves/order-up.test.ts
index 2e77d4b2fa7..2da7cc5daf8 100644
--- a/test/moves/order-up.test.ts
+++ b/test/moves/order-up.test.ts
@@ -65,23 +65,4 @@ describe("Moves - Order Up", () => {
       affectedStats.forEach(st => expect(dondozo.getStatStage(st)).toBe(st === stat ? 3 : 2));
     },
   );
-
-  it("should be boosted by Sheer Force while still applying a stat boost", async () => {
-    game.override.passiveAbility(AbilityId.SHEER_FORCE).starterForms({ [SpeciesId.TATSUGIRI]: 0 });
-
-    await game.classicMode.startBattle([SpeciesId.TATSUGIRI, SpeciesId.DONDOZO]);
-
-    const [tatsugiri, dondozo] = game.scene.getPlayerField();
-
-    expect(game.scene.triggerPokemonBattleAnim).toHaveBeenLastCalledWith(tatsugiri, PokemonAnimType.COMMANDER_APPLY);
-    expect(dondozo.getTag(BattlerTagType.COMMANDED)).toBeDefined();
-
-    game.move.select(MoveId.ORDER_UP, 1, BattlerIndex.ENEMY);
-    expect(game.scene.currentBattle.turnCommands[0]?.skip).toBeTruthy();
-
-    await game.phaseInterceptor.to("BerryPhase", false);
-
-    expect(dondozo.waveData.abilitiesApplied.has(AbilityId.SHEER_FORCE)).toBeTruthy();
-    expect(dondozo.getStatStage(Stat.ATK)).toBe(3);
-  });
 });

From f7b87f3d1e330f4fa20c85fc116f5021b4ce60ab Mon Sep 17 00:00:00 2001
From: Bertie690 <136088738+Bertie690@users.noreply.github.com>
Date: Thu, 31 Jul 2025 00:43:06 -0400
Subject: [PATCH 35/44] [Move Bug] Fully implemented Future Sight, Doom Desire;
 fixed Wish Double battle oversight  (#5862)

* Mostly implemented Future Sight/Doom Desire

* Fixed a few docs

* Fixed com

* Update magic_guard.test.ts

* Update documentation

* Update documentation on arena-tag.ts

* Update arena-tag.ts docs

* Update arena-tag.ts

* Update turn-end-phase.ts

* Update move.ts documentation

* Fixed tpyo

* Update move.ts documentation

* Add assorted TODO test cases

* Refactored FS to use a positional tag manager

* Added strong typing to the manager, finished save load stufff

* Fixed locales + tests

* Fixed tests and documentation

* sh
Fixed tests for good

* Fixed MEP

* Reverted overrides changse

* Fixed issues with merging

* Fixed locales update & heal block test

* Fixed wish tests

* Fixed test typo

* Fixed wish test flaking out due to speed ties

* Fixed tests fr fr

* actually fixed tests bc i'm stupid

* Fixed tests for real

* Remove locales update

* Update arena-tag.ts

Co-authored-by: Dean <69436131+emdeann@users.noreply.github.com>

* Update move.ts

Co-authored-by: Dean <69436131+emdeann@users.noreply.github.com>

* Update arena-tag.ts

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>

* Applied review suggestions and added a _wee_ bit more docs

* fixed wish condition

* Applied kev's reviews

* Minor nits

* Minor formatting change in `heal-block.test.ts`

---------

Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Co-authored-by: Dean <69436131+emdeann@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
---
 src/@types/arena-tags.ts                      |   3 -
 src/data/arena-tag.ts                         | 128 +-----
 src/data/moves/move.ts                        | 134 ++++--
 .../positional-tags/load-positional-tag.ts    |  70 ++++
 .../positional-tags/positional-tag-manager.ts |  55 +++
 src/data/positional-tags/positional-tag.ts    | 174 ++++++++
 src/enums/arena-tag-type.ts                   |   3 -
 src/enums/move-use-mode.ts                    |  79 ++--
 src/enums/positional-tag-type.ts              |  10 +
 src/field/arena.ts                            |  51 ++-
 src/phase-manager.ts                          |   2 +
 src/phases/move-effect-phase.ts               |  33 +-
 src/phases/move-phase.ts                      |  17 -
 src/phases/positional-tag-phase.ts            |  21 +
 src/phases/turn-start-phase.ts                |   4 +
 src/system/arena-data.ts                      |   7 +
 src/system/game-data.ts                       |   5 +
 test/moves/delayed-attack.test.ts             | 389 ++++++++++++++++++
 test/moves/future-sight.test.ts               |  45 --
 test/moves/heal-block.test.ts                 |  26 +-
 test/moves/wish.test.ts                       | 183 ++++++++
 test/test-utils/helpers/field-helper.ts       |  12 +-
 test/test-utils/helpers/move-helper.ts        |  12 +-
 test/test-utils/phase-interceptor.ts          |   2 +
 test/types/positional-tags.test-d.ts          |  29 ++
 25 files changed, 1175 insertions(+), 319 deletions(-)
 create mode 100644 src/data/positional-tags/load-positional-tag.ts
 create mode 100644 src/data/positional-tags/positional-tag-manager.ts
 create mode 100644 src/data/positional-tags/positional-tag.ts
 create mode 100644 src/enums/positional-tag-type.ts
 create mode 100644 src/phases/positional-tag-phase.ts
 create mode 100644 test/moves/delayed-attack.test.ts
 delete mode 100644 test/moves/future-sight.test.ts
 create mode 100644 test/moves/wish.test.ts
 create mode 100644 test/types/positional-tags.test-d.ts

diff --git a/src/@types/arena-tags.ts b/src/@types/arena-tags.ts
index cfdce4350da..afcc8a0f924 100644
--- a/src/@types/arena-tags.ts
+++ b/src/@types/arena-tags.ts
@@ -9,9 +9,6 @@ export type ArenaTrapTagType =
   | ArenaTagType.STEALTH_ROCK
   | ArenaTagType.IMPRISON;
 
-/** Subset of {@linkcode ArenaTagType}s that are considered delayed attacks */
-export type ArenaDelayedAttackTagType = ArenaTagType.FUTURE_SIGHT | ArenaTagType.DOOM_DESIRE;
-
 /** Subset of {@linkcode ArenaTagType}s that create {@link https://bulbapedia.bulbagarden.net/wiki/Category:Screen-creating_moves | screens}. */
 export type ArenaScreenTagType = ArenaTagType.REFLECT | ArenaTagType.LIGHT_SCREEN | ArenaTagType.AURORA_VEIL;
 
diff --git a/src/data/arena-tag.ts b/src/data/arena-tag.ts
index b24fd17e0e3..9f2a5e09667 100644
--- a/src/data/arena-tag.ts
+++ b/src/data/arena-tag.ts
@@ -1,3 +1,7 @@
+/** biome-ignore-start lint/correctness/noUnusedImports: TSDoc imports */
+import type { BattlerTag } from "#app/data/battler-tags";
+/** biome-ignore-end lint/correctness/noUnusedImports: TSDoc imports */
+
 import { applyAbAttrs, applyOnGainAbAttrs, applyOnLoseAbAttrs } from "#abilities/apply-ab-attrs";
 import { globalScene } from "#app/global-scene";
 import { getPokemonNameWithAffix } from "#app/messages";
@@ -6,35 +10,32 @@ import { allMoves } from "#data/data-lists";
 import { AbilityId } from "#enums/ability-id";
 import { ArenaTagSide } from "#enums/arena-tag-side";
 import { ArenaTagType } from "#enums/arena-tag-type";
-import type { BattlerIndex } from "#enums/battler-index";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { HitResult } from "#enums/hit-result";
 import { CommonAnim } from "#enums/move-anims-common";
 import { MoveCategory } from "#enums/move-category";
 import { MoveId } from "#enums/move-id";
 import { MoveTarget } from "#enums/move-target";
-import { MoveUseMode } from "#enums/move-use-mode";
 import { PokemonType } from "#enums/pokemon-type";
 import { Stat } from "#enums/stat";
 import { StatusEffect } from "#enums/status-effect";
 import type { Arena } from "#field/arena";
 import type { Pokemon } from "#field/pokemon";
 import type {
-  ArenaDelayedAttackTagType,
   ArenaScreenTagType,
   ArenaTagTypeData,
   ArenaTrapTagType,
   SerializableArenaTagType,
 } from "#types/arena-tags";
 import type { Mutable } from "#types/type-helpers";
-import { BooleanHolder, isNullOrUndefined, NumberHolder, toDmgValue } from "#utils/common";
+import { BooleanHolder, NumberHolder, toDmgValue } from "#utils/common";
 import i18next from "i18next";
 
 /**
  * @module
  * ArenaTags are are meant for effects that are tied to the arena (as opposed to a specific pokemon).
  * Examples include (but are not limited to)
- * - Cross-turn effects that persist even if the user/target switches out, such as Wish, Future Sight, and Happy Hour
+ * - Cross-turn effects that persist even if the user/target switches out, such as Happy Hour
  * - Effects that are applied to a specific side of the field, such as Crafty Shield, Reflect, and Spikes
  * - Field-Effects, like Gravity and Trick Room
  *
@@ -624,58 +625,6 @@ export class NoCritTag extends SerializableArenaTag {
   }
 }
 
-/**
- * Arena Tag class for {@link https://bulbapedia.bulbagarden.net/wiki/Wish_(move) | Wish}.
- * Heals the Pokémon in the user's position the turn after Wish is used.
- */
-class WishTag extends SerializableArenaTag {
-  // The following fields are meant to be inwardly mutable, but outwardly immutable.
-  readonly battlerIndex: BattlerIndex;
-  readonly healHp: number;
-  readonly sourceName: string;
-  // End inwardly mutable fields
-
-  public readonly tagType = ArenaTagType.WISH;
-
-  constructor(turnCount: number, sourceId: number | undefined, side: ArenaTagSide) {
-    super(turnCount, MoveId.WISH, sourceId, side);
-  }
-
-  onAdd(_arena: Arena): void {
-    const source = this.getSourcePokemon();
-    if (!source) {
-      console.warn(`Failed to get source Pokemon for WishTag on add message; id: ${this.sourceId}`);
-      return;
-    }
-
-    (this as Mutable<this>).sourceName = getPokemonNameWithAffix(source);
-    (this as Mutable<this>).healHp = toDmgValue(source.getMaxHp() / 2);
-    (this as Mutable<this>).battlerIndex = source.getBattlerIndex();
-  }
-
-  onRemove(_arena: Arena): void {
-    const target = globalScene.getField()[this.battlerIndex];
-    if (target?.isActive(true)) {
-      globalScene.phaseManager.queueMessage(
-        // TODO: Rename key as it triggers on activation
-        i18next.t("arenaTag:wishTagOnAdd", {
-          pokemonNameWithAffix: this.sourceName,
-        }),
-      );
-      globalScene.phaseManager.unshiftNew("PokemonHealPhase", target.getBattlerIndex(), this.healHp, null, true, false);
-    }
-  }
-
-  public override loadTag<const T extends this>(
-    source: BaseArenaTag & Pick<T, "tagType" | "healHp" | "sourceName" | "battlerIndex">,
-  ): void {
-    super.loadTag(source);
-    (this as Mutable<this>).battlerIndex = source.battlerIndex;
-    (this as Mutable<this>).healHp = source.healHp;
-    (this as Mutable<this>).sourceName = source.sourceName;
-  }
-}
-
 /**
  * Abstract class to implement weakened moves of a specific type.
  */
@@ -1148,48 +1097,6 @@ class StickyWebTag extends ArenaTrapTag {
   }
 }
 
-/**
- * Arena Tag class for delayed attacks, such as {@linkcode MoveId.FUTURE_SIGHT} or {@linkcode MoveId.DOOM_DESIRE}.
- * Delays the attack's effect by a set amount of turns, usually 3 (including the turn the move is used),
- * and deals damage after the turn count is reached.
- */
-export class DelayedAttackTag extends SerializableArenaTag {
-  public targetIndex: BattlerIndex;
-  public readonly tagType: ArenaDelayedAttackTagType;
-
-  constructor(
-    tagType: ArenaTagType.DOOM_DESIRE | ArenaTagType.FUTURE_SIGHT,
-    sourceMove: MoveId | undefined,
-    sourceId: number | undefined,
-    targetIndex: BattlerIndex,
-    side: ArenaTagSide = ArenaTagSide.BOTH,
-  ) {
-    super(3, sourceMove, sourceId, side);
-    this.tagType = tagType;
-    this.targetIndex = targetIndex;
-    this.side = side;
-  }
-
-  lapse(arena: Arena): boolean {
-    const ret = super.lapse(arena);
-
-    if (!ret) {
-      // TODO: This should not add to move history (for Spite)
-      globalScene.phaseManager.unshiftNew(
-        "MoveEffectPhase",
-        this.sourceId!,
-        [this.targetIndex],
-        allMoves[this.sourceMove!],
-        MoveUseMode.FOLLOW_UP,
-      ); // TODO: are those bangs correct?
-    }
-
-    return ret;
-  }
-
-  onRemove(_arena: Arena): void {}
-}
-
 /**
  * Arena Tag class for {@link https://bulbapedia.bulbagarden.net/wiki/Trick_Room_(move) Trick Room}.
  * Reverses the Speed stats for all Pokémon on the field as long as this arena tag is up,
@@ -1685,7 +1592,6 @@ export function getArenaTag(
   turnCount: number,
   sourceMove: MoveId | undefined,
   sourceId: number | undefined,
-  targetIndex?: BattlerIndex,
   side: ArenaTagSide = ArenaTagSide.BOTH,
 ): ArenaTag | null {
   switch (tagType) {
@@ -1711,14 +1617,6 @@ export function getArenaTag(
       return new SpikesTag(sourceId, side);
     case ArenaTagType.TOXIC_SPIKES:
       return new ToxicSpikesTag(sourceId, side);
-    case ArenaTagType.FUTURE_SIGHT:
-    case ArenaTagType.DOOM_DESIRE:
-      if (isNullOrUndefined(targetIndex)) {
-        return null; // If missing target index, no tag is created
-      }
-      return new DelayedAttackTag(tagType, sourceMove, sourceId, targetIndex, side);
-    case ArenaTagType.WISH:
-      return new WishTag(turnCount, sourceId, side);
     case ArenaTagType.STEALTH_ROCK:
       return new StealthRockTag(sourceId, side);
     case ArenaTagType.STICKY_WEB:
@@ -1761,16 +1659,9 @@ export function getArenaTag(
  * @param source - An arena tag
  * @returns The valid arena tag
  */
-export function loadArenaTag(source: (ArenaTag | ArenaTagTypeData) & { targetIndex?: BattlerIndex }): ArenaTag {
+export function loadArenaTag(source: ArenaTag | ArenaTagTypeData): ArenaTag {
   const tag =
-    getArenaTag(
-      source.tagType,
-      source.turnCount,
-      source.sourceMove,
-      source.sourceId,
-      source.targetIndex,
-      source.side,
-    ) ?? new NoneTag();
+    getArenaTag(source.tagType, source.turnCount, source.sourceMove, source.sourceId, source.side) ?? new NoneTag();
   tag.loadTag(source);
   return tag;
 }
@@ -1787,9 +1678,6 @@ export type ArenaTagTypeMap = {
   [ArenaTagType.CRAFTY_SHIELD]: CraftyShieldTag;
   [ArenaTagType.NO_CRIT]: NoCritTag;
   [ArenaTagType.TOXIC_SPIKES]: ToxicSpikesTag;
-  [ArenaTagType.FUTURE_SIGHT]: DelayedAttackTag;
-  [ArenaTagType.DOOM_DESIRE]: DelayedAttackTag;
-  [ArenaTagType.WISH]: WishTag;
   [ArenaTagType.STEALTH_ROCK]: StealthRockTag;
   [ArenaTagType.STICKY_WEB]: StickyWebTag;
   [ArenaTagType.TRICK_ROOM]: TrickRoomTag;
diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts
index 8557768bc03..bde5f2977d8 100644
--- a/src/data/moves/move.ts
+++ b/src/data/moves/move.ts
@@ -25,6 +25,7 @@ import { getBerryEffectFunc } from "#data/berry";
 import { applyChallenges } from "#data/challenge";
 import { allAbilities, allMoves } from "#data/data-lists";
 import { SpeciesFormChangeRevertWeatherFormTrigger } from "#data/form-change-triggers";
+import { DelayedAttackTag } from "#data/positional-tags/positional-tag";
 import {
   getNonVolatileStatusEffects,
   getStatusEffectHealText,
@@ -54,6 +55,7 @@ import { MoveFlags } from "#enums/move-flags";
 import { MoveTarget } from "#enums/move-target";
 import { MultiHitType } from "#enums/multi-hit-type";
 import { PokemonType } from "#enums/pokemon-type";
+import { PositionalTagType } from "#enums/positional-tag-type";
 import { SpeciesId } from "#enums/species-id";
 import {
   BATTLE_STATS,
@@ -3122,54 +3124,110 @@ export class OverrideMoveEffectAttr extends MoveAttr {
    * Its sole purpose is to ensure that typescript is able to properly narrow when the `is` method is called.
    */
   declare private _: never;
-  override apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+  /**
+   * Apply the move attribute to override other effects of this move.
+   * @param user - The {@linkcode Pokemon} using the move
+   * @param target - The {@linkcode Pokemon} targeted by the move
+   * @param move - The {@linkcode Move} being used
+   * @param args -
+   * `[0]`: A {@linkcode BooleanHolder} containing whether move effects were successfully overridden; should be set to `true` on success \
+   * `[1]`: The {@linkcode MoveUseMode} dictating how this move was used.
+   * @returns `true` if the move effect was successfully overridden.
+   */
+  public override apply(_user: Pokemon, _target: Pokemon, _move: Move, _args: [overridden: BooleanHolder, useMode: MoveUseMode]): boolean {
     return true;
   }
 }
 
+/** Abstract class for moves that add {@linkcode PositionalTag}s to the field. */
+abstract class AddPositionalTagAttr extends OverrideMoveEffectAttr {
+  protected abstract readonly tagType: PositionalTagType;
+
+  public override getCondition(): MoveConditionFunc {
+    // Check the arena if another similar positional tag is active and affecting the same slot
+    return (_user, target, move) => globalScene.arena.positionalTagManager.canAddTag(this.tagType, target.getBattlerIndex())
+  }
+}
+
 /**
- * Attack Move that doesn't hit the turn it is played and doesn't allow for multiple
- * uses on the same target. Examples are Future Sight or Doom Desire.
- * @extends OverrideMoveEffectAttr
- * @param tagType The {@linkcode ArenaTagType} that will be placed on the field when the move is used
- * @param chargeAnim The {@linkcode ChargeAnim | Charging Animation} used for the move
- * @param chargeText The text to display when the move is used
+ * Attribute to implement delayed attacks, such as {@linkcode MoveId.FUTURE_SIGHT} or {@linkcode MoveId.DOOM_DESIRE}.
+ * Delays the attack's effect with a {@linkcode DelayedAttackTag},
+ * activating against the given slot after the given turn count has elapsed.
  */
 export class DelayedAttackAttr extends OverrideMoveEffectAttr {
-  public tagType: ArenaTagType;
   public chargeAnim: ChargeAnim;
   private chargeText: string;
 
-  constructor(tagType: ArenaTagType, chargeAnim: ChargeAnim, chargeText: string) {
+  /**
+   * @param chargeAnim - The {@linkcode ChargeAnim | charging animation} used for the move's charging phase.
+   * @param chargeKey - The `i18next` locales **key** to show when the delayed attack is used.
+   * In the displayed text, `{{pokemonName}}` will be populated with the user's name.
+   */
+  constructor(chargeAnim: ChargeAnim, chargeKey: string) {
     super();
 
-    this.tagType = tagType;
     this.chargeAnim = chargeAnim;
-    this.chargeText = chargeText;
+    this.chargeText = chargeKey;
   }
 
-  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    // Edge case for the move applied on a pokemon that has fainted
-    if (!target) {
-      return true;
+  public override apply(user: Pokemon, target: Pokemon, move: Move, args: [overridden: BooleanHolder, useMode: MoveUseMode]): boolean {
+    const useMode = args[1];
+    if (useMode === MoveUseMode.DELAYED_ATTACK) {
+      // don't trigger if already queueing an indirect attack
+      return false;
     }
 
-    const overridden = args[0] as BooleanHolder;
-    const virtual = args[1] as boolean;
+    const overridden = args[0];
+    overridden.value = true;
 
-    if (!virtual) {
-      overridden.value = true;
-      globalScene.phaseManager.unshiftNew("MoveAnimPhase", new MoveChargeAnim(this.chargeAnim, move.id, user));
-      globalScene.phaseManager.queueMessage(this.chargeText.replace("{TARGET}", getPokemonNameWithAffix(target)).replace("{USER}", getPokemonNameWithAffix(user)));
-      user.pushMoveHistory({ move: move.id, targets: [ target.getBattlerIndex() ], result: MoveResult.OTHER, useMode: MoveUseMode.NORMAL });
-      const side = target.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY;
-      globalScene.arena.addTag(this.tagType, 3, move.id, user.id, side, false, target.getBattlerIndex());
-    } else {
-      globalScene.phaseManager.queueMessage(i18next.t("moveTriggers:tookMoveAttack", { pokemonName: getPokemonNameWithAffix(globalScene.getPokemonById(target.id) ?? undefined), moveName: move.name }));
-    }
+    // Display the move animation to foresee an attack
+    globalScene.phaseManager.unshiftNew("MoveAnimPhase", new MoveChargeAnim(this.chargeAnim, move.id, user));
+    globalScene.phaseManager.queueMessage(
+      i18next.t(
+        this.chargeText,
+        { pokemonName: getPokemonNameWithAffix(user) }
+      )
+    )
 
+    user.pushMoveHistory({move: move.id, targets: [target.getBattlerIndex()], result: MoveResult.OTHER, useMode, turn: globalScene.currentBattle.turn})
+    user.pushMoveHistory({move: move.id, targets: [target.getBattlerIndex()], result: MoveResult.OTHER, useMode, turn: globalScene.currentBattle.turn})
+    // Queue up an attack on the given slot.
+    globalScene.arena.positionalTagManager.addTag<PositionalTagType.DELAYED_ATTACK>({
+      tagType: PositionalTagType.DELAYED_ATTACK,
+      sourceId: user.id,
+      targetIndex: target.getBattlerIndex(),
+      sourceMove: move.id,
+      turnCount: 3
+    })
     return true;
   }
+
+  public override getCondition(): MoveConditionFunc {
+    // Check the arena if another similar attack is active and affecting the same slot
+    return (_user, target) => globalScene.arena.positionalTagManager.canAddTag(PositionalTagType.DELAYED_ATTACK, target.getBattlerIndex())
+  }
+}
+
+/**
+ * Attribute to queue a {@linkcode WishTag} to activate in 2 turns.
+ * The tag whill heal
+ */
+export class WishAttr extends MoveEffectAttr {
+  public override apply(user: Pokemon, target: Pokemon, _move: Move): boolean {
+    globalScene.arena.positionalTagManager.addTag<PositionalTagType.WISH>({
+      tagType: PositionalTagType.WISH,
+      healHp: toDmgValue(user.getMaxHp() / 2),
+      targetIndex: target.getBattlerIndex(),
+      turnCount: 2,
+      pokemonName: getPokemonNameWithAffix(user),
+    });
+    return true;
+  }
+
+  public override getCondition(): MoveConditionFunc {
+    // Check the arena if another wish is active and affecting the same slot
+    return (_user, target) => globalScene.arena.positionalTagManager.canAddTag(PositionalTagType.WISH, target.getBattlerIndex())
+  }
 }
 
 /**
@@ -3187,8 +3245,8 @@ export class AwaitCombinedPledgeAttr extends OverrideMoveEffectAttr {
    * @param user the {@linkcode Pokemon} using this move
    * @param target n/a
    * @param move the {@linkcode Move} being used
-   * @param args
-   * - [0] a {@linkcode BooleanHolder} indicating whether the move's base
+   * @param args -
+   * `[0]`: A {@linkcode BooleanHolder} indicating whether the move's base
    * effects should be overridden this turn.
    * @returns `true` if base move effects were overridden; `false` otherwise
    */
@@ -9203,9 +9261,12 @@ export function initMoves() {
       .attr(StatStageChangeAttr, [ Stat.SPDEF ], -1)
       .ballBombMove(),
     new AttackMove(MoveId.FUTURE_SIGHT, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 120, 100, 10, -1, 0, 2)
-      .partial() // cannot be used on multiple Pokemon on the same side in a double battle, hits immediately when called by Metronome/etc, should not apply abilities or held items if user is off the field
+      .attr(DelayedAttackAttr, ChargeAnim.FUTURE_SIGHT_CHARGING, "moveTriggers:foresawAnAttack")
       .ignoresProtect()
-      .attr(DelayedAttackAttr, ArenaTagType.FUTURE_SIGHT, ChargeAnim.FUTURE_SIGHT_CHARGING, i18next.t("moveTriggers:foresawAnAttack", { pokemonName: "{USER}" })),
+      /*
+       * Should not apply abilities or held items if user is off the field
+       */
+      .edgeCase(),
     new AttackMove(MoveId.ROCK_SMASH, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 40, 100, 15, 50, 0, 2)
       .attr(StatStageChangeAttr, [ Stat.DEF ], -1),
     new AttackMove(MoveId.WHIRLPOOL, PokemonType.WATER, MoveCategory.SPECIAL, 35, 85, 15, -1, 0, 2)
@@ -9291,8 +9352,8 @@ export function initMoves() {
       .ignoresSubstitute()
       .attr(AbilityCopyAttr),
     new SelfStatusMove(MoveId.WISH, PokemonType.NORMAL, -1, 10, -1, 0, 3)
-      .triageMove()
-      .attr(AddArenaTagAttr, ArenaTagType.WISH, 2, true),
+      .attr(WishAttr)
+      .triageMove(),
     new SelfStatusMove(MoveId.ASSIST, PokemonType.NORMAL, -1, 20, -1, 0, 3)
       .attr(RandomMovesetMoveAttr, invalidAssistMoves, true),
     new SelfStatusMove(MoveId.INGRAIN, PokemonType.GRASS, -1, 20, -1, 0, 3)
@@ -9541,9 +9602,12 @@ export function initMoves() {
       .attr(ConfuseAttr)
       .pulseMove(),
     new AttackMove(MoveId.DOOM_DESIRE, PokemonType.STEEL, MoveCategory.SPECIAL, 140, 100, 5, -1, 0, 3)
-      .partial() // cannot be used on multiple Pokemon on the same side in a double battle, hits immediately when called by Metronome/etc, should not apply abilities or held items if user is off the field
+      .attr(DelayedAttackAttr, ChargeAnim.DOOM_DESIRE_CHARGING, "moveTriggers:choseDoomDesireAsDestiny")
       .ignoresProtect()
-      .attr(DelayedAttackAttr, ArenaTagType.DOOM_DESIRE, ChargeAnim.DOOM_DESIRE_CHARGING, i18next.t("moveTriggers:choseDoomDesireAsDestiny", { pokemonName: "{USER}" })),
+      /*
+       * Should not apply abilities or held items if user is off the field
+      */
+      .edgeCase(),
     new AttackMove(MoveId.PSYCHO_BOOST, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 140, 90, 5, -1, 0, 3)
       .attr(StatStageChangeAttr, [ Stat.SPATK ], -2, true),
     new SelfStatusMove(MoveId.ROOST, PokemonType.FLYING, -1, 5, -1, 0, 4)
diff --git a/src/data/positional-tags/load-positional-tag.ts b/src/data/positional-tags/load-positional-tag.ts
new file mode 100644
index 00000000000..ef3609d93e7
--- /dev/null
+++ b/src/data/positional-tags/load-positional-tag.ts
@@ -0,0 +1,70 @@
+import { DelayedAttackTag, type PositionalTag, WishTag } from "#data/positional-tags/positional-tag";
+import { PositionalTagType } from "#enums/positional-tag-type";
+import type { ObjectValues } from "#types/type-helpers";
+import type { Constructor } from "#utils/common";
+
+/**
+ * Load the attributes of a {@linkcode PositionalTag}.
+ * @param tagType - The {@linkcode PositionalTagType} to create
+ * @param args - The arguments needed to instantize the given tag
+ * @returns The newly created tag.
+ * @remarks
+ * This function does not perform any checking if the added tag is valid.
+ */
+export function loadPositionalTag<T extends PositionalTagType>({
+  tagType,
+  ...args
+}: serializedPosTagMap[T]): posTagInstanceMap[T];
+/**
+ * Load the attributes of a {@linkcode PositionalTag}.
+ * @param tag - The {@linkcode SerializedPositionalTag} to instantiate
+ * @returns The newly created tag.
+ * @remarks
+ * This function does not perform any checking if the added tag is valid.
+ */
+export function loadPositionalTag(tag: SerializedPositionalTag): PositionalTag;
+export function loadPositionalTag<T extends PositionalTagType>({
+  tagType,
+  ...rest
+}: serializedPosTagMap[T]): posTagInstanceMap[T] {
+  // Note: We need 2 type assertions here:
+  // 1 because TS doesn't narrow the type of TagClass correctly based on `T`.
+  // It converts it into `new (DelayedAttackTag | WishTag) => DelayedAttackTag & WishTag`
+  const tagClass = posTagConstructorMap[tagType] as new (args: posTagParamMap[T]) => posTagInstanceMap[T];
+  // 2 because TS doesn't narrow the type of `rest` correctly
+  // (from `Omit<serializedPosTagParamMap[T], "tagType"> into `posTagParamMap[T]`)
+  return new tagClass(rest as unknown as posTagParamMap[T]);
+}
+
+/** Const object mapping tag types to their constructors. */
+const posTagConstructorMap = Object.freeze({
+  [PositionalTagType.DELAYED_ATTACK]: DelayedAttackTag,
+  [PositionalTagType.WISH]: WishTag,
+}) satisfies {
+  // NB: This `satisfies` block ensures that all tag types have corresponding entries in the map.
+  [k in PositionalTagType]: Constructor<PositionalTag & { tagType: k }>;
+};
+
+/** Type mapping positional tag types to their constructors. */
+type posTagMap = typeof posTagConstructorMap;
+
+/** Type mapping all positional tag types to their instances. */
+type posTagInstanceMap = {
+  [k in PositionalTagType]: InstanceType<posTagMap[k]>;
+};
+
+/** Type mapping all positional tag types to their constructors' parameters. */
+type posTagParamMap = {
+  [k in PositionalTagType]: ConstructorParameters<posTagMap[k]>[0];
+};
+
+/**
+ * Type mapping all positional tag types to their constructors' parameters, alongside the `tagType` selector.
+ * Equivalent to their serialized representations.
+ */
+export type serializedPosTagMap = {
+  [k in PositionalTagType]: posTagParamMap[k] & { tagType: k };
+};
+
+/** Union type containing all serialized {@linkcode PositionalTag}s. */
+export type SerializedPositionalTag = ObjectValues<serializedPosTagMap>;
diff --git a/src/data/positional-tags/positional-tag-manager.ts b/src/data/positional-tags/positional-tag-manager.ts
new file mode 100644
index 00000000000..7bf4d4995c6
--- /dev/null
+++ b/src/data/positional-tags/positional-tag-manager.ts
@@ -0,0 +1,55 @@
+import { loadPositionalTag } from "#data/positional-tags/load-positional-tag";
+import type { PositionalTag } from "#data/positional-tags/positional-tag";
+import type { BattlerIndex } from "#enums/battler-index";
+import type { PositionalTagType } from "#enums/positional-tag-type";
+
+/** A manager for the {@linkcode PositionalTag}s in the arena. */
+export class PositionalTagManager {
+  /**
+   * Array containing all pending unactivated {@linkcode PositionalTag}s,
+   * sorted by order of creation (oldest first).
+   */
+  public tags: PositionalTag[] = [];
+
+  /**
+   * Add a new {@linkcode PositionalTag} to the arena.
+   * @remarks
+   * This function does not perform any checking if the added tag is valid.
+   */
+  public addTag<T extends PositionalTagType = never>(tag: Parameters<typeof loadPositionalTag<T>>[0]): void {
+    this.tags.push(loadPositionalTag(tag));
+  }
+
+  /**
+   * Check whether a new {@linkcode PositionalTag} can be added to the battlefield.
+   * @param tagType - The {@linkcode PositionalTagType} being created
+   * @param targetIndex - The {@linkcode BattlerIndex} being targeted
+   * @returns Whether the tag can be added.
+   */
+  public canAddTag(tagType: PositionalTagType, targetIndex: BattlerIndex): boolean {
+    return !this.tags.some(t => t.tagType === tagType && t.targetIndex === targetIndex);
+  }
+
+  /**
+   * Decrement turn counts of and trigger all pending {@linkcode PositionalTag}s on field.
+   * @remarks
+   * If multiple tags trigger simultaneously, they will activate in order of **initial creation**, regardless of current speed order.
+   * (Source: [Smogon](<https://www.smogon.com/forums/threads/sword-shield-battle-mechanics-research.3655528/page-64#post-9244179>))
+   */
+  public activateAllTags(): void {
+    const leftoverTags: PositionalTag[] = [];
+    for (const tag of this.tags) {
+      // Check for silent removal, immediately removing invalid tags.
+      if (--tag.turnCount > 0) {
+        // tag still cooking
+        leftoverTags.push(tag);
+        continue;
+      }
+
+      if (tag.shouldTrigger()) {
+        tag.trigger();
+      }
+    }
+    this.tags = leftoverTags;
+  }
+}
diff --git a/src/data/positional-tags/positional-tag.ts b/src/data/positional-tags/positional-tag.ts
new file mode 100644
index 00000000000..77ca6f0e9eb
--- /dev/null
+++ b/src/data/positional-tags/positional-tag.ts
@@ -0,0 +1,174 @@
+import { globalScene } from "#app/global-scene";
+import { getPokemonNameWithAffix } from "#app/messages";
+// biome-ignore-start lint/correctness/noUnusedImports: TSDoc
+import type { ArenaTag } from "#data/arena-tag";
+// biome-ignore-end lint/correctness/noUnusedImports: TSDoc
+import { allMoves } from "#data/data-lists";
+import type { BattlerIndex } from "#enums/battler-index";
+import type { MoveId } from "#enums/move-id";
+import { MoveUseMode } from "#enums/move-use-mode";
+import { PositionalTagType } from "#enums/positional-tag-type";
+import type { Pokemon } from "#field/pokemon";
+import i18next from "i18next";
+
+/**
+ * Baseline arguments used to construct all {@linkcode PositionalTag}s,
+ * the contents of which are serialized and used to construct new tags. \
+ * Does not contain the `tagType` parameter (which is used to select the proper class constructor during tag loading).
+ * @privateRemarks
+ * All {@linkcode PositionalTag}s are intended to implement a sub-interface of this containing their respective parameters,
+ * and should refrain from adding extra serializable fields not contained in said interface.
+ * This ensures that all tags truly "become" their respective interfaces when converted to and from JSON.
+ */
+export interface PositionalTagBaseArgs {
+  /**
+   * The number of turns remaining until this tag's activation. \
+   * Decremented by 1 at the end of each turn until reaching 0, at which point it will
+   * {@linkcode PositionalTag.trigger | trigger} the tag's effects and be removed.
+   */
+  turnCount: number;
+  /**
+   * The {@linkcode BattlerIndex} targeted by this effect.
+   */
+  targetIndex: BattlerIndex;
+}
+
+/**
+ * A {@linkcode PositionalTag} is a variant of an {@linkcode ArenaTag} that targets a single *slot* of the battlefield.
+ * Each tag can last one or more turns, triggering various effects on removal.
+ * Multiple tags of the same kind can stack with one another, provided they are affecting different targets.
+ */
+export abstract class PositionalTag implements PositionalTagBaseArgs {
+  /** This tag's {@linkcode PositionalTagType | type} */
+  public abstract readonly tagType: PositionalTagType;
+  // These arguments have to be public to implement the interface, but are functionally private
+  // outside this and the tag manager.
+  // Left undocumented to inherit doc comments from the interface
+  public turnCount: number;
+  public readonly targetIndex: BattlerIndex;
+
+  constructor({ turnCount, targetIndex }: PositionalTagBaseArgs) {
+    this.turnCount = turnCount;
+    this.targetIndex = targetIndex;
+  }
+
+  /** Trigger this tag's effects prior to removal. */
+  public abstract trigger(): void;
+
+  /**
+   * Check whether this tag should be allowed to {@linkcode trigger} and activate its effects
+   * upon its duration elapsing.
+   * @returns Whether this tag should be allowed to trigger prior to being removed.
+   */
+  public abstract shouldTrigger(): boolean;
+
+  /**
+   * Get the {@linkcode Pokemon} currently targeted by this tag.
+   * @returns The {@linkcode Pokemon} located in this tag's target position, or `undefined` if none exist in it.
+   */
+  protected getTarget(): Pokemon | undefined {
+    return globalScene.getField()[this.targetIndex];
+  }
+}
+
+/** Interface containing additional properties used to construct a {@linkcode DelayedAttackTag}. */
+interface DelayedAttackArgs extends PositionalTagBaseArgs {
+  /**
+   * The {@linkcode Pokemon.id | PID} of the {@linkcode Pokemon} having created this effect.
+   */
+  sourceId: number;
+  /** The {@linkcode MoveId} that created this attack. */
+  sourceMove: MoveId;
+}
+
+/**
+ * Tag to manage execution of delayed attacks, such as {@linkcode MoveId.FUTURE_SIGHT} or {@linkcode MoveId.DOOM_DESIRE}. \
+ * Delayed attacks do nothing for the first several turns after use (including the turn the move is used),
+ * triggering against a certain slot after the turn count has elapsed.
+ */
+export class DelayedAttackTag extends PositionalTag implements DelayedAttackArgs {
+  public override readonly tagType = PositionalTagType.DELAYED_ATTACK;
+  public readonly sourceMove: MoveId;
+  public readonly sourceId: number;
+
+  constructor({ sourceId, turnCount, targetIndex, sourceMove }: DelayedAttackArgs) {
+    super({ turnCount, targetIndex });
+    this.sourceId = sourceId;
+    this.sourceMove = sourceMove;
+  }
+
+  public override trigger(): void {
+    // Bangs are justified as the `shouldTrigger` method will queue the tag for removal
+    // if the source or target no longer exist
+    const source = globalScene.getPokemonById(this.sourceId)!;
+    const target = this.getTarget()!;
+
+    source.turnData.extraTurns++;
+    globalScene.phaseManager.queueMessage(
+      i18next.t("moveTriggers:tookMoveAttack", {
+        pokemonName: getPokemonNameWithAffix(target),
+        moveName: allMoves[this.sourceMove].name,
+      }),
+    );
+
+    globalScene.phaseManager.unshiftNew(
+      "MoveEffectPhase",
+      this.sourceId, // TODO: Find an alternate method of passing the source pokemon without a source ID
+      [this.targetIndex],
+      allMoves[this.sourceMove],
+      MoveUseMode.DELAYED_ATTACK,
+    );
+  }
+
+  public override shouldTrigger(): boolean {
+    const source = globalScene.getPokemonById(this.sourceId);
+    const target = this.getTarget();
+    // Silently disappear if either source or target are missing or happen to be the same pokemon
+    // (i.e. targeting oneself)
+    // We also need to check for fainted targets as they don't technically leave the field until _after_ the turn ends
+    return !!source && !!target && source !== target && !target.isFainted();
+  }
+}
+
+/** Interface containing arguments used to construct a {@linkcode WishTag}. */
+interface WishArgs extends PositionalTagBaseArgs {
+  /** The amount of {@linkcode Stat.HP | HP} to heal; set to 50% of the user's max HP during move usage. */
+  healHp: number;
+  /** The name of the {@linkcode Pokemon} having created the tag. */
+  pokemonName: string;
+}
+
+/**
+ * Tag to implement {@linkcode MoveId.WISH | Wish}.
+ */
+export class WishTag extends PositionalTag implements WishArgs {
+  public override readonly tagType = PositionalTagType.WISH;
+
+  public readonly pokemonName: string;
+  public readonly healHp: number;
+
+  constructor({ turnCount, targetIndex, healHp, pokemonName }: WishArgs) {
+    super({ turnCount, targetIndex });
+    this.healHp = healHp;
+    this.pokemonName = pokemonName;
+  }
+
+  public override trigger(): void {
+    // TODO: Rename this locales key - wish shows a message on REMOVAL, not addition
+    globalScene.phaseManager.queueMessage(
+      i18next.t("arenaTag:wishTagOnAdd", {
+        pokemonNameWithAffix: this.pokemonName,
+      }),
+    );
+
+    globalScene.phaseManager.unshiftNew("PokemonHealPhase", this.targetIndex, this.healHp, null, true, false);
+  }
+
+  public override shouldTrigger(): boolean {
+    // Disappear if no target or target is fainted.
+    // The source need not exist at the time of activation (since all we need is a simple message)
+    // TODO: Verify whether Wish shows a message if the Pokemon it would affect is KO'd on the turn of activation
+    const target = this.getTarget();
+    return !!target && !target.isFainted();
+  }
+}
diff --git a/src/enums/arena-tag-type.ts b/src/enums/arena-tag-type.ts
index 214826993b3..7f9364395c0 100644
--- a/src/enums/arena-tag-type.ts
+++ b/src/enums/arena-tag-type.ts
@@ -15,9 +15,6 @@ export enum ArenaTagType {
   SPIKES = "SPIKES",
   TOXIC_SPIKES = "TOXIC_SPIKES",
   MIST = "MIST",
-  FUTURE_SIGHT = "FUTURE_SIGHT",
-  DOOM_DESIRE = "DOOM_DESIRE",
-  WISH = "WISH",
   STEALTH_ROCK = "STEALTH_ROCK",
   STICKY_WEB = "STICKY_WEB",
   TRICK_ROOM = "TRICK_ROOM",
diff --git a/src/enums/move-use-mode.ts b/src/enums/move-use-mode.ts
index 1bb9d6374b7..13ea5248853 100644
--- a/src/enums/move-use-mode.ts
+++ b/src/enums/move-use-mode.ts
@@ -1,5 +1,7 @@
 import type { PostDancingMoveAbAttr } from "#abilities/ability";
+import type { DelayedAttackAttr } from "#app/@types/move-types";
 import type { BattlerTagLapseType } from "#enums/battler-tag-lapse-type";
+import type { ObjectValues } from "#types/type-helpers";
 
 /**
  * Enum representing all the possible means through which a given move can be executed.
@@ -59,11 +61,20 @@ export const MoveUseMode = {
    * and retain the same copy prevention as {@linkcode MoveUseMode.FOLLOW_UP}, but additionally
    * **cannot be reflected by other reflecting effects**.
    */
-  REFLECTED: 5
-  // TODO: Add use type TRANSPARENT for Future Sight and Doom Desire to prevent move history pushing
+  REFLECTED: 5,
+  /**
+   * This "move" was created by a transparent effect that **does not count as using a move**,
+   * such as {@linkcode DelayedAttackAttr | Future Sight/Doom Desire}.
+   *
+   * In addition to inheriting the cancellation ignores and copy prevention from {@linkcode MoveUseMode.REFLECTED},
+   * transparent moves are ignored by **all forms of move usage checks** due to **not pushing to move history**.
+   * @todo Consider other means of implementing FS/DD than this - we currently only use it
+   * to prevent pushing to move history and avoid re-delaying the attack portion
+   */
+  DELAYED_ATTACK: 6
 } as const;
 
-export type MoveUseMode = (typeof MoveUseMode)[keyof typeof MoveUseMode];
+export type MoveUseMode = ObjectValues<typeof MoveUseMode>;
 
 // # HELPER FUNCTIONS
 // Please update the markdown tables if any new `MoveUseMode`s get added.
@@ -75,13 +86,14 @@ export type MoveUseMode = (typeof MoveUseMode)[keyof typeof MoveUseMode];
  * @remarks
  * This function is equivalent to the following truth table:
  *
- * | Use Type                           | Returns |
- * |------------------------------------|---------|
- * | {@linkcode MoveUseMode.NORMAL}     | `false` |
- * | {@linkcode MoveUseMode.IGNORE_PP}  | `false` |
- * | {@linkcode MoveUseMode.INDIRECT}   | `true`  |
- * | {@linkcode MoveUseMode.FOLLOW_UP}  | `true`  |
- * | {@linkcode MoveUseMode.REFLECTED}  | `true`  |
+ * | Use Type                               | Returns |
+ * |----------------------------------------|---------|
+ * | {@linkcode MoveUseMode.NORMAL}         | `false` |
+ * | {@linkcode MoveUseMode.IGNORE_PP}      | `false` |
+ * | {@linkcode MoveUseMode.INDIRECT}       | `true`  |
+ * | {@linkcode MoveUseMode.FOLLOW_UP}      | `true`  |
+ * | {@linkcode MoveUseMode.REFLECTED}      | `true`  |
+ * | {@linkcode MoveUseMode.DELAYED_ATTACK} | `true`  |
  */
 export function isVirtual(useMode: MoveUseMode): boolean {
   return useMode >= MoveUseMode.INDIRECT
@@ -95,13 +107,14 @@ export function isVirtual(useMode: MoveUseMode): boolean {
  * @remarks
  * This function is equivalent to the following truth table:
  *
- * | Use Type                           | Returns |
- * |------------------------------------|---------|
- * | {@linkcode MoveUseMode.NORMAL}     | `false` |
- * | {@linkcode MoveUseMode.IGNORE_PP}  | `false` |
- * | {@linkcode MoveUseMode.INDIRECT}   | `false` |
- * | {@linkcode MoveUseMode.FOLLOW_UP}  | `true`  |
- * | {@linkcode MoveUseMode.REFLECTED}  | `true`  |
+ * | Use Type                               | Returns |
+ * |----------------------------------------|---------|
+ * | {@linkcode MoveUseMode.NORMAL}         | `false` |
+ * | {@linkcode MoveUseMode.IGNORE_PP}      | `false` |
+ * | {@linkcode MoveUseMode.INDIRECT}       | `false` |
+ * | {@linkcode MoveUseMode.FOLLOW_UP}      | `true`  |
+ * | {@linkcode MoveUseMode.REFLECTED}      | `true`  |
+ * | {@linkcode MoveUseMode.DELAYED_ATTACK} | `true`  |
  */
 export function isIgnoreStatus(useMode: MoveUseMode): boolean {
   return useMode >= MoveUseMode.FOLLOW_UP;
@@ -115,13 +128,14 @@ export function isIgnoreStatus(useMode: MoveUseMode): boolean {
  * @remarks
  * This function is equivalent to the following truth table:
  *
- * | Use Type                           | Returns |
- * |------------------------------------|---------|
- * | {@linkcode MoveUseMode.NORMAL}     | `false` |
- * | {@linkcode MoveUseMode.IGNORE_PP}  | `true`  |
- * | {@linkcode MoveUseMode.INDIRECT}   | `true`  |
- * | {@linkcode MoveUseMode.FOLLOW_UP}  | `true`  |
- * | {@linkcode MoveUseMode.REFLECTED}  | `true`  |
+ * | Use Type                               | Returns |
+ * |----------------------------------------|---------|
+ * | {@linkcode MoveUseMode.NORMAL}         | `false` |
+ * | {@linkcode MoveUseMode.IGNORE_PP}      | `true`  |
+ * | {@linkcode MoveUseMode.INDIRECT}       | `true`  |
+ * | {@linkcode MoveUseMode.FOLLOW_UP}      | `true`  |
+ * | {@linkcode MoveUseMode.REFLECTED}      | `true`  |
+ * | {@linkcode MoveUseMode.DELAYED_ATTACK} | `true`  |
  */
 export function isIgnorePP(useMode: MoveUseMode): boolean {
   return useMode >= MoveUseMode.IGNORE_PP;
@@ -136,14 +150,15 @@ export function isIgnorePP(useMode: MoveUseMode): boolean {
  * @remarks
  * This function is equivalent to the following truth table:
  *
- * | Use Type                           | Returns |
- * |------------------------------------|---------|
- * | {@linkcode MoveUseMode.NORMAL}     | `false` |
- * | {@linkcode MoveUseMode.IGNORE_PP}  | `false` |
- * | {@linkcode MoveUseMode.INDIRECT}   | `false` |
- * | {@linkcode MoveUseMode.FOLLOW_UP}  | `false` |
- * | {@linkcode MoveUseMode.REFLECTED}  | `true`  |
+ * | Use Type                               | Returns |
+ * |----------------------------------------|---------|
+ * | {@linkcode MoveUseMode.NORMAL}         | `false` |
+ * | {@linkcode MoveUseMode.IGNORE_PP}      | `false` |
+ * | {@linkcode MoveUseMode.INDIRECT}       | `false` |
+ * | {@linkcode MoveUseMode.FOLLOW_UP}      | `false` |
+ * | {@linkcode MoveUseMode.REFLECTED}      | `true`  |
+ * | {@linkcode MoveUseMode.DELAYED_ATTACK} | `false` |
  */
 export function isReflected(useMode: MoveUseMode): boolean {
   return useMode === MoveUseMode.REFLECTED;
-}
+}
\ No newline at end of file
diff --git a/src/enums/positional-tag-type.ts b/src/enums/positional-tag-type.ts
new file mode 100644
index 00000000000..254503d0de6
--- /dev/null
+++ b/src/enums/positional-tag-type.ts
@@ -0,0 +1,10 @@
+/**
+ * Enum representing all positional tag types.
+ * @privateRemarks
+ * When adding new tag types, please update `positionalTagConstructorMap` in `src/data/positionalTags`
+ * with the new tag type.
+ */
+export enum PositionalTagType {
+  DELAYED_ATTACK = "DELAYED_ATTACK",
+  WISH = "WISH",
+}
diff --git a/src/field/arena.ts b/src/field/arena.ts
index 8f27ddb22e9..484450cc5df 100644
--- a/src/field/arena.ts
+++ b/src/field/arena.ts
@@ -1,3 +1,7 @@
+// biome-ignore-start lint/correctness/noUnusedImports: TSDoc imports
+import type { PositionalTag } from "#data/positional-tags/positional-tag";
+// biome-ignore-end lint/correctness/noUnusedImports: TSDoc imports
+
 import { applyAbAttrs } from "#abilities/apply-ab-attrs";
 import { globalScene } from "#app/global-scene";
 import Overrides from "#app/overrides";
@@ -7,6 +11,7 @@ import type { ArenaTag } from "#data/arena-tag";
 import { ArenaTrapTag, getArenaTag } from "#data/arena-tag";
 import { SpeciesFormChangeRevertWeatherFormTrigger, SpeciesFormChangeWeatherTrigger } from "#data/form-change-triggers";
 import type { PokemonSpecies } from "#data/pokemon-species";
+import { PositionalTagManager } from "#data/positional-tags/positional-tag-manager";
 import { getTerrainClearMessage, getTerrainStartMessage, Terrain, TerrainType } from "#data/terrain";
 import {
   getLegendaryWeatherContinuesMessage,
@@ -38,7 +43,14 @@ export class Arena {
   public biomeType: BiomeId;
   public weather: Weather | null;
   public terrain: Terrain | null;
-  public tags: ArenaTag[];
+  /** All currently-active {@linkcode ArenaTag}s on both sides of the field. */
+  public tags: ArenaTag[] = [];
+  /**
+   * All currently-active {@linkcode PositionalTag}s on both sides of the field,
+   * sorted by tag type.
+   */
+  public positionalTagManager: PositionalTagManager = new PositionalTagManager();
+
   public bgm: string;
   public ignoreAbilities: boolean;
   public ignoringEffectSource: BattlerIndex | null;
@@ -58,7 +70,6 @@ export class Arena {
 
   constructor(biome: BiomeId, bgm: string, playerFaints = 0) {
     this.biomeType = biome;
-    this.tags = [];
     this.bgm = bgm;
     this.trainerPool = biomeTrainerPools[biome];
     this.updatePoolsForTimeOfDay();
@@ -676,15 +687,15 @@ export class Arena {
   }
 
   /**
-   * Adds a new tag to the arena
-   * @param tagType {@linkcode ArenaTagType} the tag being added
-   * @param turnCount How many turns the tag lasts
-   * @param sourceMove {@linkcode MoveId} the move the tag came from, or `undefined` if not from a move
-   * @param sourceId The ID of the pokemon in play the tag came from (see {@linkcode BattleScene.getPokemonById})
-   * @param side {@linkcode ArenaTagSide} which side(s) the tag applies to
-   * @param quiet If a message should be queued on screen to announce the tag being added
-   * @param targetIndex The {@linkcode BattlerIndex} of the target pokemon
-   * @returns `false` if there already exists a tag of this type in the Arena
+   * Add a new {@linkcode ArenaTag} to the arena, triggering overlap effects on existing tags as applicable.
+   * @param tagType - The {@linkcode ArenaTagType} of the tag to add.
+   * @param turnCount - The number of turns the newly-added tag should last.
+   * @param sourceId - The {@linkcode Pokemon.id | PID} of the Pokemon creating the tag.
+   * @param sourceMove - The {@linkcode MoveId} of the move creating the tag, or `undefined` if not from a move.
+   * @param side - The {@linkcode ArenaTagSide}(s) to which the tag should apply; default `ArenaTagSide.BOTH`.
+   * @param quiet - Whether to suppress messages produced by tag addition; default `false`.
+   * @returns `true` if the tag was successfully added without overlapping.
+  // TODO: Do we need the return value here? literally nothing uses it
    */
   addTag(
     tagType: ArenaTagType,
@@ -693,7 +704,6 @@ export class Arena {
     sourceId: number,
     side: ArenaTagSide = ArenaTagSide.BOTH,
     quiet = false,
-    targetIndex?: BattlerIndex,
   ): boolean {
     const existingTag = this.getTagOnSide(tagType, side);
     if (existingTag) {
@@ -708,7 +718,7 @@ export class Arena {
     }
 
     // creates a new tag object
-    const newTag = getArenaTag(tagType, turnCount || 0, sourceMove, sourceId, targetIndex, side);
+    const newTag = getArenaTag(tagType, turnCount || 0, sourceMove, sourceId, side);
     if (newTag) {
       newTag.onAdd(this, quiet);
       this.tags.push(newTag);
@@ -724,10 +734,19 @@ export class Arena {
   }
 
   /**
-   * Attempts to get a tag from the Arena via {@linkcode getTagOnSide} that applies to both sides
-   * @param tagType The {@linkcode ArenaTagType} or {@linkcode ArenaTag} to get
-   * @returns either the {@linkcode ArenaTag}, or `undefined` if it isn't there
+   * Attempt to get a tag from the Arena via {@linkcode getTagOnSide} that applies to both sides
+   * @param tagType - The {@linkcode ArenaTagType} to retrieve
+   * @returns The existing {@linkcode ArenaTag}, or `undefined` if not present.
+   * @overload
    */
+  getTag(tagType: ArenaTagType): ArenaTag | undefined;
+  /**
+   * Attempt to get a tag from the Arena via {@linkcode getTagOnSide} that applies to both sides
+   * @param tagType - The constructor of the {@linkcode ArenaTag} to retrieve
+   * @returns The existing {@linkcode ArenaTag}, or `undefined` if not present.
+   * @overload
+   */
+  getTag<T extends ArenaTag>(tagType: Constructor<T> | AbstractConstructor<T>): T | undefined;
   getTag(tagType: ArenaTagType | Constructor<ArenaTag> | AbstractConstructor<ArenaTag>): ArenaTag | undefined {
     return this.getTagOnSide(tagType, ArenaTagSide.BOTH);
   }
diff --git a/src/phase-manager.ts b/src/phase-manager.ts
index c56afe446ed..37edeae7e42 100644
--- a/src/phase-manager.ts
+++ b/src/phase-manager.ts
@@ -61,6 +61,7 @@ import { PartyHealPhase } from "#phases/party-heal-phase";
 import { PokemonAnimPhase } from "#phases/pokemon-anim-phase";
 import { PokemonHealPhase } from "#phases/pokemon-heal-phase";
 import { PokemonTransformPhase } from "#phases/pokemon-transform-phase";
+import { PositionalTagPhase } from "#phases/positional-tag-phase";
 import { PostGameOverPhase } from "#phases/post-game-over-phase";
 import { PostSummonPhase } from "#phases/post-summon-phase";
 import { PostTurnStatusEffectPhase } from "#phases/post-turn-status-effect-phase";
@@ -172,6 +173,7 @@ const PHASES = Object.freeze({
   PokemonAnimPhase,
   PokemonHealPhase,
   PokemonTransformPhase,
+  PositionalTagPhase,
   PostGameOverPhase,
   PostSummonPhase,
   PostTurnStatusEffectPhase,
diff --git a/src/phases/move-effect-phase.ts b/src/phases/move-effect-phase.ts
index b1cb9e48d51..c57e0f6cead 100644
--- a/src/phases/move-effect-phase.ts
+++ b/src/phases/move-effect-phase.ts
@@ -19,7 +19,7 @@ import { MoveFlags } from "#enums/move-flags";
 import { MoveId } from "#enums/move-id";
 import { MoveResult } from "#enums/move-result";
 import { MoveTarget } from "#enums/move-target";
-import { isReflected, isVirtual, MoveUseMode } from "#enums/move-use-mode";
+import { isReflected, MoveUseMode } from "#enums/move-use-mode";
 import { PokemonType } from "#enums/pokemon-type";
 import type { Pokemon } from "#field/pokemon";
 import {
@@ -244,43 +244,19 @@ export class MoveEffectPhase extends PokemonPhase {
       globalScene.currentBattle.lastPlayerInvolved = this.fieldIndex;
     }
 
-    const isDelayedAttack = this.move.hasAttr("DelayedAttackAttr");
-    /** If the user was somehow removed from the field and it's not a delayed attack, end this phase */
-    if (!user.isOnField()) {
-      if (!isDelayedAttack) {
-        super.end();
-        return;
-      }
-      if (!user.scene) {
-        /*
-         * This happens if the Pokemon that used the delayed attack gets caught and released
-         * on the turn the attack would have triggered. Having access to the global scene
-         * in the future may solve this entirely, so for now we just cancel the hit
-         */
-        super.end();
-        return;
-      }
-    }
+    const move = this.move;
 
     /**
      * Does an effect from this move override other effects on this turn?
      * e.g. Charging moves (Fly, etc.) on their first turn of use.
      */
     const overridden = new BooleanHolder(false);
-    const move = this.move;
 
     // Apply effects to override a move effect.
     // Assuming single target here works as this is (currently)
     // only used for Future Sight, calling and Pledge moves.
     // TODO: change if any other move effect overrides are introduced
-    applyMoveAttrs(
-      "OverrideMoveEffectAttr",
-      user,
-      this.getFirstTarget() ?? null,
-      move,
-      overridden,
-      isVirtual(this.useMode),
-    );
+    applyMoveAttrs("OverrideMoveEffectAttr", user, this.getFirstTarget() ?? null, move, overridden, this.useMode);
 
     // If other effects were overriden, stop this phase before they can be applied
     if (overridden.value) {
@@ -355,7 +331,7 @@ export class MoveEffectPhase extends PokemonPhase {
    */
   private postAnimCallback(user: Pokemon, targets: Pokemon[]) {
     // Add to the move history entry
-    if (this.firstHit) {
+    if (this.firstHit && this.useMode !== MoveUseMode.DELAYED_ATTACK) {
       user.pushMoveHistory(this.moveHistoryEntry);
       applyAbAttrs("ExecutedMoveAbAttr", { pokemon: user });
     }
@@ -663,6 +639,7 @@ export class MoveEffectPhase extends PokemonPhase {
 
   /** @returns The {@linkcode Pokemon} using this phase's invoked move */
   public getUserPokemon(): Pokemon | null {
+    // TODO: Make this purely a battler index
     if (this.battlerIndex > BattlerIndex.ENEMY_2) {
       return globalScene.getPokemonById(this.battlerIndex);
     }
diff --git a/src/phases/move-phase.ts b/src/phases/move-phase.ts
index 82bb6b153ef..cd7c7a8f48f 100644
--- a/src/phases/move-phase.ts
+++ b/src/phases/move-phase.ts
@@ -2,14 +2,12 @@ import { applyAbAttrs } from "#abilities/apply-ab-attrs";
 import { globalScene } from "#app/global-scene";
 import { getPokemonNameWithAffix } from "#app/messages";
 import Overrides from "#app/overrides";
-import type { DelayedAttackTag } from "#data/arena-tag";
 import { CenterOfAttentionTag } from "#data/battler-tags";
 import { SpeciesFormChangePreMoveTrigger } from "#data/form-change-triggers";
 import { getStatusEffectActivationText, getStatusEffectHealText } from "#data/status-effect";
 import { getTerrainBlockMessage } from "#data/terrain";
 import { getWeatherBlockMessage } from "#data/weather";
 import { AbilityId } from "#enums/ability-id";
-import { ArenaTagType } from "#enums/arena-tag-type";
 import { BattlerIndex } from "#enums/battler-index";
 import { BattlerTagLapseType } from "#enums/battler-tag-lapse-type";
 import { BattlerTagType } from "#enums/battler-tag-type";
@@ -297,21 +295,6 @@ export class MovePhase extends BattlePhase {
     // form changes happen even before we know that the move wll execute.
     globalScene.triggerPokemonFormChange(this.pokemon, SpeciesFormChangePreMoveTrigger);
 
-    // Check the player side arena if another delayed attack is active and hitting the same slot.
-    if (move.hasAttr("DelayedAttackAttr")) {
-      const currentTargetIndex = targets[0].getBattlerIndex();
-      const delayedAttackHittingSameSlot = globalScene.arena.tags.some(
-        tag =>
-          (tag.tagType === ArenaTagType.FUTURE_SIGHT || tag.tagType === ArenaTagType.DOOM_DESIRE) &&
-          (tag as DelayedAttackTag).targetIndex === currentTargetIndex,
-      );
-
-      if (delayedAttackHittingSameSlot) {
-        this.failMove(true);
-        return;
-      }
-    }
-
     // Check if the move has any attributes that can interrupt its own use **before** displaying text.
     // TODO: This should not rely on direct return values
     let failed = move.getAttrs("PreUseInterruptAttr").some(attr => attr.apply(this.pokemon, targets[0], move));
diff --git a/src/phases/positional-tag-phase.ts b/src/phases/positional-tag-phase.ts
new file mode 100644
index 00000000000..dec572273c5
--- /dev/null
+++ b/src/phases/positional-tag-phase.ts
@@ -0,0 +1,21 @@
+// biome-ignore-start lint/correctness/noUnusedImports: TSDocs
+import type { PositionalTag } from "#data/positional-tags/positional-tag";
+import type { TurnEndPhase } from "#phases/turn-end-phase";
+// biome-ignore-end lint/correctness/noUnusedImports: TSDocs
+
+import { globalScene } from "#app/global-scene";
+import { Phase } from "#app/phase";
+
+/**
+ * Phase to trigger all pending post-turn {@linkcode PositionalTag}s.
+ * Occurs before {@linkcode TurnEndPhase} to allow for proper electrify timing.
+ */
+export class PositionalTagPhase extends Phase {
+  public readonly phaseName = "PositionalTagPhase";
+
+  public override start(): void {
+    globalScene.arena.positionalTagManager.activateAllTags();
+    super.end();
+    return;
+  }
+}
diff --git a/src/phases/turn-start-phase.ts b/src/phases/turn-start-phase.ts
index 9fdac65bb10..9c53a333ed0 100644
--- a/src/phases/turn-start-phase.ts
+++ b/src/phases/turn-start-phase.ts
@@ -220,12 +220,16 @@ export class TurnStartPhase extends FieldPhase {
     }
     phaseManager.pushNew("CheckInterludePhase");
 
+    // TODO: Re-order these phases to be consistent with mainline turn order:
+    // https://www.smogon.com/forums/threads/sword-shield-battle-mechanics-research.3655528/page-64#post-9244179
+
     phaseManager.pushNew("WeatherEffectPhase");
     phaseManager.pushNew("BerryPhase");
 
     /** Add a new phase to check who should be taking status damage */
     phaseManager.pushNew("CheckStatusEffectPhase", moveOrder);
 
+    phaseManager.pushNew("PositionalTagPhase");
     phaseManager.pushNew("TurnEndPhase");
 
     /*
diff --git a/src/system/arena-data.ts b/src/system/arena-data.ts
index c0ad4a25024..b2a04f96a55 100644
--- a/src/system/arena-data.ts
+++ b/src/system/arena-data.ts
@@ -1,5 +1,6 @@
 import type { ArenaTag } from "#data/arena-tag";
 import { loadArenaTag, SerializableArenaTag } from "#data/arena-tag";
+import type { SerializedPositionalTag } from "#data/positional-tags/load-positional-tag";
 import { Terrain } from "#data/terrain";
 import { Weather } from "#data/weather";
 import type { BiomeId } from "#enums/biome-id";
@@ -12,6 +13,7 @@ export interface SerializedArenaData {
   weather: NonFunctionProperties<Weather> | null;
   terrain: NonFunctionProperties<Terrain> | null;
   tags?: ArenaTagTypeData[];
+  positionalTags: SerializedPositionalTag[];
   playerTerasUsed?: number;
 }
 
@@ -20,6 +22,7 @@ export class ArenaData {
   public weather: Weather | null;
   public terrain: Terrain | null;
   public tags: ArenaTag[];
+  public positionalTags: SerializedPositionalTag[] = [];
   public playerTerasUsed: number;
 
   constructor(source: Arena | SerializedArenaData) {
@@ -37,11 +40,15 @@ export class ArenaData {
       this.biome = source.biomeType;
       this.weather = source.weather;
       this.terrain = source.terrain;
+      // The assertion here is ok - we ensure that all tags are inside the `posTagConstructorMap` map,
+      // and that all `PositionalTags` will become their respective interfaces when serialized and de-serialized.
+      this.positionalTags = (source.positionalTagManager.tags as unknown as SerializedPositionalTag[]) ?? [];
       return;
     }
 
     this.biome = source.biome;
     this.weather = source.weather ? new Weather(source.weather.weatherType, source.weather.turnsLeft) : null;
     this.terrain = source.terrain ? new Terrain(source.terrain.terrainType, source.terrain.turnsLeft) : null;
+    this.positionalTags = source.positionalTags ?? [];
   }
 }
diff --git a/src/system/game-data.ts b/src/system/game-data.ts
index b148ed4e2ba..d899afa19ef 100644
--- a/src/system/game-data.ts
+++ b/src/system/game-data.ts
@@ -16,6 +16,7 @@ import { allMoves, allSpecies } from "#data/data-lists";
 import type { Egg } from "#data/egg";
 import { pokemonFormChanges } from "#data/pokemon-forms";
 import type { PokemonSpecies } from "#data/pokemon-species";
+import { loadPositionalTag } from "#data/positional-tags/load-positional-tag";
 import { TerrainType } from "#data/terrain";
 import { AbilityAttr } from "#enums/ability-attr";
 import { BattleType } from "#enums/battle-type";
@@ -1096,6 +1097,10 @@ export class GameData {
             }
           }
 
+          globalScene.arena.positionalTagManager.tags = sessionData.arena.positionalTags.map(tag =>
+            loadPositionalTag(tag),
+          );
+
           if (globalScene.modifiers.length) {
             console.warn("Existing modifiers not cleared on session load, deleting...");
             globalScene.modifiers = [];
diff --git a/test/moves/delayed-attack.test.ts b/test/moves/delayed-attack.test.ts
new file mode 100644
index 00000000000..e8cf2871626
--- /dev/null
+++ b/test/moves/delayed-attack.test.ts
@@ -0,0 +1,389 @@
+import { getPokemonNameWithAffix } from "#app/messages";
+import { AttackTypeBoosterModifier } from "#app/modifier/modifier";
+import { allMoves } from "#data/data-lists";
+import { AbilityId } from "#enums/ability-id";
+import { BattleType } from "#enums/battle-type";
+import { BattlerIndex } from "#enums/battler-index";
+import { MoveId } from "#enums/move-id";
+import { MoveResult } from "#enums/move-result";
+import { PokemonType } from "#enums/pokemon-type";
+import { PositionalTagType } from "#enums/positional-tag-type";
+import { SpeciesId } from "#enums/species-id";
+import { Stat } from "#enums/stat";
+import { GameManager } from "#test/test-utils/game-manager";
+import i18next from "i18next";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+describe("Moves - Delayed Attacks", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .ability(AbilityId.NO_GUARD)
+      .battleStyle("single")
+      .enemySpecies(SpeciesId.MAGIKARP)
+      .enemyAbility(AbilityId.STURDY)
+      .enemyMoveset(MoveId.SPLASH);
+  });
+
+  /**
+   * Wait until a number of turns have passed.
+   * @param numTurns - Number of turns to pass.
+   * @param toEndOfTurn - Whether to advance to the `TurnEndPhase` (`true`) or the `PositionalTagPhase` (`false`);
+   * default `true`
+   * @returns A Promise that resolves once the specified number of turns has elapsed
+   * and the specified phase has been reached.
+   */
+  async function passTurns(numTurns: number, toEndOfTurn = true): Promise<void> {
+    for (let i = 0; i < numTurns; i++) {
+      game.move.use(MoveId.SPLASH, BattlerIndex.PLAYER);
+      if (game.scene.getPlayerField()[1]?.isActive()) {
+        game.move.use(MoveId.SPLASH, BattlerIndex.PLAYER_2);
+      }
+      await game.move.forceEnemyMove(MoveId.SPLASH);
+      if (game.scene.getEnemyField()[1]?.isActive()) {
+        await game.move.forceEnemyMove(MoveId.SPLASH);
+      }
+      await game.phaseInterceptor.to("PositionalTagPhase");
+    }
+    if (toEndOfTurn) {
+      await game.toEndOfTurn();
+    }
+  }
+
+  /**
+   * Expect that future sight is active with the specified number of attacks.
+   * @param numAttacks - The number of delayed attacks that should be queued; default `1`
+   */
+  function expectFutureSightActive(numAttacks = 1) {
+    const delayedAttacks = game.scene.arena.positionalTagManager["tags"].filter(
+      t => t.tagType === PositionalTagType.DELAYED_ATTACK,
+    );
+    expect(delayedAttacks).toHaveLength(numAttacks);
+  }
+
+  it.each<{ name: string; move: MoveId }>([
+    { name: "Future Sight", move: MoveId.FUTURE_SIGHT },
+    { name: "Doom Desire", move: MoveId.DOOM_DESIRE },
+  ])("$name should show message and strike 2 turns after use, ignoring player/enemy switches", async ({ move }) => {
+    game.override.battleType(BattleType.TRAINER);
+    await game.classicMode.startBattle([SpeciesId.FEEBAS, SpeciesId.MILOTIC]);
+
+    game.move.use(move);
+    await game.toNextTurn();
+
+    expectFutureSightActive();
+
+    game.doSwitchPokemon(1);
+    game.forceEnemyToSwitch();
+    await game.toNextTurn();
+
+    await passTurns(1);
+
+    expectFutureSightActive(0);
+    const enemy = game.field.getEnemyPokemon();
+    expect(enemy.hp).toBeLessThan(enemy.getMaxHp());
+    expect(game.textInterceptor.logs).toContain(
+      i18next.t("moveTriggers:tookMoveAttack", {
+        pokemonName: getPokemonNameWithAffix(enemy),
+        moveName: allMoves[move].name,
+      }),
+    );
+  });
+
+  it("should fail (preserving prior instances) when used against the same target", async () => {
+    await game.classicMode.startBattle([SpeciesId.BRONZONG]);
+
+    game.move.use(MoveId.FUTURE_SIGHT);
+    await game.toNextTurn();
+
+    expectFutureSightActive();
+    const bronzong = game.field.getPlayerPokemon();
+    expect(bronzong.getLastXMoves()[0].result).toBe(MoveResult.OTHER);
+
+    game.move.use(MoveId.FUTURE_SIGHT);
+    await game.toNextTurn();
+
+    expectFutureSightActive();
+    expect(bronzong.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+  });
+
+  it("should still be delayed when called by other moves", async () => {
+    await game.classicMode.startBattle([SpeciesId.BRONZONG]);
+
+    game.move.use(MoveId.METRONOME);
+    game.move.forceMetronomeMove(MoveId.FUTURE_SIGHT);
+    await game.toNextTurn();
+
+    expectFutureSightActive();
+    const enemy = game.field.getEnemyPokemon();
+    expect(enemy.hp).toBe(enemy.getMaxHp());
+
+    await passTurns(2);
+
+    expectFutureSightActive(0);
+    expect(enemy.hp).toBeLessThan(enemy.getMaxHp());
+  });
+
+  it("should work when used against different targets in doubles", async () => {
+    game.override.battleStyle("double");
+    await game.classicMode.startBattle([SpeciesId.MAGIKARP, SpeciesId.FEEBAS]);
+
+    const [karp, feebas, enemy1, enemy2] = game.scene.getField();
+
+    game.move.use(MoveId.FUTURE_SIGHT, BattlerIndex.PLAYER, BattlerIndex.ENEMY);
+    game.move.use(MoveId.FUTURE_SIGHT, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY_2);
+    await game.toEndOfTurn();
+
+    expectFutureSightActive(2);
+    expect(enemy1.hp).toBe(enemy1.getMaxHp());
+    expect(enemy2.hp).toBe(enemy2.getMaxHp());
+    expect(karp.getLastXMoves()[0].result).toBe(MoveResult.OTHER);
+    expect(feebas.getLastXMoves()[0].result).toBe(MoveResult.OTHER);
+
+    await passTurns(2);
+
+    expect(enemy1.hp).toBeLessThan(enemy1.getMaxHp());
+    expect(enemy2.hp).toBeLessThan(enemy2.getMaxHp());
+  });
+
+  it("should trigger multiple pending attacks in order of creation, even if that order changes later on", async () => {
+    game.override.battleStyle("double");
+    await game.classicMode.startBattle([SpeciesId.MAGIKARP, SpeciesId.FEEBAS]);
+
+    const [alomomola, blissey] = game.scene.getField();
+
+    const oldOrder = game.field.getSpeedOrder();
+
+    game.move.use(MoveId.FUTURE_SIGHT, BattlerIndex.PLAYER, BattlerIndex.ENEMY);
+    game.move.use(MoveId.FUTURE_SIGHT, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY_2);
+    await game.move.forceEnemyMove(MoveId.FUTURE_SIGHT, BattlerIndex.PLAYER);
+    await game.move.forceEnemyMove(MoveId.FUTURE_SIGHT, BattlerIndex.PLAYER_2);
+    // Ensure that the moves are used deterministically in speed order (for speed ties)
+    await game.setTurnOrder(oldOrder.map(p => p.getBattlerIndex()));
+    await game.toNextTurn();
+
+    expectFutureSightActive(4);
+
+    // Lower speed to change turn order
+    alomomola.setStatStage(Stat.SPD, 6);
+    blissey.setStatStage(Stat.SPD, -6);
+
+    const newOrder = game.field.getSpeedOrder();
+    expect(newOrder).not.toEqual(oldOrder);
+
+    await passTurns(2, false);
+
+    // All attacks have concluded at this point, unshifting new `MoveEffectPhase`s to the queue.
+    expectFutureSightActive(0);
+
+    const MEPs = game.scene.phaseManager.phaseQueue.filter(p => p.is("MoveEffectPhase"));
+    expect(MEPs).toHaveLength(4);
+    expect(MEPs.map(mep => mep.getPokemon())).toEqual(oldOrder);
+  });
+
+  it("should vanish silently if it would otherwise hit the user", async () => {
+    game.override.battleStyle("double");
+    await game.classicMode.startBattle([SpeciesId.MAGIKARP, SpeciesId.FEEBAS, SpeciesId.MILOTIC]);
+
+    const [karp, feebas, milotic] = game.scene.getPlayerParty();
+
+    game.move.use(MoveId.FUTURE_SIGHT, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2);
+    game.move.use(MoveId.SPLASH, BattlerIndex.PLAYER_2);
+    await game.toNextTurn();
+
+    expectFutureSightActive(1);
+
+    // Milotic / Feebas // Karp
+    game.doSwitchPokemon(2);
+    game.move.use(MoveId.SPLASH, BattlerIndex.PLAYER_2);
+    await game.toNextTurn();
+
+    expect(game.scene.getPlayerParty()).toEqual([milotic, feebas, karp]);
+
+    // Milotic / Karp // Feebas
+    game.move.use(MoveId.SPLASH, BattlerIndex.PLAYER);
+    game.doSwitchPokemon(2);
+
+    await passTurns(1);
+
+    expect(game.scene.getPlayerParty()).toEqual([milotic, karp, feebas]);
+
+    expect(karp.hp).toBe(karp.getMaxHp());
+    expect(feebas.hp).toBe(feebas.getMaxHp());
+    expect(game.textInterceptor.logs).not.toContain(
+      i18next.t("moveTriggers:tookMoveAttack", {
+        pokemonName: getPokemonNameWithAffix(karp),
+        moveName: allMoves[MoveId.FUTURE_SIGHT].name,
+      }),
+    );
+  });
+
+  it("should redirect normally if target is fainted when move is used", async () => {
+    game.override.battleStyle("double");
+    await game.classicMode.startBattle([SpeciesId.MAGIKARP]);
+
+    const [enemy1, enemy2] = game.scene.getEnemyField();
+
+    game.move.use(MoveId.FUTURE_SIGHT, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2);
+    await game.killPokemon(enemy2);
+    await game.toNextTurn();
+
+    expect(enemy2.isFainted()).toBe(true);
+    expectFutureSightActive();
+
+    const attack = game.scene.arena.positionalTagManager.tags.find(
+      t => t.tagType === PositionalTagType.DELAYED_ATTACK,
+    )!;
+    expect(attack).toBeDefined();
+    expect(attack.targetIndex).toBe(enemy1.getBattlerIndex());
+
+    await passTurns(2);
+
+    expect(enemy1.hp).toBeLessThan(enemy1.getMaxHp());
+    expect(game.textInterceptor.logs).toContain(
+      i18next.t("moveTriggers:tookMoveAttack", {
+        pokemonName: getPokemonNameWithAffix(enemy1),
+        moveName: allMoves[MoveId.FUTURE_SIGHT].name,
+      }),
+    );
+  });
+
+  it("should vanish silently if slot is vacant when attack lands", async () => {
+    game.override.battleStyle("double");
+    await game.classicMode.startBattle([SpeciesId.MAGIKARP]);
+
+    const [enemy1, enemy2] = game.scene.getEnemyField();
+
+    game.move.use(MoveId.FUTURE_SIGHT, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2);
+    await game.toNextTurn();
+
+    expectFutureSightActive(1);
+
+    game.move.use(MoveId.SPLASH);
+    await game.killPokemon(enemy2);
+    await game.toNextTurn();
+
+    game.move.use(MoveId.SPLASH);
+    await game.toNextTurn();
+
+    expectFutureSightActive(0);
+    expect(enemy1.hp).toBe(enemy1.getMaxHp());
+    expect(game.textInterceptor.logs).not.toContain(
+      i18next.t("moveTriggers:tookMoveAttack", {
+        pokemonName: getPokemonNameWithAffix(enemy1),
+        moveName: allMoves[MoveId.FUTURE_SIGHT].name,
+      }),
+    );
+  });
+
+  it("should consider type changes at moment of execution while ignoring redirection", async () => {
+    game.override.battleStyle("double");
+    await game.classicMode.startBattle([SpeciesId.MAGIKARP]);
+
+    // fake left enemy having lightning rod
+    const [enemy1, enemy2] = game.scene.getEnemyField();
+    game.field.mockAbility(enemy1, AbilityId.LIGHTNING_ROD);
+
+    game.move.use(MoveId.FUTURE_SIGHT, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2);
+    await game.toNextTurn();
+
+    expectFutureSightActive(1);
+
+    game.move.use(MoveId.SPLASH, BattlerIndex.PLAYER);
+    await game.toNextTurn();
+
+    game.move.use(MoveId.SPLASH, BattlerIndex.PLAYER);
+    await game.move.forceEnemyMove(MoveId.ELECTRIFY, BattlerIndex.PLAYER);
+    await game.phaseInterceptor.to("PositionalTagPhase");
+    await game.phaseInterceptor.to("MoveEffectPhase", false);
+
+    // Wait until all normal attacks have triggered, then check pending MEP
+    const karp = game.field.getPlayerPokemon();
+    const typeMock = vi.spyOn(karp, "getMoveType");
+
+    await game.toEndOfTurn();
+
+    expect(enemy1.hp).toBe(enemy1.getMaxHp());
+    expect(enemy2.hp).toBeLessThan(enemy2.getMaxHp());
+    expect(game.textInterceptor.logs).toContain(
+      i18next.t("moveTriggers:tookMoveAttack", {
+        pokemonName: getPokemonNameWithAffix(enemy2),
+        moveName: allMoves[MoveId.FUTURE_SIGHT].name,
+      }),
+    );
+    expect(typeMock).toHaveLastReturnedWith(PokemonType.ELECTRIC);
+  });
+
+  // TODO: this is not implemented
+  it.todo("should not apply Shell Bell recovery, even if user is on field");
+
+  // TODO: Enable once code is added to MEP to do this
+  it.todo("should not apply the user's abilities when dealing damage if the user is inactive", async () => {
+    game.override.ability(AbilityId.NORMALIZE).enemySpecies(SpeciesId.LUNALA);
+    await game.classicMode.startBattle([SpeciesId.FEEBAS, SpeciesId.MILOTIC]);
+
+    game.move.use(MoveId.DOOM_DESIRE);
+    await game.toNextTurn();
+
+    expectFutureSightActive();
+
+    await passTurns(1);
+
+    game.doSwitchPokemon(1);
+    const typeMock = vi.spyOn(game.field.getPlayerPokemon(), "getMoveType");
+    const powerMock = vi.spyOn(allMoves[MoveId.DOOM_DESIRE], "calculateBattlePower");
+
+    await game.toNextTurn();
+
+    // Player Normalize was not applied due to being off field
+    const enemy = game.field.getEnemyPokemon();
+    expect(enemy.hp).toBeLessThan(enemy.getMaxHp());
+    expect(game.textInterceptor.logs).toContain(
+      i18next.t("moveTriggers:tookMoveAttack", {
+        pokemonName: getPokemonNameWithAffix(enemy),
+        moveName: allMoves[MoveId.DOOM_DESIRE].name,
+      }),
+    );
+    expect(typeMock).toHaveLastReturnedWith(PokemonType.STEEL);
+    expect(powerMock).toHaveLastReturnedWith(150);
+  });
+
+  it.todo("should not apply the user's held items when dealing damage if the user is inactive", async () => {
+    game.override.startingHeldItems([{ name: "ATTACK_TYPE_BOOSTER", count: 99, type: PokemonType.PSYCHIC }]);
+    await game.classicMode.startBattle([SpeciesId.FEEBAS, SpeciesId.MILOTIC]);
+
+    game.move.use(MoveId.FUTURE_SIGHT);
+    await game.toNextTurn();
+
+    expectFutureSightActive();
+
+    await passTurns(1);
+
+    game.doSwitchPokemon(1);
+
+    const powerMock = vi.spyOn(allMoves[MoveId.FUTURE_SIGHT], "calculateBattlePower");
+    const typeBoostSpy = vi.spyOn(AttackTypeBoosterModifier.prototype, "apply");
+
+    await game.toNextTurn();
+
+    expect(powerMock).toHaveLastReturnedWith(120);
+    expect(typeBoostSpy).not.toHaveBeenCalled();
+  });
+
+  // TODO: Implement and move to a power spot's test file
+  it.todo("Should activate ally's power spot when switched in during single battles");
+});
diff --git a/test/moves/future-sight.test.ts b/test/moves/future-sight.test.ts
deleted file mode 100644
index 53e93412570..00000000000
--- a/test/moves/future-sight.test.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { AbilityId } from "#enums/ability-id";
-import { MoveId } from "#enums/move-id";
-import { SpeciesId } from "#enums/species-id";
-import { GameManager } from "#test/test-utils/game-manager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-
-describe("Moves - Future Sight", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override
-      .startingLevel(50)
-      .moveset([MoveId.FUTURE_SIGHT, MoveId.SPLASH])
-      .battleStyle("single")
-      .enemySpecies(SpeciesId.MAGIKARP)
-      .enemyAbility(AbilityId.STURDY)
-      .enemyMoveset(MoveId.SPLASH);
-  });
-
-  it("hits 2 turns after use, ignores user switch out", async () => {
-    await game.classicMode.startBattle([SpeciesId.FEEBAS, SpeciesId.MILOTIC]);
-
-    game.move.select(MoveId.FUTURE_SIGHT);
-    await game.toNextTurn();
-    game.doSwitchPokemon(1);
-    await game.toNextTurn();
-    game.move.select(MoveId.SPLASH);
-    await game.toNextTurn();
-
-    expect(game.scene.getEnemyPokemon()!.isFullHp()).toBe(false);
-  });
-});
diff --git a/test/moves/heal-block.test.ts b/test/moves/heal-block.test.ts
index 4e4a9355467..fc814fda4bc 100644
--- a/test/moves/heal-block.test.ts
+++ b/test/moves/heal-block.test.ts
@@ -1,9 +1,8 @@
 import { AbilityId } from "#enums/ability-id";
-import { ArenaTagSide } from "#enums/arena-tag-side";
-import { ArenaTagType } from "#enums/arena-tag-type";
 import { BattlerIndex } from "#enums/battler-index";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { MoveId } from "#enums/move-id";
+import { PositionalTagType } from "#enums/positional-tag-type";
 import { SpeciesId } from "#enums/species-id";
 import { WeatherType } from "#enums/weather-type";
 import { GameManager } from "#test/test-utils/game-manager";
@@ -68,22 +67,25 @@ describe("Moves - Heal Block", () => {
     expect(enemy.isFullHp()).toBe(false);
   });
 
-  it("should stop delayed heals, such as from Wish", async () => {
+  it("should prevent Wish from restoring HP", async () => {
     await game.classicMode.startBattle([SpeciesId.CHARIZARD]);
 
-    const player = game.scene.getPlayerPokemon()!;
+    const player = game.field.getPlayerPokemon()!;
 
-    player.damageAndUpdate(player.getMaxHp() - 1);
+    player.hp = 1;
 
-    game.move.select(MoveId.WISH);
-    await game.phaseInterceptor.to("TurnEndPhase");
+    game.move.use(MoveId.WISH);
+    await game.toNextTurn();
 
-    expect(game.scene.arena.getTagOnSide(ArenaTagType.WISH, ArenaTagSide.PLAYER)).toBeDefined();
-    while (game.scene.arena.getTagOnSide(ArenaTagType.WISH, ArenaTagSide.PLAYER)) {
-      game.move.select(MoveId.SPLASH);
-      await game.phaseInterceptor.to("TurnEndPhase");
-    }
+    expect(game.scene.arena.positionalTagManager.tags.filter(t => t.tagType === PositionalTagType.WISH)) //
+      .toHaveLength(1);
 
+    game.move.use(MoveId.SPLASH);
+    await game.toNextTurn();
+
+    // wish triggered, but did NOT heal the player
+    expect(game.scene.arena.positionalTagManager.tags.filter(t => t.tagType === PositionalTagType.WISH)) //
+      .toHaveLength(0);
     expect(player.hp).toBe(1);
   });
 
diff --git a/test/moves/wish.test.ts b/test/moves/wish.test.ts
new file mode 100644
index 00000000000..147c598106b
--- /dev/null
+++ b/test/moves/wish.test.ts
@@ -0,0 +1,183 @@
+import { getPokemonNameWithAffix } from "#app/messages";
+import { AbilityId } from "#enums/ability-id";
+import { BattlerIndex } from "#enums/battler-index";
+import { MoveId } from "#enums/move-id";
+import { MoveResult } from "#enums/move-result";
+import { PositionalTagType } from "#enums/positional-tag-type";
+import { SpeciesId } from "#enums/species-id";
+import { Stat } from "#enums/stat";
+import { GameManager } from "#test/test-utils/game-manager";
+import { toDmgValue } from "#utils/common";
+import i18next from "i18next";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+describe("Move - Wish", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .ability(AbilityId.BALL_FETCH)
+      .battleStyle("single")
+      .criticalHits(false)
+      .enemySpecies(SpeciesId.MAGIKARP)
+      .enemyAbility(AbilityId.BALL_FETCH)
+      .enemyMoveset(MoveId.SPLASH)
+      .startingLevel(100)
+      .enemyLevel(100);
+  });
+
+  /**
+   * Expect that wish is active with the specified number of attacks.
+   * @param numAttacks - The number of wish instances that should be queued; default `1`
+   */
+  function expectWishActive(numAttacks = 1) {
+    const wishes = game.scene.arena.positionalTagManager["tags"].filter(t => t.tagType === PositionalTagType.WISH);
+    expect(wishes).toHaveLength(numAttacks);
+  }
+
+  it("should heal the Pokemon in the current slot for 50% of the user's maximum HP", async () => {
+    await game.classicMode.startBattle([SpeciesId.ALOMOMOLA, SpeciesId.BLISSEY]);
+
+    const [alomomola, blissey] = game.scene.getPlayerParty();
+    alomomola.hp = 1;
+    blissey.hp = 1;
+
+    game.move.use(MoveId.WISH);
+    await game.toNextTurn();
+
+    expectWishActive();
+
+    game.doSwitchPokemon(1);
+    await game.toEndOfTurn();
+
+    expectWishActive(0);
+    expect(game.textInterceptor.logs).toContain(
+      i18next.t("arenaTag:wishTagOnAdd", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(alomomola),
+      }),
+    );
+    expect(alomomola.hp).toBe(1);
+    expect(blissey.hp).toBe(toDmgValue(alomomola.getMaxHp() / 2) + 1);
+  });
+
+  it("should work if the user has full HP, but not if it already has an active Wish", async () => {
+    await game.classicMode.startBattle([SpeciesId.ALOMOMOLA, SpeciesId.BLISSEY]);
+
+    const alomomola = game.field.getPlayerPokemon();
+    alomomola.hp = 1;
+
+    game.move.use(MoveId.WISH);
+    await game.toNextTurn();
+
+    expectWishActive();
+
+    game.move.use(MoveId.WISH);
+    await game.toEndOfTurn();
+
+    expect(alomomola.hp).toBe(toDmgValue(alomomola.getMaxHp() / 2) + 1);
+    expect(alomomola.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+  });
+
+  it("should function independently of Future Sight", async () => {
+    await game.classicMode.startBattle([SpeciesId.ALOMOMOLA, SpeciesId.BLISSEY]);
+
+    const [alomomola, blissey] = game.scene.getPlayerParty();
+    alomomola.hp = 1;
+    blissey.hp = 1;
+
+    game.move.use(MoveId.WISH);
+    await game.move.forceEnemyMove(MoveId.FUTURE_SIGHT);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.toNextTurn();
+
+    expectWishActive(1);
+  });
+
+  it("should work in double battles and trigger in order of creation", async () => {
+    game.override.battleStyle("double");
+    await game.classicMode.startBattle([SpeciesId.ALOMOMOLA, SpeciesId.BLISSEY]);
+
+    const [alomomola, blissey, karp1, karp2] = game.scene.getField();
+    alomomola.hp = 1;
+    blissey.hp = 1;
+
+    vi.spyOn(karp1, "getNameToRender").mockReturnValue("Karp 1");
+    vi.spyOn(karp2, "getNameToRender").mockReturnValue("Karp 2");
+
+    const oldOrder = game.field.getSpeedOrder();
+
+    game.move.use(MoveId.WISH, BattlerIndex.PLAYER);
+    game.move.use(MoveId.WISH, BattlerIndex.PLAYER_2);
+    await game.move.forceEnemyMove(MoveId.WISH);
+    await game.move.forceEnemyMove(MoveId.WISH);
+    // Ensure that the wishes are used deterministically in speed order (for speed ties)
+    await game.setTurnOrder(oldOrder.map(p => p.getBattlerIndex()));
+    await game.toNextTurn();
+
+    expectWishActive(4);
+
+    // Lower speed to change turn order
+    alomomola.setStatStage(Stat.SPD, 6);
+    blissey.setStatStage(Stat.SPD, -6);
+
+    const newOrder = game.field.getSpeedOrder();
+    expect(newOrder).not.toEqual(oldOrder);
+
+    game.move.use(MoveId.SPLASH, BattlerIndex.PLAYER);
+    game.move.use(MoveId.SPLASH, BattlerIndex.PLAYER_2);
+    await game.phaseInterceptor.to("PositionalTagPhase");
+
+    // all wishes have activated and added healing phases
+    expectWishActive(0);
+
+    const healPhases = game.scene.phaseManager.phaseQueue.filter(p => p.is("PokemonHealPhase"));
+    expect(healPhases).toHaveLength(4);
+    expect.soft(healPhases.map(php => php.getPokemon())).toEqual(oldOrder);
+
+    await game.toEndOfTurn();
+
+    expect(alomomola.hp).toBe(toDmgValue(alomomola.getMaxHp() / 2) + 1);
+    expect(blissey.hp).toBe(toDmgValue(blissey.getMaxHp() / 2) + 1);
+  });
+
+  it("should vanish and not play message if slot is empty", async () => {
+    game.override.battleStyle("double");
+    await game.classicMode.startBattle([SpeciesId.ALOMOMOLA, SpeciesId.BLISSEY]);
+
+    const [alomomola, blissey] = game.scene.getPlayerParty();
+    alomomola.hp = 1;
+    blissey.hp = 1;
+
+    game.move.use(MoveId.SPLASH, BattlerIndex.PLAYER);
+    game.move.use(MoveId.WISH, BattlerIndex.PLAYER_2);
+    await game.toNextTurn();
+
+    expectWishActive();
+
+    game.move.use(MoveId.SPLASH, BattlerIndex.PLAYER);
+    game.move.use(MoveId.MEMENTO, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY_2);
+    await game.toEndOfTurn();
+
+    // Wish went away without doing anything
+    expectWishActive(0);
+    expect(game.textInterceptor.logs).not.toContain(
+      i18next.t("arenaTag:wishTagOnAdd", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(blissey),
+      }),
+    );
+    expect(alomomola.hp).toBe(1);
+  });
+});
diff --git a/test/test-utils/helpers/field-helper.ts b/test/test-utils/helpers/field-helper.ts
index 35ca853d049..2d8fd8ee701 100644
--- a/test/test-utils/helpers/field-helper.ts
+++ b/test/test-utils/helpers/field-helper.ts
@@ -5,7 +5,6 @@ import type { globalScene } from "#app/global-scene";
 import type { Ability } from "#abilities/ability";
 import { allAbilities } from "#data/data-lists";
 import type { AbilityId } from "#enums/ability-id";
-import type { BattlerIndex } from "#enums/battler-index";
 import type { PokemonType } from "#enums/pokemon-type";
 import { Stat } from "#enums/stat";
 import type { EnemyPokemon, PlayerPokemon, Pokemon } from "#field/pokemon";
@@ -45,18 +44,21 @@ export class FieldHelper extends GameManagerHelper {
   }
 
   /**
-   * @returns The {@linkcode BattlerIndex | indexes} of Pokemon on the field in order of decreasing Speed.
+   * Helper function to return all on-field {@linkcode Pokemon} in speed order (fastest first).
+   * @returns An array containing all {@linkcode Pokemon} on the field in order of descending Speed.
    * Speed ties are returned in increasing order of index.
    *
    * @remarks
    * This does not account for Trick Room as it does not modify the _speed_ of Pokemon on the field,
    * only their turn order.
    */
-  public getSpeedOrder(): BattlerIndex[] {
+  public getSpeedOrder(): Pokemon[] {
     return this.game.scene
       .getField(true)
-      .sort((pA, pB) => pB.getEffectiveStat(Stat.SPD) - pA.getEffectiveStat(Stat.SPD))
-      .map(p => p.getBattlerIndex());
+      .sort(
+        (pA, pB) =>
+          pB.getEffectiveStat(Stat.SPD) - pA.getEffectiveStat(Stat.SPD) || pA.getBattlerIndex() - pB.getBattlerIndex(),
+      );
   }
 
   /**
diff --git a/test/test-utils/helpers/move-helper.ts b/test/test-utils/helpers/move-helper.ts
index 15605edf31d..041df916cbf 100644
--- a/test/test-utils/helpers/move-helper.ts
+++ b/test/test-utils/helpers/move-helper.ts
@@ -325,10 +325,16 @@ export class MoveHelper extends GameManagerHelper {
   }
 
   /**
-   * Force the move used by Metronome to be a specific move.
-   * @param move - The move to force metronome to use
-   * @param once - If `true`, uses {@linkcode MockInstance#mockReturnValueOnce} when mocking, else uses {@linkcode MockInstance#mockReturnValue}.
+   * Force the next move(s) used by Metronome to be a specific move. \
+   * Triggers during the next upcoming {@linkcode MoveEffectPhase} that Metronome is used.
+   * @param move - The move to force Metronome to call
+   * @param once - If `true`, mocks the return value exactly once; default `false`
    * @returns The spy that for Metronome that was mocked (Usually unneeded).
+   * @example
+   * ```ts
+   * game.move.use(MoveId.METRONOME);
+   * game.move.forceMetronomeMove(MoveId.FUTURE_SIGHT); // Can be in any order
+   * ```
    */
   public forceMetronomeMove(move: MoveId, once = false): MockInstance {
     const spy = vi.spyOn(allMoves[MoveId.METRONOME].getAttrs("RandomMoveAttr")[0], "getMoveOverride");
diff --git a/test/test-utils/phase-interceptor.ts b/test/test-utils/phase-interceptor.ts
index e0675a722f9..50de7e9f047 100644
--- a/test/test-utils/phase-interceptor.ts
+++ b/test/test-utils/phase-interceptor.ts
@@ -37,6 +37,7 @@ import { NextEncounterPhase } from "#phases/next-encounter-phase";
 import { PartyExpPhase } from "#phases/party-exp-phase";
 import { PartyHealPhase } from "#phases/party-heal-phase";
 import { PokemonTransformPhase } from "#phases/pokemon-transform-phase";
+import { PositionalTagPhase } from "#phases/positional-tag-phase";
 import { PostGameOverPhase } from "#phases/post-game-over-phase";
 import { PostSummonPhase } from "#phases/post-summon-phase";
 import { QuietFormChangePhase } from "#phases/quiet-form-change-phase";
@@ -142,6 +143,7 @@ export class PhaseInterceptor {
     [LevelCapPhase, this.startPhase],
     [AttemptRunPhase, this.startPhase],
     [SelectBiomePhase, this.startPhase],
+    [PositionalTagPhase, this.startPhase],
     [PokemonTransformPhase, this.startPhase],
     [MysteryEncounterPhase, this.startPhase],
     [MysteryEncounterOptionSelectedPhase, this.startPhase],
diff --git a/test/types/positional-tags.test-d.ts b/test/types/positional-tags.test-d.ts
new file mode 100644
index 00000000000..a75cc291764
--- /dev/null
+++ b/test/types/positional-tags.test-d.ts
@@ -0,0 +1,29 @@
+import type { SerializedPositionalTag, serializedPosTagMap } from "#data/positional-tags/load-positional-tag";
+import type { DelayedAttackTag, WishTag } from "#data/positional-tags/positional-tag";
+import type { PositionalTagType } from "#enums/positional-tag-type";
+import type { Mutable, NonFunctionPropertiesRecursive } from "#types/type-helpers";
+import { describe, expectTypeOf, it } from "vitest";
+
+// Needed to get around properties being readonly in certain classes
+type NonFunctionMutable<T> = Mutable<NonFunctionPropertiesRecursive<T>>;
+
+describe("serializedPositionalTagMap", () => {
+  it("should contain representations of each tag's serialized form", () => {
+    expectTypeOf<serializedPosTagMap[PositionalTagType.DELAYED_ATTACK]>().branded.toEqualTypeOf<
+      NonFunctionMutable<DelayedAttackTag>
+    >();
+    expectTypeOf<serializedPosTagMap[PositionalTagType.WISH]>().branded.toEqualTypeOf<NonFunctionMutable<WishTag>>();
+  });
+});
+
+describe("SerializedPositionalTag", () => {
+  it("should accept a union of all serialized tag forms", () => {
+    expectTypeOf<SerializedPositionalTag>().branded.toEqualTypeOf<
+      NonFunctionMutable<DelayedAttackTag> | NonFunctionMutable<WishTag>
+    >();
+  });
+  it("should accept a union of all unserialized tag forms", () => {
+    expectTypeOf<WishTag>().toExtend<SerializedPositionalTag>();
+    expectTypeOf<DelayedAttackTag>().toExtend<SerializedPositionalTag>();
+  });
+});

From 8b304adf1400af77fc40ff6030e905eab82d069a Mon Sep 17 00:00:00 2001
From: Bertie690 <136088738+Bertie690@users.noreply.github.com>
Date: Thu, 31 Jul 2025 02:27:54 -0400
Subject: [PATCH 36/44] [Refactor] Added `PhaseManager.toTitleScreen` (#6114)

* Added `toTitlePhase`; documented phase manager

* Documented phase methods

* Fixed syntax errors + updated signature

* Reverted all the goodies

* Fixed missing shift phase call

GHAG

* Reverted change
---
 src/battle-scene.ts                    |  7 ++-----
 src/enums/dynamic-phase-type.ts        |  3 ++-
 src/phase-manager.ts                   | 15 +++++++++++++++
 src/phases/select-starter-phase.ts     |  7 ++++---
 src/phases/title-phase.ts              | 11 ++++++-----
 src/ui/challenges-select-ui-handler.ts |  3 +--
 src/ui/starter-select-ui-handler.ts    | 16 +++++++++-------
 test/test-utils/game-manager.ts        |  5 +----
 8 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 275f129a63a..9af954c3852 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -657,9 +657,7 @@ export class BattleScene extends SceneBase {
       ).then(() => loadMoveAnimAssets(defaultMoves, true)),
       this.initStarterColors(),
     ]).then(() => {
-      this.phaseManager.pushNew("LoginPhase");
-      this.phaseManager.pushNew("TitlePhase");
-
+      this.phaseManager.toTitleScreen(true);
       this.phaseManager.shiftPhase();
     });
   }
@@ -1269,13 +1267,12 @@ export class BattleScene extends SceneBase {
         duration: 250,
         ease: "Sine.easeInOut",
         onComplete: () => {
-          this.phaseManager.clearPhaseQueue();
-
           this.ui.freeUIData();
           this.uiContainer.remove(this.ui, true);
           this.uiContainer.destroy();
           this.children.removeAll(true);
           this.game.domContainer.innerHTML = "";
+          // TODO: `launchBattle` calls `reset(false, false, true)`
           this.launchBattle();
         },
       });
diff --git a/src/enums/dynamic-phase-type.ts b/src/enums/dynamic-phase-type.ts
index a34ac371668..b9ea6bf197d 100644
--- a/src/enums/dynamic-phase-type.ts
+++ b/src/enums/dynamic-phase-type.ts
@@ -1,6 +1,7 @@
 /**
- * Enum representation of the phase types held by implementations of {@linkcode PhasePriorityQueue}
+ * Enum representation of the phase types held by implementations of {@linkcode PhasePriorityQueue}.
  */
+// TODO: We currently assume these are in order
 export enum DynamicPhaseType {
   POST_SUMMON
 }
diff --git a/src/phase-manager.ts b/src/phase-manager.ts
index 37edeae7e42..850f0c564ea 100644
--- a/src/phase-manager.ts
+++ b/src/phase-manager.ts
@@ -244,6 +244,21 @@ export class PhaseManager {
     this.dynamicPhaseTypes = [PostSummonPhase];
   }
 
+  /**
+   * Clear all previously set phases, then add a new {@linkcode TitlePhase} to transition to the title screen.
+   * @param addLogin - Whether to add a new {@linkcode LoginPhase} before the {@linkcode TitlePhase}
+   * (but reset everything else).
+   * Default `false`
+   */
+  public toTitleScreen(addLogin = false): void {
+    this.clearAllPhases();
+
+    if (addLogin) {
+      this.unshiftNew("LoginPhase");
+    }
+    this.unshiftNew("TitlePhase");
+  }
+
   /* Phase Functions */
   getCurrentPhase(): Phase | null {
     return this.currentPhase;
diff --git a/src/phases/select-starter-phase.ts b/src/phases/select-starter-phase.ts
index af056ebb4ee..6456bacd0e3 100644
--- a/src/phases/select-starter-phase.ts
+++ b/src/phases/select-starter-phase.ts
@@ -24,10 +24,11 @@ export class SelectStarterPhase extends Phase {
     globalScene.ui.setMode(UiMode.STARTER_SELECT, (starters: Starter[]) => {
       globalScene.ui.clearText();
       globalScene.ui.setMode(UiMode.SAVE_SLOT, SaveSlotUiMode.SAVE, (slotId: number) => {
+        // If clicking cancel, back out to title screen
         if (slotId === -1) {
-          globalScene.phaseManager.clearPhaseQueue();
-          globalScene.phaseManager.pushNew("TitlePhase");
-          return this.end();
+          globalScene.phaseManager.toTitleScreen();
+          this.end();
+          return;
         }
         globalScene.sessionSlotId = slotId;
         this.initBattle(starters);
diff --git a/src/phases/title-phase.ts b/src/phases/title-phase.ts
index 38e3ff3a017..6f0493f707d 100644
--- a/src/phases/title-phase.ts
+++ b/src/phases/title-phase.ts
@@ -114,11 +114,11 @@ export class TitlePhase extends Phase {
               });
             }
           }
+          // Cancel button = back to title
           options.push({
             label: i18next.t("menu:cancel"),
             handler: () => {
-              globalScene.phaseManager.clearPhaseQueue();
-              globalScene.phaseManager.pushNew("TitlePhase");
+              globalScene.phaseManager.toTitleScreen();
               super.end();
               return true;
             },
@@ -191,11 +191,12 @@ export class TitlePhase extends Phase {
   initDailyRun(): void {
     globalScene.ui.clearText();
     globalScene.ui.setMode(UiMode.SAVE_SLOT, SaveSlotUiMode.SAVE, (slotId: number) => {
-      globalScene.phaseManager.clearPhaseQueue();
       if (slotId === -1) {
-        globalScene.phaseManager.pushNew("TitlePhase");
-        return super.end();
+        globalScene.phaseManager.toTitleScreen();
+        super.end();
+        return;
       }
+      globalScene.phaseManager.clearPhaseQueue();
       globalScene.sessionSlotId = slotId;
 
       const generateDaily = (seed: string) => {
diff --git a/src/ui/challenges-select-ui-handler.ts b/src/ui/challenges-select-ui-handler.ts
index 4f205d59de8..4a7ab7641a3 100644
--- a/src/ui/challenges-select-ui-handler.ts
+++ b/src/ui/challenges-select-ui-handler.ts
@@ -382,8 +382,7 @@ export class GameChallengesUiHandler extends UiHandler {
         this.cursorObj?.setVisible(true);
         this.updateChallengeArrows(this.startCursor.visible);
       } else {
-        globalScene.phaseManager.clearPhaseQueue();
-        globalScene.phaseManager.pushNew("TitlePhase");
+        globalScene.phaseManager.toTitleScreen();
         globalScene.phaseManager.getCurrentPhase()?.end();
       }
       success = true;
diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts
index e8f9b5e1c38..974f24e706f 100644
--- a/src/ui/starter-select-ui-handler.ts
+++ b/src/ui/starter-select-ui-handler.ts
@@ -4303,7 +4303,10 @@ export class StarterSelectUiHandler extends MessageUiHandler {
     return true;
   }
 
-  tryExit(): boolean {
+  /**
+   * Attempt to back out of the starter selection screen into the appropriate parent modal
+   */
+  tryExit(): void {
     this.blockInput = true;
     const ui = this.getUi();
 
@@ -4317,12 +4320,13 @@ export class StarterSelectUiHandler extends MessageUiHandler {
         UiMode.CONFIRM,
         () => {
           ui.setMode(UiMode.STARTER_SELECT);
-          globalScene.phaseManager.clearPhaseQueue();
-          if (globalScene.gameMode.isChallenge) {
+          // Non-challenge modes go directly back to title, while challenge modes go to the selection screen.
+          if (!globalScene.gameMode.isChallenge) {
+            globalScene.phaseManager.toTitleScreen();
+          } else {
+            globalScene.phaseManager.clearPhaseQueue();
             globalScene.phaseManager.pushNew("SelectChallengePhase");
             globalScene.phaseManager.pushNew("EncounterPhase");
-          } else {
-            globalScene.phaseManager.pushNew("TitlePhase");
           }
           this.clearText();
           globalScene.phaseManager.getCurrentPhase()?.end();
@@ -4333,8 +4337,6 @@ export class StarterSelectUiHandler extends MessageUiHandler {
         19,
       );
     });
-
-    return true;
   }
 
   tryStart(manualTrigger = false): boolean {
diff --git a/test/test-utils/game-manager.ts b/test/test-utils/game-manager.ts
index b81b077b2f2..23a2e6240f8 100644
--- a/test/test-utils/game-manager.ts
+++ b/test/test-utils/game-manager.ts
@@ -103,12 +103,9 @@ export class GameManager {
     if (!firstTimeScene) {
       this.scene.reset(false, true);
       (this.scene.ui.handlers[UiMode.STARTER_SELECT] as StarterSelectUiHandler).clearStarterPreferences();
-      this.scene.phaseManager.clearAllPhases();
 
       // Must be run after phase interceptor has been initialized.
-
-      this.scene.phaseManager.pushNew("LoginPhase");
-      this.scene.phaseManager.pushNew("TitlePhase");
+      this.scene.phaseManager.toTitleScreen(true);
       this.scene.phaseManager.shiftPhase();
 
       this.gameWrapper.scene = this.scene;

From 75ececd942a439660b4670bef1b16388183c9cf1 Mon Sep 17 00:00:00 2001
From: Tiago Rodrigues <tiago.n.rodrigues@tecnico.ulisboa.pt>
Date: Thu, 31 Jul 2025 21:14:51 +0100
Subject: [PATCH 37/44] [UI/UX] Implement Discard Button (#5985)

* [feature]Implemented needed parts for discard function from issue #4780:
-TryDiscardFunction in battlescene;
-Created a party discard mode button;
-Updated Transfer button in modifier-select-ui-handler to Manage items;
-Created tests for the discard function in test/ui;
-Added images for the new discard and transfer buttons to loading-scene;
-Created placeholder messages for discard feature in party-ui-handler;

Co-authored-by: Tiago Rodrigues <tiago.n.rodrigues@tecnico.ulisboa.pt>

* [Fix] Updated icon for dynamic messaging

* [Fix] Corrected legacy mode icons and adjusted double-battle button location

* [Fix]Adjusted button positioning and mapping after review. Mapping requires debugging.

* [Fix] Fixed visible pokeball in legacy mode and key mapping

* [Fix] Background fixes,manage menu is the only one affected by changes now

* Implement i18n keys

* [Fix] implemented most code optimizations and callbacks to the modified locales folder

* [Fix] Implemented 3 suggestions

* [Fix]improved/corrected test structure

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>

* [Fix] added functionality test for the discard button

* [Fix] added necessary comment

Co-authored-by: Bertie690 <136088738+Bertie690@users.noreply.github.com>

* [Fix] Implemented suggested changes in test/discard text prompt

* [Fix] Implemented UI suggestions and removed discard text confirmation

* [Fix] added missing imports

* Fix imports in test file

* [Fix] Implemented suggested cursor behavior and reworked test code

* [Fix] Corrected failed test

* [Fix] atempting to fix the test timeout issue

* [Fix] Undoing latest attempt

* [Fix] Implemented suggestions to fix broken tests

* Reviews

* [Fix] replaced icon images

* [Fix] Updated jsons to match new icons and removed pokeball icon from legacy mode

* Optimized new images

* [Fix] Fixed referenced bug and added similar confirmation box to release

* [Fix] Updated tests to handle the corfirmation box

* [Fix] Added back the accidentally removed changes

* [Fix]updated incorrect import path

* [fix] add description for the manageItemMode function

Co-authored-by: Bertie690 <136088738+Bertie690@users.noreply.github.com>

* Update src/ui/party-ui-handler.ts

Co-authored-by: Bertie690 <136088738+Bertie690@users.noreply.github.com>

* [Fix] corrected formating issue

---------

Co-authored-by: Mikhail Shueb <mikhail.shueb@tecnico.ulisboa.pt>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Bertie690 <136088738+Bertie690@users.noreply.github.com>
Co-authored-by: damocleas <damocleas25@gmail.com>
Co-authored-by: Bertie690 <taylormw163@gmail.com>
Co-authored-by: Adri1 <adrien.grivel@hotmail.fr>
---
 .../ui/legacy/party_bg_double_manage.png      | Bin 0 -> 431 bytes
 public/images/ui/legacy/party_discard.json    |  62 ++++
 public/images/ui/legacy/party_discard.png     | Bin 0 -> 346 bytes
 public/images/ui/legacy/party_transfer.json   |  62 ++++
 public/images/ui/legacy/party_transfer.png    | Bin 0 -> 366 bytes
 public/images/ui/party_bg_double_manage.png   | Bin 0 -> 837 bytes
 public/images/ui/party_discard.json           |  62 ++++
 public/images/ui/party_discard.png            | Bin 0 -> 386 bytes
 public/images/ui/party_transfer.json          |  62 ++++
 public/images/ui/party_transfer.png           | Bin 0 -> 403 bytes
 src/battle-scene.ts                           |  17 +
 src/loading-scene.ts                          |   3 +
 src/ui/modifier-select-ui-handler.ts          |   6 +-
 src/ui/party-ui-handler.ts                    | 305 ++++++++++++++++--
 test/ui/item-manage-button.test.ts            | 172 ++++++++++
 15 files changed, 726 insertions(+), 25 deletions(-)
 create mode 100644 public/images/ui/legacy/party_bg_double_manage.png
 create mode 100644 public/images/ui/legacy/party_discard.json
 create mode 100644 public/images/ui/legacy/party_discard.png
 create mode 100644 public/images/ui/legacy/party_transfer.json
 create mode 100644 public/images/ui/legacy/party_transfer.png
 create mode 100644 public/images/ui/party_bg_double_manage.png
 create mode 100644 public/images/ui/party_discard.json
 create mode 100644 public/images/ui/party_discard.png
 create mode 100644 public/images/ui/party_transfer.json
 create mode 100644 public/images/ui/party_transfer.png
 create mode 100644 test/ui/item-manage-button.test.ts

diff --git a/public/images/ui/legacy/party_bg_double_manage.png b/public/images/ui/legacy/party_bg_double_manage.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bf2d63c3154c6f6f28101d351899c3170753130
GIT binary patch
literal 431
zcmeAS@N?(olHy`uVBq!ia0y~yU~~Yox3Dk+N%2!Jlz@~_fKQ04hetv}1VhIRjSU+j
zPF$#X@S?*b=ny|pd4#8nV@O3@Qh?Nxge#3I4T0=^RsoU+_T9bh!o!*<VwyB}y({yH
zWegXJ85MRiOnSRtRET}H;@<f;9p^+J;?(*1`G?1iy$L68%zaSzMC^`N(ZRnSdJ#t4
z`}{;>nOL7kyWVeXD&{?48nhv#<ZpD-{L39yT<5k6+I|<F)6ZBNYsEE<vG$9QipK;6
z$0im|AfrGs(EZ@|Oqc(U_TJd!02SU6czcB|x4*ZmzF?DYymd3nc`sMPrgTvT7S4Zi
zj^__9Tg}hCx_8!s-dk?DkqS`5Zmr0@VwTnPRS;%6NZ@U_{J%nbZOh%iAIZr=td!Ug
zxSf+N=St+d`*-+}oU)^5g|9)u;%zz+VjM7Gc^Sv1{F|)X-!x^H9W>qhU|MW}uTI4_
tb@7<(Q=06hADPGYS`}PrT+GM95V7FIR?(B*mcSTb@O1TaS?83{1OS1sq`m+E

literal 0
HcmV?d00001

diff --git a/public/images/ui/legacy/party_discard.json b/public/images/ui/legacy/party_discard.json
new file mode 100644
index 00000000000..4aa563fcd77
--- /dev/null
+++ b/public/images/ui/legacy/party_discard.json
@@ -0,0 +1,62 @@
+{
+	"textures": [
+		{
+			"image": "party_discard.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 75,
+				"h": 50
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "normal",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 75,
+						"h": 25
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 75,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 75,
+						"h": 25
+					}
+				},
+				{
+					"filename": "selected",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 75,
+						"h": 25
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 75,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 75,
+						"h": 25
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:17219773dfffd6b1204d988fea3f9462:1127ad21d64bc7ebb9df4fc28f3d2d39:7ad46e8fb4648c3d3d84a746ecb371ea$"
+	}
+}
diff --git a/public/images/ui/legacy/party_discard.png b/public/images/ui/legacy/party_discard.png
new file mode 100644
index 0000000000000000000000000000000000000000..d95ba6960152815beb50ca60c39624525d694622
GIT binary patch
literal 346
zcmeAS@N?(olHy`uVBq!ia0vp^-au@`!VDyz`C4B9QqloFA+A8$!y};}V#8FQiUkE9
zHYIM^X>WfdsNzR~LDCoZOrSJlNswPKgTu2MX+X|fPZ!6KinzU#4f&c4cwAo|li0!N
z`ifD)!ZFa2L8w~$Da+bTX$cQ*94)kYcANRpdH?^X|CPCBO^^|EO7zp1yW4ctrpRjc
zQ)NDt{1(%VI3<25T?>5Gd&aH)Mew%AXYQ%<DoizAXm#+$+aMpc(2eYg?}Iml8C($C
zexdoTklNfwj?z0P2!_4t`JT2r?y>$2`_uoHU+ohq^|Dx4vhH4J>gKncQ{K+tVk|IB
z724qAnzQW6tTWdNUW5aU)>P328Jz|*T0HT7@CILy(FTnWqsw<r5Dk;+1sVNY|3%D}
b|1agw2OLS5G^?x<=y3*5S3j3^P6<r_3dxcg

literal 0
HcmV?d00001

diff --git a/public/images/ui/legacy/party_transfer.json b/public/images/ui/legacy/party_transfer.json
new file mode 100644
index 00000000000..7cfcf5ccc30
--- /dev/null
+++ b/public/images/ui/legacy/party_transfer.json
@@ -0,0 +1,62 @@
+{
+	"textures": [
+		{
+			"image": "party_transfer.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 75,
+				"h": 50
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "normal",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 75,
+						"h": 25
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 75,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 75,
+						"h": 25
+					}
+				},
+				{
+					"filename": "selected",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 75,
+						"h": 25
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 75,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 75,
+						"h": 25
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:17219773dfffd6b1204d988fea3f9462:1127ad21d64bc7ebb9df4fc28f3d2d39:7ad46e8fb4648c3d3d84a746ecb371ea$"
+	}
+}
diff --git a/public/images/ui/legacy/party_transfer.png b/public/images/ui/legacy/party_transfer.png
new file mode 100644
index 0000000000000000000000000000000000000000..368795476764b7d9c85237b2f7d126bdd9778a8c
GIT binary patch
literal 366
zcmV-!0g?WRP)<h;3K|Lk000e1NJLTq002t>001%s0{{R3=1n`$0000RP)t-s0000A
z@3s)BmOz1{NJwB+u+wl@u%K}8_;4_OM|0i)0004WQchC<K<3zH00032Nkl<ZcwUW@
zp$>yU5JW2wSOhr_$$dZtx}vE^;i17J2$gm1XP1}TRL<_xFEf|S-UaT88-{D)nHBM>
zyNiWAR)NJ~NzmwA*Ch+>Noz&eHS4(2xpckPO6RpZ8ANN*I>_^&HA|a&N8@eCgVHea
zLSXM`OP)KB8hB~8m3kX%Rex>n#R_a{+8{O!T}braXmtty1&CM>u;8nBhb%m^B3}J<
zv9Qk}usAFU8lA_nC!xJ)tqB{Gjw_ve(|WCRj?Kv=T8q{|+9s`8+SWQ6Z$qAxhLLsx
zTSwc|)_~N&OS7%i+gPjqYg;Q;U{lj3v1#Z+qW4CtOZYE9!~);?0S@8G#<B)$umAu6
M07*qoM6N<$f}-f3aR2}S

literal 0
HcmV?d00001

diff --git a/public/images/ui/party_bg_double_manage.png b/public/images/ui/party_bg_double_manage.png
new file mode 100644
index 0000000000000000000000000000000000000000..e85413b5fb55d894dffaf267d5b291ae77c98894
GIT binary patch
literal 837
zcmeAS@N?(olHy`uVBq!ia0y~yU~~Yow{S26$xBwO%0S9Kz$e5NNON#-2mpbEf&>sK
zXvnGQD=I1~X&Gy3Y8qHL8X6j!7`R%Pcv@OoIypIcx<-0=c?AUpMMXs=CnrzLKDC#D
zf$5;9i(^Q|t+#jY_FXm*V7uV(LZIoi*n_|Gr*=1mX#HZIY_hF*-|VcX-S6aX-aR4b
z-~MsV;q}*lzIxvL@%Lk9g$4#jCKi?g?E{DB&*cA}{6{Nofhv!Hf`bD$quZInb0v>W
z&F@(!OexZOE|b6K*|EjW2YxCoziM1Q{j{V+>RZVOuj}4FL>rb@{NY~rU2@NZA88G$
za*W4zz2ASKB8M$v+3$wHSqy({1<e?AF0wv|ED$~*6w5GAo#}wigQM53mDtGnAO9Vh
zQnPFOeY3Uy|8e*FU;o_*bpg<2ReWD$GT6*^w@BYSw@RXbr@``oVNUu}hU0A8z9b*!
zy?VTXZ)zD!#NFbA!(WlKt>VAqKXrj*2Iu>gZoA447&556?_@df#&x#TwlC3ZC(0c!
zoO5{LrTteu@(cBDAKm$(<nz7{uZ$PmmU<ap%l0*J>Hq1;XRZF7W@O<IP&lCWn)$Uw
zdF~Fo3p`s|fMLa9z!>3re@0pMlI)k#!bfc<M$epA<u_+m1>YRAmHajDjDvbhR^|6J
zf1UJ7n)$=Q3Wk`kJ}e6!DK)%ezRDhT2o&5PW8E9xaqrg8;q3qA@qUNfE-Q!HCFM*j
z`oDa7eu&{K{}uZSLTo@~4zNJroIdyK#C1#aeKyxFSq-%JZQM`(+9krKm$rWC&D{Ob
zkKxb%Uk>+;=B(ylvpC=9wRgqmeTK3OWnbBWwq39|aQzCqS>*ii;MxU}X`IYJ2Lya>
z$o)R?p4^77c9(v!r~UTGw_&z^q0Afb-3*)}BEC$#=6(z6hHaarm~z&*?K-t+cQE(P
zNco6^Go4SHUgGPWa|#qj7cMtUI>Yao`a^Fe&wZ7t4_7ZS+T*EpSR5##vyx{%P-O8E
vqnZgJZQmzx0ps1;^JrdI2NayB`y{-Z-FxlHe76_C{J`Mp>gTe~DWM4f{^n*n

literal 0
HcmV?d00001

diff --git a/public/images/ui/party_discard.json b/public/images/ui/party_discard.json
new file mode 100644
index 00000000000..4aa563fcd77
--- /dev/null
+++ b/public/images/ui/party_discard.json
@@ -0,0 +1,62 @@
+{
+	"textures": [
+		{
+			"image": "party_discard.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 75,
+				"h": 50
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "normal",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 75,
+						"h": 25
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 75,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 75,
+						"h": 25
+					}
+				},
+				{
+					"filename": "selected",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 75,
+						"h": 25
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 75,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 75,
+						"h": 25
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:17219773dfffd6b1204d988fea3f9462:1127ad21d64bc7ebb9df4fc28f3d2d39:7ad46e8fb4648c3d3d84a746ecb371ea$"
+	}
+}
diff --git a/public/images/ui/party_discard.png b/public/images/ui/party_discard.png
new file mode 100644
index 0000000000000000000000000000000000000000..e56c845eadccfb9462418fa7c67996915e793d40
GIT binary patch
literal 386
zcmV-|0e$|7P)<h;3K|Lk000e1NJLTq002t>001%s0{{R3=1n`$0000dP)t-s00008
zT8s#cwILxXIXO~hR)TYLgn2wkoSdz#&epj<Kg3da|NsBsNj5$J0004WQchC<K<3zH
z0003ANkl<ZcwViOu?oUK5Jbg%L4;H`Y8S8&lwfZlV3*p`CLfT>R*<W$Ed}8^i&WRy
z1@5EVn-AF8BCopQL1wbMGht8JiIsJZ@POthNvj<BWCiW`IMgbqq-EV*p58OfUFF#~
zM62APzIoxJXo%K$&?_3E@d}9MfubSW#2RmkZ0DrCYu1!&7%A5f4*$33Gff)Z5LEpr
znswjo+nYIx^|I`DI@?fIV$ENXFhYxzq?M6;vV^uB*SX3<G>P_;X9!G-PkFWl(aN~a
zFF_a-4bh4KT17)NUIEbpP&7oFSmRBRZJD%h&YE%!Bjp;x;s3ULrb(k4f~td}+4jx4
gy~bOxUY7Ar|BwSDE^sg}CjbBd07*qoM6N<$f{o9q?EnA(

literal 0
HcmV?d00001

diff --git a/public/images/ui/party_transfer.json b/public/images/ui/party_transfer.json
new file mode 100644
index 00000000000..7cfcf5ccc30
--- /dev/null
+++ b/public/images/ui/party_transfer.json
@@ -0,0 +1,62 @@
+{
+	"textures": [
+		{
+			"image": "party_transfer.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 75,
+				"h": 50
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "normal",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 75,
+						"h": 25
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 75,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 75,
+						"h": 25
+					}
+				},
+				{
+					"filename": "selected",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 75,
+						"h": 25
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 75,
+						"h": 25
+					},
+					"frame": {
+						"x": 0,
+						"y": 25,
+						"w": 75,
+						"h": 25
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:17219773dfffd6b1204d988fea3f9462:1127ad21d64bc7ebb9df4fc28f3d2d39:7ad46e8fb4648c3d3d84a746ecb371ea$"
+	}
+}
diff --git a/public/images/ui/party_transfer.png b/public/images/ui/party_transfer.png
new file mode 100644
index 0000000000000000000000000000000000000000..45815a156b5a97589eee9d390fcf242f16862a39
GIT binary patch
literal 403
zcmV;E0c`$>P)<h;3K|Lk000e1NJLTq002t>001%s0{{R3=1n`$0000dP)t-s00008
zT8s#cwF#x63h%ZMsg@xjDJ5}qIXO~ubA+6nt*y@1|NsB4BSDG)0004WQchC<K<3zH
z0003RNkl<ZcwVKGF|L9@6h(i2VUMr?wZ(?S4H(!0!P3ge?@ibMA68)D0!*CJ+RD~h
zl$V>>zWWkSeKMRky!inK$sX415(GDDK{9D=5T9(R{oRhE$v-rtT}O`=&f~C?S{shz
zNoh<Q>PBcxJJq1GG^W)PyS_6trt!4C5gOYdceaK}hZ;0?8}6-VpFJrMr+t2@YGWKR
zCuJPzyDvAyyKnyOMV!R@vb^sUtRxFqzmF(*QHzpE%cJ;YPHp{KCMI)eNP8w8E#8xK
zE44f>la11tmR6<En6{}vVQEaOCbn5&XiVd2St&HOK`v|!lcp6Y?Ka$7#y)#eAWr-I
xQq{&dVou69k`-TWh<D%o+lx4f_hmWX=^L@xuWTW$pmhKM002ovPDHLkV1hHutW5v_

literal 0
HcmV?d00001

diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 9af954c3852..1864de2c6f4 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -2845,6 +2845,23 @@ export class BattleScene extends SceneBase {
     }
     return false;
   }
+  /**
+   * Attempt to discard one or more copies of a held item.
+   * @param itemModifier - The {@linkcode PokemonHeldItemModifier} being discarded
+   * @param discardQuantity - The number of copies to remove (up to the amount currently held); default `1`
+   * @returns Whether the item was successfully discarded.
+   * Removing fewer items than requested is still considered a success.
+   */
+  tryDiscardHeldItemModifier(itemModifier: PokemonHeldItemModifier, discardQuantity = 1): boolean {
+    const countTaken = Math.min(discardQuantity, itemModifier.stackCount);
+    itemModifier.stackCount -= countTaken;
+
+    if (itemModifier.stackCount > 0) {
+      return true;
+    }
+
+    return this.removeModifier(itemModifier);
+  }
 
   canTransferHeldItemModifier(itemModifier: PokemonHeldItemModifier, target: Pokemon, transferQuantity = 1): boolean {
     const mod = itemModifier.clone() as PokemonHeldItemModifier;
diff --git a/src/loading-scene.ts b/src/loading-scene.ts
index 706ea01a16a..c5b0263e785 100644
--- a/src/loading-scene.ts
+++ b/src/loading-scene.ts
@@ -119,6 +119,7 @@ export class LoadingScene extends SceneBase {
 
     this.loadImage("party_bg", "ui");
     this.loadImage("party_bg_double", "ui");
+    this.loadImage("party_bg_double_manage", "ui");
     this.loadAtlas("party_slot_main", "ui");
     this.loadAtlas("party_slot", "ui");
     this.loadImage("party_slot_overlay_lv", "ui");
@@ -126,6 +127,8 @@ export class LoadingScene extends SceneBase {
     this.loadAtlas("party_slot_hp_overlay", "ui");
     this.loadAtlas("party_pb", "ui");
     this.loadAtlas("party_cancel", "ui");
+    this.loadAtlas("party_discard", "ui");
+    this.loadAtlas("party_transfer", "ui");
 
     this.loadImage("summary_bg", "ui");
     this.loadImage("summary_overlay_shiny", "ui");
diff --git a/src/ui/modifier-select-ui-handler.ts b/src/ui/modifier-select-ui-handler.ts
index 50d88738d32..16eecf6993d 100644
--- a/src/ui/modifier-select-ui-handler.ts
+++ b/src/ui/modifier-select-ui-handler.ts
@@ -69,7 +69,7 @@ export class ModifierSelectUiHandler extends AwaitableUiHandler {
 
     if (context) {
       context.font = styleOptions.fontSize + "px " + styleOptions.fontFamily;
-      this.transferButtonWidth = context.measureText(i18next.t("modifierSelectUiHandler:transfer")).width;
+      this.transferButtonWidth = context.measureText(i18next.t("modifierSelectUiHandler:manageItems")).width;
       this.checkButtonWidth = context.measureText(i18next.t("modifierSelectUiHandler:checkTeam")).width;
     }
 
@@ -81,7 +81,7 @@ export class ModifierSelectUiHandler extends AwaitableUiHandler {
     this.transferButtonContainer.setVisible(false);
     ui.add(this.transferButtonContainer);
 
-    const transferButtonText = addTextObject(-4, -2, i18next.t("modifierSelectUiHandler:transfer"), TextStyle.PARTY);
+    const transferButtonText = addTextObject(-4, -2, i18next.t("modifierSelectUiHandler:manageItems"), TextStyle.PARTY);
     transferButtonText.setName("text-transfer-btn");
     transferButtonText.setOrigin(1, 0);
     this.transferButtonContainer.add(transferButtonText);
@@ -601,7 +601,7 @@ export class ModifierSelectUiHandler extends AwaitableUiHandler {
         (globalScene.game.canvas.width - this.transferButtonWidth - this.checkButtonWidth) / 6 - 30,
         OPTION_BUTTON_YPOSITION + 4,
       );
-      ui.showText(i18next.t("modifierSelectUiHandler:transferDesc"));
+      ui.showText(i18next.t("modifierSelectUiHandler:manageItemsDesc"));
     } else if (cursor === 2) {
       this.cursorObj.setPosition(
         (globalScene.game.canvas.width - this.checkButtonWidth) / 6 - 10,
diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts
index 915cc76fd73..b259316f6fa 100644
--- a/src/ui/party-ui-handler.ts
+++ b/src/ui/party-ui-handler.ts
@@ -103,6 +103,11 @@ export enum PartyUiMode {
    * This is generally used in for Mystery Encounter or special effects that require the player to select a Pokemon
    */
   SELECT,
+  /**
+   * Indicates that the party UI is open to select a party member from which items will be discarded.
+   * This type of selection can be cancelled.
+   */
+  DISCARD,
 }
 
 export enum PartyOption {
@@ -121,6 +126,7 @@ export enum PartyOption {
   RELEASE,
   RENAME,
   SELECT,
+  DISCARD,
   SCROLL_UP = 1000,
   SCROLL_DOWN = 1001,
   FORM_CHANGE_ITEM = 2000,
@@ -155,6 +161,7 @@ export class PartyUiHandler extends MessageUiHandler {
   private partySlotsContainer: Phaser.GameObjects.Container;
   private partySlots: PartySlot[];
   private partyCancelButton: PartyCancelButton;
+  private partyDiscardModeButton: PartyDiscardModeButton;
   private partyMessageBox: Phaser.GameObjects.NineSlice;
   private moveInfoOverlay: MoveInfoOverlay;
 
@@ -180,6 +187,8 @@ export class PartyUiHandler extends MessageUiHandler {
   private transferAll: boolean;
 
   private lastCursor = 0;
+  private lastLeftPokemonCursor = 0;
+  private lastRightPokemonCursor = 0;
   private selectCallback: PartySelectCallback | PartyModifierTransferSelectCallback | null;
   private selectFilter: PokemonSelectFilter | PokemonModifierTransferSelectFilter;
   private moveSelectFilter: PokemonMoveSelectFilter;
@@ -308,6 +317,12 @@ export class PartyUiHandler extends MessageUiHandler {
     this.iconAnimHandler = new PokemonIconAnimHandler();
     this.iconAnimHandler.setup();
 
+    const partyDiscardModeButton = new PartyDiscardModeButton(60, -globalScene.game.canvas.height / 15 - 1, this);
+
+    partyContainer.add(partyDiscardModeButton);
+
+    this.partyDiscardModeButton = partyDiscardModeButton;
+
     // prepare move overlay. in case it appears to be too big, set the overlayScale to .5
     const overlayScale = 1;
     this.moveInfoOverlay = new MoveInfoOverlay({
@@ -349,8 +364,18 @@ export class PartyUiHandler extends MessageUiHandler {
     this.showMovePp = args.length > 6 && args[6];
 
     this.partyContainer.setVisible(true);
-    this.partyBg.setTexture(`party_bg${globalScene.currentBattle.double ? "_double" : ""}`);
+    if (this.isItemManageMode()) {
+      this.partyBg.setTexture(`party_bg${globalScene.currentBattle.double ? "_double_manage" : ""}`);
+    } else {
+      this.partyBg.setTexture(`party_bg${globalScene.currentBattle.double ? "_double" : ""}`);
+    }
+
     this.populatePartySlots();
+    // If we are currently transferring items, set the icon to its proper state and reveal the button.
+    if (this.isItemManageMode()) {
+      this.partyDiscardModeButton.toggleIcon(this.partyUiMode as PartyUiMode.MODIFIER_TRANSFER | PartyUiMode.DISCARD);
+    }
+    this.showPartyText();
     this.setCursor(0);
 
     return true;
@@ -595,7 +620,7 @@ export class PartyUiHandler extends MessageUiHandler {
     const option = this.options[this.optionsCursor];
     if (button === Button.LEFT) {
       /** Decrease quantity for the current item and update UI */
-      if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER) {
+      if (this.isItemManageMode()) {
         this.transferQuantities[option] =
           this.transferQuantities[option] === 1
             ? this.transferQuantitiesMax[option]
@@ -609,7 +634,7 @@ export class PartyUiHandler extends MessageUiHandler {
 
     if (button === Button.RIGHT) {
       /** Increase quantity for the current item and update UI */
-      if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER) {
+      if (this.isItemManageMode()) {
         this.transferQuantities[option] =
           this.transferQuantities[option] === this.transferQuantitiesMax[option]
             ? 1
@@ -639,6 +664,45 @@ export class PartyUiHandler extends MessageUiHandler {
     return success;
   }
 
+  private processDiscardMenuInput(pokemon: PlayerPokemon) {
+    const ui = this.getUi();
+    const option = this.options[this.optionsCursor];
+    this.clearOptions();
+
+    this.blockInput = true;
+    this.showText(i18next.t("partyUiHandler:discardConfirmation"), null, () => {
+      this.blockInput = false;
+      ui.setModeWithoutClear(
+        UiMode.CONFIRM,
+        () => {
+          ui.setMode(UiMode.PARTY);
+          this.doDiscard(option, pokemon);
+        },
+        () => {
+          ui.setMode(UiMode.PARTY);
+          this.showPartyText();
+        },
+      );
+    });
+
+    return true;
+  }
+
+  private doDiscard(option: PartyOption, pokemon: PlayerPokemon) {
+    const itemModifiers = this.getTransferrableItemsFromPokemon(pokemon);
+    this.clearOptions();
+
+    if (option === PartyOption.ALL) {
+      // Discard all currently held items
+      for (let i = 0; i < itemModifiers.length; i++) {
+        globalScene.tryDiscardHeldItemModifier(itemModifiers[i], this.transferQuantities[i]);
+      }
+    } else {
+      // Discard the currently selected item
+      globalScene.tryDiscardHeldItemModifier(itemModifiers[option], this.transferQuantities[option]);
+    }
+  }
+
   private moveOptionCursor(button: Button.UP | Button.DOWN): boolean {
     if (button === Button.UP) {
       return this.setCursor(this.optionsCursor ? this.optionsCursor - 1 : this.options.length - 1);
@@ -725,6 +789,10 @@ export class PartyUiHandler extends MessageUiHandler {
       return this.processModifierTransferModeInput(pokemon);
     }
 
+    if (this.partyUiMode === PartyUiMode.DISCARD) {
+      return this.processDiscardMenuInput(pokemon);
+    }
+
     // options specific to the mode (moves)
     if (this.partyUiMode === PartyUiMode.REMEMBER_MOVE_MODIFIER) {
       return this.processRememberMoveModeInput(pokemon);
@@ -864,7 +932,7 @@ export class PartyUiHandler extends MessageUiHandler {
     }
 
     if (button === Button.LEFT || button === Button.RIGHT) {
-      if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER) {
+      if (this.isItemManageMode()) {
         return this.processModifierTransferModeLeftRightInput(button);
       }
     }
@@ -919,10 +987,22 @@ export class PartyUiHandler extends MessageUiHandler {
     return !(this.partyUiMode === PartyUiMode.FAINT_SWITCH || this.partyUiMode === PartyUiMode.REVIVAL_BLESSING);
   }
 
+  /**
+   * Return whether this UI handler is responsible for managing items.
+   * Used to ensure proper placement of mode toggle buttons in the UI, etc.
+   * @returns Whether the current handler is responsible for managing items.
+   */
+  private isItemManageMode(): boolean {
+    return this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER || this.partyUiMode === PartyUiMode.DISCARD;
+  }
+
   private processPartyActionInput(): boolean {
     const ui = this.getUi();
     if (this.cursor < 6) {
-      if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER && !this.transferMode) {
+      if (
+        (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER && !this.transferMode) ||
+        this.partyUiMode === PartyUiMode.DISCARD
+      ) {
         /** Initialize item quantities for the selected Pokemon */
         const itemModifiers = globalScene.findModifiers(
           m =>
@@ -936,6 +1016,25 @@ export class PartyUiHandler extends MessageUiHandler {
       this.showOptions();
       ui.playSelect();
     }
+
+    // Toggle item transfer mode to discard items or vice versa
+    if (this.cursor === 7) {
+      switch (this.partyUiMode) {
+        case PartyUiMode.DISCARD:
+          this.partyUiMode = PartyUiMode.MODIFIER_TRANSFER;
+          break;
+        case PartyUiMode.MODIFIER_TRANSFER:
+          this.partyUiMode = PartyUiMode.DISCARD;
+          break;
+        default:
+          ui.playError();
+          return false;
+      }
+      this.partyDiscardModeButton.toggleIcon(this.partyUiMode);
+      ui.playSelect();
+      return true;
+    }
+
     // Pressing return button
     if (this.cursor === 6) {
       if (!this.allowCancel()) {
@@ -956,6 +1055,7 @@ export class PartyUiHandler extends MessageUiHandler {
       this.clearTransfer();
       ui.playSelect();
     } else if (this.allowCancel()) {
+      this.partyDiscardModeButton.clear();
       if (this.selectCallback) {
         const selectCallback = this.selectCallback;
         this.selectCallback = null;
@@ -974,30 +1074,74 @@ export class PartyUiHandler extends MessageUiHandler {
     const slotCount = this.partySlots.length;
     const battlerCount = globalScene.currentBattle.getBattlerCount();
 
+    if (this.lastCursor < battlerCount) {
+      this.lastLeftPokemonCursor = this.lastCursor;
+    }
+    if (this.lastCursor >= battlerCount && this.lastCursor < 6) {
+      this.lastRightPokemonCursor = this.lastCursor;
+    }
+
     let success = false;
     switch (button) {
+      // Item manage mode adds an extra 8th "toggle mode" button to the UI, located *below* both active party members.
+      // The following logic serves to ensure its menu behaviour matches its in-game position,
+      // being selected when scrolling up from the first inactive party member or down from the last active one.
       case Button.UP:
+        if (this.isItemManageMode()) {
+          if (this.cursor === 1) {
+            success = this.setCursor(globalScene.currentBattle.double ? 0 : 7);
+            break;
+          }
+          if (this.cursor === 2) {
+            success = this.setCursor(globalScene.currentBattle.double ? 7 : 1);
+            break;
+          }
+          if (this.cursor === 6) {
+            success = this.setCursor(slotCount <= globalScene.currentBattle.getBattlerCount() ? 7 : slotCount - 1);
+            break;
+          }
+          if (this.cursor === 7) {
+            success = this.setCursor(globalScene.currentBattle.double && slotCount > 1 ? 1 : 0);
+            break;
+          }
+        }
         success = this.setCursor(this.cursor ? (this.cursor < 6 ? this.cursor - 1 : slotCount - 1) : 6);
         break;
       case Button.DOWN:
+        if (this.isItemManageMode()) {
+          if (this.cursor === 0) {
+            success = this.setCursor(globalScene.currentBattle.double && slotCount > 1 ? 1 : 7);
+            break;
+          }
+          if (this.cursor === 1) {
+            success = this.setCursor(globalScene.currentBattle.double ? 7 : slotCount > 2 ? 2 : 6);
+            break;
+          }
+          if (this.cursor === 7) {
+            success = this.setCursor(
+              slotCount > globalScene.currentBattle.getBattlerCount() ? globalScene.currentBattle.getBattlerCount() : 6,
+            );
+            break;
+          }
+        }
         success = this.setCursor(this.cursor < 6 ? (this.cursor < slotCount - 1 ? this.cursor + 1 : 6) : 0);
         break;
       case Button.LEFT:
-        if (this.cursor >= battlerCount && this.cursor <= 6) {
-          success = this.setCursor(0);
+        if (this.cursor === 6) {
+          success = this.setCursor(this.isItemManageMode() ? 7 : this.lastLeftPokemonCursor);
+        }
+        if (this.cursor >= battlerCount && this.cursor < 6) {
+          success = this.setCursor(this.lastLeftPokemonCursor);
         }
         break;
       case Button.RIGHT:
-        if (slotCount === battlerCount) {
+        // Scrolling right from item transfer button or with no backup party members goes to cancel
+        if (this.cursor === 7 || slotCount <= battlerCount) {
           success = this.setCursor(6);
           break;
         }
-        if (battlerCount >= 2 && slotCount > battlerCount && this.getCursor() === 0 && this.lastCursor === 1) {
-          success = this.setCursor(2);
-          break;
-        }
-        if (slotCount > battlerCount && this.cursor < battlerCount) {
-          success = this.setCursor(this.lastCursor < 6 ? this.lastCursor || battlerCount : battlerCount);
+        if (this.cursor < battlerCount) {
+          success = this.setCursor(this.lastRightPokemonCursor || battlerCount);
           break;
         }
     }
@@ -1044,11 +1188,15 @@ export class PartyUiHandler extends MessageUiHandler {
         this.partySlots[this.lastCursor].deselect();
       } else if (this.lastCursor === 6) {
         this.partyCancelButton.deselect();
+      } else if (this.lastCursor === 7) {
+        this.partyDiscardModeButton.deselect();
       }
       if (cursor < 6) {
         this.partySlots[cursor].select();
       } else if (cursor === 6) {
         this.partyCancelButton.select();
+      } else if (cursor === 7) {
+        this.partyDiscardModeButton.select();
       }
     }
     return changed;
@@ -1143,14 +1291,16 @@ export class PartyUiHandler extends MessageUiHandler {
           optionsMessage = i18next.t("partyUiHandler:selectAnotherPokemonToSplice");
         }
         break;
+      case PartyUiMode.DISCARD:
+        optionsMessage = i18next.t("partyUiHandler:changeQuantityDiscard");
     }
 
     this.showText(optionsMessage, 0);
 
     this.updateOptions();
 
-    /** When an item is being selected for transfer, the message box is taller as the message occupies two lines */
-    if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER) {
+    /** When an item is being selected for transfer or discard, the message box is taller as the message occupies two lines */
+    if (this.isItemManageMode()) {
       this.partyMessageBox.setSize(262 - Math.max(this.optionsBg.displayWidth - 56, 0), 42);
     } else {
       this.partyMessageBox.setSize(262 - Math.max(this.optionsBg.displayWidth - 56, 0), 30);
@@ -1159,6 +1309,20 @@ export class PartyUiHandler extends MessageUiHandler {
     this.setCursor(0);
   }
 
+  showPartyText() {
+    switch (this.partyUiMode) {
+      case PartyUiMode.MODIFIER_TRANSFER:
+        this.showText(i18next.t("partyUiHandler:partyTransfer"));
+        break;
+      case PartyUiMode.DISCARD:
+        this.showText(i18next.t("partyUiHandler:partyDiscard"));
+        break;
+      default:
+        this.showText("", 0);
+        break;
+    }
+  }
+
   private allowBatonModifierSwitch(): boolean {
     return !!(
       this.partyUiMode !== PartyUiMode.FAINT_SWITCH &&
@@ -1276,6 +1440,9 @@ export class PartyUiHandler extends MessageUiHandler {
           this.addCommonOptions(pokemon);
         }
         break;
+      case PartyUiMode.DISCARD:
+        this.updateOptionsWithModifierTransferMode(pokemon);
+        break;
       // TODO: This still needs to be broken up.
       // It could use a rework differentiating different kind of switches
       // to treat baton passing separately from switching on faint.
@@ -1381,7 +1548,8 @@ export class PartyUiHandler extends MessageUiHandler {
         optionName = "↓";
       } else if (
         (this.partyUiMode !== PartyUiMode.REMEMBER_MOVE_MODIFIER &&
-          (this.partyUiMode !== PartyUiMode.MODIFIER_TRANSFER || this.transferMode)) ||
+          (this.partyUiMode !== PartyUiMode.MODIFIER_TRANSFER || this.transferMode) &&
+          this.partyUiMode !== PartyUiMode.DISCARD) ||
         option === PartyOption.CANCEL
       ) {
         switch (option) {
@@ -1444,7 +1612,7 @@ export class PartyUiHandler extends MessageUiHandler {
       const itemModifiers = this.getItemModifiers(pokemon);
       const itemModifier = itemModifiers[option];
       if (
-        this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER &&
+        this.isItemManageMode() &&
         this.transferQuantitiesMax[option] > 1 &&
         !this.transferMode &&
         itemModifier !== undefined &&
@@ -1474,7 +1642,6 @@ export class PartyUiHandler extends MessageUiHandler {
       optionText.x = 15 - this.optionsBg.width;
     }
   }
-
   startTransfer(): void {
     this.transferMode = true;
     this.transferCursor = this.cursor;
@@ -1608,7 +1775,7 @@ export class PartyUiHandler extends MessageUiHandler {
     this.eraseOptionsCursor();
 
     this.partyMessageBox.setSize(262, 30);
-    this.showText("", 0);
+    this.showPartyText();
   }
 
   eraseOptionsCursor() {
@@ -1663,7 +1830,9 @@ class PartySlot extends Phaser.GameObjects.Container {
         ? -184 +
             (globalScene.currentBattle.double ? -40 : 0) +
             (28 + (globalScene.currentBattle.double ? 8 : 0)) * slotIndex
-        : -124 + (globalScene.currentBattle.double ? -8 : 0) + slotIndex * 64,
+        : partyUiMode === PartyUiMode.MODIFIER_TRANSFER
+          ? -124 + (globalScene.currentBattle.double ? -20 : 0) + slotIndex * 55
+          : -124 + (globalScene.currentBattle.double ? -8 : 0) + slotIndex * 64,
     );
 
     this.slotIndex = slotIndex;
@@ -1918,7 +2087,6 @@ class PartySlot extends Phaser.GameObjects.Container {
 
 class PartyCancelButton extends Phaser.GameObjects.Container {
   private selected: boolean;
-
   private partyCancelBg: Phaser.GameObjects.Sprite;
   private partyCancelPb: Phaser.GameObjects.Sprite;
 
@@ -1965,3 +2133,96 @@ class PartyCancelButton extends Phaser.GameObjects.Container {
     this.partyCancelPb.setFrame("party_pb");
   }
 }
+
+class PartyDiscardModeButton extends Phaser.GameObjects.Container {
+  private selected: boolean;
+  private transferIcon: Phaser.GameObjects.Sprite;
+  private discardIcon: Phaser.GameObjects.Sprite;
+  private textBox: Phaser.GameObjects.Text;
+  private party: PartyUiHandler;
+
+  constructor(x: number, y: number, party: PartyUiHandler) {
+    super(globalScene, x, y);
+
+    this.setup(party);
+  }
+
+  setup(party: PartyUiHandler) {
+    this.transferIcon = globalScene.add.sprite(0, 0, "party_transfer");
+    this.discardIcon = globalScene.add.sprite(0, 0, "party_discard");
+    this.textBox = addTextObject(-8, -7, i18next.t("partyUiHandler:TRANSFER"), TextStyle.PARTY);
+    this.party = party;
+
+    this.add(this.transferIcon);
+    this.add(this.discardIcon);
+    this.add(this.textBox);
+
+    this.clear();
+  }
+
+  select() {
+    if (this.selected) {
+      return;
+    }
+
+    this.selected = true;
+
+    this.party.showText(i18next.t("partyUiHandler:changeMode"));
+
+    this.transferIcon.setFrame("selected");
+    this.discardIcon.setFrame("selected");
+  }
+
+  deselect() {
+    if (!this.selected) {
+      return;
+    }
+
+    this.selected = false;
+    this.party.showPartyText();
+
+    this.transferIcon.setFrame("normal");
+    this.discardIcon.setFrame("normal");
+  }
+
+  /**
+   * If the current mode deals with transferring items, toggle the discard items button's name and assets.
+   * @param partyMode - The current {@linkcode PartyUiMode}
+   * @remarks
+   * This will also reveal the button if it is currently hidden.
+   */
+  public toggleIcon(partyMode: PartyUiMode.MODIFIER_TRANSFER | PartyUiMode.DISCARD): void {
+    this.setActive(true).setVisible(true);
+    switch (partyMode) {
+      case PartyUiMode.MODIFIER_TRANSFER:
+        this.transferIcon.setVisible(true);
+        this.discardIcon.setVisible(false);
+        this.textBox.setVisible(true);
+        this.textBox.setText(i18next.t("partyUiHandler:TRANSFER"));
+        this.setPosition(
+          globalScene.currentBattle.double ? 64 : 60,
+          globalScene.currentBattle.double ? -48 : -globalScene.game.canvas.height / 15 - 1,
+        );
+        this.transferIcon.displayWidth = this.textBox.text.length * 9 + 3;
+        break;
+      case PartyUiMode.DISCARD:
+        this.transferIcon.setVisible(false);
+        this.discardIcon.setVisible(true);
+        this.textBox.setVisible(true);
+        this.textBox.setText(i18next.t("partyUiHandler:DISCARD"));
+        this.setPosition(
+          globalScene.currentBattle.double ? 64 : 60,
+          globalScene.currentBattle.double ? -48 : -globalScene.game.canvas.height / 15 - 1,
+        );
+        this.discardIcon.displayWidth = this.textBox.text.length * 9 + 3;
+        break;
+    }
+  }
+
+  clear() {
+    this.setActive(false).setVisible(false);
+    this.transferIcon.setVisible(false);
+    this.discardIcon.setVisible(false);
+    this.textBox.setVisible(false);
+  }
+}
diff --git a/test/ui/item-manage-button.test.ts b/test/ui/item-manage-button.test.ts
new file mode 100644
index 00000000000..a7ea76918a5
--- /dev/null
+++ b/test/ui/item-manage-button.test.ts
@@ -0,0 +1,172 @@
+import { BerryType } from "#enums/berry-type";
+import { Button } from "#enums/buttons";
+import { MoveId } from "#enums/move-id";
+import { SpeciesId } from "#enums/species-id";
+import { UiMode } from "#enums/ui-mode";
+import type { Pokemon } from "#field/pokemon";
+import { GameManager } from "#test/test-utils/game-manager";
+import type { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler";
+import type { PartyUiHandler } from "#ui/party-ui-handler";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("UI - Transfer Items", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(async () => {
+    game = new GameManager(phaserGame);
+    game.override
+      .battleStyle("single")
+      .startingLevel(100)
+      .startingHeldItems([
+        { name: "BERRY", count: 1, type: BerryType.SITRUS },
+        { name: "BERRY", count: 2, type: BerryType.APICOT },
+        { name: "BERRY", count: 2, type: BerryType.LUM },
+      ])
+      .enemySpecies(SpeciesId.MAGIKARP)
+      .enemyMoveset(MoveId.SPLASH);
+
+    await game.classicMode.startBattle([SpeciesId.RAYQUAZA, SpeciesId.RAYQUAZA, SpeciesId.RAYQUAZA]);
+
+    game.move.use(MoveId.DRAGON_CLAW);
+
+    await game.phaseInterceptor.to("SelectModifierPhase");
+  });
+
+  it("manage button exists in the proper screen", async () => {
+    let handlerLength: Phaser.GameObjects.GameObject[] | undefined;
+
+    await new Promise<void>(resolve => {
+      //select manage items menu
+      game.onNextPrompt("SelectModifierPhase", UiMode.MODIFIER_SELECT, async () => {
+        await new Promise(r => setTimeout(r, 100));
+        const handler = game.scene.ui.getHandler() as ModifierSelectUiHandler;
+
+        handler.processInput(Button.DOWN);
+        handler.setCursor(1);
+        handler.processInput(Button.ACTION);
+      });
+
+      game.onNextPrompt("SelectModifierPhase", UiMode.PARTY, async () => {
+        await new Promise(r => setTimeout(r, 100));
+        const handler = game.scene.ui.getHandler() as PartyUiHandler;
+
+        handler.processInput(Button.DOWN);
+        handler.processInput(Button.ACTION);
+        handlerLength = handler.optionsContainer.list;
+
+        handler.processInput(Button.CANCEL);
+
+        resolve();
+      });
+    });
+
+    expect(handlerLength).toHaveLength(0); // should select manage button, which has no menu
+  });
+
+  it("manage button doesn't exist in the other screens", async () => {
+    let handlerLength: Phaser.GameObjects.GameObject[] | undefined;
+
+    await new Promise<void>(resolve => {
+      game.onNextPrompt("SelectModifierPhase", UiMode.MODIFIER_SELECT, async () => {
+        await new Promise(r => setTimeout(r, 100));
+        const handler = game.scene.ui.getHandler() as ModifierSelectUiHandler;
+
+        handler.processInput(Button.DOWN);
+        handler.setCursor(2);
+        handler.processInput(Button.ACTION);
+      });
+
+      game.onNextPrompt("SelectModifierPhase", UiMode.PARTY, async () => {
+        await new Promise(r => setTimeout(r, 100));
+        const handler = game.scene.ui.getHandler() as PartyUiHandler;
+
+        handler.processInput(Button.DOWN);
+        handler.processInput(Button.ACTION);
+        handlerLength = handler.optionsContainer.list;
+
+        handler.processInput(Button.CANCEL);
+        handler.processInput(Button.CANCEL);
+
+        resolve();
+      });
+    });
+
+    expect(handlerLength).toHaveLength(6); // should select 2nd pokemon (length is 5 options + image)
+  });
+
+  // Test that the manage button actually discards items, needs proofreading
+  it("should discard items when button is selected", async () => {
+    let pokemon: Pokemon | undefined;
+
+    await new Promise<void>(resolve => {
+      game.onNextPrompt("SelectModifierPhase", UiMode.MODIFIER_SELECT, async () => {
+        await new Promise(r => setTimeout(r, 100));
+        const handler = game.scene.ui.getHandler() as ModifierSelectUiHandler;
+
+        handler.processInput(Button.DOWN);
+        handler.setCursor(1);
+        handler.processInput(Button.ACTION);
+      });
+      game.onNextPrompt("SelectModifierPhase", UiMode.PARTY, async () => {
+        await new Promise(r => setTimeout(r, 100));
+        const handler = game.scene.ui.getHandler() as PartyUiHandler;
+
+        // Enter discard mode and select first party member
+        handler.setCursor(7);
+        handler.processInput(Button.ACTION);
+        handler.setCursor(0);
+        handler.processInput(Button.ACTION);
+        pokemon = game.field.getPlayerPokemon();
+
+        resolve();
+      });
+    });
+
+    expect(pokemon).toBeDefined();
+    if (pokemon) {
+      expect(pokemon.getHeldItems()).toHaveLength(3);
+      expect(pokemon.getHeldItems().map(h => h.stackCount)).toEqual([1, 2, 2]);
+    }
+
+    await new Promise<void>(resolve => {
+      game.onNextPrompt("SelectModifierPhase", UiMode.PARTY, async () => {
+        await new Promise(r => setTimeout(r, 100));
+        const handler = game.scene.ui.getHandler() as PartyUiHandler;
+        handler.processInput(Button.ACTION);
+        resolve();
+      });
+    });
+
+    await new Promise<void>(resolve => {
+      game.onNextPrompt("SelectModifierPhase", UiMode.PARTY, async () => {
+        await new Promise(r => setTimeout(r, 100));
+        const handler = game.scene.ui.getHandler() as PartyUiHandler;
+        handler.processInput(Button.ACTION);
+
+        pokemon = game.field.getPlayerPokemon();
+
+        handler.processInput(Button.CANCEL);
+        resolve();
+      });
+    });
+
+    expect(pokemon).toBeDefined();
+    if (pokemon) {
+      // Sitrus berry was discarded, leaving 2 stacks of 2 berries behind
+      expect(pokemon.getHeldItems()).toHaveLength(2);
+      expect(pokemon.getHeldItems().map(h => h.stackCount)).toEqual([2, 2]);
+    }
+  });
+});

From 901f6a6812d77e0ae0bfc5883f690dd62b47d047 Mon Sep 17 00:00:00 2001
From: Acelynn Zhang <102631387+acelynnzhang@users.noreply.github.com>
Date: Thu, 31 Jul 2025 16:18:11 -0400
Subject: [PATCH 38/44] [Bug] Fix Truant behavior (#6171)

---
 src/data/battler-tags.ts      |  2 +-
 test/abilities/truant.test.ts | 72 +++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 test/abilities/truant.test.ts

diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts
index e21065c184f..f3cfe4e7d99 100644
--- a/src/data/battler-tags.ts
+++ b/src/data/battler-tags.ts
@@ -2038,7 +2038,7 @@ export class TruantTag extends AbilityBattlerTag {
 
     const lastMove = pokemon.getLastXMoves()[0];
 
-    if (!lastMove) {
+    if (!lastMove || lastMove.move === MoveId.NONE) {
       // Don't interrupt move if last move was `Moves.NONE` OR no prior move was found
       return true;
     }
diff --git a/test/abilities/truant.test.ts b/test/abilities/truant.test.ts
new file mode 100644
index 00000000000..0d71cd393b0
--- /dev/null
+++ b/test/abilities/truant.test.ts
@@ -0,0 +1,72 @@
+import { getPokemonNameWithAffix } from "#app/messages";
+import { AbilityId } from "#enums/ability-id";
+import { MoveId } from "#enums/move-id";
+import { MoveResult } from "#enums/move-result";
+import { SpeciesId } from "#enums/species-id";
+import { GameManager } from "#test/test-utils/game-manager";
+import i18next from "i18next";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Ability - Truant", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .battleStyle("single")
+      .criticalHits(false)
+      .moveset([MoveId.SPLASH, MoveId.TACKLE])
+      .ability(AbilityId.TRUANT)
+      .enemySpecies(SpeciesId.MAGIKARP)
+      .enemyAbility(AbilityId.BALL_FETCH)
+      .enemyMoveset(MoveId.SPLASH);
+  });
+
+  it("should loaf around and prevent using moves every other turn", async () => {
+    await game.classicMode.startBattle([SpeciesId.FEEBAS]);
+
+    const player = game.field.getPlayerPokemon();
+    const enemy = game.field.getEnemyPokemon();
+
+    // Turn 1: Splash succeeds
+    game.move.select(MoveId.SPLASH);
+    await game.toNextTurn();
+
+    expect(player.getLastXMoves(1)[0]).toEqual(
+      expect.objectContaining({ move: MoveId.SPLASH, result: MoveResult.SUCCESS }),
+    );
+
+    // Turn 2: Truant activates, cancelling tackle and displaying message
+    game.move.select(MoveId.TACKLE);
+    await game.toNextTurn();
+
+    expect(player.getLastXMoves(1)[0]).toEqual(expect.objectContaining({ move: MoveId.NONE, result: MoveResult.FAIL }));
+    expect(enemy.hp).toBe(enemy.getMaxHp());
+    expect(game.textInterceptor.logs).toContain(
+      i18next.t("battlerTags:truantLapse", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(player),
+      }),
+    );
+
+    // Turn 3: Truant didn't activate, tackle worked
+    game.move.select(MoveId.TACKLE);
+    await game.toNextTurn();
+
+    expect(player.getLastXMoves(1)[0]).toEqual(
+      expect.objectContaining({ move: MoveId.TACKLE, result: MoveResult.SUCCESS }),
+    );
+    expect(enemy.hp).toBeLessThan(enemy.getMaxHp());
+  });
+});

From c3b6e9e6b515120cd452ffc092717e22b7ca175b Mon Sep 17 00:00:00 2001
From: damocleas <damocleas25@gmail.com>
Date: Thu, 31 Jul 2025 17:07:48 -0400
Subject: [PATCH 39/44] Update locales

---
 public/locales | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/locales b/public/locales
index e2fbba17ea7..5784dda3ac3 160000
--- a/public/locales
+++ b/public/locales
@@ -1 +1 @@
-Subproject commit e2fbba17ea7a96068970ea98a8a84ed3e25b6f07
+Subproject commit 5784dda3ac3aff7f84878888ce8f6ed5443bfd88

From 12433b78e5d11af423276f7bc6a5af6234de4582 Mon Sep 17 00:00:00 2001
From: Lugiad <adrien.grivel@hotmail.fr>
Date: Fri, 1 Aug 2025 00:13:05 +0200
Subject: [PATCH 40/44] [i18n] Add Tagalog language support (#6170)

---
 public/images/statuses_tl.json                | 188 ++++++++
 public/images/statuses_tl.png                 | Bin 0 -> 419 bytes
 public/images/types_tl.json                   | 440 ++++++++++++++++++
 public/images/types_tl.png                    | Bin 0 -> 1861 bytes
 public/locales                                |   2 +-
 src/plugins/i18n.ts                           |   5 +-
 src/system/settings/settings.ts               |   4 +
 .../settings/settings-display-ui-handler.ts   |   6 +
 src/ui/starter-select-ui-handler.ts           |   4 +
 src/utils/common.ts                           |   1 +
 10 files changed, 647 insertions(+), 3 deletions(-)
 create mode 100644 public/images/statuses_tl.json
 create mode 100644 public/images/statuses_tl.png
 create mode 100644 public/images/types_tl.json
 create mode 100644 public/images/types_tl.png

diff --git a/public/images/statuses_tl.json b/public/images/statuses_tl.json
new file mode 100644
index 00000000000..094b0188d69
--- /dev/null
+++ b/public/images/statuses_tl.json
@@ -0,0 +1,188 @@
+{
+	"textures": [
+		{
+			"image": "statuses_tl.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 22,
+				"h": 64
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "pokerus",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 22,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 22,
+						"h": 8
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 22,
+						"h": 8
+					}
+				},
+				{
+					"filename": "burn",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 20,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 20,
+						"h": 8
+					},
+					"frame": {
+						"x": 0,
+						"y": 8,
+						"w": 20,
+						"h": 8
+					}
+				},
+				{
+					"filename": "faint",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 20,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 20,
+						"h": 8
+					},
+					"frame": {
+						"x": 0,
+						"y": 16,
+						"w": 20,
+						"h": 8
+					}
+				},
+				{
+					"filename": "freeze",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 20,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 20,
+						"h": 8
+					},
+					"frame": {
+						"x": 0,
+						"y": 24,
+						"w": 20,
+						"h": 8
+					}
+				},
+				{
+					"filename": "paralysis",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 20,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 20,
+						"h": 8
+					},
+					"frame": {
+						"x": 0,
+						"y": 32,
+						"w": 20,
+						"h": 8
+					}
+				},
+				{
+					"filename": "poison",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 20,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 20,
+						"h": 8
+					},
+					"frame": {
+						"x": 0,
+						"y": 40,
+						"w": 20,
+						"h": 8
+					}
+				},
+				{
+					"filename": "sleep",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 20,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 20,
+						"h": 8
+					},
+					"frame": {
+						"x": 0,
+						"y": 48,
+						"w": 20,
+						"h": 8
+					}
+				},
+				{
+					"filename": "toxic",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 20,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 20,
+						"h": 8
+					},
+					"frame": {
+						"x": 0,
+						"y": 56,
+						"w": 20,
+						"h": 8
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:37686e85605d17b806f22d43081c1139:70535ffee63ba61b3397d8470c2c8982:e6649238c018d3630e55681417c698ca$"
+	}
+}
diff --git a/public/images/statuses_tl.png b/public/images/statuses_tl.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f24c6a0810ebd6ca4ecbc752e77f3ec43243352
GIT binary patch
literal 419
zcmV;U0bKrxP)<h;3K|Lk000e1NJLTq000&M002M;0{{R3DZO{&0000sP)t-s0002M
zV8F<L$oP0*`1tsk!0@oJkjQ|@$jE@8pooMve2B2%_;_IWh-koIz__>==ukM|a8Nin
zUPJ%@00eYWPE!B?006U-W|{y10T@X{K~#8Nt<&3%!!QU0P|{BB?Oy)>XLlHZ&|-O?
z77^o|xPexx+5R!aE(Jiy3b+%Xj0#nYQ;<Xkvx-5I7vtAUau9@M%Wz@FzL>qgTfCQL
zafK2f0dh0#$wV#g)>xQK^Mo53x0k48NVYV23+eOq)#CLeyMieJ<Ye7R>v6KQ@%*&1
zc+zq{psja{H5E#zKyFk5IS_=#cjI^f_s%l$&{Dk42ejj}#SsdC0B9HPz^sMvH^=9p
zT`{kI`WX3`4><lW_fQDHqLdTF5<oY_@{#L&abmGrGFr>ofVQ12wp0KoSh%Enl@*`=
z#hX}t{ql925BM0r&Vx+71Q&}ke{ZqmViJnwBiH%j#A3B%w3d?re*h(mIE1ye$|wK;
N002ovPDHLkV1kAS!6N_w

literal 0
HcmV?d00001

diff --git a/public/images/types_tl.json b/public/images/types_tl.json
new file mode 100644
index 00000000000..2706c6f49f3
--- /dev/null
+++ b/public/images/types_tl.json
@@ -0,0 +1,440 @@
+{
+	"textures": [
+		{
+			"image": "types_tl.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 32,
+				"h": 280
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "unknown",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 32,
+						"h": 14
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 32,
+						"h": 14
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 32,
+						"h": 14
+					}
+				},
+				{
+					"filename": "bug",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 32,
+						"h": 14
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 32,
+						"h": 14
+					},
+					"frame": {
+						"x": 0,
+						"y": 14,
+						"w": 32,
+						"h": 14
+					}
+				},
+				{
+					"filename": "dark",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 32,
+						"h": 14
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 32,
+						"h": 14
+					},
+					"frame": {
+						"x": 0,
+						"y": 28,
+						"w": 32,
+						"h": 14
+					}
+				},
+				{
+					"filename": "dragon",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 32,
+						"h": 14
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 32,
+						"h": 14
+					},
+					"frame": {
+						"x": 0,
+						"y": 42,
+						"w": 32,
+						"h": 14
+					}
+				},
+				{
+					"filename": "electric",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 32,
+						"h": 14
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 32,
+						"h": 14
+					},
+					"frame": {
+						"x": 0,
+						"y": 56,
+						"w": 32,
+						"h": 14
+					}
+				},
+				{
+					"filename": "fairy",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 32,
+						"h": 14
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 32,
+						"h": 14
+					},
+					"frame": {
+						"x": 0,
+						"y": 70,
+						"w": 32,
+						"h": 14
+					}
+				},
+				{
+					"filename": "fighting",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 32,
+						"h": 14
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 32,
+						"h": 14
+					},
+					"frame": {
+						"x": 0,
+						"y": 84,
+						"w": 32,
+						"h": 14
+					}
+				},
+				{
+					"filename": "fire",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 32,
+						"h": 14
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 32,
+						"h": 14
+					},
+					"frame": {
+						"x": 0,
+						"y": 98,
+						"w": 32,
+						"h": 14
+					}
+				},
+				{
+					"filename": "flying",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 32,
+						"h": 14
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 32,
+						"h": 14
+					},
+					"frame": {
+						"x": 0,
+						"y": 112,
+						"w": 32,
+						"h": 14
+					}
+				},
+				{
+					"filename": "ghost",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 32,
+						"h": 14
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 32,
+						"h": 14
+					},
+					"frame": {
+						"x": 0,
+						"y": 126,
+						"w": 32,
+						"h": 14
+					}
+				},
+				{
+					"filename": "grass",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 32,
+						"h": 14
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 32,
+						"h": 14
+					},
+					"frame": {
+						"x": 0,
+						"y": 140,
+						"w": 32,
+						"h": 14
+					}
+				},
+				{
+					"filename": "ground",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 32,
+						"h": 14
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 32,
+						"h": 14
+					},
+					"frame": {
+						"x": 0,
+						"y": 154,
+						"w": 32,
+						"h": 14
+					}
+				},
+				{
+					"filename": "ice",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 32,
+						"h": 14
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 32,
+						"h": 14
+					},
+					"frame": {
+						"x": 0,
+						"y": 168,
+						"w": 32,
+						"h": 14
+					}
+				},
+				{
+					"filename": "normal",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 32,
+						"h": 14
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 32,
+						"h": 14
+					},
+					"frame": {
+						"x": 0,
+						"y": 182,
+						"w": 32,
+						"h": 14
+					}
+				},
+				{
+					"filename": "poison",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 32,
+						"h": 14
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 32,
+						"h": 14
+					},
+					"frame": {
+						"x": 0,
+						"y": 196,
+						"w": 32,
+						"h": 14
+					}
+				},
+				{
+					"filename": "psychic",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 32,
+						"h": 14
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 32,
+						"h": 14
+					},
+					"frame": {
+						"x": 0,
+						"y": 210,
+						"w": 32,
+						"h": 14
+					}
+				},
+				{
+					"filename": "rock",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 32,
+						"h": 14
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 32,
+						"h": 14
+					},
+					"frame": {
+						"x": 0,
+						"y": 224,
+						"w": 32,
+						"h": 14
+					}
+				},
+				{
+					"filename": "steel",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 32,
+						"h": 14
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 32,
+						"h": 14
+					},
+					"frame": {
+						"x": 0,
+						"y": 238,
+						"w": 32,
+						"h": 14
+					}
+				},
+				{
+					"filename": "water",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 32,
+						"h": 14
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 32,
+						"h": 14
+					},
+					"frame": {
+						"x": 0,
+						"y": 252,
+						"w": 32,
+						"h": 14
+					}
+				},
+				{
+					"filename": "stellar",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 32,
+						"h": 14
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 32,
+						"h": 14
+					},
+					"frame": {
+						"x": 0,
+						"y": 266,
+						"w": 32,
+						"h": 14
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:f14cf47d9a8f1d40c8e03aa6ba00fff3:6fc4227b57a95d429a1faad4280f7ec8:5961efbfbf4c56b8745347e7a663a32f$"
+	}
+}
diff --git a/public/images/types_tl.png b/public/images/types_tl.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9fdceba7da236067f326c6ae0411d21ecc3aca6
GIT binary patch
literal 1861
zcmV-L2fFx)P)<h;3K|Lk000e1NJLTq001BW009^X0{{R33i<@H0003aP)t-s0001y
zLCarI5YYdB98Q2BL>w(#bTLPPF?g0TJzF&)W;aGAIh_AGV0S+vJ3(AuL^4fDElo<H
zK~7_QPiHAoam`Y`?o%BfS13?dEgn}gS653QS5Hb>&gWl5En=CyV`H^s7$9UM5@tAf
zXfp?BNC0zCdw3yLdq{hG&Qg3B7=fm~gQZ%LLCcg-i=3_ZrBXSqrIfCEJG%e2y`@^c
z!T-L{sLQ$k%;5jcUA@h+O4#N9<<_9+;Q#5mjP5u}?o}!8L3!_R@9&lW^z+{J<C6Ay
z5cZa!_NI^assQ&=G5WcJ`qFv*|E~Y1tpC35|Hp#(`1oH?5P(J)G*Cb}CnYgBbgjK1
zdt>L&|9_&Ef3f1>&ZhtW|NsBSF=(KWb6QHX@AnA+000DZQchC<00029lV+L#00qrS
zL_t(|Uc8T4Zp1JQLy4Ia%3Ee_d;e3EQDO*g1@^BG6l22=F$_E<JpYtD!IFev)}j)@
zTC*0F3CyfaXuA-#2ysbNCbXr}KSZTMYf+1!LDND5ngqDsC0E=x$sH_-3uacVY<u>J
z?G(5z?pX06tFX(bu$AHmzFvhwg+tYglL*_qBK?D(%@g1LeuZC?y~5c%oVg7_fue<i
zOOafFhlJ-}k_T9lDVSOJvOae|gx+T;uzw2?;{ES}S???kD|tmHtY8ro=vwGNmjHN4
zcz%<-z>?r*X5*;aT1UVdHqv4afmw<lW);qR*z>?wAuLy9LSD@IiV(Quc+FP~!iq1)
z%R}K0Ftjj$Ap!7~@ccva220|CRpuz0Yc5iuGUmgCz|CTvix75sy~0TThsYw(h$|u?
zxU)|#)av0Z2|<CXg$h*3H*aI896=1jP|?K!p`8f}X<5-7C@g9H|36c$wR6t2Il*dV
z#a_Q11NgGy{=@1E3@ZW=F*5kjn$%pt80iEUt1n>nI_&{UEwux5ir$@|wkLwHc4G?+
zig8MPS%4RY2L>>#0Nky(f3v!SVMQQ%nw5_1LXCi&I?Y#IIf2~iXLV%(+G)E2!6=~j
zKR}(JuP`SncqZck^iD6aJ_&fCd!Pf|3c$A&_n%hZU|2nXh{<B8n~W9U7k;YP0d&O%
zpypWuo}W0k8ulmD$<F{Dnj2tFnnC3=7r+bC0~4550B%;?zgpeEuu34>84-=emXXsh
zphc4_7C<RiYyh5UjORdW83xe%2cTM30h|hGrJQK>0=&>X(12zI;N6P*7pr$LtP+TW
zzTzB%4{HIa1z^era9RMq@_OQ5fFrU(tDGJH+jN$OoG!o%hX)Seu=?S9jFB4(VIaC`
zD5z<eAqPm|!g1r?_5pPN%Vg1q86dFF`YZYK3<khM!u21?0}M$M%q%e(t=MKEB}-S3
zYgz<Wi{#T*AZ{Inl(ewKzgrAK;@4S7gfaBtni?c6Bp^uud?Z}|m3+XEG{Le5%dF0f
zqmXlpqtHVfQA6yI+4K=UtwP&5pM+dt@~J}WP0%1~Ap=<g;3?tyx8w<iqze}KA#7FP
zuoD7t!Mtw-4n4MlSvU$@uXPssJ1vml!3?Vq0;|JuxTXd{3jqic0B;G`?~*qd5*Ms^
z`NQzZYZ9!KDOiKhf6`+S+P-Y{X;ZOfhxv$ADDKQrmOr_RE|kLBL=!Y9S|~t~0C-8b
zev`bwkhoyc)8Y_bqriw3hhVJ&ixF#V1rqD~uG;Ph|NT*5jWHfUe9e!zV!B1VxOwqy
zpPQgT)ItQJ<O}#Kd<<6_2cjr^fk+B9J59k-wlJZx?F5wmS{GIqi~zM#70&y=j3+nK
z>@eEv=gpbe^Cg$Oo3MW}c^8JsC;)*M0uKfdG65l+Cf<J%p7@)#3}(I}ApWjrE~pV;
zz5$#l&^WUqSYN>vp})o>5o{#beGmyIBJyU!{<q1SFicJY0MBG#2%ihygMaDd0*8^#
z=M^BikgqU=Z&##`d%$OcCyY3}lFzgeZ}(orn~2DR3Huw92Vt0~0KhRBar8(9=ip-8
z#Jf!3Xy_5Gd<BS$yLg;k!NOj_`Fe#4X%Kf39AR*hAW^UpXZKFTnTW`p3HwWvJ7Jg%
z0)PU=B?CNS6p6q#3Pn2q1y;i_#$lfeaYb~`ykUIF_bYOt0G~n<MJn(gUbK=JKhs9&
zSrj6LiHQ8^`4@Q|I3ACO!{M2*zg6xBUX=ZQ-*w$%&$G<gCd$}9Mr2MX0hrzcs~2qg
z9$2RWxxjRa)e0MI_%zmQ8eI>C0bI;6y~PT@xEa?SuKz01D1$&&`XtCQ6$q*ZWr+%P
z+wQPjCc>41l0%K>w#APfXQ#qdMB4=gGDF=v$|zLTVlr7ws;Vl>*=*L<T$Kn-vrw8I
z>f7zMRd!Np%{~g5QHxY$a-t%-rTob~bzRE`&F;ShLE)A900000NkvXXu0mjf9426$

literal 0
HcmV?d00001

diff --git a/public/locales b/public/locales
index 5784dda3ac3..7898c0018a7 160000
--- a/public/locales
+++ b/public/locales
@@ -1 +1 @@
-Subproject commit 5784dda3ac3aff7f84878888ce8f6ed5443bfd88
+Subproject commit 7898c0018a70601a6ead76c9dd497ff966cc2e2a
diff --git a/src/plugins/i18n.ts b/src/plugins/i18n.ts
index 89946b2691b..62fc73a10a3 100644
--- a/src/plugins/i18n.ts
+++ b/src/plugins/i18n.ts
@@ -79,13 +79,13 @@ const fonts: Array<LoadingFontFaceProperty> = [
     face: new FontFace("emerald", "url(./fonts/pokemon-bw.ttf)", {
       unicodeRange: rangesByLanguage.japanese,
     }),
-    only: ["en", "es", "fr", "it", "de", "pt", "ko", "ja", "ca", "da", "tr", "ro", "ru"],
+    only: ["en", "es", "fr", "it", "de", "pt", "ko", "ja", "ca", "da", "tr", "ro", "ru", "tl"],
   },
   {
     face: new FontFace("pkmnems", "url(./fonts/pokemon-bw.ttf)", {
       unicodeRange: rangesByLanguage.japanese,
     }),
-    only: ["en", "es", "fr", "it", "de", "pt", "ko", "ja", "ca", "da", "tr", "ro", "ru"],
+    only: ["en", "es", "fr", "it", "de", "pt", "ko", "ja", "ca", "da", "tr", "ro", "ru", "tl"],
   },
 ];
 
@@ -191,6 +191,7 @@ export async function initI18n(): Promise<void> {
       "tr",
       "ro",
       "ru",
+      "tl",
     ],
     backend: {
       loadPath(lng: string, [ns]: string[]) {
diff --git a/src/system/settings/settings.ts b/src/system/settings/settings.ts
index 33087f2509e..32d9e0ee2be 100644
--- a/src/system/settings/settings.ts
+++ b/src/system/settings/settings.ts
@@ -981,6 +981,10 @@ export function setSetting(setting: string, value: number): boolean {
                 label: "Română (Needs Help)",
                 handler: () => changeLocaleHandler("ro"),
               },
+              {
+                label: "Tagalog (Needs Help)",
+                handler: () => changeLocaleHandler("tl"),
+              },
               {
                 label: i18next.t("settings:back"),
                 handler: () => cancelHandler(),
diff --git a/src/ui/settings/settings-display-ui-handler.ts b/src/ui/settings/settings-display-ui-handler.ts
index 3c261d6ddab..1a0481b8e8d 100644
--- a/src/ui/settings/settings-display-ui-handler.ts
+++ b/src/ui/settings/settings-display-ui-handler.ts
@@ -117,6 +117,12 @@ export class SettingsDisplayUiHandler extends AbstractSettingsUiHandler {
             label: "Română (Needs Help)",
           };
           break;
+        case "tl":
+          this.settings[languageIndex].options[0] = {
+            value: "Tagalog",
+            label: "Tagalog (Needs Help)",
+          };
+          break;
         default:
           this.settings[languageIndex].options[0] = {
             value: "English",
diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts
index 974f24e706f..6929d6f818d 100644
--- a/src/ui/starter-select-ui-handler.ts
+++ b/src/ui/starter-select-ui-handler.ts
@@ -176,6 +176,10 @@ const languageSettings: { [key: string]: LanguageSetting } = {
     starterInfoYOffset: 0.5,
     starterInfoXPos: 26,
   },
+  tl: {
+    starterInfoTextSize: "56px",
+    instructionTextSize: "38px",
+  },
 };
 
 const valueReductionMax = 2;
diff --git a/src/utils/common.ts b/src/utils/common.ts
index 66a74ed2c33..1c75dac93b4 100644
--- a/src/utils/common.ts
+++ b/src/utils/common.ts
@@ -436,6 +436,7 @@ export function hasAllLocalizedSprites(lang?: string): boolean {
     case "ja":
     case "ca":
     case "ru":
+    case "tl":
       return true;
     default:
       return false;

From 6204a6fdcb18f6a78d7a72511eb4e28841a71ac4 Mon Sep 17 00:00:00 2001
From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Date: Thu, 31 Jul 2025 17:44:03 -0600
Subject: [PATCH 41/44] [Bug] [Beta] Fix serializable battler tags (#6183)

Fix serializable battler tags
---
 src/data/arena-tag.ts    | 5 ++++-
 src/data/battler-tags.ts | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/data/arena-tag.ts b/src/data/arena-tag.ts
index 9f2a5e09667..34477d737b4 100644
--- a/src/data/arena-tag.ts
+++ b/src/data/arena-tag.ts
@@ -1659,7 +1659,10 @@ export function getArenaTag(
  * @param source - An arena tag
  * @returns The valid arena tag
  */
-export function loadArenaTag(source: ArenaTag | ArenaTagTypeData): ArenaTag {
+export function loadArenaTag(source: ArenaTag | ArenaTagTypeData | { tagType: ArenaTagType.NONE }): ArenaTag {
+  if (source.tagType === ArenaTagType.NONE) {
+    return new NoneTag();
+  }
   const tag =
     getArenaTag(source.tagType, source.turnCount, source.sourceMove, source.sourceId, source.side) ?? new NoneTag();
   tag.loadTag(source);
diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts
index f3cfe4e7d99..a1ed535e1d1 100644
--- a/src/data/battler-tags.ts
+++ b/src/data/battler-tags.ts
@@ -201,7 +201,7 @@ export class BattlerTag implements BaseBattlerTag {
   }
 }
 
-export abstract class SerializableBattlerTag extends BattlerTag {
+export class SerializableBattlerTag extends BattlerTag {
   /** Nonexistent, dummy field to allow typescript to distinguish this class from `BattlerTag` */
   private declare __SerializableBattlerTag: never;
 }
@@ -3641,7 +3641,7 @@ export function getBattlerTag(
     case BattlerTagType.FRENZY:
       return new FrenzyTag(turnCount, sourceMove, sourceId);
     case BattlerTagType.CHARGING:
-      return new BattlerTag(tagType, BattlerTagLapseType.CUSTOM, 1, sourceMove, sourceId);
+      return new SerializableBattlerTag(tagType, BattlerTagLapseType.CUSTOM, 1, sourceMove, sourceId);
     case BattlerTagType.ENCORE:
       return new EncoreTag(sourceId);
     case BattlerTagType.HELPING_HAND:
@@ -3726,10 +3726,10 @@ export function getBattlerTag(
       return new DragonCheerTag();
     case BattlerTagType.ALWAYS_CRIT:
     case BattlerTagType.IGNORE_ACCURACY:
-      return new BattlerTag(tagType, BattlerTagLapseType.TURN_END, 2, sourceMove);
+      return new SerializableBattlerTag(tagType, BattlerTagLapseType.TURN_END, 2, sourceMove);
     case BattlerTagType.ALWAYS_GET_HIT:
     case BattlerTagType.RECEIVE_DOUBLE_DAMAGE:
-      return new BattlerTag(tagType, BattlerTagLapseType.PRE_MOVE, 1, sourceMove);
+      return new SerializableBattlerTag(tagType, BattlerTagLapseType.PRE_MOVE, 1, sourceMove);
     case BattlerTagType.BYPASS_SLEEP:
       return new BattlerTag(tagType, BattlerTagLapseType.TURN_END, turnCount, sourceMove);
     case BattlerTagType.IGNORE_FLYING:

From 4dd6eb4e954d58735a7009eac959eb6349ae5a31 Mon Sep 17 00:00:00 2001
From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Date: Thu, 31 Jul 2025 17:57:53 -0600
Subject: [PATCH 42/44] [Misc] [Beta] Fix serializable battler tags (#6184)

Fix serializable battler tags
---
 src/data/battler-tags.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts
index a1ed535e1d1..8805d671f8e 100644
--- a/src/data/battler-tags.ts
+++ b/src/data/battler-tags.ts
@@ -3856,7 +3856,7 @@ export type BattlerTagTypeMap = {
   [BattlerTagType.POWDER]: PowderTag;
   [BattlerTagType.NIGHTMARE]: NightmareTag;
   [BattlerTagType.FRENZY]: FrenzyTag;
-  [BattlerTagType.CHARGING]: BattlerTag;
+  [BattlerTagType.CHARGING]: SerializableBattlerTag;
   [BattlerTagType.ENCORE]: EncoreTag;
   [BattlerTagType.HELPING_HAND]: HelpingHandTag;
   [BattlerTagType.INGRAIN]: IngrainTag;
@@ -3897,10 +3897,10 @@ export type BattlerTagTypeMap = {
   [BattlerTagType.FIRE_BOOST]: TypeBoostTag;
   [BattlerTagType.CRIT_BOOST]: CritBoostTag;
   [BattlerTagType.DRAGON_CHEER]: DragonCheerTag;
-  [BattlerTagType.ALWAYS_CRIT]: BattlerTag;
-  [BattlerTagType.IGNORE_ACCURACY]: BattlerTag;
-  [BattlerTagType.ALWAYS_GET_HIT]: BattlerTag;
-  [BattlerTagType.RECEIVE_DOUBLE_DAMAGE]: BattlerTag;
+  [BattlerTagType.ALWAYS_CRIT]: SerializableBattlerTag;
+  [BattlerTagType.IGNORE_ACCURACY]: SerializableBattlerTag;
+  [BattlerTagType.ALWAYS_GET_HIT]: SerializableBattlerTag;
+  [BattlerTagType.RECEIVE_DOUBLE_DAMAGE]: SerializableBattlerTag;
   [BattlerTagType.BYPASS_SLEEP]: BattlerTag;
   [BattlerTagType.IGNORE_FLYING]: GroundedTag;
   [BattlerTagType.ROOSTED]: RoostedTag;

From 8ef2fadce45c3891bd7d32e91003cb7cbd220458 Mon Sep 17 00:00:00 2001
From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Date: Thu, 31 Jul 2025 19:08:41 -0600
Subject: [PATCH 43/44] [Misc] Disallow using NonFunctionProperties in loadTag
 methods (#6185)

Disallow using NonFunctionProperties in loadTag methods
---
 src/data/arena-tag.ts    |  3 ---
 src/data/battler-tags.ts | 16 +++++++---------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/data/arena-tag.ts b/src/data/arena-tag.ts
index 34477d737b4..15c2cde1d58 100644
--- a/src/data/arena-tag.ts
+++ b/src/data/arena-tag.ts
@@ -71,13 +71,10 @@ import i18next from "i18next";
  *   // Then we must also define a loadTag method with one of the following signatures
  *   public override loadTag(source: BaseArenaTag & Pick<ExampleTag, "tagType" | "a" | "b"): void;
  *   public override loadTag<const T extends this>(source: BaseArenaTag & Pick<T, "tagType" | "a" | "b">): void;
- *   public override loadTag(source: NonFunctionProperties<ExampleTag>): void;
  * }
  * ```
  * Notes
  * - If the class has any subclasses, then the second form of `loadTag` *must* be used.
- * - The third form *must not* be used if the class has any getters, as typescript would expect such fields to be
- *   present in `source`.
  */
 
 /** Interface containing the serializable fields of ArenaTagData. */
diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts
index 8805d671f8e..edeff293aa0 100644
--- a/src/data/battler-tags.ts
+++ b/src/data/battler-tags.ts
@@ -44,7 +44,7 @@ import type {
   SemiInvulnerableTagType,
   TrappingBattlerTagType,
 } from "#types/battler-tags";
-import type { Mutable, NonFunctionProperties } from "#types/type-helpers";
+import type { Mutable } from "#types/type-helpers";
 import { BooleanHolder, coerceArray, getFrameMs, isNullOrUndefined, NumberHolder, toDmgValue } from "#utils/common";
 
 /**
@@ -80,13 +80,10 @@ import { BooleanHolder, coerceArray, getFrameMs, isNullOrUndefined, NumberHolder
  *   // Then we must also define a loadTag method with one of the following signatures
  *   public override loadTag(source: BaseBattlerTag & Pick<ExampleTag, "tagType" | "a" | "b"): void;
  *   public override loadTag<const T extends this>(source: BaseBattlerTag & Pick<T, "tagType" | "a" | "b">): void;
- *   public override loadTag(source: NonFunctionProperties<ExampleTag>): void;
  * }
  * ```
  * Notes
  * - If the class has any subclasses, then the second form of `loadTag` *must* be used.
- * - The third form *must not* be used if the class has any getters, as typescript would expect such fields to be
- *   present in `source`.
  */
 
 /** Interface containing the serializable fields of BattlerTag */
@@ -419,7 +416,6 @@ export class GorillaTacticsTag extends MoveRestrictionBattlerTag {
   public override readonly tagType = BattlerTagType.GORILLA_TACTICS;
   /** ID of the move that the user is locked into using*/
   public readonly moveId: MoveId = MoveId.NONE;
-
   constructor() {
     super(BattlerTagType.GORILLA_TACTICS, BattlerTagLapseType.CUSTOM, 0);
   }
@@ -1235,7 +1231,7 @@ export class EncoreTag extends MoveRestrictionBattlerTag {
     );
   }
 
-  public override loadTag(source: NonFunctionProperties<EncoreTag>): void {
+  public override loadTag(source: BaseBattlerTag & Pick<EncoreTag, "tagType" | "moveId">): void {
     super.loadTag(source);
     this.moveId = source.moveId;
   }
@@ -2618,7 +2614,7 @@ export class CommandedTag extends SerializableBattlerTag {
     }
   }
 
-  override loadTag(source: NonFunctionProperties<CommandedTag>): void {
+  override loadTag(source: BaseBattlerTag & Pick<CommandedTag, "tagType" | "tatsugiriFormKey">): void {
     super.loadTag(source);
     (this as Mutable<this>).tatsugiriFormKey = source.tatsugiriFormKey;
   }
@@ -2659,7 +2655,9 @@ export class StockpilingTag extends SerializableBattlerTag {
     }
   };
 
-  public override loadTag(source: NonFunctionProperties<StockpilingTag>): void {
+  public override loadTag(
+    source: BaseBattlerTag & Pick<StockpilingTag, "tagType" | "stockpiledCount" | "statChangeCounts">,
+  ): void {
     super.loadTag(source);
     this.stockpiledCount = source.stockpiledCount || 0;
     this.statChangeCounts = {
@@ -3006,7 +3004,7 @@ export class AutotomizedTag extends SerializableBattlerTag {
     this.onAdd(pokemon);
   }
 
-  public override loadTag(source: NonFunctionProperties<AutotomizedTag>): void {
+  public override loadTag(source: BaseBattlerTag & Pick<AutotomizedTag, "tagType" | "autotomizeCount">): void {
     super.loadTag(source);
     this.autotomizeCount = source.autotomizeCount;
   }

From f54890001c895123842b81d53232711327208d82 Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Thu, 31 Jul 2025 19:06:38 -0700
Subject: [PATCH 44/44] [Dev] `pnpm biome` will now only display errors by
 default (#6187)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 71a8b1ae334..d3494da677c 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "typecheck": "tsc --noEmit",
     "eslint": "eslint --fix .",
     "eslint-ci": "eslint .",
-    "biome": "biome check --write --changed --no-errors-on-unmatched",
+    "biome": "biome check --write --changed --no-errors-on-unmatched --diagnostic-level=error",
     "biome-ci": "biome ci --diagnostic-level=error --reporter=github --no-errors-on-unmatched",
     "docs": "typedoc",
     "depcruise": "depcruise src test",