Moved operator linebreaks before lines

2025-08-17 12:59:25 +02:00 · 2025-08-14 14:00:06 -04:00 · 2025-08-14 14:00:06 -04:00 · 14b4ef82b7
commit 14b4ef82b7
parent c52dfcef6a
210 changed files with 32254 additions and 28423 deletions
--- a/.dependency-cruiser.cjs
+++ b/.dependency-cruiser.cjs
@ -5,9 +5,7 @@ module.exports = {
      name: "no-non-type-@type-exports",
      severity: "error",
      comment:
-        "Files in @types should not export anything but types and interfaces. " +
-        "The folder is intended to house imports that are removed at runtime, " +
-        "and thus should not contain anything with a bearing on runtime code.",
+        "Files in @types should not export anything but types and interfaces. The folder is intended to house imports that are removed at runtime, and thus should not contain anything with a bearing on runtime code.",
      from: {},
      to: {
        path: "(^|/)src/@types",
@ -29,8 +27,7 @@ module.exports = {
      name: "no-circular-at-runtime",
      severity: "error",
      comment:
-        "This dependency is part of a circular relationship. You might want to revise " +
-        "your solution (i.e. use dependency inversion, make sure the modules have a single responsibility) ",
+        "This dependency is part of a circular relationship. You might want to revise your solution (i.e. use dependency inversion, make sure the modules have a single responsibility) ",
      from: {},
      to: {
        circular: true,
@ -42,11 +39,7 @@ module.exports = {
    {
      name: "no-orphans",
      comment:
-        "This is an orphan module - it's likely not used (anymore?). Either use it or " +
-        "remove it. If it's logical this module is an orphan (i.e. it's a config file), " +
-        "add an exception for it in your dependency-cruiser configuration. By default " +
-        "this rule does not scrutinize dot-files (e.g. .eslintrc.js), TypeScript declaration " +
-        "files (.d.ts), tsconfig.json and some of the babel and webpack configs.",
+        "This is an orphan module - it's likely not used (anymore?). Either use it or remove it. If it's logical this module is an orphan (i.e. it's a config file), add an exception for it in your dependency-cruiser configuration. By default this rule does not scrutinize dot-files (e.g. .eslintrc.js), TypeScript declaration files (.d.ts), tsconfig.json and some of the babel and webpack configs.",
      severity: "error",
      from: {
        orphan: true,
@ -63,8 +56,7 @@ module.exports = {
    {
      name: "no-deprecated-core",
      comment:
-        "A module depends on a node core module that has been deprecated. Find an alternative - these are " +
-        "bound to exist - node doesn't deprecate lightly.",
+        "A module depends on a node core module that has been deprecated. Find an alternative - these are bound to exist - node doesn't deprecate lightly.",
      severity: "error",
      from: {},
      to: {
@ -96,8 +88,7 @@ module.exports = {
    {
      name: "not-to-deprecated",
      comment:
-        "This module uses a (version of an) npm module that has been deprecated. Either upgrade to a later " +
-        "version of that module, or find an alternative. Deprecated modules are a security risk.",
+        "This module uses a (version of an) npm module that has been deprecated. Either upgrade to a later version of that module, or find an alternative. Deprecated modules are a security risk.",
      severity: "error",
      from: {},
      to: {
@ -108,10 +99,7 @@ module.exports = {
      name: "no-non-package-json",
      severity: "error",
      comment:
-        "This module depends on an npm package that isn't in the 'dependencies' section of your package.json. " +
-        "That's problematic as the package either (1) won't be available on live (2 - worse) will be " +
-        "available on live with an non-guaranteed version. Fix it by adding the package to the dependencies " +
-        "in your package.json.",
+        "This module depends on an npm package that isn't in the 'dependencies' section of your package.json. That's problematic as the package either (1) won't be available on live (2 - worse) will be available on live with an non-guaranteed version. Fix it by adding the package to the dependencies in your package.json.",
      from: {},
      to: {
        dependencyTypes: ["npm-no-pkg", "npm-unknown"],
@ -120,8 +108,7 @@ module.exports = {
    {
      name: "not-to-unresolvable",
      comment:
-        "This module depends on a module that cannot be found ('resolved to disk'). If it's an npm " +
-        "module: add it to your package.json. In all other cases you likely already know what to do.",
+        "This module depends on a module that cannot be found ('resolved to disk'). If it's an npm module: add it to your package.json. In all other cases you likely already know what to do.",
      severity: "error",
      from: {},
      to: {
@ -131,9 +118,7 @@ module.exports = {
    {
      name: "no-duplicate-dep-types",
      comment:
-        "Likely this module depends on an external ('npm') package that occurs more than once " +
-        "in your package.json i.e. bot as a devDependencies and in dependencies. This will cause " +
-        "maintenance problems later on.",
+        "Likely this module depends on an external ('npm') package that occurs more than once in your package.json i.e. bot as a devDependencies and in dependencies. This will cause maintenance problems later on.",
      severity: "error",
      from: {},
      to: {
@ -150,9 +135,7 @@ module.exports = {
    {
      name: "not-to-spec",
      comment:
-        "This module depends on a spec (test) file. The sole responsibility of a spec file is to test code. " +
-        "If there's something in a spec that's of use to other modules, it doesn't have that single " +
-        "responsibility anymore. Factor it out into (e.g.) a separate utility/ helper or a mock.",
+        "This module depends on a spec (test) file. The sole responsibility of a spec file is to test code. If there's something in a spec that's of use to other modules, it doesn't have that single responsibility anymore. Factor it out into (e.g.) a separate utility/ helper or a mock.",
      severity: "error",
      from: {},
      to: {
@ -163,11 +146,7 @@ module.exports = {
      name: "not-to-dev-dep",
      severity: "error",
      comment:
-        "This module depends on an npm package from the 'devDependencies' section of your " +
-        "package.json. It looks like something that ships to production, though. To prevent problems " +
-        "with npm packages that aren't there on production declare it (only!) in the 'dependencies'" +
-        "section of your package.json. If this module is development only - add it to the " +
-        "from.pathNot re of the not-to-dev-dep rule in the dependency-cruiser configuration",
+        "This module depends on an npm package from the 'devDependencies' section of your package.json. It looks like something that ships to production, though. To prevent problems with npm packages that aren't there on production declare it (only!) in the 'dependencies'section of your package.json. If this module is development only - add it to the from.pathNot re of the not-to-dev-dep rule in the dependency-cruiser configuration",
      from: {
        path: "^(src)",
        pathNot: ["[.](?:spec|test|setup|script)[.](?:js|mjs|cjs|jsx|ts|mts|cts|tsx)$", "./test"],
@ -184,10 +163,7 @@ module.exports = {
      name: "optional-deps-used",
      severity: "info",
      comment:
-        "This module depends on an npm package that is declared as an optional dependency " +
-        "in your package.json. As this makes sense in limited situations only, it's flagged here. " +
-        "If you're using an optional dependency here by design - add an exception to your" +
-        "dependency-cruiser configuration.",
+        "This module depends on an npm package that is declared as an optional dependency in your package.json. As this makes sense in limited situations only, it's flagged here. If you're using an optional dependency here by design - add an exception to yourdependency-cruiser configuration.",
      from: {},
      to: {
        dependencyTypes: ["npm-optional"],
@ -196,10 +172,7 @@ module.exports = {
    {
      name: "peer-deps-used",
      comment:
-        "This module depends on an npm package that is declared as a peer dependency " +
-        "in your package.json. This makes sense if your package is e.g. a plugin, but in " +
-        "other cases - maybe not so much. If the use of a peer dependency is intentional " +
-        "add an exception to your dependency-cruiser configuration.",
+        "This module depends on an npm package that is declared as a peer dependency in your package.json. This makes sense if your package is e.g. a plugin, but in other cases - maybe not so much. If the use of a peer dependency is intentional add an exception to your dependency-cruiser configuration.",
      severity: "error",
      from: {},
      to: {
--- a/lefthook.yml
+++ b/lefthook.yml
@ -4,8 +4,9 @@ pre-commit:
    - rebase
  commands:
    biome-lint:
-      # Disable colors as certain IDEs don't allow it
-      run: pnpm exec biome check --write --colors="off" --staged --no-errors-on-unmatched
+      # Disable colors as certain IDEs don't support it in the output pane.
+      # Summary mode looks decent in plain ASCII anyhow
+      run: pnpm exec biome check --write --colors=off --reporter=summary --staged --no-errors-on-unmatched
      stage_fixed: true
    ls-lint:
      run: pnpm exec ls-lint
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@ -810,7 +810,7 @@ export class BattleScene extends SceneBase {
   * @returns An array of {@linkcode Pokemon}, as described above.
   */
  public getField(activeOnly = false): Pokemon[] {
-    const ret = new Array(4).fill(null);
+    const ret: Pokemon[] = new Array(4).fill(null);
    const playerField = this.getPlayerField();
    const enemyField = this.getEnemyField();
    ret.splice(0, playerField.length, ...playerField);
@ -833,10 +833,10 @@ export class BattleScene extends SceneBase {
      do {
        targetingMovePhase = this.phaseManager.findPhase(
          mp =>
-            mp.is("MovePhase") &&
-            mp.targets.length === 1 &&
-            mp.targets[0] === removedPokemon.getBattlerIndex() &&
-            mp.pokemon.isPlayer() !== allyPokemon.isPlayer(),
+            mp.is("MovePhase")
+            && mp.targets.length === 1
+            && mp.targets[0] === removedPokemon.getBattlerIndex()
+            && mp.pokemon.isPlayer() !== allyPokemon.isPlayer(),
        ) as MovePhase;
        if (targetingMovePhase && targetingMovePhase.targets[0] !== allyPokemon.getBattlerIndex()) {
          targetingMovePhase.targets[0] = allyPokemon.getBattlerIndex();
@ -1320,16 +1320,16 @@ export class BattleScene extends SceneBase {
      }
    } else {
      if (
-        !this.gameMode.hasTrainers ||
-        Overrides.BATTLE_TYPE_OVERRIDE === BattleType.WILD ||
-        (Overrides.DISABLE_STANDARD_TRAINERS_OVERRIDE && isNullOrUndefined(trainerData))
+        !this.gameMode.hasTrainers
+        || Overrides.BATTLE_TYPE_OVERRIDE === BattleType.WILD
+        || (Overrides.DISABLE_STANDARD_TRAINERS_OVERRIDE && isNullOrUndefined(trainerData))
      ) {
        newBattleType = BattleType.WILD;
      } else {
        newBattleType =
-          Overrides.BATTLE_TYPE_OVERRIDE ??
-          battleType ??
-          (this.gameMode.isWaveTrainer(newWaveIndex, this.arena) ? BattleType.TRAINER : BattleType.WILD);
+          Overrides.BATTLE_TYPE_OVERRIDE
+          ?? battleType
+          ?? (this.gameMode.isWaveTrainer(newWaveIndex, this.arena) ? BattleType.TRAINER : BattleType.WILD);
      }

      if (newBattleType === BattleType.TRAINER) {
@ -1340,12 +1340,12 @@ export class BattleScene extends SceneBase {
          doubleTrainer = true;
        } else if (trainerConfigs[trainerType].hasDouble) {
          doubleTrainer =
-            Overrides.RANDOM_TRAINER_OVERRIDE?.alwaysDouble ||
-            !randSeedInt(this.getDoubleBattleChance(newWaveIndex, playerField));
+            Overrides.RANDOM_TRAINER_OVERRIDE?.alwaysDouble
+            || !randSeedInt(this.getDoubleBattleChance(newWaveIndex, playerField));
          // Add a check that special trainers can't be double except for tate and liza - they should use the normal double chance
          if (
-            trainerConfigs[trainerType].trainerTypeDouble &&
-            ![TrainerType.TATE, TrainerType.LIZA].includes(trainerType)
+            trainerConfigs[trainerType].trainerTypeDouble
+            && ![TrainerType.TATE, TrainerType.LIZA].includes(trainerType)
          ) {
            doubleTrainer = false;
          }
@ -1362,8 +1362,8 @@ export class BattleScene extends SceneBase {
      // Check for mystery encounter
      // Can only occur in place of a standard (non-boss) wild battle, waves 10-180
      if (
-        !Overrides.BATTLE_TYPE_OVERRIDE &&
-        (this.isWaveMysteryEncounter(newBattleType, newWaveIndex) || newBattleType === BattleType.MYSTERY_ENCOUNTER)
+        !Overrides.BATTLE_TYPE_OVERRIDE
+        && (this.isWaveMysteryEncounter(newBattleType, newWaveIndex) || newBattleType === BattleType.MYSTERY_ENCOUNTER)
      ) {
        newBattleType = BattleType.MYSTERY_ENCOUNTER;
        // Reset to base spawn weight
@ -1453,9 +1453,9 @@ export class BattleScene extends SceneBase {
      const isNewBiome = this.isNewBiome(lastBattle);
      /** Whether to reset and recall pokemon */
      const resetArenaState =
-        isNewBiome ||
-        [BattleType.TRAINER, BattleType.MYSTERY_ENCOUNTER].includes(this.currentBattle.battleType) ||
-        this.currentBattle.battleSpec === BattleSpec.FINAL_BOSS;
+        isNewBiome
+        || [BattleType.TRAINER, BattleType.MYSTERY_ENCOUNTER].includes(this.currentBattle.battleType)
+        || this.currentBattle.battleSpec === BattleSpec.FINAL_BOSS;

      for (const enemyPokemon of this.getEnemyParty()) {
        enemyPokemon.destroy();
@ -1482,8 +1482,8 @@ export class BattleScene extends SceneBase {
          pokemon.resetTera();
          applyAbAttrs("PostBattleInitAbAttr", { pokemon });
          if (
-            pokemon.hasSpecies(SpeciesId.TERAPAGOS) ||
-            (this.gameMode.isClassic && this.currentBattle.waveIndex > 180 && this.currentBattle.waveIndex <= 190)
+            pokemon.hasSpecies(SpeciesId.TERAPAGOS)
+            || (this.gameMode.isClassic && this.currentBattle.waveIndex > 180 && this.currentBattle.waveIndex <= 190)
          ) {
            this.arena.playerTerasUsed = 0;
          }
@ -1529,8 +1529,8 @@ export class BattleScene extends SceneBase {
      const fieldScale =
        Math.floor(
          Math.pow(
-            1 /
-              this.getField(true)
+            1
+              / this.getField(true)
                .map(p => p.getSpriteScale())
                .reduce((highestScale: number, scale: number) => (highestScale = Math.max(scale, highestScale)), 0),
            0.7,
@ -1554,7 +1554,7 @@ export class BattleScene extends SceneBase {

      this.tweens.add({
        targets: this.field,
-        scale: scale,
+        scale,
        x: (defaultWidth - scaledWidth) / 2,
        y: defaultHeight - scaledHeight,
        duration: !instant ? fixedInt(Math.abs(this.field.scale - scale) * 200) : 0,
@ -1575,10 +1575,10 @@ export class BattleScene extends SceneBase {

    if (
      // Give trainers with specialty types an appropriately-typed form for Wormadam, Rotom, Arceus, Oricorio, Silvally, or Paldean Tauros.
-      !isEggPhase &&
-      this.currentBattle?.battleType === BattleType.TRAINER &&
-      !isNullOrUndefined(this.currentBattle.trainer) &&
-      this.currentBattle.trainer.config.hasSpecialtyType()
+      !isEggPhase
+      && this.currentBattle?.battleType === BattleType.TRAINER
+      && !isNullOrUndefined(this.currentBattle.trainer)
+      && this.currentBattle.trainer.config.hasSpecialtyType()
    ) {
      if (species.speciesId === SpeciesId.WORMADAM) {
        switch (this.currentBattle.trainer.config.specialtyType) {
@ -1670,9 +1670,9 @@ export class BattleScene extends SceneBase {
        return randSeedInt(8);
      case SpeciesId.EEVEE:
        if (
-          this.currentBattle?.battleType === BattleType.TRAINER &&
-          this.currentBattle?.waveIndex < 30 &&
-          !isEggPhase
+          this.currentBattle?.battleType === BattleType.TRAINER
+          && this.currentBattle?.waveIndex < 30
+          && !isEggPhase
        ) {
          return 0; // No Partner Eevee for Wave 12 Preschoolers
        }
@ -1782,9 +1782,9 @@ export class BattleScene extends SceneBase {
    } else {
      this.executeWithSeedOffset(() => {
        isBoss =
-          waveIndex % 10 === 0 ||
-          (this.gameMode.hasRandomBosses &&
-            randSeedInt(100) < Math.min(Math.max(Math.ceil((waveIndex - 250) / 50), 0) * 2, 30));
+          waveIndex % 10 === 0
+          || (this.gameMode.hasRandomBosses
+            && randSeedInt(100) < Math.min(Math.max(Math.ceil((waveIndex - 250) / 50), 0) * 2, 30));
      }, waveIndex << 2);
    }
    if (!isBoss) {
@ -1898,8 +1898,8 @@ export class BattleScene extends SceneBase {
  ): Phaser.GameObjects.Sprite {
    sprite.setPipeline(this.spritePipeline, {
      tone: [0.0, 0.0, 0.0, 0.0],
-      hasShadow: hasShadow,
-      ignoreOverride: ignoreOverride,
+      hasShadow,
+      ignoreOverride,
      teraColor: pokemon ? getTypeRgb(pokemon.getTeraType()) : undefined,
      isTerastallized: pokemon ? pokemon.isTerastallized : false,
    });
@ -1920,7 +1920,7 @@ export class BattleScene extends SceneBase {
        targets: this.fieldOverlay,
        alpha: 0.5,
        ease: "Sine.easeOut",
-        duration: duration,
+        duration,
        onComplete: () => resolve(),
      });
    });
@ -1931,7 +1931,7 @@ export class BattleScene extends SceneBase {
      this.tweens.add({
        targets: this.fieldOverlay,
        alpha: 0,
-        duration: duration,
+        duration,
        ease: "Cubic.easeIn",
        onComplete: () => resolve(),
      });
@ -1965,7 +1965,7 @@ export class BattleScene extends SceneBase {
      this.tweens.add({
        targets: this.shopOverlay,
        alpha: 0,
-        duration: duration,
+        duration,
        ease: "Cubic.easeIn",
        onComplete: () => resolve(),
      });
@ -2042,7 +2042,7 @@ export class BattleScene extends SceneBase {
    this.luckLabelText.setX(this.scaledCanvas.width - 2 - (this.luckText.displayWidth + 2));
    this.tweens.add({
      targets: labels,
-      duration: duration,
+      duration,
      alpha: 1,
      onComplete: () => {
        for (const label of labels) {
@ -2059,7 +2059,7 @@ export class BattleScene extends SceneBase {
    const labels = [this.luckLabelText, this.luckText];
    this.tweens.add({
      targets: labels,
-      duration: duration,
+      duration,
      alpha: 0,
      onComplete: () => {
        for (const label of labels) {
@ -2073,9 +2073,9 @@ export class BattleScene extends SceneBase {
    const enemyModifierCount = this.enemyModifiers.filter(m => m.isIconVisible()).length;
    const biomeWaveTextHeight = this.biomeWaveText.getBottomLeft().y - this.biomeWaveText.getTopLeft().y;
    this.biomeWaveText.setY(
-      -this.scaledCanvas.height +
-        (enemyModifierCount ? (enemyModifierCount <= 12 ? 15 : 24) : 0) +
-        biomeWaveTextHeight / 2,
+      -this.scaledCanvas.height
+        + (enemyModifierCount ? (enemyModifierCount <= 12 ? 15 : 24) : 0)
+        + biomeWaveTextHeight / 2,
    );
    this.moneyText.setY(this.biomeWaveText.y + 10);
    this.scoreText.setY(this.moneyText.y + 10);
@ -2099,9 +2099,9 @@ export class BattleScene extends SceneBase {

  addFaintedEnemyScore(enemy: EnemyPokemon): void {
    let scoreIncrease =
-      enemy.getSpeciesForm().getBaseExp() *
-      (enemy.level / this.getMaxExpLevel()) *
-      ((enemy.ivs.reduce((iv: number, total: number) => (total += iv), 0) / 93) * 0.2 + 0.8);
+      enemy.getSpeciesForm().getBaseExp()
+      * (enemy.level / this.getMaxExpLevel())
+      * ((enemy.ivs.reduce((iv: number, total: number) => (total += iv), 0) / 93) * 0.2 + 0.8);
    this.findModifiers(m => m instanceof PokemonHeldItemModifier && m.pokemonId === enemy.id, false).map(
      m => (scoreIncrease *= (m as PokemonHeldItemModifier).getScoreMultiplier()),
    );
@ -2619,8 +2619,8 @@ export class BattleScene extends SceneBase {
    const waveIndex = this.currentBattle.waveIndex;
    const waveSetIndex = Math.ceil(waveIndex / 10) - 1;
    const moneyValue =
-      Math.pow((waveSetIndex + 1 + (0.75 + (((waveIndex - 1) % 10) + 1) / 10)) * 100, 1 + 0.005 * waveSetIndex) *
-      moneyMultiplier;
+      Math.pow((waveSetIndex + 1 + (0.75 + (((waveIndex - 1) % 10) + 1) / 10)) * 100, 1 + 0.005 * waveSetIndex)
+      * moneyMultiplier;
    return Math.floor(moneyValue / 10) * 10;
  }

@ -2932,8 +2932,8 @@ export class BattleScene extends SceneBase {
          }
        } else {
          const isBoss =
-            enemyPokemon.isBoss() ||
-            (this.currentBattle.battleType === BattleType.TRAINER && !!this.currentBattle.trainer?.config.isBoss);
+            enemyPokemon.isBoss()
+            || (this.currentBattle.battleType === BattleType.TRAINER && !!this.currentBattle.trainer?.config.isBoss);
          let upgradeChance = 32;
          if (isBoss) {
            upgradeChance /= 2;
@ -3002,15 +3002,15 @@ export class BattleScene extends SceneBase {
    for (let m = 0; m < modifiers.length; m++) {
      const modifier = modifiers[m];
      if (
-        modifier instanceof PokemonHeldItemModifier &&
-        !this.getPokemonById((modifier as PokemonHeldItemModifier).pokemonId)
+        modifier instanceof PokemonHeldItemModifier
+        && !this.getPokemonById((modifier as PokemonHeldItemModifier).pokemonId)
      ) {
        modifiers.splice(m--, 1);
      }
      if (
-        modifier instanceof PokemonHeldItemModifier &&
-        !isNullOrUndefined(modifier.getSpecies()) &&
-        !this.getPokemonById(modifier.pokemonId)?.hasSpecies(modifier.getSpecies()!)
+        modifier instanceof PokemonHeldItemModifier
+        && !isNullOrUndefined(modifier.getSpecies())
+        && !this.getPokemonById(modifier.pokemonId)?.hasSpecies(modifier.getSpecies()!)
      ) {
        modifiers.splice(m--, 1);
      }
@ -3274,8 +3274,8 @@ export class BattleScene extends SceneBase {

  validateAchv(achv: Achv, args?: unknown[]): boolean {
    if (
-      (!this.gameData.achvUnlocks.hasOwnProperty(achv.id) || Overrides.ACHIEVEMENTS_REUNLOCK_OVERRIDE) &&
-      achv.validate(args)
+      (!this.gameData.achvUnlocks.hasOwnProperty(achv.id) || Overrides.ACHIEVEMENTS_REUNLOCK_OVERRIDE)
+      && achv.validate(args)
    ) {
      this.gameData.achvUnlocks[achv.id] = Date.now();
      this.ui.achvBar.showAchv(achv);
@ -3413,8 +3413,8 @@ export class BattleScene extends SceneBase {

    if (participantIds.size > 0) {
      if (
-        this.currentBattle.battleType === BattleType.TRAINER ||
-        this.currentBattle.mysteryEncounter?.encounterMode === MysteryEncounterMode.TRAINER_BATTLE
+        this.currentBattle.battleType === BattleType.TRAINER
+        || this.currentBattle.mysteryEncounter?.encounterMode === MysteryEncounterMode.TRAINER_BATTLE
      ) {
        expValue = Math.floor(expValue * 1.5);
      } else if (this.currentBattle.isBattleMysteryEncounter() && this.currentBattle.mysteryEncounter) {
@ -3510,12 +3510,12 @@ export class BattleScene extends SceneBase {
  isMysteryEncounterValidForWave(battleType: BattleType, waveIndex: number): boolean {
    const [lowestMysteryEncounterWave, highestMysteryEncounterWave] = this.gameMode.getMysteryEncounterLegalWaves();
    return (
-      this.gameMode.hasMysteryEncounters &&
-      battleType === BattleType.WILD &&
-      !this.gameMode.isBoss(waveIndex) &&
-      waveIndex % 10 !== 1 &&
-      waveIndex < highestMysteryEncounterWave &&
-      waveIndex > lowestMysteryEncounterWave
+      this.gameMode.hasMysteryEncounters
+      && battleType === BattleType.WILD
+      && !this.gameMode.isBoss(waveIndex)
+      && waveIndex % 10 !== 1
+      && waveIndex < highestMysteryEncounterWave
+      && waveIndex > lowestMysteryEncounterWave
    );
  }

@ -3537,12 +3537,12 @@ export class BattleScene extends SceneBase {
      // Reduces occurrence of runs with total encounters significantly different from AVERAGE_ENCOUNTERS_PER_RUN_TARGET
      // Favored rate changes can never exceed 50%. So if base rate is 15/256 and favored rate would add 200/256, result will be (15 + 128)/256
      const expectedEncountersByFloor =
-        (AVERAGE_ENCOUNTERS_PER_RUN_TARGET / (highestMysteryEncounterWave - lowestMysteryEncounterWave)) *
-        (waveIndex - lowestMysteryEncounterWave);
+        (AVERAGE_ENCOUNTERS_PER_RUN_TARGET / (highestMysteryEncounterWave - lowestMysteryEncounterWave))
+        * (waveIndex - lowestMysteryEncounterWave);
      const currentRunDiffFromAvg = expectedEncountersByFloor - encounteredEvents.length;
      const favoredEncounterRate =
-        sessionEncounterRate +
-        Math.min(currentRunDiffFromAvg * ANTI_VARIANCE_WEIGHT_MODIFIER, MYSTERY_ENCOUNTER_SPAWN_MAX_WEIGHT / 2);
+        sessionEncounterRate
+        + Math.min(currentRunDiffFromAvg * ANTI_VARIANCE_WEIGHT_MODIFIER, MYSTERY_ENCOUNTER_SPAWN_MAX_WEIGHT / 2);

      const successRate = Overrides.MYSTERY_ENCOUNTER_RATE_OVERRIDE ?? favoredEncounterRate;

@ -3576,8 +3576,8 @@ export class BattleScene extends SceneBase {
    // Loading override or session encounter
    let encounter: MysteryEncounter | null;
    if (
-      !isNullOrUndefined(Overrides.MYSTERY_ENCOUNTER_OVERRIDE) &&
-      allMysteryEncounters.hasOwnProperty(Overrides.MYSTERY_ENCOUNTER_OVERRIDE)
+      !isNullOrUndefined(Overrides.MYSTERY_ENCOUNTER_OVERRIDE)
+      && allMysteryEncounters.hasOwnProperty(Overrides.MYSTERY_ENCOUNTER_OVERRIDE)
    ) {
      encounter = allMysteryEncounters[Overrides.MYSTERY_ENCOUNTER_OVERRIDE];
      if (canBypass) {
@ -3592,9 +3592,9 @@ export class BattleScene extends SceneBase {

    // Check for queued encounters first
    if (
-      !encounter &&
-      this.mysteryEncounterSaveData?.queuedEncounters &&
-      this.mysteryEncounterSaveData.queuedEncounters.length > 0
+      !encounter
+      && this.mysteryEncounterSaveData?.queuedEncounters
+      && this.mysteryEncounterSaveData.queuedEncounters.length > 0
    ) {
      let i = 0;
      while (i < this.mysteryEncounterSaveData.queuedEncounters.length && !!encounter) {
@ -3674,18 +3674,18 @@ export class BattleScene extends SceneBase {
          }
          const disallowedGameModes = encounterCandidate.disallowedGameModes;
          if (
-            disallowedGameModes &&
-            disallowedGameModes.length > 0 &&
-            disallowedGameModes.includes(this.gameMode.modeId)
+            disallowedGameModes
+            && disallowedGameModes.length > 0
+            && disallowedGameModes.includes(this.gameMode.modeId)
          ) {
            return false;
          }
          if (this.gameMode.modeId === GameModes.CHALLENGE) {
            const disallowedChallenges = encounterCandidate.disallowedChallenges;
            if (
-              disallowedChallenges &&
-              disallowedChallenges.length > 0 &&
-              this.gameMode.challenges.some(challenge => disallowedChallenges.includes(challenge.id))
+              disallowedChallenges
+              && disallowedChallenges.length > 0
+              && this.gameMode.challenges.some(challenge => disallowedChallenges.includes(challenge.id))
            ) {
              return false;
            }
@ -3697,11 +3697,11 @@ export class BattleScene extends SceneBase {
            return false;
          }
          return !(
-            this.mysteryEncounterSaveData.encounteredEvents.length > 0 &&
-            encounterCandidate.maxAllowedEncounters &&
-            encounterCandidate.maxAllowedEncounters > 0 &&
-            this.mysteryEncounterSaveData.encounteredEvents.filter(e => e.type === encounterType).length >=
-              encounterCandidate.maxAllowedEncounters
+            this.mysteryEncounterSaveData.encounteredEvents.length > 0
+            && encounterCandidate.maxAllowedEncounters
+            && encounterCandidate.maxAllowedEncounters > 0
+            && this.mysteryEncounterSaveData.encounteredEvents.filter(e => e.type === encounterType).length
+              >= encounterCandidate.maxAllowedEncounters
          );
        })
        .map(m => allMysteryEncounters[m]);
--- a/src/battle.ts
+++ b/src/battle.ts
@ -237,8 +237,8 @@ export class Battle {
      return null;
    }
    if (
-      this.battleType === BattleType.TRAINER ||
-      this.mysteryEncounter?.encounterMode === MysteryEncounterMode.TRAINER_BATTLE
+      this.battleType === BattleType.TRAINER
+      || this.mysteryEncounter?.encounterMode === MysteryEncounterMode.TRAINER_BATTLE
    ) {
      if (!this.started && this.trainer?.config.encounterBgm && this.trainer?.getEncounterMessages()?.length) {
        return `encounter_${this.trainer?.getEncounterBgm()}`;
--- a/src/configs/inputs/config-handler.ts
+++ b/src/configs/inputs/config-handler.ts
@ -116,8 +116,8 @@ export function getIconForLatestInput(configs, source, devices, settingName) {
 export function assign(config, settingNameTarget, keycode): boolean {
  // first, we need to check if this keycode is already used on another settingName
  if (
-    !canIAssignThisKey(config, getKeyWithKeycode(config, keycode)) ||
-    !canIOverrideThisSetting(config, settingNameTarget)
+    !canIAssignThisKey(config, getKeyWithKeycode(config, keycode))
+    || !canIOverrideThisSetting(config, settingNameTarget)
  ) {
    return false;
  }
--- a/src/data/abilities/ability.ts
+++ b/src/data/abilities/ability.ts
@ -578,13 +578,10 @@ export abstract class PreDefendAbAttr extends AbAttr {
 export class PreDefendFullHpEndureAbAttr extends PreDefendAbAttr {
  override canApply({ pokemon, damage }: PreDefendModifyDamageAbAttrParams): boolean {
    return (
-      pokemon.isFullHp() &&
-      // Checks if pokemon has wonder_guard (which forces 1hp)
-      pokemon.getMaxHp() > 1 &&
-      // Damage >= hp
-      damage.value >= pokemon.hp &&
-      // Cannot apply if the pokemon already has sturdy from some other source
-      !pokemon.getTag(BattlerTagType.STURDY)
+      pokemon.isFullHp() // Checks if pokemon has wonder_guard (which forces 1hp)
+      && pokemon.getMaxHp() > 1 // Damage >= hp
+      && damage.value >= pokemon.hp // Cannot apply if the pokemon already has sturdy from some other source
+      && !pokemon.getTag(BattlerTagType.STURDY)
    );
  }

@ -702,9 +699,9 @@ export class TypeImmunityAbAttr extends PreDefendAbAttr {

  override canApply({ move, opponent: attacker, pokemon }: TypeMultiplierAbAttrParams): boolean {
    return (
-      ![MoveTarget.BOTH_SIDES, MoveTarget.ENEMY_SIDE, MoveTarget.USER_SIDE].includes(move.moveTarget) &&
-      attacker !== pokemon &&
-      attacker.getMoveType(move) === this.immuneType
+      ![MoveTarget.BOTH_SIDES, MoveTarget.ENEMY_SIDE, MoveTarget.USER_SIDE].includes(move.moveTarget)
+      && attacker !== pokemon
+      && attacker.getMoveType(move) === this.immuneType
    );
  }

@ -730,9 +727,9 @@ export class AttackTypeImmunityAbAttr extends TypeImmunityAbAttr {
  override canApply(params: TypeMultiplierAbAttrParams): boolean {
    const { move } = params;
    return (
-      move.category !== MoveCategory.STATUS &&
-      !move.hasAttr("NeutralDamageAgainstFlyingTypeMultiplierAttr") &&
-      super.canApply(params)
+      move.category !== MoveCategory.STATUS
+      && !move.hasAttr("NeutralDamageAgainstFlyingTypeMultiplierAttr")
+      && super.canApply(params)
    );
  }
 }
@ -844,10 +841,10 @@ export class FullHpResistTypeAbAttr extends PreDefendAbAttr {
   */
  override canApply({ typeMultiplier, move, pokemon }: TypeMultiplierAbAttrParams): boolean {
    return (
-      typeMultiplier instanceof NumberHolder &&
-      !move?.hasAttr("FixedDamageAttr") &&
-      pokemon.isFullHp() &&
-      typeMultiplier.value > 0.5
+      typeMultiplier instanceof NumberHolder
+      && !move?.hasAttr("FixedDamageAttr")
+      && pokemon.isFullHp()
+      && typeMultiplier.value > 0.5
    );
  }

@ -874,9 +871,9 @@ export interface FieldPriorityMoveImmunityAbAttrParams extends AugmentMoveIntera
 export class FieldPriorityMoveImmunityAbAttr extends PreDefendAbAttr {
  override canApply({ move, opponent: attacker }: FieldPriorityMoveImmunityAbAttrParams): boolean {
    return (
-      !(move.moveTarget === MoveTarget.USER || move.moveTarget === MoveTarget.NEAR_ALLY) &&
-      move.getPriority(attacker) > 0 &&
-      !move.isMultiTarget()
+      !(move.moveTarget === MoveTarget.USER || move.moveTarget === MoveTarget.NEAR_ALLY)
+      && move.getPriority(attacker) > 0
+      && !move.isMultiTarget()
    );
  }

@ -1118,8 +1115,8 @@ export class PostDefendApplyArenaTrapTagAbAttr extends PostDefendAbAttr {
  override canApply({ pokemon, opponent: attacker, move }: PostMoveInteractionAbAttrParams): boolean {
    const tag = globalScene.arena.getTag(this.arenaTagType) as ArenaTrapTag;
    return (
-      this.condition(pokemon, attacker, move) &&
-      (!globalScene.arena.getTag(this.arenaTagType) || tag.layers < tag.maxLayers)
+      this.condition(pokemon, attacker, move)
+      && (!globalScene.arena.getTag(this.arenaTagType) || tag.layers < tag.maxLayers)
    );
  }

@ -1227,10 +1224,10 @@ export class PostDefendContactApplyStatusEffectAbAttr extends PostDefendAbAttr {
    const effect =
      this.effects.length === 1 ? this.effects[0] : this.effects[pokemon.randBattleSeedInt(this.effects.length)];
    return (
-      move.doesFlagEffectApply({ flag: MoveFlags.MAKES_CONTACT, user: attacker, target: pokemon }) &&
-      !attacker.status &&
-      (this.chance === -1 || pokemon.randBattleSeedInt(100) < this.chance) &&
-      attacker.canSetStatus(effect, true, false, pokemon)
+      move.doesFlagEffectApply({ flag: MoveFlags.MAKES_CONTACT, user: attacker, target: pokemon })
+      && !attacker.status
+      && (this.chance === -1 || pokemon.randBattleSeedInt(100) < this.chance)
+      && attacker.canSetStatus(effect, true, false, pokemon)
    );
  }

@ -1268,9 +1265,9 @@ export class PostDefendContactApplyTagChanceAbAttr extends PostDefendAbAttr {

  override canApply({ move, pokemon, opponent: attacker }: PostMoveInteractionAbAttrParams): boolean {
    return (
-      move.doesFlagEffectApply({ flag: MoveFlags.MAKES_CONTACT, user: attacker, target: pokemon }) &&
-      pokemon.randBattleSeedInt(100) < this.chance &&
-      attacker.canAddTag(this.tagType)
+      move.doesFlagEffectApply({ flag: MoveFlags.MAKES_CONTACT, user: attacker, target: pokemon })
+      && pokemon.randBattleSeedInt(100) < this.chance
+      && attacker.canAddTag(this.tagType)
    );
  }

@ -1325,9 +1322,9 @@ export class PostDefendContactDamageAbAttr extends PostDefendAbAttr {

  override canApply({ simulated, move, opponent: attacker, pokemon }: PostMoveInteractionAbAttrParams): boolean {
    return (
-      !simulated &&
-      move.doesFlagEffectApply({ flag: MoveFlags.MAKES_CONTACT, user: attacker, target: pokemon }) &&
-      !attacker.hasAbilityWithAttr("BlockNonDirectDamageAbAttr")
+      !simulated
+      && move.doesFlagEffectApply({ flag: MoveFlags.MAKES_CONTACT, user: attacker, target: pokemon })
+      && !attacker.hasAbilityWithAttr("BlockNonDirectDamageAbAttr")
    );
  }

@ -1361,8 +1358,8 @@ export class PostDefendPerishSongAbAttr extends PostDefendAbAttr {

  override canApply({ move, opponent: attacker, pokemon }: PostMoveInteractionAbAttrParams): boolean {
    return (
-      move.doesFlagEffectApply({ flag: MoveFlags.MAKES_CONTACT, user: attacker, target: pokemon }) &&
-      !attacker.getTag(BattlerTagType.PERISH_SONG)
+      move.doesFlagEffectApply({ flag: MoveFlags.MAKES_CONTACT, user: attacker, target: pokemon })
+      && !attacker.getTag(BattlerTagType.PERISH_SONG)
    );
  }

@ -1376,7 +1373,7 @@ export class PostDefendPerishSongAbAttr extends PostDefendAbAttr {
  override getTriggerMessage({ pokemon }: PostMoveInteractionAbAttrParams, abilityName: string): string {
    return i18next.t("abilityTriggers:perishBody", {
      pokemonName: getPokemonNameWithAffix(pokemon),
-      abilityName: abilityName,
+      abilityName,
    });
  }
 }
@ -1394,9 +1391,9 @@ export class PostDefendWeatherChangeAbAttr extends PostDefendAbAttr {

  override canApply({ pokemon, opponent: attacker, move }: PostMoveInteractionAbAttrParams): boolean {
    return (
-      !(this.condition && !this.condition(pokemon, attacker, move)) &&
-      !globalScene.arena.weather?.isImmutable() &&
-      globalScene.arena.canSetWeather(this.weatherType)
+      !(this.condition && !this.condition(pokemon, attacker, move))
+      && !globalScene.arena.weather?.isImmutable()
+      && globalScene.arena.canSetWeather(this.weatherType)
    );
  }

@ -1410,8 +1407,8 @@ export class PostDefendWeatherChangeAbAttr extends PostDefendAbAttr {
 export class PostDefendAbilitySwapAbAttr extends PostDefendAbAttr {
  override canApply({ move, opponent: attacker, pokemon }: PostMoveInteractionAbAttrParams): boolean {
    return (
-      move.doesFlagEffectApply({ flag: MoveFlags.MAKES_CONTACT, user: attacker, target: pokemon }) &&
-      attacker.getAbility().isSwappable
+      move.doesFlagEffectApply({ flag: MoveFlags.MAKES_CONTACT, user: attacker, target: pokemon })
+      && attacker.getAbility().isSwappable
    );
  }

@ -1440,9 +1437,9 @@ export class PostDefendAbilityGiveAbAttr extends PostDefendAbAttr {

  override canApply({ move, opponent: attacker, pokemon }: PostMoveInteractionAbAttrParams): boolean {
    return (
-      move.doesFlagEffectApply({ flag: MoveFlags.MAKES_CONTACT, user: attacker, target: pokemon }) &&
-      attacker.getAbility().isSuppressable &&
-      !attacker.getAbility().hasAttr("PostDefendAbilityGiveAbAttr")
+      move.doesFlagEffectApply({ flag: MoveFlags.MAKES_CONTACT, user: attacker, target: pokemon })
+      && attacker.getAbility().isSuppressable
+      && !attacker.getAbility().hasAttr("PostDefendAbilityGiveAbAttr")
    );
  }

@ -1472,9 +1469,9 @@ export class PostDefendMoveDisableAbAttr extends PostDefendAbAttr {

  override canApply({ move, opponent: attacker, pokemon }: PostMoveInteractionAbAttrParams): boolean {
    return (
-      isNullOrUndefined(attacker.getTag(BattlerTagType.DISABLED)) &&
-      move.doesFlagEffectApply({ flag: MoveFlags.MAKES_CONTACT, user: attacker, target: pokemon }) &&
-      (this.chance === -1 || pokemon.randBattleSeedInt(100) < this.chance)
+      isNullOrUndefined(attacker.getTag(BattlerTagType.DISABLED))
+      && move.doesFlagEffectApply({ flag: MoveFlags.MAKES_CONTACT, user: attacker, target: pokemon })
+      && (this.chance === -1 || pokemon.randBattleSeedInt(100) < this.chance)
    );
  }

@ -1639,10 +1636,10 @@ export class FieldMultiplyStatAbAttr extends AbAttr {

  canApply({ hasApplied, target, stat }: FieldMultiplyStatAbAttrParams): boolean {
    return (
-      this.canStack ||
-      (!hasApplied.value &&
-        this.stat === stat &&
-        target.getAbilityAttrs("FieldMultiplyStatAbAttr").every(attr => attr.stat !== stat))
+      this.canStack
+      || (!hasApplied.value
+        && this.stat === stat
+        && target.getAbilityAttrs("FieldMultiplyStatAbAttr").every(attr => attr.stat !== stat))
    );
  }

@ -1683,14 +1680,14 @@ export class MoveTypeChangeAbAttr extends PreAttackAbAttr {
   */
  override canApply({ pokemon, opponent: target, move }: MoveTypeChangeAbAttrParams): boolean {
    return (
-      (!this.condition || this.condition(pokemon, target, move)) &&
-      !noAbilityTypeOverrideMoves.has(move.id) &&
-      !(
-        pokemon.isTerastallized &&
-        (move.id === MoveId.TERA_BLAST ||
-          (move.id === MoveId.TERA_STARSTORM &&
-            pokemon.getTeraType() === PokemonType.STELLAR &&
-            pokemon.hasSpecies(SpeciesId.TERAPAGOS)))
+      (!this.condition || this.condition(pokemon, target, move))
+      && !noAbilityTypeOverrideMoves.has(move.id)
+      && !(
+        pokemon.isTerastallized
+        && (move.id === MoveId.TERA_BLAST
+          || (move.id === MoveId.TERA_STARSTORM
+            && pokemon.getTeraType() === PokemonType.STELLAR
+            && pokemon.hasSpecies(SpeciesId.TERAPAGOS)))
      )
    );
  }
@ -1713,14 +1710,13 @@ export class PokemonTypeChangeAbAttr extends PreAttackAbAttr {

  override canApply({ move, pokemon }: AugmentMoveInteractionAbAttrParams): boolean {
    if (
-      pokemon.isTerastallized ||
-      move.id === MoveId.STRUGGLE ||
-      /*
+      pokemon.isTerastallized
+      || move.id === MoveId.STRUGGLE /*
       * Skip moves that call other moves because these moves generate a following move that will trigger this ability attribute
       * See: https://bulbapedia.bulbagarden.net/wiki/Category:Moves_that_call_other_moves
       */
-      move.hasAttr("CallMoveAttr") ||
-      move.hasAttr("NaturePowerAttr") // TODO: remove this line when nature power is made to extend from `CallMoveAttr`
+      || move.hasAttr("CallMoveAttr")
+      || move.hasAttr("NaturePowerAttr") // TODO: remove this line when nature power is made to extend from `CallMoveAttr`
    ) {
      return false;
    }
@ -2148,10 +2144,10 @@ export class PostAttackStealHeldItemAbAttr extends PostAttackAbAttr {
    // The PostAttackAbAttr should should only be invoked in cases where the move successfully connected,
    // calling `super.canApply` already checks that the move was a damage move and not a status move.
    if (
-      super.canApply(params) &&
-      !simulated &&
-      hitResult < HitResult.NO_EFFECT &&
-      (!this.stealCondition || this.stealCondition(pokemon, opponent, move))
+      super.canApply(params)
+      && !simulated
+      && hitResult < HitResult.NO_EFFECT
+      && (!this.stealCondition || this.stealCondition(pokemon, opponent, move))
    ) {
      const heldItems = this.getTargetHeldItems(opponent).filter(i => i.isTransferable);
      if (heldItems.length) {
@ -2207,14 +2203,14 @@ export class PostAttackApplyStatusEffectAbAttr extends PostAttackAbAttr {
  override canApply(params: PostMoveInteractionAbAttrParams): boolean {
    const { simulated, pokemon, move, opponent } = params;
    if (
-      super.canApply(params) &&
-      (simulated ||
-        (!opponent.hasAbilityWithAttr("IgnoreMoveEffectsAbAttr") &&
-          pokemon !== opponent &&
-          (!this.contactRequired ||
-            move.doesFlagEffectApply({ flag: MoveFlags.MAKES_CONTACT, user: pokemon, target: opponent })) &&
-          pokemon.randBattleSeedInt(100) < this.chance &&
-          !pokemon.status))
+      super.canApply(params)
+      && (simulated
+        || (!opponent.hasAbilityWithAttr("IgnoreMoveEffectsAbAttr")
+          && pokemon !== opponent
+          && (!this.contactRequired
+            || move.doesFlagEffectApply({ flag: MoveFlags.MAKES_CONTACT, user: pokemon, target: opponent }))
+          && pokemon.randBattleSeedInt(100) < this.chance
+          && !pokemon.status))
    ) {
      const effect =
        this.effects.length === 1 ? this.effects[0] : this.effects[pokemon.randBattleSeedInt(this.effects.length)];
@ -2258,13 +2254,13 @@ export class PostAttackApplyBattlerTagAbAttr extends PostAttackAbAttr {
    const { pokemon, move, opponent } = params;
    /**Battler tags inflicted by abilities post attacking are also considered additional effects.*/
    return (
-      super.canApply(params) &&
-      !opponent.hasAbilityWithAttr("IgnoreMoveEffectsAbAttr") &&
-      pokemon !== opponent &&
-      (!this.contactRequired ||
-        move.doesFlagEffectApply({ flag: MoveFlags.MAKES_CONTACT, user: opponent, target: pokemon })) &&
-      pokemon.randBattleSeedInt(100) < this.chance(opponent, pokemon, move) &&
-      !pokemon.status
+      super.canApply(params)
+      && !opponent.hasAbilityWithAttr("IgnoreMoveEffectsAbAttr")
+      && pokemon !== opponent
+      && (!this.contactRequired
+        || move.doesFlagEffectApply({ flag: MoveFlags.MAKES_CONTACT, user: opponent, target: pokemon }))
+      && pokemon.randBattleSeedInt(100) < this.chance(opponent, pokemon, move)
+      && !pokemon.status
    );
  }

@ -2921,10 +2917,10 @@ export class PostSummonWeatherChangeAbAttr extends PostSummonAbAttr {

  override canApply(_params: AbAttrBaseParams): boolean {
    const weatherReplaceable =
-      this.weatherType === WeatherType.HEAVY_RAIN ||
-      this.weatherType === WeatherType.HARSH_SUN ||
-      this.weatherType === WeatherType.STRONG_WINDS ||
-      !globalScene.arena.weather?.isImmutable();
+      this.weatherType === WeatherType.HEAVY_RAIN
+      || this.weatherType === WeatherType.HARSH_SUN
+      || this.weatherType === WeatherType.STRONG_WINDS
+      || !globalScene.arena.weather?.isImmutable();
    return weatherReplaceable && globalScene.arena.canSetWeather(this.weatherType);
  }

@ -3032,9 +3028,8 @@ export class PostSummonCopyAbilityAbAttr extends PostSummonAbAttr {
    }

    if (
-      !target!.getAbility().isCopiable &&
-      // Wonder Guard is normally uncopiable so has the attribute, but Trace specifically can copy it
-      !(pokemon.hasAbility(AbilityId.TRACE) && target!.getAbility().id === AbilityId.WONDER_GUARD)
+      !target!.getAbility().isCopiable // Wonder Guard is normally uncopiable so has the attribute, but Trace specifically can copy it
+      && !(pokemon.hasAbility(AbilityId.TRACE) && target!.getAbility().id === AbilityId.WONDER_GUARD)
    ) {
      return false;
    }
@ -3250,10 +3245,10 @@ export class CommanderAbAttr extends AbAttr {
    // TODO: Should this work with X + Dondozo fusions?
    const ally = pokemon.getAlly();
    return (
-      globalScene.currentBattle?.double &&
-      !isNullOrUndefined(ally) &&
-      ally.species.speciesId === SpeciesId.DONDOZO &&
-      !(ally.isFainted() || ally.getTag(BattlerTagType.COMMANDED))
+      globalScene.currentBattle?.double
+      && !isNullOrUndefined(ally)
+      && ally.species.speciesId === SpeciesId.DONDOZO
+      && !(ally.isFainted() || ally.getTag(BattlerTagType.COMMANDED))
    );
  }

@ -3319,8 +3314,8 @@ export class PreSwitchOutClearWeatherAbAttr extends PreSwitchOutAbAttr {
    switch (weatherType) {
      case WeatherType.HARSH_SUN:
        if (
-          pokemon.hasAbility(AbilityId.DESOLATE_LAND) &&
-          globalScene
+          pokemon.hasAbility(AbilityId.DESOLATE_LAND)
+          && globalScene
            .getField(true)
            .filter(p => p !== pokemon)
            .filter(p => p.hasAbility(AbilityId.DESOLATE_LAND)).length === 0
@ -3330,8 +3325,8 @@ export class PreSwitchOutClearWeatherAbAttr extends PreSwitchOutAbAttr {
        break;
      case WeatherType.HEAVY_RAIN:
        if (
-          pokemon.hasAbility(AbilityId.PRIMORDIAL_SEA) &&
-          globalScene
+          pokemon.hasAbility(AbilityId.PRIMORDIAL_SEA)
+          && globalScene
            .getField(true)
            .filter(p => p !== pokemon)
            .filter(p => p.hasAbility(AbilityId.PRIMORDIAL_SEA)).length === 0
@ -3341,8 +3336,8 @@ export class PreSwitchOutClearWeatherAbAttr extends PreSwitchOutAbAttr {
        break;
      case WeatherType.STRONG_WINDS:
        if (
-          pokemon.hasAbility(AbilityId.DELTA_STREAM) &&
-          globalScene
+          pokemon.hasAbility(AbilityId.DELTA_STREAM)
+          && globalScene
            .getField(true)
            .filter(p => p !== pokemon)
            .filter(p => p.hasAbility(AbilityId.DELTA_STREAM)).length === 0
@ -3427,8 +3422,8 @@ export class PreLeaveFieldClearWeatherAbAttr extends PreLeaveFieldAbAttr {
    switch (weatherType) {
      case WeatherType.HARSH_SUN:
        if (
-          pokemon.hasAbility(AbilityId.DESOLATE_LAND) &&
-          globalScene
+          pokemon.hasAbility(AbilityId.DESOLATE_LAND)
+          && globalScene
            .getField(true)
            .filter(p => p !== pokemon)
            .filter(p => p.hasAbility(AbilityId.DESOLATE_LAND)).length === 0
@ -3438,8 +3433,8 @@ export class PreLeaveFieldClearWeatherAbAttr extends PreLeaveFieldAbAttr {
        break;
      case WeatherType.HEAVY_RAIN:
        if (
-          pokemon.hasAbility(AbilityId.PRIMORDIAL_SEA) &&
-          globalScene
+          pokemon.hasAbility(AbilityId.PRIMORDIAL_SEA)
+          && globalScene
            .getField(true)
            .filter(p => p !== pokemon)
            .filter(p => p.hasAbility(AbilityId.PRIMORDIAL_SEA)).length === 0
@ -3449,8 +3444,8 @@ export class PreLeaveFieldClearWeatherAbAttr extends PreLeaveFieldAbAttr {
        break;
      case WeatherType.STRONG_WINDS:
        if (
-          pokemon.hasAbility(AbilityId.DELTA_STREAM) &&
-          globalScene
+          pokemon.hasAbility(AbilityId.DELTA_STREAM)
+          && globalScene
            .getField(true)
            .filter(p => p !== pokemon)
            .filter(p => p.hasAbility(AbilityId.DELTA_STREAM)).length === 0
@ -3727,8 +3722,8 @@ export class UserFieldStatusEffectImmunityAbAttr extends AbAttr {

  override canApply({ effect, cancelled }: UserFieldStatusEffectImmunityAbAttrParams): boolean {
    return (
-      (!cancelled.value && effect !== StatusEffect.FAINT && this.immuneEffects.length < 1) ||
-      this.immuneEffects.includes(effect)
+      (!cancelled.value && effect !== StatusEffect.FAINT && this.immuneEffects.length < 1)
+      || this.immuneEffects.includes(effect)
    );
  }

@ -3810,9 +3805,9 @@ export class ConditionalUserFieldProtectStatAbAttr extends PreStatStageChangeAbA
      return false;
    }
    return (
-      !cancelled.value &&
-      (isNullOrUndefined(this.protectedStat) || stat === this.protectedStat) &&
-      this.condition(target)
+      !cancelled.value
+      && (isNullOrUndefined(this.protectedStat) || stat === this.protectedStat)
+      && this.condition(target)
    );
  }

@ -4202,8 +4197,8 @@ function getAnticipationCondition(): AbAttrCondition {
        }
        // the move's base type (not accounting for variable type changes) is super effective
        if (
-          move.getMove().is("AttackMove") &&
-          pokemon.getAttackTypeEffectiveness(move.getMove().type, opponent, true, undefined, move.getMove()) >= 2
+          move.getMove().is("AttackMove")
+          && pokemon.getAttackTypeEffectiveness(move.getMove().type, opponent, true, undefined, move.getMove()) >= 2
        ) {
          return true;
        }
@ -4214,14 +4209,14 @@ function getAnticipationCondition(): AbAttrCondition {
        // edge case for hidden power, type is computed
        if (move.getMove().id === MoveId.HIDDEN_POWER) {
          const iv_val = Math.floor(
-            (((opponent.ivs[Stat.HP] & 1) +
-              (opponent.ivs[Stat.ATK] & 1) * 2 +
-              (opponent.ivs[Stat.DEF] & 1) * 4 +
-              (opponent.ivs[Stat.SPD] & 1) * 8 +
-              (opponent.ivs[Stat.SPATK] & 1) * 16 +
-              (opponent.ivs[Stat.SPDEF] & 1) * 32) *
-              15) /
-              63,
+            (((opponent.ivs[Stat.HP] & 1)
+              + (opponent.ivs[Stat.ATK] & 1) * 2
+              + (opponent.ivs[Stat.DEF] & 1) * 4
+              + (opponent.ivs[Stat.SPD] & 1) * 8
+              + (opponent.ivs[Stat.SPATK] & 1) * 16
+              + (opponent.ivs[Stat.SPDEF] & 1) * 32)
+              * 15)
+              / 63,
          );

          const type = [
@ -4288,9 +4283,9 @@ export class ForewarnAbAttr extends PostSummonAbAttr {
        } else if (move?.getMove().hasAttr("OneHitKOAttr")) {
          movePower = 150;
        } else if (
-          move?.getMove().id === MoveId.COUNTER ||
-          move?.getMove().id === MoveId.MIRROR_COAT ||
-          move?.getMove().id === MoveId.METAL_BURST
+          move?.getMove().id === MoveId.COUNTER
+          || move?.getMove().id === MoveId.MIRROR_COAT
+          || move?.getMove().id === MoveId.METAL_BURST
        ) {
          movePower = 120;
        } else if (move?.getMove().power === -1) {
@ -4881,9 +4876,9 @@ export class PostTurnHurtIfSleepingAbAttr extends PostTurnAbAttr {
      .getOpponents()
      .some(
        opp =>
-          (opp.status?.effect === StatusEffect.SLEEP || opp.hasAbility(AbilityId.COMATOSE)) &&
-          !opp.hasAbilityWithAttr("BlockNonDirectDamageAbAttr") &&
-          !opp.switchOutStatus,
+          (opp.status?.effect === StatusEffect.SLEEP || opp.hasAbility(AbilityId.COMATOSE))
+          && !opp.hasAbilityWithAttr("BlockNonDirectDamageAbAttr")
+          && !opp.switchOutStatus,
      );
  }

@ -5017,8 +5012,8 @@ export class PostDancingMoveAbAttr extends PostMoveUsedAbAttr {
    ];
    // The move to replicate cannot come from the Dancer
    return (
-      source.getBattlerIndex() !== pokemon.getBattlerIndex() &&
-      !pokemon.summonData.tags.some(tag => forbiddenTags.includes(tag.tagType))
+      source.getBattlerIndex() !== pokemon.getBattlerIndex()
+      && !pokemon.summonData.tags.some(tag => forbiddenTags.includes(tag.tagType))
    );
  }

@ -5278,12 +5273,12 @@ export interface CheckTrappedAbAttrParams extends AbAttrBaseParams {
 export class ArenaTrapAbAttr extends CheckTrappedAbAttr {
  override canApply({ pokemon, opponent }: CheckTrappedAbAttrParams): boolean {
    return (
-      this.arenaTrapCondition(pokemon, opponent) &&
-      !(
-        opponent.getTypes(true).includes(PokemonType.GHOST) ||
-        (opponent.getTypes(true).includes(PokemonType.STELLAR) && opponent.getTypes().includes(PokemonType.GHOST))
-      ) &&
-      !opponent.hasAbility(AbilityId.RUN_AWAY)
+      this.arenaTrapCondition(pokemon, opponent)
+      && !(
+        opponent.getTypes(true).includes(PokemonType.GHOST)
+        || (opponent.getTypes(true).includes(PokemonType.STELLAR) && opponent.getTypes().includes(PokemonType.GHOST))
+      )
+      && !opponent.hasAbility(AbilityId.RUN_AWAY)
    );
  }

@ -5443,9 +5438,9 @@ export class PostFaintContactDamageAbAttr extends PostFaintAbAttr {

  override canApply({ pokemon, attacker, move, simulated }: PostFaintAbAttrParams): boolean {
    if (
-      move === undefined ||
-      attacker === undefined ||
-      !move.doesFlagEffectApply({ flag: MoveFlags.MAKES_CONTACT, user: attacker, target: pokemon })
+      move === undefined
+      || attacker === undefined
+      || !move.doesFlagEffectApply({ flag: MoveFlags.MAKES_CONTACT, user: attacker, target: pokemon })
    ) {
      return false;
    }
@ -6020,9 +6015,9 @@ export class IllusionPreSummonAbAttr extends PreSummonAbAttr {
      // If the last conscious Pokémon in the party is a Terastallized Ogerpon or Terapagos, Illusion will not activate.
      // Illusion will also not activate if the Pokémon with Illusion is Terastallized and the last Pokémon in the party is Ogerpon or Terapagos.
      if (
-        lastPokemon === pokemon ||
-        ((speciesId === SpeciesId.OGERPON || speciesId === SpeciesId.TERAPAGOS) &&
-          (lastPokemon.isTerastallized || pokemon.isTerastallized))
+        lastPokemon === pokemon
+        || ((speciesId === SpeciesId.OGERPON || speciesId === SpeciesId.TERAPAGOS)
+          && (lastPokemon.isTerastallized || pokemon.isTerastallized))
      ) {
        return false;
      }
@ -6343,30 +6338,30 @@ class ForceSwitchOutHelper {
    }

    if (
-      !player &&
-      globalScene.currentBattle.battleType === BattleType.WILD &&
-      !globalScene.currentBattle.waveIndex &&
-      globalScene.currentBattle.waveIndex % 10 === 0
+      !player
+      && globalScene.currentBattle.battleType === BattleType.WILD
+      && !globalScene.currentBattle.waveIndex
+      && globalScene.currentBattle.waveIndex % 10 === 0
    ) {
      return false;
    }

    if (
-      !player &&
-      globalScene.currentBattle.isBattleMysteryEncounter() &&
-      !globalScene.currentBattle.mysteryEncounter?.fleeAllowed
+      !player
+      && globalScene.currentBattle.isBattleMysteryEncounter()
+      && !globalScene.currentBattle.mysteryEncounter?.fleeAllowed
    ) {
      return false;
    }

    const party = player ? globalScene.getPlayerParty() : globalScene.getEnemyParty();
    return (
-      (!player && globalScene.currentBattle.battleType === BattleType.WILD) ||
-      party.filter(
+      (!player && globalScene.currentBattle.battleType === BattleType.WILD)
+      || party.filter(
        p =>
-          p.isAllowedInBattle() &&
-          !p.isOnField() &&
-          (player || (p as EnemyPokemon).trainerSlot === (switchOutTarget as EnemyPokemon).trainerSlot),
+          p.isAllowedInBattle()
+          && !p.isOnField()
+          && (player || (p as EnemyPokemon).trainerSlot === (switchOutTarget as EnemyPokemon).trainerSlot),
      ).length > 0
    );
  }
@ -6460,8 +6455,8 @@ export class PostDamageForceSwitchAbAttr extends PostDamageAbAttr {
        const enemyLastMoveUsed = enemyMoveHistory[enemyMoveHistory.length - 1];
        // Will not activate if the Pokémon's HP falls below half while it is in the air during Sky Drop.
        if (
-          forbiddenDefendingMoves.includes(enemyLastMoveUsed.move) ||
-          (enemyLastMoveUsed.move === MoveId.SKY_DROP && enemyLastMoveUsed.result === MoveResult.OTHER)
+          forbiddenDefendingMoves.includes(enemyLastMoveUsed.move)
+          || (enemyLastMoveUsed.move === MoveId.SKY_DROP && enemyLastMoveUsed.result === MoveResult.OTHER)
        ) {
          return false;
          // Will not activate if the Pokémon's HP falls below half by a move affected by Sheer Force.
@ -6750,8 +6745,8 @@ function getPokemonWithWeatherBasedForms() {
    .getField(true)
    .filter(
      p =>
-        (p.hasAbility(AbilityId.FORECAST) && p.species.speciesId === SpeciesId.CASTFORM) ||
-        (p.hasAbility(AbilityId.FLOWER_GIFT) && p.species.speciesId === SpeciesId.CHERRIM),
+        (p.hasAbility(AbilityId.FORECAST) && p.species.speciesId === SpeciesId.CASTFORM)
+        || (p.hasAbility(AbilityId.FLOWER_GIFT) && p.species.speciesId === SpeciesId.CHERRIM),
    );
 }

@ -7450,7 +7445,7 @@ export function initAbilities() {
      .conditionalAttr(pokemon => pokemon.formIndex === 0, PostSummonAddBattlerTagAbAttr, BattlerTagType.DISGUISE, 0, false)
      .attr(FormBlockDamageAbAttr,
        (target, user, move) => !!target.getTag(BattlerTagType.DISGUISE) && target.getMoveEffectiveness(user, move) > 0, 0, BattlerTagType.DISGUISE,
-        (pokemon, abilityName) => i18next.t("abilityTriggers:disguiseAvoidedDamage", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName: abilityName }),
+        (pokemon, abilityName) => i18next.t("abilityTriggers:disguiseAvoidedDamage", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName }),
        (pokemon) => toDmgValue(pokemon.getMaxHp() / 8))
      .attr(PostBattleInitFormChangeAbAttr, () => 0)
      .attr(PostFaintFormChangeAbAttr, () => 0)
@ -7624,7 +7619,7 @@ export function initAbilities() {
      .attr(PostWeatherChangeAddBattlerTagAttr, BattlerTagType.ICE_FACE, 0, WeatherType.HAIL, WeatherType.SNOW)
      .attr(FormBlockDamageAbAttr,
        (target, _user, move) => move.category === MoveCategory.PHYSICAL && !!target.getTag(BattlerTagType.ICE_FACE), 0, BattlerTagType.ICE_FACE,
-        (pokemon, abilityName) => i18next.t("abilityTriggers:iceFaceAvoidedDamage", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName: abilityName }))
+        (pokemon, abilityName) => i18next.t("abilityTriggers:iceFaceAvoidedDamage", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName }))
      .attr(PostBattleInitFormChangeAbAttr, () => 0)
      .uncopiable()
      .unreplaceable()
--- a/src/data/arena-tag.ts
+++ b/src/data/arena-tag.ts
@ -570,10 +570,10 @@ class MatBlockTag extends ConditionalProtectTag {
 const CraftyShieldConditionFunc: ProtectConditionFunc = (_arena, moveId) => {
  const move = allMoves[moveId];
  return (
-    move.category === MoveCategory.STATUS &&
-    move.moveTarget !== MoveTarget.ENEMY_SIDE &&
-    move.moveTarget !== MoveTarget.BOTH_SIDES &&
-    move.moveTarget !== MoveTarget.ALL
+    move.category === MoveCategory.STATUS
+    && move.moveTarget !== MoveTarget.ENEMY_SIDE
+    && move.moveTarget !== MoveTarget.BOTH_SIDES
+    && move.moveTarget !== MoveTarget.ALL
  );
 };

--- a/src/data/balance/biomes.ts
+++ b/src/data/balance/biomes.ts
--- a/src/data/balance/egg-moves.ts
+++ b/src/data/balance/egg-moves.ts
--- a/src/data/balance/passives.ts
+++ b/src/data/balance/passives.ts
@ -2,11 +2,11 @@ import { AbilityId } from "#enums/ability-id";
 import { SpeciesId } from "#enums/species-id";

 export interface PassiveAbilities {
-  [key: number]: AbilityId
+  [key: number]: AbilityId;
 }

 interface StarterPassiveAbilities {
-  [key: number]: PassiveAbilities
+  [key: number]: PassiveAbilities;
 }

 export const starterPassiveAbilities: StarterPassiveAbilities = {
@ -15,7 +15,12 @@ export const starterPassiveAbilities: StarterPassiveAbilities = {
  [SpeciesId.VENUSAUR]: { 0: AbilityId.GRASSY_SURGE, 1: AbilityId.SEED_SOWER, 2: AbilityId.FLOWER_VEIL },
  [SpeciesId.CHARMANDER]: { 0: AbilityId.SHEER_FORCE },
  [SpeciesId.CHARMELEON]: { 0: AbilityId.BEAST_BOOST },
-  [SpeciesId.CHARIZARD]: { 0: AbilityId.BEAST_BOOST, 1: AbilityId.LEVITATE, 2: AbilityId.TURBOBLAZE, 3: AbilityId.UNNERVE },
+  [SpeciesId.CHARIZARD]: {
+    0: AbilityId.BEAST_BOOST,
+    1: AbilityId.LEVITATE,
+    2: AbilityId.TURBOBLAZE,
+    3: AbilityId.UNNERVE,
+  },
  [SpeciesId.SQUIRTLE]: { 0: AbilityId.DAUNTLESS_SHIELD },
  [SpeciesId.WARTORTLE]: { 0: AbilityId.DAUNTLESS_SHIELD },
  [SpeciesId.BLASTOISE]: { 0: AbilityId.DAUNTLESS_SHIELD, 1: AbilityId.BULLETPROOF, 2: AbilityId.BULLETPROOF },
@ -192,7 +197,17 @@ export const starterPassiveAbilities: StarterPassiveAbilities = {
  [SpeciesId.CHINCHOU]: { 0: AbilityId.REGENERATOR },
  [SpeciesId.LANTURN]: { 0: AbilityId.REGENERATOR },
  [SpeciesId.PICHU]: { 0: AbilityId.ELECTRIC_SURGE, 1: AbilityId.STURDY },
-  [SpeciesId.PIKACHU]: { 0: AbilityId.ELECTRIC_SURGE, 1: AbilityId.STURDY, 2: AbilityId.COSTAR, 3: AbilityId.IRON_FIST, 4: AbilityId.QUEENLY_MAJESTY, 5: AbilityId.MISTY_SURGE, 6: AbilityId.TINTED_LENS, 7: AbilityId.LIBERO, 8: AbilityId.THICK_FAT },
+  [SpeciesId.PIKACHU]: {
+    0: AbilityId.ELECTRIC_SURGE,
+    1: AbilityId.STURDY,
+    2: AbilityId.COSTAR,
+    3: AbilityId.IRON_FIST,
+    4: AbilityId.QUEENLY_MAJESTY,
+    5: AbilityId.MISTY_SURGE,
+    6: AbilityId.TINTED_LENS,
+    7: AbilityId.LIBERO,
+    8: AbilityId.THICK_FAT,
+  },
  [SpeciesId.RAICHU]: { 0: AbilityId.ELECTRIC_SURGE },
  [SpeciesId.ALOLA_RAICHU]: { 0: AbilityId.ELECTRIC_SURGE },
  [SpeciesId.CLEFFA]: { 0: AbilityId.PRANKSTER },
@ -224,7 +239,36 @@ export const starterPassiveAbilities: StarterPassiveAbilities = {
  [SpeciesId.HONCHKROW]: { 0: AbilityId.INTIMIDATE },
  [SpeciesId.MISDREAVUS]: { 0: AbilityId.BEADS_OF_RUIN },
  [SpeciesId.MISMAGIUS]: { 0: AbilityId.BEADS_OF_RUIN },
-  [SpeciesId.UNOWN]: { 0: AbilityId.ADAPTABILITY, 1: AbilityId.BEAST_BOOST, 2: AbilityId.CONTRARY, 3: AbilityId.DAZZLING, 4: AbilityId.EMERGENCY_EXIT, 5: AbilityId.FRIEND_GUARD, 6: AbilityId.GOOD_AS_GOLD, 7: AbilityId.HONEY_GATHER, 8: AbilityId.IMPOSTER, 9: AbilityId.JUSTIFIED, 10: AbilityId.KLUTZ, 11: AbilityId.LIBERO, 12: AbilityId.MOODY, 13: AbilityId.NEUTRALIZING_GAS, 14: AbilityId.OPPORTUNIST, 15: AbilityId.PICKUP, 16: AbilityId.QUICK_DRAW, 17: AbilityId.RUN_AWAY, 18: AbilityId.SIMPLE, 19: AbilityId.TRACE, 20: AbilityId.UNNERVE, 21: AbilityId.VICTORY_STAR, 22: AbilityId.WANDERING_SPIRIT, 23: AbilityId.FAIRY_AURA, 24: AbilityId.DARK_AURA, 25: AbilityId.AURA_BREAK, 26: AbilityId.PURE_POWER, 27: AbilityId.UNAWARE },
+  [SpeciesId.UNOWN]: {
+    0: AbilityId.ADAPTABILITY,
+    1: AbilityId.BEAST_BOOST,
+    2: AbilityId.CONTRARY,
+    3: AbilityId.DAZZLING,
+    4: AbilityId.EMERGENCY_EXIT,
+    5: AbilityId.FRIEND_GUARD,
+    6: AbilityId.GOOD_AS_GOLD,
+    7: AbilityId.HONEY_GATHER,
+    8: AbilityId.IMPOSTER,
+    9: AbilityId.JUSTIFIED,
+    10: AbilityId.KLUTZ,
+    11: AbilityId.LIBERO,
+    12: AbilityId.MOODY,
+    13: AbilityId.NEUTRALIZING_GAS,
+    14: AbilityId.OPPORTUNIST,
+    15: AbilityId.PICKUP,
+    16: AbilityId.QUICK_DRAW,
+    17: AbilityId.RUN_AWAY,
+    18: AbilityId.SIMPLE,
+    19: AbilityId.TRACE,
+    20: AbilityId.UNNERVE,
+    21: AbilityId.VICTORY_STAR,
+    22: AbilityId.WANDERING_SPIRIT,
+    23: AbilityId.FAIRY_AURA,
+    24: AbilityId.DARK_AURA,
+    25: AbilityId.AURA_BREAK,
+    26: AbilityId.PURE_POWER,
+    27: AbilityId.UNAWARE,
+  },
  [SpeciesId.GIRAFARIG]: { 0: AbilityId.PARENTAL_BOND },
  [SpeciesId.FARIGIRAF]: { 0: AbilityId.PARENTAL_BOND },
  [SpeciesId.PINECO]: { 0: AbilityId.ROUGH_SKIN },
@ -385,7 +429,12 @@ export const starterPassiveAbilities: StarterPassiveAbilities = {
  [SpeciesId.ARMALDO]: { 0: AbilityId.WATER_ABSORB },
  [SpeciesId.FEEBAS]: { 0: AbilityId.MULTISCALE },
  [SpeciesId.MILOTIC]: { 0: AbilityId.MAGIC_GUARD },
-  [SpeciesId.CASTFORM]: { 0: AbilityId.ADAPTABILITY, 1: AbilityId.ADAPTABILITY, 2: AbilityId.ADAPTABILITY, 3: AbilityId.ADAPTABILITY },
+  [SpeciesId.CASTFORM]: {
+    0: AbilityId.ADAPTABILITY,
+    1: AbilityId.ADAPTABILITY,
+    2: AbilityId.ADAPTABILITY,
+    3: AbilityId.ADAPTABILITY,
+  },
  [SpeciesId.KECLEON]: { 0: AbilityId.ADAPTABILITY },
  [SpeciesId.SHUPPET]: { 0: AbilityId.SHADOW_SHIELD },
  [SpeciesId.BANETTE]: { 0: AbilityId.SHADOW_SHIELD, 1: AbilityId.SHADOW_SHIELD },
@ -422,7 +471,12 @@ export const starterPassiveAbilities: StarterPassiveAbilities = {
  [SpeciesId.GROUDON]: { 0: AbilityId.MOLD_BREAKER, 1: AbilityId.TURBOBLAZE },
  [SpeciesId.RAYQUAZA]: { 0: AbilityId.UNNERVE, 1: AbilityId.UNNERVE },
  [SpeciesId.JIRACHI]: { 0: AbilityId.PURIFYING_SALT },
-  [SpeciesId.DEOXYS]: { 0: AbilityId.PROTEAN, 1: AbilityId.ADAPTABILITY, 2: AbilityId.REGENERATOR, 3: AbilityId.SHADOW_SHIELD },
+  [SpeciesId.DEOXYS]: {
+    0: AbilityId.PROTEAN,
+    1: AbilityId.ADAPTABILITY,
+    2: AbilityId.REGENERATOR,
+    3: AbilityId.SHADOW_SHIELD,
+  },

  [SpeciesId.TURTWIG]: { 0: AbilityId.SOLID_ROCK },
  [SpeciesId.GROTLE]: { 0: AbilityId.SOLID_ROCK },
@ -505,7 +559,14 @@ export const starterPassiveAbilities: StarterPassiveAbilities = {
  [SpeciesId.MANTINE]: { 0: AbilityId.UNAWARE },
  [SpeciesId.SNOVER]: { 0: AbilityId.SLUSH_RUSH },
  [SpeciesId.ABOMASNOW]: { 0: AbilityId.SLUSH_RUSH, 1: AbilityId.SEED_SOWER },
-  [SpeciesId.ROTOM]: { 0: AbilityId.HADRON_ENGINE, 1: AbilityId.HADRON_ENGINE, 2: AbilityId.HADRON_ENGINE, 3: AbilityId.HADRON_ENGINE, 4: AbilityId.HADRON_ENGINE, 5: AbilityId.HADRON_ENGINE },
+  [SpeciesId.ROTOM]: {
+    0: AbilityId.HADRON_ENGINE,
+    1: AbilityId.HADRON_ENGINE,
+    2: AbilityId.HADRON_ENGINE,
+    3: AbilityId.HADRON_ENGINE,
+    4: AbilityId.HADRON_ENGINE,
+    5: AbilityId.HADRON_ENGINE,
+  },
  [SpeciesId.UXIE]: { 0: AbilityId.ILLUSION },
  [SpeciesId.MESPRIT]: { 0: AbilityId.MOODY },
  [SpeciesId.AZELF]: { 0: AbilityId.NEUROFORCE },
@ -519,7 +580,26 @@ export const starterPassiveAbilities: StarterPassiveAbilities = {
  [SpeciesId.MANAPHY]: { 0: AbilityId.PRIMORDIAL_SEA },
  [SpeciesId.DARKRAI]: { 0: AbilityId.UNNERVE },
  [SpeciesId.SHAYMIN]: { 0: AbilityId.GRASSY_SURGE, 1: AbilityId.DELTA_STREAM },
-  [SpeciesId.ARCEUS]: { 0: AbilityId.ADAPTABILITY, 1: AbilityId.ADAPTABILITY, 2: AbilityId.ADAPTABILITY, 3: AbilityId.ADAPTABILITY, 4: AbilityId.ADAPTABILITY, 5: AbilityId.ADAPTABILITY, 6: AbilityId.ADAPTABILITY, 7: AbilityId.ADAPTABILITY, 8: AbilityId.ADAPTABILITY, 9: AbilityId.ADAPTABILITY, 10: AbilityId.ADAPTABILITY, 11: AbilityId.ADAPTABILITY, 12: AbilityId.ADAPTABILITY, 13: AbilityId.ADAPTABILITY, 14: AbilityId.ADAPTABILITY, 15: AbilityId.ADAPTABILITY, 16: AbilityId.ADAPTABILITY, 17: AbilityId.ADAPTABILITY },
+  [SpeciesId.ARCEUS]: {
+    0: AbilityId.ADAPTABILITY,
+    1: AbilityId.ADAPTABILITY,
+    2: AbilityId.ADAPTABILITY,
+    3: AbilityId.ADAPTABILITY,
+    4: AbilityId.ADAPTABILITY,
+    5: AbilityId.ADAPTABILITY,
+    6: AbilityId.ADAPTABILITY,
+    7: AbilityId.ADAPTABILITY,
+    8: AbilityId.ADAPTABILITY,
+    9: AbilityId.ADAPTABILITY,
+    10: AbilityId.ADAPTABILITY,
+    11: AbilityId.ADAPTABILITY,
+    12: AbilityId.ADAPTABILITY,
+    13: AbilityId.ADAPTABILITY,
+    14: AbilityId.ADAPTABILITY,
+    15: AbilityId.ADAPTABILITY,
+    16: AbilityId.ADAPTABILITY,
+    17: AbilityId.ADAPTABILITY,
+  },

  [SpeciesId.VICTINI]: { 0: AbilityId.SHEER_FORCE },
  [SpeciesId.SNIVY]: { 0: AbilityId.MULTISCALE },
@ -615,8 +695,18 @@ export const starterPassiveAbilities: StarterPassiveAbilities = {
  [SpeciesId.VANILLITE]: { 0: AbilityId.REFRIGERATE },
  [SpeciesId.VANILLISH]: { 0: AbilityId.REFRIGERATE },
  [SpeciesId.VANILLUXE]: { 0: AbilityId.SLUSH_RUSH },
-  [SpeciesId.DEERLING]: { 0: AbilityId.FLOWER_VEIL, 1: AbilityId.CUD_CHEW, 2: AbilityId.HARVEST, 3: AbilityId.FUR_COAT },
-  [SpeciesId.SAWSBUCK]: { 0: AbilityId.FLOWER_VEIL, 1: AbilityId.CUD_CHEW, 2: AbilityId.HARVEST, 3: AbilityId.FUR_COAT },
+  [SpeciesId.DEERLING]: {
+    0: AbilityId.FLOWER_VEIL,
+    1: AbilityId.CUD_CHEW,
+    2: AbilityId.HARVEST,
+    3: AbilityId.FUR_COAT,
+  },
+  [SpeciesId.SAWSBUCK]: {
+    0: AbilityId.FLOWER_VEIL,
+    1: AbilityId.CUD_CHEW,
+    2: AbilityId.HARVEST,
+    3: AbilityId.FUR_COAT,
+  },
  [SpeciesId.EMOLGA]: { 0: AbilityId.SERENE_GRACE },
  [SpeciesId.KARRABLAST]: { 0: AbilityId.QUICK_DRAW },
  [SpeciesId.ESCAVALIER]: { 0: AbilityId.QUICK_DRAW },
@ -681,7 +771,13 @@ export const starterPassiveAbilities: StarterPassiveAbilities = {
  [SpeciesId.KYUREM]: { 0: AbilityId.SNOW_WARNING, 1: AbilityId.HADRON_ENGINE, 2: AbilityId.ORICHALCUM_PULSE },
  [SpeciesId.KELDEO]: { 0: AbilityId.GRIM_NEIGH, 1: AbilityId.GRIM_NEIGH },
  [SpeciesId.MELOETTA]: { 0: AbilityId.PUNK_ROCK, 1: AbilityId.SCRAPPY },
-  [SpeciesId.GENESECT]: { 0: AbilityId.PROTEAN, 1: AbilityId.PROTEAN, 2: AbilityId.PROTEAN, 3: AbilityId.PROTEAN, 4: AbilityId.PROTEAN },
+  [SpeciesId.GENESECT]: {
+    0: AbilityId.PROTEAN,
+    1: AbilityId.PROTEAN,
+    2: AbilityId.PROTEAN,
+    3: AbilityId.PROTEAN,
+    4: AbilityId.PROTEAN,
+  },

  [SpeciesId.CHESPIN]: { 0: AbilityId.ROUGH_SKIN },
  [SpeciesId.QUILLADIN]: { 0: AbilityId.DAUNTLESS_SHIELD },
@ -697,19 +793,111 @@ export const starterPassiveAbilities: StarterPassiveAbilities = {
  [SpeciesId.FLETCHLING]: { 0: AbilityId.FLAME_BODY },
  [SpeciesId.FLETCHINDER]: { 0: AbilityId.MAGIC_GUARD },
  [SpeciesId.TALONFLAME]: { 0: AbilityId.MAGIC_GUARD },
-  [SpeciesId.SCATTERBUG]: { 0: AbilityId.RUN_AWAY, 1: AbilityId.RUN_AWAY, 2: AbilityId.RUN_AWAY, 3: AbilityId.RUN_AWAY, 4: AbilityId.RUN_AWAY, 5: AbilityId.RUN_AWAY, 6: AbilityId.RUN_AWAY, 7: AbilityId.RUN_AWAY, 8: AbilityId.RUN_AWAY, 9: AbilityId.RUN_AWAY, 10: AbilityId.RUN_AWAY, 11: AbilityId.RUN_AWAY, 12: AbilityId.RUN_AWAY, 13: AbilityId.RUN_AWAY, 14: AbilityId.RUN_AWAY, 15: AbilityId.RUN_AWAY, 16: AbilityId.RUN_AWAY, 17: AbilityId.RUN_AWAY, 18: AbilityId.RUN_AWAY, 19: AbilityId.RUN_AWAY },
-  [SpeciesId.SPEWPA]: { 0: AbilityId.COMPOUND_EYES, 1: AbilityId.COMPOUND_EYES, 2: AbilityId.COMPOUND_EYES, 3: AbilityId.COMPOUND_EYES, 4: AbilityId.COMPOUND_EYES, 5: AbilityId.COMPOUND_EYES, 6: AbilityId.COMPOUND_EYES, 7: AbilityId.COMPOUND_EYES, 8: AbilityId.COMPOUND_EYES, 9: AbilityId.COMPOUND_EYES, 10: AbilityId.COMPOUND_EYES, 11: AbilityId.COMPOUND_EYES, 12: AbilityId.COMPOUND_EYES, 13: AbilityId.COMPOUND_EYES, 14: AbilityId.COMPOUND_EYES, 15: AbilityId.COMPOUND_EYES, 16: AbilityId.COMPOUND_EYES, 17: AbilityId.COMPOUND_EYES, 18: AbilityId.COMPOUND_EYES, 19: AbilityId.COMPOUND_EYES },
-  [SpeciesId.VIVILLON]: { 0: AbilityId.PRANKSTER, 1: AbilityId.PRANKSTER, 2: AbilityId.PRANKSTER, 3: AbilityId.PRANKSTER, 4: AbilityId.PRANKSTER, 5: AbilityId.PRANKSTER, 6: AbilityId.PRANKSTER, 7: AbilityId.PRANKSTER, 8: AbilityId.PRANKSTER, 9: AbilityId.PRANKSTER, 10: AbilityId.PRANKSTER, 11: AbilityId.PRANKSTER, 12: AbilityId.PRANKSTER, 13: AbilityId.PRANKSTER, 14: AbilityId.PRANKSTER, 15: AbilityId.PRANKSTER, 16: AbilityId.PRANKSTER, 17: AbilityId.PRANKSTER, 18: AbilityId.PRANKSTER, 19: AbilityId.PRANKSTER },
+  [SpeciesId.SCATTERBUG]: {
+    0: AbilityId.RUN_AWAY,
+    1: AbilityId.RUN_AWAY,
+    2: AbilityId.RUN_AWAY,
+    3: AbilityId.RUN_AWAY,
+    4: AbilityId.RUN_AWAY,
+    5: AbilityId.RUN_AWAY,
+    6: AbilityId.RUN_AWAY,
+    7: AbilityId.RUN_AWAY,
+    8: AbilityId.RUN_AWAY,
+    9: AbilityId.RUN_AWAY,
+    10: AbilityId.RUN_AWAY,
+    11: AbilityId.RUN_AWAY,
+    12: AbilityId.RUN_AWAY,
+    13: AbilityId.RUN_AWAY,
+    14: AbilityId.RUN_AWAY,
+    15: AbilityId.RUN_AWAY,
+    16: AbilityId.RUN_AWAY,
+    17: AbilityId.RUN_AWAY,
+    18: AbilityId.RUN_AWAY,
+    19: AbilityId.RUN_AWAY,
+  },
+  [SpeciesId.SPEWPA]: {
+    0: AbilityId.COMPOUND_EYES,
+    1: AbilityId.COMPOUND_EYES,
+    2: AbilityId.COMPOUND_EYES,
+    3: AbilityId.COMPOUND_EYES,
+    4: AbilityId.COMPOUND_EYES,
+    5: AbilityId.COMPOUND_EYES,
+    6: AbilityId.COMPOUND_EYES,
+    7: AbilityId.COMPOUND_EYES,
+    8: AbilityId.COMPOUND_EYES,
+    9: AbilityId.COMPOUND_EYES,
+    10: AbilityId.COMPOUND_EYES,
+    11: AbilityId.COMPOUND_EYES,
+    12: AbilityId.COMPOUND_EYES,
+    13: AbilityId.COMPOUND_EYES,
+    14: AbilityId.COMPOUND_EYES,
+    15: AbilityId.COMPOUND_EYES,
+    16: AbilityId.COMPOUND_EYES,
+    17: AbilityId.COMPOUND_EYES,
+    18: AbilityId.COMPOUND_EYES,
+    19: AbilityId.COMPOUND_EYES,
+  },
+  [SpeciesId.VIVILLON]: {
+    0: AbilityId.PRANKSTER,
+    1: AbilityId.PRANKSTER,
+    2: AbilityId.PRANKSTER,
+    3: AbilityId.PRANKSTER,
+    4: AbilityId.PRANKSTER,
+    5: AbilityId.PRANKSTER,
+    6: AbilityId.PRANKSTER,
+    7: AbilityId.PRANKSTER,
+    8: AbilityId.PRANKSTER,
+    9: AbilityId.PRANKSTER,
+    10: AbilityId.PRANKSTER,
+    11: AbilityId.PRANKSTER,
+    12: AbilityId.PRANKSTER,
+    13: AbilityId.PRANKSTER,
+    14: AbilityId.PRANKSTER,
+    15: AbilityId.PRANKSTER,
+    16: AbilityId.PRANKSTER,
+    17: AbilityId.PRANKSTER,
+    18: AbilityId.PRANKSTER,
+    19: AbilityId.PRANKSTER,
+  },
  [SpeciesId.LITLEO]: { 0: AbilityId.BEAST_BOOST },
  [SpeciesId.PYROAR]: { 0: AbilityId.BEAST_BOOST },
-  [SpeciesId.FLABEBE]: { 0: AbilityId.GRASSY_SURGE, 1: AbilityId.GRASSY_SURGE, 2: AbilityId.GRASSY_SURGE, 3: AbilityId.GRASSY_SURGE, 4: AbilityId.GRASSY_SURGE },
-  [SpeciesId.FLOETTE]: { 0: AbilityId.GRASSY_SURGE, 1: AbilityId.GRASSY_SURGE, 2: AbilityId.GRASSY_SURGE, 3: AbilityId.GRASSY_SURGE, 4: AbilityId.GRASSY_SURGE },
-  [SpeciesId.FLORGES]: { 0: AbilityId.GRASSY_SURGE, 1: AbilityId.GRASSY_SURGE, 2: AbilityId.GRASSY_SURGE, 3: AbilityId.GRASSY_SURGE, 4: AbilityId.GRASSY_SURGE },
+  [SpeciesId.FLABEBE]: {
+    0: AbilityId.GRASSY_SURGE,
+    1: AbilityId.GRASSY_SURGE,
+    2: AbilityId.GRASSY_SURGE,
+    3: AbilityId.GRASSY_SURGE,
+    4: AbilityId.GRASSY_SURGE,
+  },
+  [SpeciesId.FLOETTE]: {
+    0: AbilityId.GRASSY_SURGE,
+    1: AbilityId.GRASSY_SURGE,
+    2: AbilityId.GRASSY_SURGE,
+    3: AbilityId.GRASSY_SURGE,
+    4: AbilityId.GRASSY_SURGE,
+  },
+  [SpeciesId.FLORGES]: {
+    0: AbilityId.GRASSY_SURGE,
+    1: AbilityId.GRASSY_SURGE,
+    2: AbilityId.GRASSY_SURGE,
+    3: AbilityId.GRASSY_SURGE,
+    4: AbilityId.GRASSY_SURGE,
+  },
  [SpeciesId.SKIDDO]: { 0: AbilityId.SEED_SOWER },
  [SpeciesId.GOGOAT]: { 0: AbilityId.SEED_SOWER },
  [SpeciesId.PANCHAM]: { 0: AbilityId.TECHNICIAN },
  [SpeciesId.PANGORO]: { 0: AbilityId.FUR_COAT },
-  [SpeciesId.FURFROU]: { 0: AbilityId.FLUFFY, 1: AbilityId.FLUFFY, 2: AbilityId.FLUFFY, 3: AbilityId.FLUFFY, 4: AbilityId.FLUFFY, 5: AbilityId.FLUFFY, 6: AbilityId.FLUFFY, 7: AbilityId.FLUFFY, 8: AbilityId.FLUFFY, 9: AbilityId.FLUFFY },
+  [SpeciesId.FURFROU]: {
+    0: AbilityId.FLUFFY,
+    1: AbilityId.FLUFFY,
+    2: AbilityId.FLUFFY,
+    3: AbilityId.FLUFFY,
+    4: AbilityId.FLUFFY,
+    5: AbilityId.FLUFFY,
+    6: AbilityId.FLUFFY,
+    7: AbilityId.FLUFFY,
+    8: AbilityId.FLUFFY,
+    9: AbilityId.FLUFFY,
+  },
  [SpeciesId.ESPURR]: { 0: AbilityId.PRANKSTER },
  [SpeciesId.MEOWSTIC]: { 0: AbilityId.FUR_COAT, 1: AbilityId.NEUROFORCE },
  [SpeciesId.HONEDGE]: { 0: AbilityId.SHARPNESS },
@ -744,8 +932,18 @@ export const starterPassiveAbilities: StarterPassiveAbilities = {
  [SpeciesId.KLEFKI]: { 0: AbilityId.LEVITATE },
  [SpeciesId.PHANTUMP]: { 0: AbilityId.SHADOW_TAG },
  [SpeciesId.TREVENANT]: { 0: AbilityId.SHADOW_TAG },
-  [SpeciesId.PUMPKABOO]: { 0: AbilityId.ILLUMINATE, 1: AbilityId.ADAPTABILITY, 2: AbilityId.WELL_BAKED_BODY, 3: AbilityId.SEED_SOWER },
-  [SpeciesId.GOURGEIST]: { 0: AbilityId.ILLUMINATE, 1: AbilityId.ADAPTABILITY, 2: AbilityId.WELL_BAKED_BODY, 3: AbilityId.SEED_SOWER },
+  [SpeciesId.PUMPKABOO]: {
+    0: AbilityId.ILLUMINATE,
+    1: AbilityId.ADAPTABILITY,
+    2: AbilityId.WELL_BAKED_BODY,
+    3: AbilityId.SEED_SOWER,
+  },
+  [SpeciesId.GOURGEIST]: {
+    0: AbilityId.ILLUMINATE,
+    1: AbilityId.ADAPTABILITY,
+    2: AbilityId.WELL_BAKED_BODY,
+    3: AbilityId.SEED_SOWER,
+  },
  [SpeciesId.BERGMITE]: { 0: AbilityId.ICE_SCALES },
  [SpeciesId.AVALUGG]: { 0: AbilityId.ICE_SCALES },
  [SpeciesId.HISUI_AVALUGG]: { 0: AbilityId.ICE_SCALES },
@ -753,7 +951,14 @@ export const starterPassiveAbilities: StarterPassiveAbilities = {
  [SpeciesId.NOIVERN]: { 0: AbilityId.PUNK_ROCK },
  [SpeciesId.XERNEAS]: { 0: AbilityId.HARVEST, 1: AbilityId.HARVEST },
  [SpeciesId.YVELTAL]: { 0: AbilityId.SOUL_HEART },
-  [SpeciesId.ZYGARDE]: { 0: AbilityId.UNNERVE, 1: AbilityId.MOXIE, 2: AbilityId.UNNERVE, 3: AbilityId.MOXIE, 4: AbilityId.ADAPTABILITY, 5: AbilityId.ADAPTABILITY },
+  [SpeciesId.ZYGARDE]: {
+    0: AbilityId.UNNERVE,
+    1: AbilityId.MOXIE,
+    2: AbilityId.UNNERVE,
+    3: AbilityId.MOXIE,
+    4: AbilityId.ADAPTABILITY,
+    5: AbilityId.ADAPTABILITY,
+  },
  [SpeciesId.DIANCIE]: { 0: AbilityId.SOLID_ROCK, 1: AbilityId.PRISM_ARMOR },
  [SpeciesId.HOOPA]: { 0: AbilityId.OPPORTUNIST, 1: AbilityId.OPPORTUNIST },
  [SpeciesId.VOLCANION]: { 0: AbilityId.NEUTRALIZING_GAS },
@ -779,7 +984,12 @@ export const starterPassiveAbilities: StarterPassiveAbilities = {
  [SpeciesId.VIKAVOLT]: { 0: AbilityId.SPEED_BOOST },
  [SpeciesId.CRABRAWLER]: { 0: AbilityId.WATER_BUBBLE },
  [SpeciesId.CRABOMINABLE]: { 0: AbilityId.WATER_BUBBLE },
-  [SpeciesId.ORICORIO]: { 0: AbilityId.ADAPTABILITY, 1: AbilityId.ADAPTABILITY, 2: AbilityId.ADAPTABILITY, 3: AbilityId.ADAPTABILITY },
+  [SpeciesId.ORICORIO]: {
+    0: AbilityId.ADAPTABILITY,
+    1: AbilityId.ADAPTABILITY,
+    2: AbilityId.ADAPTABILITY,
+    3: AbilityId.ADAPTABILITY,
+  },
  [SpeciesId.CUTIEFLY]: { 0: AbilityId.PICKUP },
  [SpeciesId.RIBOMBEE]: { 0: AbilityId.PICKUP },
  [SpeciesId.ROCKRUFF]: { 0: AbilityId.PICKUP, 1: AbilityId.PICKUP },
@ -811,8 +1021,42 @@ export const starterPassiveAbilities: StarterPassiveAbilities = {
  [SpeciesId.PALOSSAND]: { 0: AbilityId.SAND_SPIT },
  [SpeciesId.PYUKUMUKU]: { 0: AbilityId.PURIFYING_SALT },
  [SpeciesId.TYPE_NULL]: { 0: AbilityId.CLEAR_BODY },
-  [SpeciesId.SILVALLY]: { 0: AbilityId.ADAPTABILITY, 1: AbilityId.ADAPTABILITY, 2: AbilityId.ADAPTABILITY, 3: AbilityId.ADAPTABILITY, 4: AbilityId.ADAPTABILITY, 5: AbilityId.ADAPTABILITY, 6: AbilityId.ADAPTABILITY, 7: AbilityId.ADAPTABILITY, 8: AbilityId.ADAPTABILITY, 9: AbilityId.ADAPTABILITY, 10: AbilityId.ADAPTABILITY, 11: AbilityId.ADAPTABILITY, 12: AbilityId.ADAPTABILITY, 13: AbilityId.ADAPTABILITY, 14: AbilityId.ADAPTABILITY, 15: AbilityId.ADAPTABILITY, 16: AbilityId.ADAPTABILITY, 17: AbilityId.ADAPTABILITY },
-  [SpeciesId.MINIOR]: { 0: AbilityId.STURDY, 1: AbilityId.STURDY, 2: AbilityId.STURDY, 3: AbilityId.STURDY, 4: AbilityId.STURDY, 5: AbilityId.STURDY, 6: AbilityId.STURDY, 7: AbilityId.AERILATE, 8: AbilityId.AERILATE, 9: AbilityId.AERILATE, 10: AbilityId.AERILATE, 11: AbilityId.AERILATE, 12: AbilityId.AERILATE, 13: AbilityId.AERILATE },
+  [SpeciesId.SILVALLY]: {
+    0: AbilityId.ADAPTABILITY,
+    1: AbilityId.ADAPTABILITY,
+    2: AbilityId.ADAPTABILITY,
+    3: AbilityId.ADAPTABILITY,
+    4: AbilityId.ADAPTABILITY,
+    5: AbilityId.ADAPTABILITY,
+    6: AbilityId.ADAPTABILITY,
+    7: AbilityId.ADAPTABILITY,
+    8: AbilityId.ADAPTABILITY,
+    9: AbilityId.ADAPTABILITY,
+    10: AbilityId.ADAPTABILITY,
+    11: AbilityId.ADAPTABILITY,
+    12: AbilityId.ADAPTABILITY,
+    13: AbilityId.ADAPTABILITY,
+    14: AbilityId.ADAPTABILITY,
+    15: AbilityId.ADAPTABILITY,
+    16: AbilityId.ADAPTABILITY,
+    17: AbilityId.ADAPTABILITY,
+  },
+  [SpeciesId.MINIOR]: {
+    0: AbilityId.STURDY,
+    1: AbilityId.STURDY,
+    2: AbilityId.STURDY,
+    3: AbilityId.STURDY,
+    4: AbilityId.STURDY,
+    5: AbilityId.STURDY,
+    6: AbilityId.STURDY,
+    7: AbilityId.AERILATE,
+    8: AbilityId.AERILATE,
+    9: AbilityId.AERILATE,
+    10: AbilityId.AERILATE,
+    11: AbilityId.AERILATE,
+    12: AbilityId.AERILATE,
+    13: AbilityId.AERILATE,
+  },
  [SpeciesId.KOMALA]: { 0: AbilityId.GUTS },
  [SpeciesId.TURTONATOR]: { 0: AbilityId.DAUNTLESS_SHIELD },
  [SpeciesId.TOGEDEMARU]: { 0: AbilityId.CHEEK_POUCH },
@ -838,7 +1082,12 @@ export const starterPassiveAbilities: StarterPassiveAbilities = {
  [SpeciesId.CELESTEELA]: { 0: AbilityId.HEATPROOF },
  [SpeciesId.KARTANA]: { 0: AbilityId.TECHNICIAN },
  [SpeciesId.GUZZLORD]: { 0: AbilityId.POISON_HEAL },
-  [SpeciesId.NECROZMA]: { 0: AbilityId.BEAST_BOOST, 1: AbilityId.FULL_METAL_BODY, 2: AbilityId.SHADOW_SHIELD, 3: AbilityId.UNNERVE },
+  [SpeciesId.NECROZMA]: {
+    0: AbilityId.BEAST_BOOST,
+    1: AbilityId.FULL_METAL_BODY,
+    2: AbilityId.SHADOW_SHIELD,
+    3: AbilityId.UNNERVE,
+  },
  [SpeciesId.MAGEARNA]: { 0: AbilityId.STEELY_SPIRIT, 1: AbilityId.STEELY_SPIRIT },
  [SpeciesId.MARSHADOW]: { 0: AbilityId.IRON_FIST },
  [SpeciesId.POIPOLE]: { 0: AbilityId.LEVITATE },
@ -919,7 +1168,18 @@ export const starterPassiveAbilities: StarterPassiveAbilities = {
  [SpeciesId.MORGREM]: { 0: AbilityId.INTIMIDATE },
  [SpeciesId.GRIMMSNARL]: { 0: AbilityId.INTIMIDATE, 1: AbilityId.INTIMIDATE },
  [SpeciesId.MILCERY]: { 0: AbilityId.REGENERATOR },
-  [SpeciesId.ALCREMIE]: { 0: AbilityId.REGENERATOR, 1: AbilityId.REGENERATOR, 2: AbilityId.REGENERATOR, 3: AbilityId.REGENERATOR, 4: AbilityId.REGENERATOR, 5: AbilityId.REGENERATOR, 6: AbilityId.REGENERATOR, 7: AbilityId.REGENERATOR, 8: AbilityId.REGENERATOR, 9: AbilityId.REGENERATOR },
+  [SpeciesId.ALCREMIE]: {
+    0: AbilityId.REGENERATOR,
+    1: AbilityId.REGENERATOR,
+    2: AbilityId.REGENERATOR,
+    3: AbilityId.REGENERATOR,
+    4: AbilityId.REGENERATOR,
+    5: AbilityId.REGENERATOR,
+    6: AbilityId.REGENERATOR,
+    7: AbilityId.REGENERATOR,
+    8: AbilityId.REGENERATOR,
+    9: AbilityId.REGENERATOR,
+  },
  [SpeciesId.FALINKS]: { 0: AbilityId.DAUNTLESS_SHIELD },
  [SpeciesId.PINCURCHIN]: { 0: AbilityId.ELECTROMORPHOSIS },
  [SpeciesId.SNOM]: { 0: AbilityId.SNOW_WARNING },
@ -943,7 +1203,12 @@ export const starterPassiveAbilities: StarterPassiveAbilities = {
  [SpeciesId.ZAMAZENTA]: { 0: AbilityId.UNNERVE, 1: AbilityId.UNNERVE },
  [SpeciesId.ETERNATUS]: { 0: AbilityId.NEUTRALIZING_GAS, 1: AbilityId.NEUTRALIZING_GAS },
  [SpeciesId.KUBFU]: { 0: AbilityId.IRON_FIST },
-  [SpeciesId.URSHIFU]: { 0: AbilityId.IRON_FIST, 1: AbilityId.IRON_FIST, 2: AbilityId.IRON_FIST, 3: AbilityId.IRON_FIST },
+  [SpeciesId.URSHIFU]: {
+    0: AbilityId.IRON_FIST,
+    1: AbilityId.IRON_FIST,
+    2: AbilityId.IRON_FIST,
+    3: AbilityId.IRON_FIST,
+  },
  [SpeciesId.ZARUDE]: { 0: AbilityId.TOUGH_CLAWS, 1: AbilityId.TOUGH_CLAWS },
  [SpeciesId.REGIELEKI]: { 0: AbilityId.ELECTRIC_SURGE },
  [SpeciesId.REGIDRAGO]: { 0: AbilityId.MULTISCALE },
@ -1044,7 +1309,14 @@ export const starterPassiveAbilities: StarterPassiveAbilities = {
  [SpeciesId.FINIZEN]: { 0: AbilityId.FRIEND_GUARD },
  [SpeciesId.PALAFIN]: { 0: AbilityId.EMERGENCY_EXIT, 1: AbilityId.IRON_FIST },
  [SpeciesId.VAROOM]: { 0: AbilityId.LEVITATE },
-  [SpeciesId.REVAVROOM]: { 0: AbilityId.LEVITATE, 1: AbilityId.INTIMIDATE, 2: AbilityId.SPEED_BOOST, 3: AbilityId.TOXIC_DEBRIS, 4: AbilityId.MISTY_SURGE, 5: AbilityId.STAMINA },
+  [SpeciesId.REVAVROOM]: {
+    0: AbilityId.LEVITATE,
+    1: AbilityId.INTIMIDATE,
+    2: AbilityId.SPEED_BOOST,
+    3: AbilityId.TOXIC_DEBRIS,
+    4: AbilityId.MISTY_SURGE,
+    5: AbilityId.STAMINA,
+  },
  [SpeciesId.CYCLIZAR]: { 0: AbilityId.PROTEAN },
  [SpeciesId.ORTHWORM]: { 0: AbilityId.REGENERATOR },
  [SpeciesId.GLIMMET]: { 0: AbilityId.STURDY },
@ -1089,7 +1361,16 @@ export const starterPassiveAbilities: StarterPassiveAbilities = {
  [SpeciesId.OKIDOGI]: { 0: AbilityId.DARK_AURA },
  [SpeciesId.MUNKIDORI]: { 0: AbilityId.MAGICIAN },
  [SpeciesId.FEZANDIPITI]: { 0: AbilityId.PIXILATE },
-  [SpeciesId.OGERPON]: { 0: AbilityId.OPPORTUNIST, 1: AbilityId.SUPER_LUCK, 2: AbilityId.FLASH_FIRE, 3: AbilityId.MAGIC_GUARD, 4: AbilityId.OPPORTUNIST, 5: AbilityId.SUPER_LUCK, 6: AbilityId.FLASH_FIRE, 7: AbilityId.MAGIC_GUARD },
+  [SpeciesId.OGERPON]: {
+    0: AbilityId.OPPORTUNIST,
+    1: AbilityId.SUPER_LUCK,
+    2: AbilityId.FLASH_FIRE,
+    3: AbilityId.MAGIC_GUARD,
+    4: AbilityId.OPPORTUNIST,
+    5: AbilityId.SUPER_LUCK,
+    6: AbilityId.FLASH_FIRE,
+    7: AbilityId.MAGIC_GUARD,
+  },
  [SpeciesId.GOUGING_FIRE]: { 0: AbilityId.BEAST_BOOST },
  [SpeciesId.RAGING_BOLT]: { 0: AbilityId.BEAST_BOOST },
  [SpeciesId.IRON_BOULDER]: { 0: AbilityId.SHARPNESS },
@ -1099,5 +1380,5 @@ export const starterPassiveAbilities: StarterPassiveAbilities = {
  [SpeciesId.PALDEA_TAUROS]: { 0: AbilityId.STAMINA, 1: AbilityId.ADAPTABILITY, 2: AbilityId.ADAPTABILITY },
  [SpeciesId.PALDEA_WOOPER]: { 0: AbilityId.POISON_TOUCH },
  [SpeciesId.CLODSIRE]: { 0: AbilityId.THICK_FAT },
-  [SpeciesId.BLOODMOON_URSALUNA]: { 0: AbilityId.BERSERK }
+  [SpeciesId.BLOODMOON_URSALUNA]: { 0: AbilityId.BERSERK },
 };
--- a/src/data/balance/pokemon-evolutions.ts
+++ b/src/data/balance/pokemon-evolutions.ts
--- a/src/data/balance/pokemon-level-moves.ts
+++ b/src/data/balance/pokemon-level-moves.ts
--- a/src/data/balance/signature-species.ts
+++ b/src/data/balance/signature-species.ts
@ -16,91 +16,94 @@ export type SignatureSpecies = {
 * This means that accessing `signatureSpecies` will not throw an error if the property does not exist,
 * but instead default to an empty array.
 */
-export const signatureSpecies: SignatureSpecies = new Proxy({
-  // Gym Leaders- Kanto
-  BROCK: [SpeciesId.ONIX, SpeciesId.GEODUDE, [SpeciesId.OMANYTE, SpeciesId.KABUTO], SpeciesId.AERODACTYL],
-  MISTY: [SpeciesId.STARYU, SpeciesId.PSYDUCK, SpeciesId.WOOPER, SpeciesId.LAPRAS],
-  LT_SURGE: [SpeciesId.PICHU, SpeciesId.VOLTORB, SpeciesId.ELEKID, SpeciesId.JOLTEON],
-  ERIKA: [SpeciesId.ODDISH, SpeciesId.BELLSPROUT, SpeciesId.TANGELA, SpeciesId.HOPPIP],
-  JANINE: [SpeciesId.VENONAT, SpeciesId.SPINARAK, SpeciesId.ZUBAT, SpeciesId.KOFFING],
-  SABRINA: [SpeciesId.ABRA, SpeciesId.MR_MIME, SpeciesId.SMOOCHUM, SpeciesId.ESPEON],
-  BLAINE: [SpeciesId.GROWLITHE, SpeciesId.PONYTA, SpeciesId.MAGBY, SpeciesId.VULPIX],
-  GIOVANNI: [SpeciesId.RHYHORN, SpeciesId.MEOWTH, [SpeciesId.NIDORAN_F, SpeciesId.NIDORAN_M], SpeciesId.DIGLETT], // Tera Ground Meowth
-  // Gym Leaders- Johto
-  FALKNER: [SpeciesId.PIDGEY, SpeciesId.HOOTHOOT, SpeciesId.NATU, SpeciesId.MURKROW],
-  BUGSY: [SpeciesId.SCYTHER, SpeciesId.SHUCKLE, SpeciesId.YANMA, [SpeciesId.PINSIR, SpeciesId.HERACROSS]],
-  WHITNEY: [SpeciesId.MILTANK, SpeciesId.AIPOM, SpeciesId.IGGLYBUFF, [SpeciesId.GIRAFARIG, SpeciesId.STANTLER]],
-  MORTY: [SpeciesId.GASTLY, SpeciesId.MISDREAVUS, SpeciesId.DUSKULL, SpeciesId.HISUI_TYPHLOSION],
-  CHUCK: [SpeciesId.POLIWRATH, SpeciesId.MANKEY, SpeciesId.TYROGUE, SpeciesId.MACHOP],
-  JASMINE: [SpeciesId.STEELIX, SpeciesId.MAGNEMITE, SpeciesId.PINECO, SpeciesId.SKARMORY],
-  PRYCE: [SpeciesId.SWINUB, SpeciesId.SEEL, SpeciesId.SHELLDER, SpeciesId.SNEASEL],
-  CLAIR: [SpeciesId.HORSEA, SpeciesId.DRATINI, SpeciesId.MAGIKARP, SpeciesId.DRUDDIGON], // Tera Dragon Magikarp
-  // Gym Leaders- Hoenn
-  ROXANNE: [SpeciesId.NOSEPASS, SpeciesId.GEODUDE, [SpeciesId.LILEEP, SpeciesId.ANORITH], SpeciesId.ARON],
-  BRAWLY: [SpeciesId.MAKUHITA, SpeciesId.MACHOP, SpeciesId.MEDITITE, SpeciesId.SHROOMISH],
-  WATTSON: [SpeciesId.ELECTRIKE, SpeciesId.VOLTORB, SpeciesId.MAGNEMITE, [SpeciesId.PLUSLE, SpeciesId.MINUN]],
-  FLANNERY: [SpeciesId.TORKOAL, SpeciesId.SLUGMA, SpeciesId.NUMEL, SpeciesId.HOUNDOUR],
-  NORMAN: [SpeciesId.SLAKOTH, SpeciesId.KECLEON, SpeciesId.WHISMUR, SpeciesId.ZANGOOSE],
-  WINONA: [SpeciesId.SWABLU, SpeciesId.WINGULL, SpeciesId.TROPIUS, SpeciesId.SKARMORY],
-  TATE: [SpeciesId.SOLROCK, SpeciesId.NATU, SpeciesId.CHINGLING, SpeciesId.GALLADE],
-  LIZA: [SpeciesId.LUNATONE, SpeciesId.BALTOY, SpeciesId.SPOINK, SpeciesId.GARDEVOIR],
-  JUAN: [SpeciesId.HORSEA, SpeciesId.SPHEAL, SpeciesId.BARBOACH, SpeciesId.CORPHISH],
-  // Gym Leaders- Sinnoh
-  ROARK: [SpeciesId.CRANIDOS, SpeciesId.GEODUDE, SpeciesId.NOSEPASS, SpeciesId.LARVITAR],
-  GARDENIA: [SpeciesId.BUDEW, SpeciesId.CHERUBI, SpeciesId.TURTWIG, SpeciesId.LEAFEON],
-  MAYLENE: [SpeciesId.RIOLU, SpeciesId.MEDITITE, SpeciesId.CHIMCHAR, SpeciesId.CROAGUNK],
-  CRASHER_WAKE: [SpeciesId.BUIZEL, SpeciesId.WOOPER, SpeciesId.PIPLUP, SpeciesId.MAGIKARP],
-  FANTINA: [SpeciesId.MISDREAVUS, SpeciesId.DRIFLOON, SpeciesId.DUSKULL, SpeciesId.SPIRITOMB],
-  BYRON: [SpeciesId.SHIELDON, SpeciesId.BRONZOR, SpeciesId.ARON, SpeciesId.SKARMORY],
-  CANDICE: [SpeciesId.FROSLASS, SpeciesId.SNOVER, SpeciesId.SNEASEL, SpeciesId.GLACEON],
-  VOLKNER: [SpeciesId.ELEKID, SpeciesId.SHINX, SpeciesId.CHINCHOU, SpeciesId.ROTOM],
-  // Gym Leaders- Unova
-  CILAN: [SpeciesId.PANSAGE, SpeciesId.SNIVY, SpeciesId.MARACTUS, SpeciesId.FERROSEED],
-  CHILI: [SpeciesId.PANSEAR, SpeciesId.TEPIG, SpeciesId.HEATMOR, SpeciesId.DARUMAKA],
-  CRESS: [SpeciesId.PANPOUR, SpeciesId.OSHAWOTT, SpeciesId.BASCULIN, SpeciesId.TYMPOLE],
-  CHEREN: [SpeciesId.LILLIPUP, SpeciesId.MINCCINO, SpeciesId.PIDOVE, SpeciesId.BOUFFALANT],
-  LENORA: [SpeciesId.PATRAT, SpeciesId.DEERLING, SpeciesId.AUDINO, SpeciesId.BRAVIARY],
-  ROXIE: [SpeciesId.VENIPEDE, SpeciesId.KOFFING, SpeciesId.TRUBBISH, SpeciesId.TOXEL],
-  BURGH: [SpeciesId.SEWADDLE, SpeciesId.DWEBBLE, [SpeciesId.KARRABLAST, SpeciesId.SHELMET], SpeciesId.DURANT],
-  ELESA: [SpeciesId.BLITZLE, SpeciesId.EMOLGA, SpeciesId.JOLTIK, SpeciesId.TYNAMO],
-  CLAY: [SpeciesId.DRILBUR, SpeciesId.SANDILE, SpeciesId.TYMPOLE, SpeciesId.GOLETT],
-  SKYLA: [SpeciesId.DUCKLETT, SpeciesId.WOOBAT, [SpeciesId.RUFFLET, SpeciesId.VULLABY], SpeciesId.ARCHEN],
-  BRYCEN: [SpeciesId.CRYOGONAL, SpeciesId.VANILLITE, SpeciesId.CUBCHOO, SpeciesId.GALAR_DARUMAKA],
-  DRAYDEN: [SpeciesId.AXEW, SpeciesId.DRUDDIGON, SpeciesId.TRAPINCH, SpeciesId.DEINO],
-  MARLON: [SpeciesId.FRILLISH, SpeciesId.TIRTOUGA, SpeciesId.WAILMER, SpeciesId.MANTYKE],
-  // Gym Leaders- Kalos
-  VIOLA: [SpeciesId.SCATTERBUG, SpeciesId.SURSKIT, SpeciesId.CUTIEFLY, SpeciesId.BLIPBUG],
-  GRANT: [SpeciesId.TYRUNT, SpeciesId.AMAURA, SpeciesId.BINACLE, SpeciesId.DWEBBLE],
-  KORRINA: [SpeciesId.RIOLU, SpeciesId.MIENFOO, SpeciesId.HAWLUCHA, SpeciesId.PANCHAM],
-  RAMOS: [SpeciesId.SKIDDO, SpeciesId.HOPPIP, SpeciesId.BELLSPROUT, [SpeciesId.PHANTUMP, SpeciesId.PUMPKABOO]],
-  CLEMONT: [SpeciesId.HELIOPTILE, SpeciesId.MAGNEMITE, SpeciesId.DEDENNE, SpeciesId.ROTOM],
-  VALERIE: [SpeciesId.SYLVEON, SpeciesId.MAWILE, SpeciesId.MR_MIME, [SpeciesId.SPRITZEE, SpeciesId.SWIRLIX]],
-  OLYMPIA: [SpeciesId.ESPURR, SpeciesId.SIGILYPH, SpeciesId.INKAY, SpeciesId.SLOWKING],
-  WULFRIC: [SpeciesId.BERGMITE, SpeciesId.SNOVER, SpeciesId.CRYOGONAL, SpeciesId.SWINUB],
-  // Gym Leaders- Galar
-  MILO: [SpeciesId.GOSSIFLEUR, SpeciesId.SEEDOT, SpeciesId.APPLIN, SpeciesId.LOTAD],
-  NESSA: [SpeciesId.CHEWTLE, SpeciesId.WIMPOD, SpeciesId.ARROKUDA, SpeciesId.MAREANIE],
-  KABU: [SpeciesId.SIZZLIPEDE, SpeciesId.VULPIX, SpeciesId.GROWLITHE, SpeciesId.TORKOAL],
-  BEA: [SpeciesId.MACHOP, SpeciesId.GALAR_FARFETCHD, SpeciesId.CLOBBOPUS, SpeciesId.FALINKS],
-  ALLISTER: [SpeciesId.GASTLY, SpeciesId.GALAR_YAMASK, SpeciesId.GALAR_CORSOLA, SpeciesId.SINISTEA],
-  OPAL: [SpeciesId.MILCERY, SpeciesId.GALAR_WEEZING, SpeciesId.TOGEPI, SpeciesId.MAWILE],
-  BEDE: [SpeciesId.HATENNA, SpeciesId.GALAR_PONYTA, SpeciesId.GARDEVOIR, SpeciesId.SYLVEON],
-  GORDIE: [SpeciesId.ROLYCOLY, [SpeciesId.SHUCKLE, SpeciesId.BINACLE], SpeciesId.STONJOURNER, SpeciesId.LARVITAR],
-  MELONY: [SpeciesId.LAPRAS, SpeciesId.SNOM, SpeciesId.EISCUE, [SpeciesId.GALAR_MR_MIME, SpeciesId.GALAR_DARUMAKA]],
-  PIERS: [SpeciesId.GALAR_ZIGZAGOON, SpeciesId.SCRAGGY, SpeciesId.TOXEL, SpeciesId.INKAY], // Tera Dark Toxel
-  MARNIE: [SpeciesId.IMPIDIMP, SpeciesId.MORPEKO, SpeciesId.PURRLOIN, SpeciesId.CROAGUNK], // Tera Dark Croagunk
-  RAIHAN: [SpeciesId.DURALUDON, SpeciesId.TRAPINCH, SpeciesId.GOOMY, SpeciesId.TURTONATOR],
-  // Gym Leaders- Paldea; First slot is Tera
-  KATY: [SpeciesId.TEDDIURSA, SpeciesId.NYMBLE, SpeciesId.TAROUNTULA, SpeciesId.RELLOR], // Tera Bug Teddiursa
-  BRASSIUS: [SpeciesId.BONSLY, SpeciesId.SMOLIV, SpeciesId.BRAMBLIN, SpeciesId.SUNKERN], // Tera Grass Bonsly
-  IONO: [SpeciesId.MISDREAVUS, SpeciesId.TADBULB, SpeciesId.WATTREL, SpeciesId.MAGNEMITE], // Tera Ghost Misdreavus
-  KOFU: [SpeciesId.CRABRAWLER, SpeciesId.VELUZA, SpeciesId.WIGLETT, SpeciesId.WINGULL], // Tera Water Crabrawler
-  LARRY: [SpeciesId.STARLY, SpeciesId.DUNSPARCE, SpeciesId.LECHONK, SpeciesId.KOMALA], // Tera Normal Starly
-  RYME: [SpeciesId.TOXEL, SpeciesId.GREAVARD, SpeciesId.SHUPPET, SpeciesId.MIMIKYU], // Tera Ghost Toxel
-  TULIP: [SpeciesId.FLABEBE, SpeciesId.FLITTLE, SpeciesId.RALTS, SpeciesId.GIRAFARIG], // Tera Psychic Flabebe
-  GRUSHA: [SpeciesId.SWABLU, SpeciesId.CETODDLE, SpeciesId.SNOM, SpeciesId.CUBCHOO], // Tera Ice Swablu
-}, {
-  get(target, prop: string) {
-    return target[prop as keyof SignatureSpecies] ?? [];
-  }
-});
+export const signatureSpecies: SignatureSpecies = new Proxy(
+  {
+    // Gym Leaders- Kanto
+    BROCK: [SpeciesId.ONIX, SpeciesId.GEODUDE, [SpeciesId.OMANYTE, SpeciesId.KABUTO], SpeciesId.AERODACTYL],
+    MISTY: [SpeciesId.STARYU, SpeciesId.PSYDUCK, SpeciesId.WOOPER, SpeciesId.LAPRAS],
+    LT_SURGE: [SpeciesId.PICHU, SpeciesId.VOLTORB, SpeciesId.ELEKID, SpeciesId.JOLTEON],
+    ERIKA: [SpeciesId.ODDISH, SpeciesId.BELLSPROUT, SpeciesId.TANGELA, SpeciesId.HOPPIP],
+    JANINE: [SpeciesId.VENONAT, SpeciesId.SPINARAK, SpeciesId.ZUBAT, SpeciesId.KOFFING],
+    SABRINA: [SpeciesId.ABRA, SpeciesId.MR_MIME, SpeciesId.SMOOCHUM, SpeciesId.ESPEON],
+    BLAINE: [SpeciesId.GROWLITHE, SpeciesId.PONYTA, SpeciesId.MAGBY, SpeciesId.VULPIX],
+    GIOVANNI: [SpeciesId.RHYHORN, SpeciesId.MEOWTH, [SpeciesId.NIDORAN_F, SpeciesId.NIDORAN_M], SpeciesId.DIGLETT], // Tera Ground Meowth
+    // Gym Leaders- Johto
+    FALKNER: [SpeciesId.PIDGEY, SpeciesId.HOOTHOOT, SpeciesId.NATU, SpeciesId.MURKROW],
+    BUGSY: [SpeciesId.SCYTHER, SpeciesId.SHUCKLE, SpeciesId.YANMA, [SpeciesId.PINSIR, SpeciesId.HERACROSS]],
+    WHITNEY: [SpeciesId.MILTANK, SpeciesId.AIPOM, SpeciesId.IGGLYBUFF, [SpeciesId.GIRAFARIG, SpeciesId.STANTLER]],
+    MORTY: [SpeciesId.GASTLY, SpeciesId.MISDREAVUS, SpeciesId.DUSKULL, SpeciesId.HISUI_TYPHLOSION],
+    CHUCK: [SpeciesId.POLIWRATH, SpeciesId.MANKEY, SpeciesId.TYROGUE, SpeciesId.MACHOP],
+    JASMINE: [SpeciesId.STEELIX, SpeciesId.MAGNEMITE, SpeciesId.PINECO, SpeciesId.SKARMORY],
+    PRYCE: [SpeciesId.SWINUB, SpeciesId.SEEL, SpeciesId.SHELLDER, SpeciesId.SNEASEL],
+    CLAIR: [SpeciesId.HORSEA, SpeciesId.DRATINI, SpeciesId.MAGIKARP, SpeciesId.DRUDDIGON], // Tera Dragon Magikarp
+    // Gym Leaders- Hoenn
+    ROXANNE: [SpeciesId.NOSEPASS, SpeciesId.GEODUDE, [SpeciesId.LILEEP, SpeciesId.ANORITH], SpeciesId.ARON],
+    BRAWLY: [SpeciesId.MAKUHITA, SpeciesId.MACHOP, SpeciesId.MEDITITE, SpeciesId.SHROOMISH],
+    WATTSON: [SpeciesId.ELECTRIKE, SpeciesId.VOLTORB, SpeciesId.MAGNEMITE, [SpeciesId.PLUSLE, SpeciesId.MINUN]],
+    FLANNERY: [SpeciesId.TORKOAL, SpeciesId.SLUGMA, SpeciesId.NUMEL, SpeciesId.HOUNDOUR],
+    NORMAN: [SpeciesId.SLAKOTH, SpeciesId.KECLEON, SpeciesId.WHISMUR, SpeciesId.ZANGOOSE],
+    WINONA: [SpeciesId.SWABLU, SpeciesId.WINGULL, SpeciesId.TROPIUS, SpeciesId.SKARMORY],
+    TATE: [SpeciesId.SOLROCK, SpeciesId.NATU, SpeciesId.CHINGLING, SpeciesId.GALLADE],
+    LIZA: [SpeciesId.LUNATONE, SpeciesId.BALTOY, SpeciesId.SPOINK, SpeciesId.GARDEVOIR],
+    JUAN: [SpeciesId.HORSEA, SpeciesId.SPHEAL, SpeciesId.BARBOACH, SpeciesId.CORPHISH],
+    // Gym Leaders- Sinnoh
+    ROARK: [SpeciesId.CRANIDOS, SpeciesId.GEODUDE, SpeciesId.NOSEPASS, SpeciesId.LARVITAR],
+    GARDENIA: [SpeciesId.BUDEW, SpeciesId.CHERUBI, SpeciesId.TURTWIG, SpeciesId.LEAFEON],
+    MAYLENE: [SpeciesId.RIOLU, SpeciesId.MEDITITE, SpeciesId.CHIMCHAR, SpeciesId.CROAGUNK],
+    CRASHER_WAKE: [SpeciesId.BUIZEL, SpeciesId.WOOPER, SpeciesId.PIPLUP, SpeciesId.MAGIKARP],
+    FANTINA: [SpeciesId.MISDREAVUS, SpeciesId.DRIFLOON, SpeciesId.DUSKULL, SpeciesId.SPIRITOMB],
+    BYRON: [SpeciesId.SHIELDON, SpeciesId.BRONZOR, SpeciesId.ARON, SpeciesId.SKARMORY],
+    CANDICE: [SpeciesId.FROSLASS, SpeciesId.SNOVER, SpeciesId.SNEASEL, SpeciesId.GLACEON],
+    VOLKNER: [SpeciesId.ELEKID, SpeciesId.SHINX, SpeciesId.CHINCHOU, SpeciesId.ROTOM],
+    // Gym Leaders- Unova
+    CILAN: [SpeciesId.PANSAGE, SpeciesId.SNIVY, SpeciesId.MARACTUS, SpeciesId.FERROSEED],
+    CHILI: [SpeciesId.PANSEAR, SpeciesId.TEPIG, SpeciesId.HEATMOR, SpeciesId.DARUMAKA],
+    CRESS: [SpeciesId.PANPOUR, SpeciesId.OSHAWOTT, SpeciesId.BASCULIN, SpeciesId.TYMPOLE],
+    CHEREN: [SpeciesId.LILLIPUP, SpeciesId.MINCCINO, SpeciesId.PIDOVE, SpeciesId.BOUFFALANT],
+    LENORA: [SpeciesId.PATRAT, SpeciesId.DEERLING, SpeciesId.AUDINO, SpeciesId.BRAVIARY],
+    ROXIE: [SpeciesId.VENIPEDE, SpeciesId.KOFFING, SpeciesId.TRUBBISH, SpeciesId.TOXEL],
+    BURGH: [SpeciesId.SEWADDLE, SpeciesId.DWEBBLE, [SpeciesId.KARRABLAST, SpeciesId.SHELMET], SpeciesId.DURANT],
+    ELESA: [SpeciesId.BLITZLE, SpeciesId.EMOLGA, SpeciesId.JOLTIK, SpeciesId.TYNAMO],
+    CLAY: [SpeciesId.DRILBUR, SpeciesId.SANDILE, SpeciesId.TYMPOLE, SpeciesId.GOLETT],
+    SKYLA: [SpeciesId.DUCKLETT, SpeciesId.WOOBAT, [SpeciesId.RUFFLET, SpeciesId.VULLABY], SpeciesId.ARCHEN],
+    BRYCEN: [SpeciesId.CRYOGONAL, SpeciesId.VANILLITE, SpeciesId.CUBCHOO, SpeciesId.GALAR_DARUMAKA],
+    DRAYDEN: [SpeciesId.AXEW, SpeciesId.DRUDDIGON, SpeciesId.TRAPINCH, SpeciesId.DEINO],
+    MARLON: [SpeciesId.FRILLISH, SpeciesId.TIRTOUGA, SpeciesId.WAILMER, SpeciesId.MANTYKE],
+    // Gym Leaders- Kalos
+    VIOLA: [SpeciesId.SCATTERBUG, SpeciesId.SURSKIT, SpeciesId.CUTIEFLY, SpeciesId.BLIPBUG],
+    GRANT: [SpeciesId.TYRUNT, SpeciesId.AMAURA, SpeciesId.BINACLE, SpeciesId.DWEBBLE],
+    KORRINA: [SpeciesId.RIOLU, SpeciesId.MIENFOO, SpeciesId.HAWLUCHA, SpeciesId.PANCHAM],
+    RAMOS: [SpeciesId.SKIDDO, SpeciesId.HOPPIP, SpeciesId.BELLSPROUT, [SpeciesId.PHANTUMP, SpeciesId.PUMPKABOO]],
+    CLEMONT: [SpeciesId.HELIOPTILE, SpeciesId.MAGNEMITE, SpeciesId.DEDENNE, SpeciesId.ROTOM],
+    VALERIE: [SpeciesId.SYLVEON, SpeciesId.MAWILE, SpeciesId.MR_MIME, [SpeciesId.SPRITZEE, SpeciesId.SWIRLIX]],
+    OLYMPIA: [SpeciesId.ESPURR, SpeciesId.SIGILYPH, SpeciesId.INKAY, SpeciesId.SLOWKING],
+    WULFRIC: [SpeciesId.BERGMITE, SpeciesId.SNOVER, SpeciesId.CRYOGONAL, SpeciesId.SWINUB],
+    // Gym Leaders- Galar
+    MILO: [SpeciesId.GOSSIFLEUR, SpeciesId.SEEDOT, SpeciesId.APPLIN, SpeciesId.LOTAD],
+    NESSA: [SpeciesId.CHEWTLE, SpeciesId.WIMPOD, SpeciesId.ARROKUDA, SpeciesId.MAREANIE],
+    KABU: [SpeciesId.SIZZLIPEDE, SpeciesId.VULPIX, SpeciesId.GROWLITHE, SpeciesId.TORKOAL],
+    BEA: [SpeciesId.MACHOP, SpeciesId.GALAR_FARFETCHD, SpeciesId.CLOBBOPUS, SpeciesId.FALINKS],
+    ALLISTER: [SpeciesId.GASTLY, SpeciesId.GALAR_YAMASK, SpeciesId.GALAR_CORSOLA, SpeciesId.SINISTEA],
+    OPAL: [SpeciesId.MILCERY, SpeciesId.GALAR_WEEZING, SpeciesId.TOGEPI, SpeciesId.MAWILE],
+    BEDE: [SpeciesId.HATENNA, SpeciesId.GALAR_PONYTA, SpeciesId.GARDEVOIR, SpeciesId.SYLVEON],
+    GORDIE: [SpeciesId.ROLYCOLY, [SpeciesId.SHUCKLE, SpeciesId.BINACLE], SpeciesId.STONJOURNER, SpeciesId.LARVITAR],
+    MELONY: [SpeciesId.LAPRAS, SpeciesId.SNOM, SpeciesId.EISCUE, [SpeciesId.GALAR_MR_MIME, SpeciesId.GALAR_DARUMAKA]],
+    PIERS: [SpeciesId.GALAR_ZIGZAGOON, SpeciesId.SCRAGGY, SpeciesId.TOXEL, SpeciesId.INKAY], // Tera Dark Toxel
+    MARNIE: [SpeciesId.IMPIDIMP, SpeciesId.MORPEKO, SpeciesId.PURRLOIN, SpeciesId.CROAGUNK], // Tera Dark Croagunk
+    RAIHAN: [SpeciesId.DURALUDON, SpeciesId.TRAPINCH, SpeciesId.GOOMY, SpeciesId.TURTONATOR],
+    // Gym Leaders- Paldea; First slot is Tera
+    KATY: [SpeciesId.TEDDIURSA, SpeciesId.NYMBLE, SpeciesId.TAROUNTULA, SpeciesId.RELLOR], // Tera Bug Teddiursa
+    BRASSIUS: [SpeciesId.BONSLY, SpeciesId.SMOLIV, SpeciesId.BRAMBLIN, SpeciesId.SUNKERN], // Tera Grass Bonsly
+    IONO: [SpeciesId.MISDREAVUS, SpeciesId.TADBULB, SpeciesId.WATTREL, SpeciesId.MAGNEMITE], // Tera Ghost Misdreavus
+    KOFU: [SpeciesId.CRABRAWLER, SpeciesId.VELUZA, SpeciesId.WIGLETT, SpeciesId.WINGULL], // Tera Water Crabrawler
+    LARRY: [SpeciesId.STARLY, SpeciesId.DUNSPARCE, SpeciesId.LECHONK, SpeciesId.KOMALA], // Tera Normal Starly
+    RYME: [SpeciesId.TOXEL, SpeciesId.GREAVARD, SpeciesId.SHUPPET, SpeciesId.MIMIKYU], // Tera Ghost Toxel
+    TULIP: [SpeciesId.FLABEBE, SpeciesId.FLITTLE, SpeciesId.RALTS, SpeciesId.GIRAFARIG], // Tera Psychic Flabebe
+    GRUSHA: [SpeciesId.SWABLU, SpeciesId.CETODDLE, SpeciesId.SNOM, SpeciesId.CUBCHOO], // Tera Ice Swablu
+  },
+  {
+    get(target, prop: string) {
+      return target[prop as keyof SignatureSpecies] ?? [];
+    },
+  },
+);
--- a/src/data/balance/species-egg-tiers.ts
+++ b/src/data/balance/species-egg-tiers.ts
@ -581,5 +581,5 @@ export const speciesEggTiers = {
  [SpeciesId.PECHARUNT]: EggTier.EPIC,
  [SpeciesId.PALDEA_TAUROS]: EggTier.RARE,
  [SpeciesId.PALDEA_WOOPER]: EggTier.RARE,
-  [SpeciesId.BLOODMOON_URSALUNA]: EggTier.EPIC
+  [SpeciesId.BLOODMOON_URSALUNA]: EggTier.EPIC,
 };
--- a/src/data/balance/starters.ts
+++ b/src/data/balance/starters.ts
@ -618,17 +618,17 @@ export const speciesStarterCosts = {
  [SpeciesId.BLOODMOON_URSALUNA]: 5,
 } as const;

-const starterCandyCosts: { passive: number; costReduction: [number, number]; egg: number; }[] = [
-  { passive: 40, costReduction: [ 25, 60 ], egg: 30 }, // 1 Cost
-  { passive: 40, costReduction: [ 25, 60 ], egg: 30 }, // 2 Cost
-  { passive: 35, costReduction: [ 20, 50 ], egg: 25 }, // 3 Cost
-  { passive: 30, costReduction: [ 15, 40 ], egg: 20 }, // 4 Cost
-  { passive: 25, costReduction: [ 12, 35 ], egg: 18 }, // 5 Cost
-  { passive: 20, costReduction: [ 10, 30 ], egg: 15 }, // 6 Cost
-  { passive: 15, costReduction: [ 8, 20 ], egg: 12 }, // 7 Cost
-  { passive: 10, costReduction: [ 5, 15 ], egg: 10 }, // 8 Cost
-  { passive: 10, costReduction: [ 5, 15 ], egg: 10 }, // 9 Cost
-  { passive: 10, costReduction: [ 5, 15 ], egg: 10 }, // 10 Cost
+const starterCandyCosts: { passive: number; costReduction: [number, number]; egg: number }[] = [
+  { passive: 40, costReduction: [25, 60], egg: 30 }, // 1 Cost
+  { passive: 40, costReduction: [25, 60], egg: 30 }, // 2 Cost
+  { passive: 35, costReduction: [20, 50], egg: 25 }, // 3 Cost
+  { passive: 30, costReduction: [15, 40], egg: 20 }, // 4 Cost
+  { passive: 25, costReduction: [12, 35], egg: 18 }, // 5 Cost
+  { passive: 20, costReduction: [10, 30], egg: 15 }, // 6 Cost
+  { passive: 15, costReduction: [8, 20], egg: 12 }, // 7 Cost
+  { passive: 10, costReduction: [5, 15], egg: 10 }, // 8 Cost
+  { passive: 10, costReduction: [5, 15], egg: 10 }, // 9 Cost
+  { passive: 10, costReduction: [5, 15], egg: 10 }, // 10 Cost
 ];

 /**
--- a/src/data/battle-anims.ts
+++ b/src/data/battle-anims.ts
@ -812,8 +812,8 @@ export abstract class BattleAnim {
            x = point[0];
            y = point[1];
            if (
-              frame.target === AnimFrameTarget.GRAPHIC &&
-              isReversed(this.srcLine[0], this.srcLine[2], this.dstLine[0], this.dstLine[2])
+              frame.target === AnimFrameTarget.GRAPHIC
+              && isReversed(this.srcLine[0], this.srcLine[2], this.dstLine[0], this.dstLine[2])
            ) {
              scaleX = scaleX * -1;
            }
@ -822,7 +822,7 @@ export abstract class BattleAnim {
      }
      const angle = -frame.angle;
      const key = frame.target === AnimFrameTarget.GRAPHIC ? g++ : frame.target === AnimFrameTarget.USER ? u++ : t++;
-      ret.get(frame.target)!.set(key, { x: x, y: y, scaleX: scaleX, scaleY: scaleY, angle: angle }); // TODO: is the bang correct?
+      ret.get(frame.target)!.set(key, { x, y, scaleX, scaleY, angle }); // TODO: is the bang correct?
    }

    return ret;
@ -1145,11 +1145,11 @@ export abstract class BattleAnim {
      const angle = -frame.angle;
      const key = frame.target === AnimFrameTarget.GRAPHIC ? g++ : frame.target === AnimFrameTarget.USER ? u++ : t++;
      ret.get(frame.target)?.set(key, {
-        x: x,
-        y: y,
-        scaleX: scaleX,
-        scaleY: scaleY,
-        angle: angle,
+        x,
+        y,
+        scaleX,
+        scaleY,
+        angle,
      });
    }

--- a/src/data/battler-tags.ts
+++ b/src/data/battler-tags.ts
@ -1134,8 +1134,8 @@ export class PowderTag extends BattlerTag {
    const move = movePhase.move.getMove();
    const weather = globalScene.arena.weather;
    if (
-      pokemon.getMoveType(move) !== PokemonType.FIRE ||
-      (weather?.weatherType === WeatherType.HEAVY_RAIN && !weather.isEffectSuppressed()) // Heavy rain takes priority over powder
+      pokemon.getMoveType(move) !== PokemonType.FIRE
+      || (weather?.weatherType === WeatherType.HEAVY_RAIN && !weather.isEffectSuppressed()) // Heavy rain takes priority over powder
    ) {
      return true;
    }
@ -1792,9 +1792,9 @@ export abstract class ContactProtectedTag extends ProtectedTag {

    const moveData = getMoveEffectPhaseData(pokemon);
    if (
-      lapseType === BattlerTagLapseType.CUSTOM &&
-      moveData &&
-      moveData.move.doesFlagEffectApply({ flag: MoveFlags.MAKES_CONTACT, user: moveData.attacker, target: pokemon })
+      lapseType === BattlerTagLapseType.CUSTOM
+      && moveData
+      && moveData.move.doesFlagEffectApply({ flag: MoveFlags.MAKES_CONTACT, user: moveData.attacker, target: pokemon })
    ) {
      this.onContact(moveData.attacker, pokemon);
    }
@ -2816,9 +2816,9 @@ export class GulpMissileTag extends SerializableBattlerTag {
    // 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) &&
-      !pokemon.getTag(BattlerTagType.GULP_MISSILE_PIKACHU);
+      pokemon.formIndex === 0
+      && !pokemon.getTag(BattlerTagType.GULP_MISSILE_ARROKUDA)
+      && !pokemon.getTag(BattlerTagType.GULP_MISSILE_PIKACHU);
    const isCramorant = pokemon.species.speciesId === SpeciesId.CRAMORANT;

    return isSurfOrDive && isNormalForm && isCramorant;
@ -3859,7 +3859,7 @@ function getMoveEffectPhaseData(_pokemon: Pokemon): { phase: MoveEffectPhase; at
  const phase = globalScene.phaseManager.getCurrentPhase();
  if (phase?.is("MoveEffectPhase")) {
    return {
-      phase: phase,
+      phase,
      attacker: phase.getPokemon(),
      move: phase.move,
    };
--- a/src/data/berry.ts
+++ b/src/data/berry.ts
@ -141,8 +141,8 @@ export function getBerryEffectFunc(berryType: BerryType): BerryEffectFunc {
        {
          // Pick the first move completely out of PP, or else the first one that has any PP missing
          const ppRestoreMove =
-            consumer.getMoveset().find(m => m.ppUsed === m.getMovePp()) ??
-            consumer.getMoveset().find(m => m.ppUsed < m.getMovePp());
+            consumer.getMoveset().find(m => m.ppUsed === m.getMovePp())
+            ?? consumer.getMoveset().find(m => m.ppUsed < m.getMovePp());
          if (ppRestoreMove) {
            ppRestoreMove.ppUsed = Math.max(ppRestoreMove.ppUsed - 10, 0);
            globalScene.phaseManager.queueMessage(
--- a/src/data/challenge.ts
+++ b/src/data/challenge.ts
@ -439,8 +439,8 @@ export class SingleGenerationChallenge extends Challenge {
    const baseGeneration = getPokemonSpecies(pokemon.species.speciesId).generation;
    const fusionGeneration = pokemon.isFusion() ? getPokemonSpecies(pokemon.fusionSpecies!.speciesId).generation : 0;
    if (
-      pokemon.isPlayer() &&
-      (baseGeneration !== this.value || (pokemon.isFusion() && fusionGeneration !== this.value))
+      pokemon.isPlayer()
+      && (baseGeneration !== this.value || (pokemon.isFusion() && fusionGeneration !== this.value))
    ) {
      valid.value = false;
      return true;
@ -707,12 +707,12 @@ export class SingleTypeChallenge extends Challenge {

  applyPokemonInBattle(pokemon: Pokemon, valid: BooleanHolder): boolean {
    if (
-      pokemon.isPlayer() &&
-      !pokemon.isOfType(this.value - 1, false, false, true) &&
-      !SingleTypeChallenge.TYPE_OVERRIDES.some(
+      pokemon.isPlayer()
+      && !pokemon.isOfType(this.value - 1, false, false, true)
+      && !SingleTypeChallenge.TYPE_OVERRIDES.some(
        o =>
-          o.type === this.value - 1 &&
-          (pokemon.isFusion() && o.fusion ? pokemon.fusionSpecies! : pokemon.species).speciesId === o.species,
+          o.type === this.value - 1
+          && (pokemon.isFusion() && o.fusion ? pokemon.fusionSpecies! : pokemon.species).speciesId === o.species,
      )
    ) {
      // TODO: is the bang on fusionSpecies correct?
@ -794,8 +794,8 @@ export class FreshStartChallenge extends Challenge {
    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 &&
-      [
+      pokemon.formIndex > 0
+      && [
        SpeciesId.PIKACHU,
        SpeciesId.EEVEE,
        SpeciesId.PICHU,
--- a/src/data/egg.ts
+++ b/src/data/egg.ts
@ -221,9 +221,9 @@ export class Egg {

  public isManaphyEgg(): boolean {
    return (
-      this._species === SpeciesId.PHIONE ||
-      this._species === SpeciesId.MANAPHY ||
-      (this._tier === EggTier.COMMON && !(this._id % 204) && !this._species)
+      this._species === SpeciesId.PHIONE
+      || this._species === SpeciesId.MANAPHY
+      || (this._tier === EggTier.COMMON && !(this._id % 204) && !this._species)
    );
  }

@ -325,15 +325,15 @@ export class Egg {
    switch (this.sourceType) {
      case EggSourceType.SAME_SPECIES_EGG:
        return (
-          this._eggDescriptor ??
-          i18next.t("egg:sameSpeciesEgg", {
+          this._eggDescriptor
+          ?? i18next.t("egg:sameSpeciesEgg", {
            species: getPokemonSpecies(this._species).getName(),
          })
        );
      case EggSourceType.GACHA_LEGENDARY:
        return (
-          this._eggDescriptor ??
-          `${i18next.t("egg:gachaTypeLegendary")} (${getPokemonSpecies(getLegendaryGachaSpeciesForTimestamp(this.timestamp)).getName()})`
+          this._eggDescriptor
+          ?? `${i18next.t("egg:gachaTypeLegendary")} (${getPokemonSpecies(getLegendaryGachaSpeciesForTimestamp(this.timestamp)).getName()})`
        );
      case EggSourceType.GACHA_SHINY:
        return this._eggDescriptor ?? i18next.t("egg:gachaTypeShiny");
@ -452,9 +452,9 @@ export class Egg {
      .map(s => Number.parseInt(s) as SpeciesId)
      .filter(
        s =>
-          !pokemonPrevolutions.hasOwnProperty(s) &&
-          getPokemonSpecies(s).isObtainable() &&
-          ignoredSpecies.indexOf(s) === -1,
+          !pokemonPrevolutions.hasOwnProperty(s)
+          && getPokemonSpecies(s).isObtainable()
+          && ignoredSpecies.indexOf(s) === -1,
      );

    // If this is the 10th egg without unlocking something new, attempt to force it.
@ -508,8 +508,8 @@ export class Egg {
    species = species!; // tell TS compiled it's defined now!

    if (
-      globalScene.gameData.dexData[species].caughtAttr ||
-      globalScene.gameData.eggs.some(e => e.species === species)
+      globalScene.gameData.dexData[species].caughtAttr
+      || globalScene.gameData.eggs.some(e => e.species === species)
    ) {
      globalScene.gameData.unlockPity[this.tier] = Math.min(globalScene.gameData.unlockPity[this.tier] + 1, 10);
    } else {
@ -565,8 +565,8 @@ export class Egg {
    globalScene.gameData.eggPity[EggTier.LEGENDARY] += 1 + tierValueOffset;
    // These numbers are roughly the 80% mark. That is, 80% of the time you'll get an egg before this gets triggered.
    if (
-      globalScene.gameData.eggPity[EggTier.LEGENDARY] >= EGG_PITY_LEGENDARY_THRESHOLD &&
-      this._tier === EggTier.COMMON
+      globalScene.gameData.eggPity[EggTier.LEGENDARY] >= EGG_PITY_LEGENDARY_THRESHOLD
+      && this._tier === EggTier.COMMON
    ) {
      this._tier = EggTier.LEGENDARY;
    } else if (globalScene.gameData.eggPity[EggTier.EPIC] >= EGG_PITY_EPIC_THRESHOLD && this._tier === EggTier.COMMON) {
--- a/src/data/moves/pokemon-move.ts
+++ b/src/data/moves/pokemon-move.ts
@ -50,10 +50,9 @@ export class PokemonMove {
    const move = this.getMove();
    // TODO: Add Sky Drop's 1 turn stall
    const usability = new BooleanHolder(
-      !move.name.endsWith(" (N)") &&
-        (ignorePp || this.ppUsed < this.getMovePp() || move.pp === -1) &&
-        // TODO: Review if the `MoveId.NONE` check is even necessary anymore
-        !(this.moveId !== MoveId.NONE && !ignoreRestrictionTags && pokemon.isMoveRestricted(this.moveId, pokemon)),
+      !move.name.endsWith(" (N)")
+        && (ignorePp || this.ppUsed < this.getMovePp() || move.pp === -1) // TODO: Review if the `MoveId.NONE` check is even necessary anymore
+        && !(this.moveId !== MoveId.NONE && !ignoreRestrictionTags && pokemon.isMoveRestricted(this.moveId, pokemon)),
    );
    if (pokemon.isPlayer()) {
      applyChallenges(ChallengeType.POKEMON_MOVE, move.id, usability);
--- a/src/data/mystery-encounters/encounters/a-trainers-test-encounter.ts
+++ b/src/data/mystery-encounters/encounters/a-trainers-test-encounter.ts
@ -111,7 +111,7 @@ export const ATrainersTestEncounter: MysteryEncounter = MysteryEncounterBuilder.
    const trainerSpriteKey = trainerConfig.getSpriteKey();
    encounter.enemyPartyConfigs.push({
      levelAdditiveModifier: 1,
-      trainerConfig: trainerConfig,
+      trainerConfig,
    });

    encounter.spriteConfigs = [
--- a/src/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter.ts
+++ b/src/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter.ts
@ -93,8 +93,8 @@ export const AnOfferYouCantRefuseEncounter: MysteryEncounter = MysteryEncounterB

    // Store pokemon and price
    encounter.misc = {
-      pokemon: pokemon,
-      price: price,
+      pokemon,
+      price,
    };

    // If player meets the combo OR requirements for option 2, populate the token
--- a/src/data/mystery-encounters/encounters/berries-abound-encounter.ts
+++ b/src/data/mystery-encounters/encounters/berries-abound-encounter.ts
@ -71,7 +71,7 @@ export const BerriesAboundEncounter: MysteryEncounter = MysteryEncounterBuilder.
    const config: EnemyPartyConfig = {
      pokemonConfigs: [
        {
-          level: level,
+          level,
          species: bossPokemon.species,
          dataSource: new PokemonData(bossPokemon),
          isBoss: true,
@ -105,8 +105,8 @@ export const BerriesAboundEncounter: MysteryEncounter = MysteryEncounterBuilder.
        hasShadow: true,
      },
      {
-        spriteKey: spriteKey,
-        fileRoot: fileRoot,
+        spriteKey,
+        fileRoot,
        hasShadow: true,
        tint: 0.25,
        x: -5,
@ -320,9 +320,9 @@ function tryGiveBerry(prioritizedPokemon?: PlayerPokemon) {
  if (prioritizedPokemon) {
    const heldBerriesOfType = globalScene.findModifier(
      m =>
-        m instanceof BerryModifier &&
-        m.pokemonId === prioritizedPokemon.id &&
-        (m as BerryModifier).berryType === berryType,
+        m instanceof BerryModifier
+        && m.pokemonId === prioritizedPokemon.id
+        && (m as BerryModifier).berryType === berryType,
      true,
    ) as BerryModifier;

--- a/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts
+++ b/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts
@ -248,7 +248,7 @@ export const BugTypeSuperfanEncounter: MysteryEncounter = MysteryEncounterBuilde
        yShadow: -4,
      },
      {
-        spriteKey: spriteKey,
+        spriteKey,
        fileRoot: "trainer",
        hasShadow: true,
        x: 4,
@ -441,11 +441,11 @@ export const BugTypeSuperfanEncounter: MysteryEncounter = MysteryEncounterBuilde
          // Get Pokemon held items and filter for valid ones
          const validItems = pokemon.getHeldItems().filter(item => {
            return (
-              (item instanceof BypassSpeedChanceModifier ||
-                item instanceof ContactHeldItemTransferChanceModifier ||
-                (item instanceof AttackTypeBoosterModifier &&
-                  (item.type as AttackTypeBoosterModifierType).moveType === PokemonType.BUG)) &&
-              item.isTransferable
+              (item instanceof BypassSpeedChanceModifier
+                || item instanceof ContactHeldItemTransferChanceModifier
+                || (item instanceof AttackTypeBoosterModifier
+                  && (item.type as AttackTypeBoosterModifierType).moveType === PokemonType.BUG))
+              && item.isTransferable
            );
          });

@ -470,10 +470,10 @@ export const BugTypeSuperfanEncounter: MysteryEncounter = MysteryEncounterBuilde
          // If pokemon has valid item, it can be selected
          const hasValidItem = pokemon.getHeldItems().some(item => {
            return (
-              item instanceof BypassSpeedChanceModifier ||
-              item instanceof ContactHeldItemTransferChanceModifier ||
-              (item instanceof AttackTypeBoosterModifier &&
-                (item.type as AttackTypeBoosterModifierType).moveType === PokemonType.BUG)
+              item instanceof BypassSpeedChanceModifier
+              || item instanceof ContactHeldItemTransferChanceModifier
+              || (item instanceof AttackTypeBoosterModifier
+                && (item.type as AttackTypeBoosterModifierType).moveType === PokemonType.BUG)
            );
          });
          if (!hasValidItem) {
--- a/src/data/mystery-encounters/encounters/clowning-around-encounter.ts
+++ b/src/data/mystery-encounters/encounters/clowning-around-encounter.ts
@ -163,7 +163,7 @@ export const ClowningAroundEncounter: MysteryEncounter = MysteryEncounterBuilder
          // Blacephalon has the random ability from pool, and 2 entirely random types to fit with the theme of the encounter
          species: getPokemonSpecies(SpeciesId.BLACEPHALON),
          customPokemonData: new CustomPokemonData({
-            ability: ability,
+            ability,
            types: [firstType, secondType],
          }),
          isBoss: true,
--- a/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts
+++ b/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts
@ -168,7 +168,7 @@ export const DancingLessonsEncounter: MysteryEncounter = MysteryEncounterBuilder
    const config: EnemyPartyConfig = {
      pokemonConfigs: [
        {
-          species: species,
+          species,
          dataSource: oricorioData,
          isBoss: true,
          // Gets +1 to all stats except SPD on battle start
--- a/src/data/mystery-encounters/encounters/field-trip-encounter.ts
+++ b/src/data/mystery-encounters/encounters/field-trip-encounter.ts
@ -249,6 +249,6 @@ function pokemonAndMoveChosen(pokemon: PlayerPokemon, move: PokemonMove, correct
    setEncounterExp([pokemon.id], 100);
  }
  encounter.misc = {
-    correctMove: correctMove,
+    correctMove,
  };
 }
--- a/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts
+++ b/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts
@ -63,7 +63,7 @@ export const FightOrFlightEncounter: MysteryEncounter = MysteryEncounterBuilder.
    const config: EnemyPartyConfig = {
      pokemonConfigs: [
        {
-          level: level,
+          level,
          species: bossPokemon.species,
          dataSource: new PokemonData(bossPokemon),
          isBoss: true,
@ -120,8 +120,8 @@ export const FightOrFlightEncounter: MysteryEncounter = MysteryEncounterBuilder.
        disableAnimation: true,
      },
      {
-        spriteKey: spriteKey,
-        fileRoot: fileRoot,
+        spriteKey,
+        fileRoot,
        hasShadow: true,
        tint: 0.25,
        x: -5,
--- a/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts
+++ b/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts
@ -192,10 +192,10 @@ export const GlobalTradeSystemEncounter: MysteryEncounter = MysteryEncounterBuil
                    : ""
                }`;
                const line2 =
-                  i18next.t("pokemonInfoContainer:nature") +
-                  " " +
-                  getNatureName(tradePokemon.getNature()) +
-                  (formName ? `     |     ${i18next.t("pokemonInfoContainer:form")} ${formName}` : "");
+                  i18next.t("pokemonInfoContainer:nature")
+                  + " "
+                  + getNatureName(tradePokemon.getNature())
+                  + (formName ? `     |     ${i18next.t("pokemonInfoContainer:form")} ${formName}` : "");
                showEncounterText(`${line1}\n${line2}`, 0, 0, false);
              },
            };
--- a/src/data/mystery-encounters/encounters/mysterious-challengers-encounter.ts
+++ b/src/data/mystery-encounters/encounters/mysterious-challengers-encounter.ts
@ -50,7 +50,7 @@ export const MysteriousChallengersEncounter: MysteryEncounter = MysteryEncounter
    const normalSpriteKey = normalConfig.getSpriteKey(female, normalConfig.doubleOnly);
    encounter.enemyPartyConfigs.push({
      trainerConfig: normalConfig,
-      female: female,
+      female,
    });

    // Hard difficulty trainer is another random trainer, but with AVERAGE_BALANCED config
@ -81,7 +81,7 @@ export const MysteriousChallengersEncounter: MysteryEncounter = MysteryEncounter
    encounter.enemyPartyConfigs.push({
      trainerConfig: hardConfig,
      levelAdditiveModifier: 1,
-      female: female,
+      female,
    });

    // Brutal trainer is pulled from pool of boss trainers (gym leaders) for the biome
@ -101,7 +101,7 @@ export const MysteriousChallengersEncounter: MysteryEncounter = MysteryEncounter
    encounter.enemyPartyConfigs.push({
      trainerConfig: brutalConfig,
      levelAdditiveModifier: 1.5,
-      female: female,
+      female,
    });

    encounter.spriteConfigs = [
--- a/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts
+++ b/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts
@ -163,8 +163,12 @@ export const MysteriousChestEncounter: MysteryEncounter = MysteryEncounterBuilde
          queueEncounterMessage(`${namespace}:option.1.great`);
          leaveEncounterWithoutBattle();
        } else if (
-          roll >=
-          RAND_LENGTH - COMMON_REWARDS_PERCENT - ULTRA_REWARDS_PERCENT - ROGUE_REWARDS_PERCENT - MASTER_REWARDS_PERCENT
+          roll
+          >= RAND_LENGTH
+            - COMMON_REWARDS_PERCENT
+            - ULTRA_REWARDS_PERCENT
+            - ROGUE_REWARDS_PERCENT
+            - MASTER_REWARDS_PERCENT
        ) {
          // Choose 1 MASTER tier item (5%)
          setEncounterRewards({
--- a/src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts
+++ b/src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts
@ -104,7 +104,7 @@ export const ShadyVitaminDealerEncounter: MysteryEncounter = MysteryEncounterBui
          encounter.setDialogueToken("boost2", modifiers[1].name);
          encounter.misc = {
            chosenPokemon: pokemon,
-            modifiers: modifiers,
+            modifiers,
          };
        };

@ -187,7 +187,7 @@ export const ShadyVitaminDealerEncounter: MysteryEncounter = MysteryEncounterBui
          encounter.setDialogueToken("boost2", modifiers[1].name);
          encounter.misc = {
            chosenPokemon: pokemon,
-            modifiers: modifiers,
+            modifiers,
          };
        };

--- a/src/data/mystery-encounters/encounters/teleporting-hijinks-encounter.ts
+++ b/src/data/mystery-encounters/encounters/teleporting-hijinks-encounter.ts
@ -165,7 +165,7 @@ export const TeleportingHijinksEncounter: MysteryEncounter = MysteryEncounterBui
      const config: EnemyPartyConfig = {
        pokemonConfigs: [
          {
-            level: level,
+            level,
            species: bossSpecies,
            dataSource: new PokemonData(bossPokemon),
            isBoss: true,
@ -221,7 +221,7 @@ async function doBiomeTransitionDialogueAndBattleInit() {
  const config: EnemyPartyConfig = {
    pokemonConfigs: [
      {
-        level: level,
+        level,
        species: bossSpecies,
        dataSource: new PokemonData(bossPokemon),
        isBoss: true,
--- a/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts
+++ b/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts
@ -92,11 +92,11 @@ export const ThePokemonSalesmanEncounter: MysteryEncounter = MysteryEncounterBui
      .getEventEncounters()
      .filter(
        s =>
-          !getPokemonSpecies(s.species).legendary &&
-          !getPokemonSpecies(s.species).subLegendary &&
-          !getPokemonSpecies(s.species).mythical &&
-          !NON_LEGEND_PARADOX_POKEMON.includes(s.species) &&
-          !NON_LEGEND_ULTRA_BEASTS.includes(s.species),
+          !getPokemonSpecies(s.species).legendary
+          && !getPokemonSpecies(s.species).subLegendary
+          && !getPokemonSpecies(s.species).mythical
+          && !NON_LEGEND_PARADOX_POKEMON.includes(s.species)
+          && !NON_LEGEND_ULTRA_BEASTS.includes(s.species),
      );

    let pokemon: PlayerPokemon;
@ -109,16 +109,16 @@ export const ThePokemonSalesmanEncounter: MysteryEncounter = MysteryEncounterBui
     * Mons rolled from the event encounter pool get 3 extra shiny rolls
     */
    if (
-      r === 0 ||
-      ((isNullOrUndefined(species.abilityHidden) || species.abilityHidden === AbilityId.NONE) &&
-        validEventEncounters.length === 0)
+      r === 0
+      || ((isNullOrUndefined(species.abilityHidden) || species.abilityHidden === AbilityId.NONE)
+        && validEventEncounters.length === 0)
    ) {
      // If you roll 1%, give shiny Magikarp with random variant
      species = getPokemonSpecies(SpeciesId.MAGIKARP);
      pokemon = new PlayerPokemon(species, 5, 2, undefined, undefined, true);
    } else if (
-      validEventEncounters.length > 0 &&
-      (r <= EVENT_THRESHOLD || isNullOrUndefined(species.abilityHidden) || species.abilityHidden === AbilityId.NONE)
+      validEventEncounters.length > 0
+      && (r <= EVENT_THRESHOLD || isNullOrUndefined(species.abilityHidden) || species.abilityHidden === AbilityId.NONE)
    ) {
      tries = 0;
      do {
@ -162,8 +162,8 @@ export const ThePokemonSalesmanEncounter: MysteryEncounter = MysteryEncounterBui

    const { spriteKey, fileRoot } = getSpriteKeysFromPokemon(pokemon);
    encounter.spriteConfigs.push({
-      spriteKey: spriteKey,
-      fileRoot: fileRoot,
+      spriteKey,
+      fileRoot,
      hasShadow: true,
      repeat: true,
      isPokemon: true,
@ -185,8 +185,8 @@ export const ThePokemonSalesmanEncounter: MysteryEncounter = MysteryEncounterBui
    encounter.setDialogueToken("purchasePokemon", pokemon.getNameToRender());
    encounter.setDialogueToken("price", price.toString());
    encounter.misc = {
-      price: price,
-      pokemon: pokemon,
+      price,
+      pokemon,
    };

    pokemon.calculateStats();
--- a/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts
+++ b/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts
@ -212,9 +212,9 @@ function endTrainerBattleAndShowDialogue(): Promise<void> {
        // Only trigger form change when Eiscue is in Noice form
        // Hardcoded Eiscue for now in case it is fused with another pokemon
        if (
-          pokemon.species.speciesId === SpeciesId.EISCUE &&
-          pokemon.hasAbility(AbilityId.ICE_FACE) &&
-          pokemon.formIndex === 1
+          pokemon.species.speciesId === SpeciesId.EISCUE
+          && pokemon.hasAbility(AbilityId.ICE_FACE)
+          && pokemon.formIndex === 1
        ) {
          globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeAbilityTrigger);
        }
--- a/src/data/mystery-encounters/encounters/training-session-encounter.ts
+++ b/src/data/mystery-encounters/encounters/training-session-encounter.ts
@ -113,7 +113,7 @@ export const TrainingSessionEncounter: MysteryEncounter = MysteryEncounterBuilde
          let ivIndexes: any[] = [];
          playerPokemon.ivs.forEach((iv, index) => {
            if (iv < 31) {
-              ivIndexes.push({ iv: iv, index: index });
+              ivIndexes.push({ iv, index });
            }
          });

@ -324,9 +324,9 @@ export const TrainingSessionEncounter: MysteryEncounter = MysteryEncounterBuilde
            // Only update the fusion's dex data if the Pokemon is already caught in dex (ignore rentals)
            const rootFusionSpecies = playerPokemon.fusionSpecies?.getRootSpeciesId();
            if (
-              !isNullOrUndefined(rootFusionSpecies) &&
-              speciesStarterCosts.hasOwnProperty(rootFusionSpecies) &&
-              !!globalScene.gameData.dexData[rootFusionSpecies].caughtAttr
+              !isNullOrUndefined(rootFusionSpecies)
+              && speciesStarterCosts.hasOwnProperty(rootFusionSpecies)
+              && !!globalScene.gameData.dexData[rootFusionSpecies].caughtAttr
            ) {
              globalScene.gameData.starterData[rootFusionSpecies].abilityAttr |=
                playerPokemon.fusionAbilityIndex !== 1 || playerPokemon.fusionSpecies?.ability2
@ -396,7 +396,7 @@ function getEnemyConfig(playerPokemon: PlayerPokemon, segments: number, modifier
        formIndex: playerPokemon.formIndex,
        level: playerPokemon.level,
        dataSource: data,
-        modifierConfigs: modifierConfigs,
+        modifierConfigs,
      },
    ],
  };
--- a/src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts
+++ b/src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts
@ -71,7 +71,7 @@ export const UncommonBreedEncounter: MysteryEncounter = MysteryEncounterBuilder.
      const randomEggMove: MoveId = eggMoves[eggMoveIndex];
      encounter.misc = {
        eggMove: randomEggMove,
-        pokemon: pokemon,
+        pokemon,
      };
      if (pokemon.moveset.length < 4) {
        pokemon.moveset.push(new PokemonMove(randomEggMove));
@ -91,7 +91,7 @@ export const UncommonBreedEncounter: MysteryEncounter = MysteryEncounterBuilder.
    const config: EnemyPartyConfig = {
      pokemonConfigs: [
        {
-          level: level,
+          level,
          species: pokemon.species,
          dataSource: new PokemonData(pokemon),
          isBoss: false,
@ -114,8 +114,8 @@ export const UncommonBreedEncounter: MysteryEncounter = MysteryEncounterBuilder.
    const { spriteKey, fileRoot } = getSpriteKeysFromPokemon(pokemon);
    encounter.spriteConfigs = [
      {
-        spriteKey: spriteKey,
-        fileRoot: fileRoot,
+        spriteKey,
+        fileRoot,
        hasShadow: true,
        x: -5,
        repeat: true,
--- a/src/data/mystery-encounters/encounters/weird-dream-encounter.ts
+++ b/src/data/mystery-encounters/encounters/weird-dream-encounter.ts
@ -282,7 +282,7 @@ export const WeirdDreamEncounter: MysteryEncounter = MysteryEncounterBuilder.wit
          species: transformation.newSpecies,
          isBoss: newPokemon.getSpeciesForm().getBaseStatTotal() > NON_LEGENDARY_BST_THRESHOLD,
          level: previousPokemon.level,
-          dataSource: dataSource,
+          dataSource,
          modifierConfigs: newPokemonHeldItemConfigs,
        };

@ -296,7 +296,7 @@ export const WeirdDreamEncounter: MysteryEncounter = MysteryEncounterBuilder.wit
        ].clone();
      trainerConfig.setPartyTemplates(new TrainerPartyTemplate(transformations.length, PartyMemberStrength.STRONG));
      const enemyPartyConfig: EnemyPartyConfig = {
-        trainerConfig: trainerConfig,
+        trainerConfig,
        pokemonConfigs: enemyPokemonConfigs,
        female: genderIndex === PlayerGender.FEMALE,
      };
@ -521,12 +521,12 @@ async function postProcessTransformedPokemon(

  // For pokemon at/below 570 BST or any shiny pokemon, unlock it permanently as if you had caught it
  if (
-    !forBattle &&
-    (newPokemon.getSpeciesForm().getBaseStatTotal() <= NON_LEGENDARY_BST_THRESHOLD || newPokemon.isShiny())
+    !forBattle
+    && (newPokemon.getSpeciesForm().getBaseStatTotal() <= NON_LEGENDARY_BST_THRESHOLD || newPokemon.isShiny())
  ) {
    if (
-      newPokemon.getSpeciesForm().abilityHidden &&
-      newPokemon.abilityIndex === newPokemon.getSpeciesForm().getAbilityCount() - 1
+      newPokemon.getSpeciesForm().abilityHidden
+      && newPokemon.abilityIndex === newPokemon.getSpeciesForm().getAbilityCount() - 1
    ) {
      globalScene.validateAchv(achvs.HIDDEN_ABILITY);
    }
@ -624,10 +624,10 @@ function getTransformedSpecies(
      const bstInRange = speciesBst >= bstMin && speciesBst <= bstCap;
      // Checks that a Pokemon has not already been added in the +600 or 570-600 slots;
      const validBst =
-        (!hasPokemonBstBetween570And600 ||
-          speciesBst < NON_LEGENDARY_BST_THRESHOLD ||
-          speciesBst > SUPER_LEGENDARY_BST_THRESHOLD) &&
-        (!hasPokemonBstHigherThan600 || speciesBst <= SUPER_LEGENDARY_BST_THRESHOLD);
+        (!hasPokemonBstBetween570And600
+          || speciesBst < NON_LEGENDARY_BST_THRESHOLD
+          || speciesBst > SUPER_LEGENDARY_BST_THRESHOLD)
+        && (!hasPokemonBstHigherThan600 || speciesBst <= SUPER_LEGENDARY_BST_THRESHOLD);
      return bstInRange && validBst && !EXCLUDED_TRANSFORMATION_SPECIES.includes(s.speciesId);
    });

@ -772,9 +772,9 @@ async function addEggMoveToNewPokemonMoveset(

      // For pokemon that the player owns (including ones just caught), unlock the egg move
      if (
-        !forBattle &&
-        !isNullOrUndefined(randomEggMoveIndex) &&
-        !!globalScene.gameData.dexData[speciesRootForm].caughtAttr
+        !forBattle
+        && !isNullOrUndefined(randomEggMoveIndex)
+        && !!globalScene.gameData.dexData[speciesRootForm].caughtAttr
      ) {
        await globalScene.gameData.setEggMoveUnlocked(getPokemonSpecies(speciesRootForm), randomEggMoveIndex, true);
      }
--- a/src/data/mystery-encounters/mystery-encounter-option.ts
+++ b/src/data/mystery-encounters/mystery-encounter-option.ts
@ -76,9 +76,9 @@ export class MysteryEncounterOption implements IMysteryEncounterOption {
   */
  hasRequirements(): boolean {
    return (
-      this.requirements.length > 0 ||
-      this.primaryPokemonRequirements.length > 0 ||
-      this.secondaryPokemonRequirements.length > 0
+      this.requirements.length > 0
+      || this.primaryPokemonRequirements.length > 0
+      || this.secondaryPokemonRequirements.length > 0
    );
  }

@ -87,9 +87,9 @@ export class MysteryEncounterOption implements IMysteryEncounterOption {
   */
  meetsRequirements(): boolean {
    return (
-      !this.requirements.some(requirement => !requirement.meetsRequirement()) &&
-      this.meetsSupportingRequirementAndSupportingPokemonSelected() &&
-      this.meetsPrimaryRequirementAndPrimaryPokemonSelected()
+      !this.requirements.some(requirement => !requirement.meetsRequirement())
+      && this.meetsSupportingRequirementAndSupportingPokemonSelected()
+      && this.meetsPrimaryRequirementAndPrimaryPokemonSelected()
    );
  }

@ -209,7 +209,7 @@ export class MysteryEncounterOptionBuilder implements Partial<IMysteryEncounterO
  }

  withHasDexProgress(hasDexProgress: boolean): this & Required<Pick<IMysteryEncounterOption, "hasDexProgress">> {
-    return Object.assign(this, { hasDexProgress: hasDexProgress });
+    return Object.assign(this, { hasDexProgress });
  }

  /**
@ -240,7 +240,7 @@ export class MysteryEncounterOptionBuilder implements Partial<IMysteryEncounterO
  withPreOptionPhase(
    onPreOptionPhase: OptionPhaseCallback,
  ): this & Required<Pick<IMysteryEncounterOption, "onPreOptionPhase">> {
-    return Object.assign(this, { onPreOptionPhase: onPreOptionPhase });
+    return Object.assign(this, { onPreOptionPhase });
  }

  /**
@ -248,13 +248,13 @@ export class MysteryEncounterOptionBuilder implements Partial<IMysteryEncounterO
   * @param onOptionPhase
   */
  withOptionPhase(onOptionPhase: OptionPhaseCallback): this & Required<Pick<IMysteryEncounterOption, "onOptionPhase">> {
-    return Object.assign(this, { onOptionPhase: onOptionPhase });
+    return Object.assign(this, { onOptionPhase });
  }

  withPostOptionPhase(
    onPostOptionPhase: OptionPhaseCallback,
  ): this & Required<Pick<IMysteryEncounterOption, "onPostOptionPhase">> {
-    return Object.assign(this, { onPostOptionPhase: onPostOptionPhase });
+    return Object.assign(this, { onPostOptionPhase });
  }

  /**
--- a/src/data/mystery-encounters/mystery-encounter-requirements.ts
+++ b/src/data/mystery-encounters/mystery-encounter-requirements.ts
@ -222,8 +222,8 @@ export class WaveRangeRequirement extends EncounterSceneRequirement {
    if (!isNullOrUndefined(this.waveRange) && this.waveRange[0] <= this.waveRange[1]) {
      const waveIndex = globalScene.currentBattle.waveIndex;
      if (
-        (waveIndex >= 0 && this.waveRange[0] >= 0 && this.waveRange[0] > waveIndex) ||
-        (this.waveRange[1] >= 0 && this.waveRange[1] < waveIndex)
+        (waveIndex >= 0 && this.waveRange[0] >= 0 && this.waveRange[0] > waveIndex)
+        || (this.waveRange[1] >= 0 && this.waveRange[1] < waveIndex)
      ) {
        return false;
      }
@ -276,9 +276,9 @@ export class TimeOfDayRequirement extends EncounterSceneRequirement {
  override meetsRequirement(): boolean {
    const timeOfDay = globalScene.arena?.getTimeOfDay();
    return !(
-      !isNullOrUndefined(timeOfDay) &&
-      this.requiredTimeOfDay?.length > 0 &&
-      !this.requiredTimeOfDay.includes(timeOfDay)
+      !isNullOrUndefined(timeOfDay)
+      && this.requiredTimeOfDay?.length > 0
+      && !this.requiredTimeOfDay.includes(timeOfDay)
    );
  }

@ -298,9 +298,9 @@ export class WeatherRequirement extends EncounterSceneRequirement {
  override meetsRequirement(): boolean {
    const currentWeather = globalScene.arena.weather?.weatherType;
    return !(
-      !isNullOrUndefined(currentWeather) &&
-      this.requiredWeather?.length > 0 &&
-      !this.requiredWeather.includes(currentWeather!)
+      !isNullOrUndefined(currentWeather)
+      && this.requiredWeather?.length > 0
+      && !this.requiredWeather.includes(currentWeather!)
    );
  }

@ -336,8 +336,8 @@ export class PartySizeRequirement extends EncounterSceneRequirement {
        ? globalScene.getPokemonAllowedInBattle().length
        : globalScene.getPlayerParty().length;
      if (
-        (partySize >= 0 && this.partySizeRange[0] >= 0 && this.partySizeRange[0] > partySize) ||
-        (this.partySizeRange[1] >= 0 && this.partySizeRange[1] < partySize)
+        (partySize >= 0 && this.partySizeRange[0] >= 0 && this.partySizeRange[0] > partySize)
+        || (this.partySizeRange[1] >= 0 && this.partySizeRange[1] < partySize)
      ) {
        return false;
      }
@ -572,15 +572,15 @@ export class MoveRequirement extends EncounterPokemonRequirement {
      // get the Pokemon with at least one move in the required moves list
      return partyPokemon.filter(
        pokemon =>
-          (!this.excludeDisallowedPokemon || pokemon.isAllowedInBattle()) &&
-          pokemon.moveset.some(move => move.moveId && this.requiredMoves.includes(move.moveId)),
+          (!this.excludeDisallowedPokemon || pokemon.isAllowedInBattle())
+          && pokemon.moveset.some(move => move.moveId && this.requiredMoves.includes(move.moveId)),
      );
    }
    // for an inverted query, we only want to get the pokemon that don't have ANY of the listed moves
    return partyPokemon.filter(
      pokemon =>
-        (!this.excludeDisallowedPokemon || pokemon.isAllowedInBattle()) &&
-        !pokemon.moveset.some(move => move.moveId && this.requiredMoves.includes(move.moveId)),
+        (!this.excludeDisallowedPokemon || pokemon.isAllowedInBattle())
+        && !pokemon.moveset.some(move => move.moveId && this.requiredMoves.includes(move.moveId)),
    );
  }

@ -678,15 +678,15 @@ export class AbilityRequirement extends EncounterPokemonRequirement {
    if (!this.invertQuery) {
      return partyPokemon.filter(
        pokemon =>
-          (!this.excludeDisallowedPokemon || pokemon.isAllowedInBattle()) &&
-          this.requiredAbilities.some(ability => pokemon.hasAbility(ability, false)),
+          (!this.excludeDisallowedPokemon || pokemon.isAllowedInBattle())
+          && this.requiredAbilities.some(ability => pokemon.hasAbility(ability, false)),
      );
    }
    // for an inverted query, we only want to get the pokemon that don't have ANY of the listed abilities
    return partyPokemon.filter(
      pokemon =>
-        (!this.excludeDisallowedPokemon || pokemon.isAllowedInBattle()) &&
-        this.requiredAbilities.filter(ability => pokemon.hasAbility(ability, false)).length === 0,
+        (!this.excludeDisallowedPokemon || pokemon.isAllowedInBattle())
+        && this.requiredAbilities.filter(ability => pokemon.hasAbility(ability, false)).length === 0,
    );
  }

@ -728,9 +728,9 @@ export class StatusEffectRequirement extends EncounterPokemonRequirement {
          if (statusEffect === StatusEffect.NONE) {
            // StatusEffect.NONE also checks for null or undefined status
            return (
-              isNullOrUndefined(pokemon.status) ||
-              isNullOrUndefined(pokemon.status.effect) ||
-              pokemon.status.effect === statusEffect
+              isNullOrUndefined(pokemon.status)
+              || isNullOrUndefined(pokemon.status.effect)
+              || pokemon.status.effect === statusEffect
            );
          }
          return pokemon.status?.effect === statusEffect;
@ -743,9 +743,9 @@ export class StatusEffectRequirement extends EncounterPokemonRequirement {
        if (statusEffect === StatusEffect.NONE) {
          // StatusEffect.NONE also checks for null or undefined status
          return (
-            isNullOrUndefined(pokemon.status) ||
-            isNullOrUndefined(pokemon.status.effect) ||
-            pokemon.status.effect === statusEffect
+            isNullOrUndefined(pokemon.status)
+            || isNullOrUndefined(pokemon.status.effect)
+            || pokemon.status.effect === statusEffect
          );
        }
        return pokemon.status?.effect === statusEffect;
@ -796,9 +796,8 @@ export class CanFormChangeWithItemRequirement extends EncounterPokemonRequiremen

  filterByForm(pokemon, formChangeItem) {
    return (
-      pokemonFormChanges.hasOwnProperty(pokemon.species.speciesId) &&
-      // Get all form changes for this species with an item trigger, including any compound triggers
-      pokemonFormChanges[pokemon.species.speciesId]
+      pokemonFormChanges.hasOwnProperty(pokemon.species.speciesId) // Get all form changes for this species with an item trigger, including any compound triggers
+      && pokemonFormChanges[pokemon.species.speciesId]
        .filter(fc => fc.trigger.hasTriggerType(SpeciesFormChangeItemTrigger))
        // Returns true if any form changes match this item
        .flatMap(fc => fc.findTrigger(SpeciesFormChangeItemTrigger) as SpeciesFormChangeItemTrigger)
@ -870,8 +869,8 @@ export class HeldItemRequirement extends EncounterPokemonRequirement {
      pokemon =>
        pokemon.getHeldItems().filter(it => {
          return (
-            !this.requiredHeldItemModifiers.some(heldItem => it.constructor.name === heldItem) &&
-            (!this.requireTransferable || it.isTransferable)
+            !this.requiredHeldItemModifiers.some(heldItem => it.constructor.name === heldItem)
+            && (!this.requireTransferable || it.isTransferable)
          );
        }).length > 0,
    );
@ -880,8 +879,8 @@ export class HeldItemRequirement extends EncounterPokemonRequirement {
  override getDialogueToken(pokemon?: PlayerPokemon): [string, string] {
    const requiredItems = pokemon?.getHeldItems().filter(it => {
      return (
-        this.requiredHeldItemModifiers.some(heldItem => it.constructor.name === heldItem) &&
-        (!this.requireTransferable || it.isTransferable)
+        this.requiredHeldItemModifiers.some(heldItem => it.constructor.name === heldItem)
+        && (!this.requireTransferable || it.isTransferable)
      );
    });
    if (requiredItems && requiredItems.length > 0) {
@ -924,9 +923,9 @@ export class AttackTypeBoosterHeldItemTypeRequirement extends EncounterPokemonRe
        this.requiredHeldItemTypes.some(heldItemType => {
          return pokemon.getHeldItems().some(it => {
            return (
-              it instanceof AttackTypeBoosterModifier &&
-              (it.type as AttackTypeBoosterModifierType).moveType === heldItemType &&
-              (!this.requireTransferable || it.isTransferable)
+              it instanceof AttackTypeBoosterModifier
+              && (it.type as AttackTypeBoosterModifierType).moveType === heldItemType
+              && (!this.requireTransferable || it.isTransferable)
            );
          });
        }),
@ -939,9 +938,9 @@ export class AttackTypeBoosterHeldItemTypeRequirement extends EncounterPokemonRe
        pokemon.getHeldItems().filter(it => {
          return !this.requiredHeldItemTypes.some(
            heldItemType =>
-              it instanceof AttackTypeBoosterModifier &&
-              (it.type as AttackTypeBoosterModifierType).moveType === heldItemType &&
-              (!this.requireTransferable || it.isTransferable),
+              it instanceof AttackTypeBoosterModifier
+              && (it.type as AttackTypeBoosterModifierType).moveType === heldItemType
+              && (!this.requireTransferable || it.isTransferable),
          );
        }).length > 0,
    );
@ -952,10 +951,10 @@ export class AttackTypeBoosterHeldItemTypeRequirement extends EncounterPokemonRe
      return (
        this.requiredHeldItemTypes.some(
          heldItemType =>
-            it instanceof AttackTypeBoosterModifier &&
-            (it.type as AttackTypeBoosterModifierType).moveType === heldItemType,
-        ) &&
-        (!this.requireTransferable || it.isTransferable)
+            it instanceof AttackTypeBoosterModifier
+            && (it.type as AttackTypeBoosterModifierType).moveType === heldItemType,
+        )
+        && (!this.requireTransferable || it.isTransferable)
      );
    });
    if (requiredItems && requiredItems.length > 0) {
@ -1021,8 +1020,8 @@ export class FriendshipRequirement extends EncounterPokemonRequirement {
  override meetsRequirement(): boolean {
    // Party Pokemon inside required friendship range
    if (
-      !isNullOrUndefined(this.requiredFriendshipRange) &&
-      this.requiredFriendshipRange[0] <= this.requiredFriendshipRange[1]
+      !isNullOrUndefined(this.requiredFriendshipRange)
+      && this.requiredFriendshipRange[0] <= this.requiredFriendshipRange[1]
    ) {
      const partyPokemon = globalScene.getPlayerParty();
      const pokemonInRange = this.queryParty(partyPokemon);
@ -1037,8 +1036,8 @@ export class FriendshipRequirement extends EncounterPokemonRequirement {
    if (!this.invertQuery) {
      return partyPokemon.filter(
        pokemon =>
-          pokemon.friendship >= this.requiredFriendshipRange[0] &&
-          pokemon.friendship <= this.requiredFriendshipRange[1],
+          pokemon.friendship >= this.requiredFriendshipRange[0]
+          && pokemon.friendship <= this.requiredFriendshipRange[1],
      );
    }
    // for an inverted query, we only want to get the pokemon that don't have ANY of the listed requiredFriendshipRanges
--- a/src/data/mystery-encounters/mystery-encounter.ts
+++ b/src/data/mystery-encounters/mystery-encounter.ts
@ -658,7 +658,7 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
  withIntroSpriteConfigs(
    spriteConfigs: MysteryEncounterSpriteConfig[],
  ): this & Pick<IMysteryEncounter, "spriteConfigs"> {
-    return Object.assign(this, { spriteConfigs: spriteConfigs });
+    return Object.assign(this, { spriteConfigs });
  }

  withIntroDialogue(dialogue: MysteryEncounterDialogue["intro"] = []): this {
@ -703,7 +703,7 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
   * @returns
   */
  withEncounterTier(encounterTier: MysteryEncounterTier): this & Pick<IMysteryEncounter, "encounterTier"> {
-    return Object.assign(this, { encounterTier: encounterTier });
+    return Object.assign(this, { encounterTier });
  }

  /**
@ -753,7 +753,7 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
  withContinuousEncounter(
    continuousEncounter: boolean,
  ): this & Required<Pick<IMysteryEncounter, "continuousEncounter">> {
-    return Object.assign(this, { continuousEncounter: continuousEncounter });
+    return Object.assign(this, { continuousEncounter });
  }

  /**
@ -807,7 +807,7 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
  withMaxAllowedEncounters(
    maxAllowedEncounters: number,
  ): this & Required<Pick<IMysteryEncounter, "maxAllowedEncounters">> {
-    return Object.assign(this, { maxAllowedEncounters: maxAllowedEncounters });
+    return Object.assign(this, { maxAllowedEncounters });
  }

  /**
@ -939,7 +939,7 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
   * @returns
   */
  withRewards(doEncounterRewards: () => boolean): this & Required<Pick<IMysteryEncounter, "doEncounterRewards">> {
-    return Object.assign(this, { doEncounterRewards: doEncounterRewards });
+    return Object.assign(this, { doEncounterRewards });
  }

  /**
@ -953,7 +953,7 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
   * @returns
   */
  withExp(doEncounterExp: () => boolean): this & Required<Pick<IMysteryEncounter, "doEncounterExp">> {
-    return Object.assign(this, { doEncounterExp: doEncounterExp });
+    return Object.assign(this, { doEncounterExp });
  }

  /**
@ -974,7 +974,7 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
   * @returns
   */
  withOnVisualsStart(onVisualsStart: () => boolean): this & Required<Pick<IMysteryEncounter, "onVisualsStart">> {
-    return Object.assign(this, { onVisualsStart: onVisualsStart });
+    return Object.assign(this, { onVisualsStart });
  }

  /**
@ -984,7 +984,7 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
   * @returns
   */
  withCatchAllowed(catchAllowed: boolean): this & Required<Pick<IMysteryEncounter, "catchAllowed">> {
-    return Object.assign(this, { catchAllowed: catchAllowed });
+    return Object.assign(this, { catchAllowed });
  }

  /**
@ -1004,7 +1004,7 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
    hideBattleIntroMessage: boolean,
  ): this & Required<Pick<IMysteryEncounter, "hideBattleIntroMessage">> {
    return Object.assign(this, {
-      hideBattleIntroMessage: hideBattleIntroMessage,
+      hideBattleIntroMessage,
    });
  }

@ -1015,7 +1015,7 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
  withAutoHideIntroVisuals(
    autoHideIntroVisuals: boolean,
  ): this & Required<Pick<IMysteryEncounter, "autoHideIntroVisuals">> {
-    return Object.assign(this, { autoHideIntroVisuals: autoHideIntroVisuals });
+    return Object.assign(this, { autoHideIntroVisuals });
  }

  /**
@ -1027,7 +1027,7 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
    enterIntroVisualsFromRight: boolean,
  ): this & Required<Pick<IMysteryEncounter, "enterIntroVisualsFromRight">> {
    return Object.assign(this, {
-      enterIntroVisualsFromRight: enterIntroVisualsFromRight,
+      enterIntroVisualsFromRight,
    });
  }

--- a/src/data/mystery-encounters/utils/encounter-phase-utils.ts
+++ b/src/data/mystery-encounters/utils/encounter-phase-utils.ts
@ -683,7 +683,7 @@ export function selectOptionThenPokemon(
            globalScene.ui.setMode(modeToSetOnExit).then(() => {
              const result: PokemonAndOptionSelected = {
                selectedPokemonIndex: slotIndex,
-                selectedOptionIndex: selectedOptionIndex,
+                selectedOptionIndex,
              };
              resolve(result);
            });
@ -965,10 +965,10 @@ export function transitionMysteryEncounterIntroVisuals(hide = true, destroy = tr
 export function handleMysteryEncounterBattleStartEffects() {
  const encounter = globalScene.currentBattle.mysteryEncounter;
  if (
-    globalScene.currentBattle.isBattleMysteryEncounter() &&
-    encounter &&
-    encounter.encounterMode !== MysteryEncounterMode.NO_BATTLE &&
-    !encounter.startOfBattleEffectsComplete
+    globalScene.currentBattle.isBattleMysteryEncounter()
+    && encounter
+    && encounter.encounterMode !== MysteryEncounterMode.NO_BATTLE
+    && !encounter.startOfBattleEffectsComplete
  ) {
    const effects = encounter.startOfBattleEffects;
    effects.forEach(effect => {
--- a/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts
+++ b/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts
@ -265,11 +265,11 @@ export function getRandomSpeciesByStarterCost(
    .filter(s => {
      const pokemonSpecies = getPokemonSpecies(s[0]);
      return (
-        pokemonSpecies &&
-        (!excludedSpecies || !excludedSpecies.includes(s[0])) &&
-        (allowSubLegendary || !pokemonSpecies.subLegendary) &&
-        (allowLegendary || !pokemonSpecies.legendary) &&
-        (allowMythical || !pokemonSpecies.mythical)
+        pokemonSpecies
+        && (!excludedSpecies || !excludedSpecies.includes(s[0]))
+        && (allowSubLegendary || !pokemonSpecies.subLegendary)
+        && (allowLegendary || !pokemonSpecies.legendary)
+        && (allowMythical || !pokemonSpecies.mythical)
      );
    })
    .map(s => [getPokemonSpecies(s[0]), s[1]]);
@ -409,10 +409,10 @@ export async function applyModifierTypeToPlayerPokemon(
  const modifier = modType.newModifier(pokemon);
  const existing = globalScene.findModifier(
    (m): m is PokemonHeldItemModifier =>
-      m instanceof PokemonHeldItemModifier &&
-      m.type.id === modType.id &&
-      m.pokemonId === pokemon.id &&
-      m.matchType(modifier),
+      m instanceof PokemonHeldItemModifier
+      && m.type.id === modType.id
+      && m.pokemonId === pokemon.id
+      && m.matchType(modifier),
  ) as PokemonHeldItemModifier | undefined;

  // At max stacks
@ -650,8 +650,8 @@ export async function catchPokemon(
  const speciesForm = !pokemon.fusionSpecies ? pokemon.getSpeciesForm() : pokemon.getFusionSpeciesForm();

  if (
-    speciesForm.abilityHidden &&
-    (pokemon.fusionSpecies ? pokemon.fusionAbilityIndex : pokemon.abilityIndex) === speciesForm.getAbilityCount() - 1
+    speciesForm.abilityHidden
+    && (pokemon.fusionSpecies ? pokemon.fusionAbilityIndex : pokemon.abilityIndex) === speciesForm.getAbilityCount() - 1
  ) {
    globalScene.validateAchv(achvs.HIDDEN_ABILITY);
  }
@ -982,8 +982,8 @@ export async function addPokemonDataToDexAndValidateAchievements(pokemon: Player
  const speciesForm = !pokemon.fusionSpecies ? pokemon.getSpeciesForm() : pokemon.getFusionSpeciesForm();

  if (
-    speciesForm.abilityHidden &&
-    (pokemon.fusionSpecies ? pokemon.fusionAbilityIndex : pokemon.abilityIndex) === speciesForm.getAbilityCount() - 1
+    speciesForm.abilityHidden
+    && (pokemon.fusionSpecies ? pokemon.fusionAbilityIndex : pokemon.abilityIndex) === speciesForm.getAbilityCount() - 1
  ) {
    globalScene.validateAchv(achvs.HIDDEN_ABILITY);
  }
--- a/src/data/phase-priority-queue.ts
+++ b/src/data/phase-priority-queue.ts
@ -58,8 +58,8 @@ export class PostSummonPhasePriorityQueue extends PhasePriorityQueue {
    this.queue.sort((phaseA: PostSummonPhase, phaseB: PostSummonPhase) => {
      if (phaseA.getPriority() === phaseB.getPriority()) {
        return (
-          (phaseB.getPokemon().getEffectiveStat(Stat.SPD) - phaseA.getPokemon().getEffectiveStat(Stat.SPD)) *
-          (isTrickRoom() ? -1 : 1)
+          (phaseB.getPokemon().getEffectiveStat(Stat.SPD) - phaseA.getPokemon().getEffectiveStat(Stat.SPD))
+          * (isTrickRoom() ? -1 : 1)
        );
      }

--- a/src/data/pokemon-forms/form-change-triggers.ts
+++ b/src/data/pokemon-forms/form-change-triggers.ts
@ -81,10 +81,10 @@ export class SpeciesFormChangeItemTrigger extends SpeciesFormChangeTrigger {
      // Assume that if m has the `formChangeItem` property, then it is a PokemonFormChangeItemModifier
      const m = r as PokemonFormChangeItemModifier;
      return (
-        "formChangeItem" in m &&
-        m.pokemonId === pokemon.id &&
-        m.formChangeItem === this.item &&
-        m.active === this.active
+        "formChangeItem" in m
+        && m.pokemonId === pokemon.id
+        && m.formChangeItem === this.item
+        && m.active === this.active
      );
    });
  }
@ -214,9 +214,10 @@ export class SpeciesDefaultFormMatchTrigger extends SpeciesFormChangeTrigger {

  canChange(pokemon: Pokemon): boolean {
    return (
-      this.formKey ===
-      pokemon.species.forms[globalScene.getSpeciesFormIndex(pokemon.species, pokemon.gender, pokemon.getNature(), true)]
-        .formKey
+      this.formKey
+      === pokemon.species.forms[
+        globalScene.getSpeciesFormIndex(pokemon.species, pokemon.gender, pokemon.getNature(), true)
+      ].formKey
    );
  }
 }
@ -262,10 +263,10 @@ export class SpeciesFormChangeWeatherTrigger extends SpeciesFormChangeTrigger {
    const isAbilitySuppressed = pokemon.summonData.abilitySuppressed;

    return (
-      !isAbilitySuppressed &&
-      !isWeatherSuppressed &&
-      pokemon.hasAbility(this.ability) &&
-      this.weathers.includes(currentWeather)
+      !isAbilitySuppressed
+      && !isWeatherSuppressed
+      && pokemon.hasAbility(this.ability)
+      && this.weathers.includes(currentWeather)
    );
  }
 }
--- a/src/data/pokemon-species.ts
+++ b/src/data/pokemon-species.ts
@ -202,8 +202,8 @@ export abstract class PokemonSpeciesForm {
    }
    let starterSpeciesId = this.speciesId;
    while (
-      !(starterSpeciesId in starterPassiveAbilities) ||
-      !(formIndex in starterPassiveAbilities[starterSpeciesId])
+      !(starterSpeciesId in starterPassiveAbilities)
+      || !(formIndex in starterPassiveAbilities[starterSpeciesId])
    ) {
      if (pokemonPrevolutions.hasOwnProperty(starterSpeciesId)) {
        starterSpeciesId = pokemonPrevolutions[starterSpeciesId];
@ -221,8 +221,8 @@ export abstract class PokemonSpeciesForm {

  getLevelMoves(): LevelMoves {
    if (
-      pokemonSpeciesFormLevelMoves.hasOwnProperty(this.speciesId) &&
-      pokemonSpeciesFormLevelMoves[this.speciesId].hasOwnProperty(this.formIndex)
+      pokemonSpeciesFormLevelMoves.hasOwnProperty(this.speciesId)
+      && pokemonSpeciesFormLevelMoves[this.speciesId].hasOwnProperty(this.formIndex)
    ) {
      return pokemonSpeciesFormLevelMoves[this.speciesId][this.formIndex].slice(0);
    }
@ -302,9 +302,9 @@ export abstract class PokemonSpeciesForm {

    const formSpriteKey = this.getFormSpriteKey(formIndex);
    const showGenderDiffs =
-      this.genderDiffs &&
-      female &&
-      ![SpeciesFormKey.MEGA, SpeciesFormKey.GIGANTAMAX].includes(formSpriteKey as SpeciesFormKey);
+      this.genderDiffs
+      && female
+      && ![SpeciesFormKey.MEGA, SpeciesFormKey.GIGANTAMAX].includes(formSpriteKey as SpeciesFormKey);

    return `${showGenderDiffs ? "female__" : ""}${this.speciesId}${formSpriteKey ? `-${formSpriteKey}` : ""}`;
  }
@ -487,8 +487,8 @@ export abstract class PokemonSpeciesForm {
        }
      }
      if (
-        pokemonFormLevelMoves.hasOwnProperty(this.speciesId) &&
-        pokemonFormLevelMoves[this.speciesId].hasOwnProperty(this.formIndex)
+        pokemonFormLevelMoves.hasOwnProperty(this.speciesId)
+        && pokemonFormLevelMoves[this.speciesId].hasOwnProperty(this.formIndex)
      ) {
        if (!pokemonFormLevelMoves[this.speciesId][this.formIndex].find(lm => lm[0] <= 5 && lm[1] === moveId)) {
          return false;
@ -844,9 +844,9 @@ export class PokemonSpecies extends PokemonSpeciesForm implements Localizable {
        ? i18next.t(`battlePokemonForm:${formKey}`, { pokemonName: this.name })
        : i18next.t(`pokemonForm:battleForm.${formKey}`);
    } else if (
-      region === Region.NORMAL ||
-      (this.speciesId === SpeciesId.GALAR_DARMANITAN && formIndex > 0) ||
-      this.speciesId === SpeciesId.PALDEA_TAUROS
+      region === Region.NORMAL
+      || (this.speciesId === SpeciesId.GALAR_DARMANITAN && formIndex > 0)
+      || this.speciesId === SpeciesId.PALDEA_TAUROS
    ) {
      // More special cases can be added here
      const i18key = `pokemonForm:${speciesName}${formText}`;
@ -956,11 +956,11 @@ export class PokemonSpecies extends PokemonSpeciesForm implements Localizable {

    if (
      // If evolutions shouldn't happen, add more cases here :)
-      !allowEvolving ||
-      !pokemonEvolutions.hasOwnProperty(this.speciesId) ||
-      (globalScene.currentBattle?.waveIndex === 20 &&
-        globalScene.gameMode.isClassic &&
-        globalScene.currentBattle.trainer)
+      !allowEvolving
+      || !pokemonEvolutions.hasOwnProperty(this.speciesId)
+      || (globalScene.currentBattle?.waveIndex === 20
+        && globalScene.gameMode.isClassic
+        && globalScene.currentBattle.trainer)
    ) {
      return this.speciesId;
    }
@ -1012,9 +1012,9 @@ export class PokemonSpecies extends PokemonSpeciesForm implements Localizable {
        }

        evolutionChance = Math.min(
-          0.65 * easeInFunc(Math.min(Math.max(level - evolutionLevel, 0), preferredMinLevel) / preferredMinLevel) +
-            0.35 *
-              easeOutFunc(
+          0.65 * easeInFunc(Math.min(Math.max(level - evolutionLevel, 0), preferredMinLevel) / preferredMinLevel)
+            + 0.35
+              * easeOutFunc(
                Math.min(Math.max(level - evolutionLevel, 0), preferredMinLevel * 2.5) / (preferredMinLevel * 2.5),
              ),
          1,
@ -1093,9 +1093,9 @@ export class PokemonSpecies extends PokemonSpeciesForm implements Localizable {
    for (const p of allEvolvingPokemon) {
      for (const e of pokemonEvolutions[p]) {
        if (
-          e.speciesId === this.speciesId &&
-          (!this.forms.length || !e.evoFormKey || e.evoFormKey === this.forms[this.formIndex].formKey) &&
-          prevolutionLevels.every(pe => pe[0] !== Number.parseInt(p))
+          e.speciesId === this.speciesId
+          && (!this.forms.length || !e.evoFormKey || e.evoFormKey === this.forms[this.formIndex].formKey)
+          && prevolutionLevels.every(pe => pe[0] !== Number.parseInt(p))
        ) {
          const speciesId = Number.parseInt(p) as SpeciesId;
          const level = e.level;
@ -1131,9 +1131,9 @@ export class PokemonSpecies extends PokemonSpeciesForm implements Localizable {
          prevolutionLevels[l][0],
          Math.min(
            Math.max(
-              evolution?.level! +
-                Math.round(randSeedGauss(0.5, 1 + levelDiff * 0.2) * Math.max(evolution?.wildDelay!, 0.5) * 5) -
-                1,
+              evolution?.level!
+                + Math.round(randSeedGauss(0.5, 1 + levelDiff * 0.2) * Math.max(evolution?.wildDelay!, 0.5) * 5)
+                - 1,
              2,
              evolution?.level!,
            ),
@ -1149,8 +1149,8 @@ export class PokemonSpecies extends PokemonSpeciesForm implements Localizable {
        this.speciesId,
        Math.min(
          Math.max(
-            lastPrevolutionLevel +
-              Math.round(randSeedGauss(0.5, 1 + levelDiff * 0.2) * Math.max(evolution?.wildDelay!, 0.5) * 5),
+            lastPrevolutionLevel
+              + Math.round(randSeedGauss(0.5, 1 + levelDiff * 0.2) * Math.max(evolution?.wildDelay!, 0.5) * 5),
            lastPrevolutionLevel + 1,
            evolution?.level!,
          ),
@ -1172,16 +1172,16 @@ export class PokemonSpecies extends PokemonSpeciesForm implements Localizable {
    const mythical = this.mythical;
    return species => {
      return (
-        (subLegendary ||
-          legendary ||
-          mythical ||
-          (pokemonEvolutions.hasOwnProperty(species.speciesId) === hasEvolution &&
-            pokemonPrevolutions.hasOwnProperty(species.speciesId) === hasPrevolution)) &&
-        species.subLegendary === subLegendary &&
-        species.legendary === legendary &&
-        species.mythical === mythical &&
-        (this.isTrainerForbidden() || !species.isTrainerForbidden()) &&
-        species.speciesId !== SpeciesId.DITTO
+        (subLegendary
+          || legendary
+          || mythical
+          || (pokemonEvolutions.hasOwnProperty(species.speciesId) === hasEvolution
+            && pokemonPrevolutions.hasOwnProperty(species.speciesId) === hasPrevolution))
+        && species.subLegendary === subLegendary
+        && species.legendary === legendary
+        && species.mythical === mythical
+        && (this.isTrainerForbidden() || !species.isTrainerForbidden())
+        && species.speciesId !== SpeciesId.DITTO
      );
    };
  }
--- a/src/data/status-effect.ts
+++ b/src/data/status-effect.ts
@ -59,12 +59,12 @@ export function getStatusEffectObtainText(

  if (!sourceText) {
    const i18nKey = `${getStatusEffectMessageKey(statusEffect)}.obtain` as ParseKeys;
-    return i18next.t(i18nKey, { pokemonNameWithAffix: pokemonNameWithAffix });
+    return i18next.t(i18nKey, { pokemonNameWithAffix });
  }
  const i18nKey = `${getStatusEffectMessageKey(statusEffect)}.obtainSource` as ParseKeys;
  return i18next.t(i18nKey, {
-    pokemonNameWithAffix: pokemonNameWithAffix,
-    sourceText: sourceText,
+    pokemonNameWithAffix,
+    sourceText,
  });
 }

@ -73,7 +73,7 @@ export function getStatusEffectActivationText(statusEffect: StatusEffect, pokemo
    return "";
  }
  const i18nKey = `${getStatusEffectMessageKey(statusEffect)}.activation` as ParseKeys;
-  return i18next.t(i18nKey, { pokemonNameWithAffix: pokemonNameWithAffix });
+  return i18next.t(i18nKey, { pokemonNameWithAffix });
 }

 export function getStatusEffectOverlapText(statusEffect: StatusEffect, pokemonNameWithAffix: string): string {
@ -81,7 +81,7 @@ export function getStatusEffectOverlapText(statusEffect: StatusEffect, pokemonNa
    return "";
  }
  const i18nKey = `${getStatusEffectMessageKey(statusEffect)}.overlap` as ParseKeys;
-  return i18next.t(i18nKey, { pokemonNameWithAffix: pokemonNameWithAffix });
+  return i18next.t(i18nKey, { pokemonNameWithAffix });
 }

 export function getStatusEffectHealText(statusEffect: StatusEffect, pokemonNameWithAffix: string): string {
@ -89,7 +89,7 @@ export function getStatusEffectHealText(statusEffect: StatusEffect, pokemonNameW
    return "";
  }
  const i18nKey = `${getStatusEffectMessageKey(statusEffect)}.heal` as ParseKeys;
-  return i18next.t(i18nKey, { pokemonNameWithAffix: pokemonNameWithAffix });
+  return i18next.t(i18nKey, { pokemonNameWithAffix });
 }

 export function getStatusEffectDescriptor(statusEffect: StatusEffect): string {
--- a/src/data/terrain.ts
+++ b/src/data/terrain.ts
@ -65,14 +65,10 @@ export class Terrain {
        // Psychic terrain will only cancel a move if it:
        return (
          // ... is neither spread nor field-targeted,
-          !isFieldTargeted(move) &&
-          !isSpreadMove(move) &&
-          // .. has positive final priority,
-          move.getPriority(user) > 0 &&
-          // ...and is targeting at least 1 grounded opponent
-          user
-            .getOpponents(true)
-            .some(o => targets.includes(o.getBattlerIndex()) && o.isGrounded())
+          !isFieldTargeted(move)
+          && !isSpreadMove(move) // .. has positive final priority,
+          && move.getPriority(user) > 0 // ...and is targeting at least 1 grounded opponent
+          && user.getOpponents(true).some(o => targets.includes(o.getBattlerIndex()) && o.isGrounded())
        );
    }

--- a/src/data/trainers/trainer-config.ts
+++ b/src/data/trainers/trainer-config.ts
@ -140,8 +140,8 @@ export class TrainerConfig {
    this.victoryBgm = "victory_trainer";
    this.partyTemplates = [trainerPartyTemplates.TWO_AVG];
    this.speciesFilter = species =>
-      (allowLegendaries || (!species.legendary && !species.subLegendary && !species.mythical)) &&
-      !species.isTrainerForbidden();
+      (allowLegendaries || (!species.legendary && !species.subLegendary && !species.mythical))
+      && !species.isTrainerForbidden();
  }

  getKey(): string {
@ -818,8 +818,8 @@ export class TrainerConfig {
      if (this.nameFemale) {
        // Check if the variant is either female or this is for the partner in a double battle
        if (
-          variant === TrainerVariant.FEMALE ||
-          (variant === TrainerVariant.DOUBLE && trainerSlot === TrainerSlot.TRAINER_PARTNER)
+          variant === TrainerVariant.FEMALE
+          || (variant === TrainerVariant.DOUBLE && trainerSlot === TrainerSlot.TRAINER_PARTNER)
        ) {
          return this.nameFemale;
        }
@ -1090,8 +1090,8 @@ export const trainerConfigs: TrainerConfigs = {
      s =>
        [s.ability1, s.ability2, s.abilityHidden].some(
          a =>
-            !!a &&
-            [
+            !!a
+            && [
              AbilityId.WHITE_SMOKE,
              AbilityId.GLUTTONY,
              AbilityId.HONEY_GATHER,
@ -1104,8 +1104,8 @@ export const trainerConfigs: TrainerConfigs = {
              AbilityId.SUPERSWEET_SYRUP,
              AbilityId.HOSPITALITY,
            ].includes(a),
-        ) ||
-        s
+        )
+        || s
          .getLevelMoves()
          .some(plm =>
            [MoveId.SOFT_BOILED, MoveId.SPORE, MoveId.MILK_DRINK, MoveId.OVERHEAT, MoveId.TEATIME].includes(plm[1]),
@ -1569,8 +1569,8 @@ export const trainerConfigs: TrainerConfigs = {
      s =>
        [s.ability1, s.ability2, s.abilityHidden].some(
          a =>
-            !!a &&
-            [
+            !!a
+            && [
              AbilityId.DRIZZLE,
              AbilityId.SWIFT_SWIM,
              AbilityId.HYDRATION,
@ -4658,9 +4658,9 @@ export const trainerConfigs: TrainerConfigs = {
      2,
      getSpeciesFilterRandomPartyMemberFunc(
        (species: PokemonSpecies) =>
-          !pokemonEvolutions.hasOwnProperty(species.speciesId) &&
-          !pokemonPrevolutions.hasOwnProperty(species.speciesId) &&
-          species.baseTotal >= 450,
+          !pokemonEvolutions.hasOwnProperty(species.speciesId)
+          && !pokemonPrevolutions.hasOwnProperty(species.speciesId)
+          && species.baseTotal >= 450,
      ),
    ),
  [TrainerType.RIVAL_3]: new TrainerConfig(++t)
@ -4733,9 +4733,9 @@ export const trainerConfigs: TrainerConfigs = {
      2,
      getSpeciesFilterRandomPartyMemberFunc(
        (species: PokemonSpecies) =>
-          !pokemonEvolutions.hasOwnProperty(species.speciesId) &&
-          !pokemonPrevolutions.hasOwnProperty(species.speciesId) &&
-          species.baseTotal >= 450,
+          !pokemonEvolutions.hasOwnProperty(species.speciesId)
+          && !pokemonPrevolutions.hasOwnProperty(species.speciesId)
+          && species.baseTotal >= 450,
      ),
    )
    .setSpeciesFilter(species => species.baseTotal >= 540),
@ -4814,9 +4814,9 @@ export const trainerConfigs: TrainerConfigs = {
      2,
      getSpeciesFilterRandomPartyMemberFunc(
        (species: PokemonSpecies) =>
-          !pokemonEvolutions.hasOwnProperty(species.speciesId) &&
-          !pokemonPrevolutions.hasOwnProperty(species.speciesId) &&
-          species.baseTotal >= 450,
+          !pokemonEvolutions.hasOwnProperty(species.speciesId)
+          && !pokemonPrevolutions.hasOwnProperty(species.speciesId)
+          && species.baseTotal >= 450,
      ),
    )
    .setSpeciesFilter(species => species.baseTotal >= 540)
@ -4896,9 +4896,9 @@ export const trainerConfigs: TrainerConfigs = {
      2,
      getSpeciesFilterRandomPartyMemberFunc(
        (species: PokemonSpecies) =>
-          !pokemonEvolutions.hasOwnProperty(species.speciesId) &&
-          !pokemonPrevolutions.hasOwnProperty(species.speciesId) &&
-          species.baseTotal >= 450,
+          !pokemonEvolutions.hasOwnProperty(species.speciesId)
+          && !pokemonPrevolutions.hasOwnProperty(species.speciesId)
+          && species.baseTotal >= 450,
      ),
    )
    .setSpeciesFilter(species => species.baseTotal >= 540)
@ -4992,9 +4992,9 @@ export const trainerConfigs: TrainerConfigs = {
      2,
      getSpeciesFilterRandomPartyMemberFunc(
        (species: PokemonSpecies) =>
-          !pokemonEvolutions.hasOwnProperty(species.speciesId) &&
-          !pokemonPrevolutions.hasOwnProperty(species.speciesId) &&
-          species.baseTotal >= 450,
+          !pokemonEvolutions.hasOwnProperty(species.speciesId)
+          && !pokemonPrevolutions.hasOwnProperty(species.speciesId)
+          && species.baseTotal >= 450,
      ),
    )
    .setSpeciesFilter(species => species.baseTotal >= 540)
--- a/src/enums/ability-attr.ts
+++ b/src/enums/ability-attr.ts
@ -10,4 +10,4 @@ export const AbilityAttr = Object.freeze({
  ABILITY_HIDDEN: 4,
 });

-export type AbilityAttr = ObjectValues<typeof AbilityAttr>;
+export type AbilityAttr = ObjectValues<typeof AbilityAttr>;
--- a/src/enums/ai-type.ts
+++ b/src/enums/ai-type.ts
@ -1,5 +1,5 @@
 export enum AiType {
  RANDOM,
  SMART_RANDOM,
-  SMART
+  SMART,
 }
--- a/src/enums/arena-tag-side.ts
+++ b/src/enums/arena-tag-side.ts
@ -1,5 +1,5 @@
 export enum ArenaTagSide {
  BOTH,
  PLAYER,
-  ENEMY
+  ENEMY,
 }
--- a/src/enums/arena-tag-type.ts
+++ b/src/enums/arena-tag-type.ts
@ -1,13 +1,10 @@
-import type { ArenaTagTypeMap } from "#data/arena-tag";
-import type { NonSerializableArenaTagType, SerializableArenaTagType } from "#types/arena-tags";
-
 /**
 * Enum representing all different types of {@linkcode ArenaTag}s.
 * @privateRemarks
 * ⚠️ When modifying the fields in this enum, ensure that:
- * - The entry is added to / removed from {@linkcode ArenaTagTypeMap} 
+ * - The entry is added to / removed from {@linkcode ArenaTagTypeMap}
 * - The tag is added to / removed from {@linkcode NonSerializableArenaTagType} or {@linkcode SerializableArenaTagType}
-*/
+ */
 export enum ArenaTagType {
  NONE = "NONE",
  MUD_SPORT = "MUD_SPORT",
@ -36,5 +33,5 @@ export enum ArenaTagType {
  WATER_FIRE_PLEDGE = "WATER_FIRE_PLEDGE",
  GRASS_WATER_PLEDGE = "GRASS_WATER_PLEDGE",
  FAIRY_LOCK = "FAIRY_LOCK",
-  NEUTRALIZING_GAS = "NEUTRALIZING_GAS"
+  NEUTRALIZING_GAS = "NEUTRALIZING_GAS",
 }
--- a/src/enums/battle-spec.ts
+++ b/src/enums/battle-spec.ts
@ -1,4 +1,4 @@
 export enum BattleSpec {
-    DEFAULT,
-    FINAL_BOSS
+  DEFAULT,
+  FINAL_BOSS,
 }
--- a/src/enums/battle-style.ts
+++ b/src/enums/battle-style.ts
@ -3,5 +3,5 @@ export enum BattleStyle {
  /** Display option to switch active pokemon at battle start. */
  SWITCH,
  /** Hide option to switch active pokemon at battle start. */
-  SET
+  SET,
 }
--- a/src/enums/battle-type.ts
+++ b/src/enums/battle-type.ts
@ -2,5 +2,5 @@ export enum BattleType {
  WILD,
  TRAINER,
  CLEAR,
-  MYSTERY_ENCOUNTER
+  MYSTERY_ENCOUNTER,
 }
--- a/src/enums/battler-index.ts
+++ b/src/enums/battler-index.ts
@ -7,5 +7,5 @@ export enum BattlerIndex {
  PLAYER,
  PLAYER_2,
  ENEMY,
-  ENEMY_2
+  ENEMY_2,
 }
--- a/src/enums/berry-type.ts
+++ b/src/enums/berry-type.ts
@ -9,5 +9,5 @@ export enum BerryType {
  SALAC,
  LANSAT,
  STARF,
-  LEPPA
+  LEPPA,
 }
--- a/src/enums/biome-id.ts
+++ b/src/enums/biome-id.ts
@ -34,5 +34,5 @@ export enum BiomeId {
  SNOWY_FOREST,
  ISLAND = 40,
  LABORATORY,
-  END = 50
+  END = 50,
 }
--- a/src/enums/buttons.ts
+++ b/src/enums/buttons.ts
@ -1,19 +1,19 @@
 export enum Button {
-	UP,
-	DOWN,
-	LEFT,
-	RIGHT,
-	SUBMIT,
-	ACTION,
-	CANCEL,
-	MENU,
-	STATS,
-	CYCLE_SHINY,
-	CYCLE_FORM,
-	CYCLE_GENDER,
-	CYCLE_ABILITY,
-	CYCLE_NATURE,
-	CYCLE_TERA,
-	SPEED_UP,
-	SLOW_DOWN,
+  UP,
+  DOWN,
+  LEFT,
+  RIGHT,
+  SUBMIT,
+  ACTION,
+  CANCEL,
+  MENU,
+  STATS,
+  CYCLE_SHINY,
+  CYCLE_FORM,
+  CYCLE_GENDER,
+  CYCLE_ABILITY,
+  CYCLE_NATURE,
+  CYCLE_TERA,
+  SPEED_UP,
+  SLOW_DOWN,
 }
--- a/src/enums/challenges.ts
+++ b/src/enums/challenges.ts
@ -1,12 +1,12 @@
 export enum Challenges {
-    SINGLE_GENERATION,
-    SINGLE_TYPE,
-    LOWER_MAX_STARTER_COST,
-    LOWER_STARTER_POINTS,
-    FRESH_START,
-    INVERSE_BATTLE,
-    FLIP_STAT,
-    LIMITED_CATCH,
-    LIMITED_SUPPORT,
-    HARDCORE,
+  SINGLE_GENERATION,
+  SINGLE_TYPE,
+  LOWER_MAX_STARTER_COST,
+  LOWER_STARTER_POINTS,
+  FRESH_START,
+  INVERSE_BATTLE,
+  FLIP_STAT,
+  LIMITED_CATCH,
+  LIMITED_SUPPORT,
+  HARDCORE,
 }
--- a/src/enums/color.ts
+++ b/src/enums/color.ts
@ -1,83 +1,83 @@
 export enum Color {
-    WHITE = "#ffffff",
-    OFF_WHITE = "#f8f8f8",
-    LIGHT_GREY = "#a0a0a0",
-    GREY = "#484848",
-    DARK_GREY = "#404040",
-    PINK = "#f89890",
-    RED = "#e13d3d",
-    RED2 = "#e70808",
-    REDORANGE = "#d64b00",
-    ORANGE = "#f8b050",
-    LIGHT_YELLOW = "#e8e8a8",
-    YELLOW = "#ccbe00",
-    DARK_YELLOW = "#a68e17",
-    GREEN = "#78c850",
-    BLUE = "#40c8f8",
-    COMMON = "#ffffff",
-    GREAT = "#3890f8",
-    ULTRA = "#f8d038",
-    ROGUE = "#d52929",
-    MASTER = "#e020c0",
-    LUXURY = "#e64a18"
+  WHITE = "#ffffff",
+  OFF_WHITE = "#f8f8f8",
+  LIGHT_GREY = "#a0a0a0",
+  GREY = "#484848",
+  DARK_GREY = "#404040",
+  PINK = "#f89890",
+  RED = "#e13d3d",
+  RED2 = "#e70808",
+  REDORANGE = "#d64b00",
+  ORANGE = "#f8b050",
+  LIGHT_YELLOW = "#e8e8a8",
+  YELLOW = "#ccbe00",
+  DARK_YELLOW = "#a68e17",
+  GREEN = "#78c850",
+  BLUE = "#40c8f8",
+  COMMON = "#ffffff",
+  GREAT = "#3890f8",
+  ULTRA = "#f8d038",
+  ROGUE = "#d52929",
+  MASTER = "#e020c0",
+  LUXURY = "#e64a18",
 }

 export enum TypeColor {
-    NORMAL = "#ADA594",
-    FIGHTING = "#A55239",
-    FLYING = "#9CADF7",
-    POISON = "#9141CB",
-    GROUND = "#AE7A3B",
-    ROCK = "#BDA55A",
-    BUG = "#ADBD21",
-    GHOST = "#6363B5",
-    STEEL = "#81A6BE",
-    FIRE = "#F75231",
-    WATER = "#399CFF",
-    GRASS = "#7BCE52",
-    ELECTRIC = "#FFC631",
-    PSYCHIC = "#EF4179",
-    ICE = "#5ACEE7",
-    DRAGON = "#7B63E7",
-    DARK = "#735A4A",
-    FAIRY = "#EF70EF",
+  NORMAL = "#ADA594",
+  FIGHTING = "#A55239",
+  FLYING = "#9CADF7",
+  POISON = "#9141CB",
+  GROUND = "#AE7A3B",
+  ROCK = "#BDA55A",
+  BUG = "#ADBD21",
+  GHOST = "#6363B5",
+  STEEL = "#81A6BE",
+  FIRE = "#F75231",
+  WATER = "#399CFF",
+  GRASS = "#7BCE52",
+  ELECTRIC = "#FFC631",
+  PSYCHIC = "#EF4179",
+  ICE = "#5ACEE7",
+  DRAGON = "#7B63E7",
+  DARK = "#735A4A",
+  FAIRY = "#EF70EF",
 }

 export enum TypeShadow {
-    NORMAL = "#574F4A",
-    FIGHTING = "#4E637C",
-    FLYING = "#4E637C",
-    POISON = "#352166",
-    GROUND = "#572D1E",
-    ROCK = "#5F442D",
-    BUG = "#5F5010",
-    GHOST = "#323D5B",
-    STEEL = "#415C5F",
-    FIRE = "#7C1818",
-    WATER = "#1C4E80",
-    GRASS = "#4F6729",
-    ELECTRIC = "#804618",
-    PSYCHIC = "#782155",
-    ICE = "#2D5C74",
-    DRAGON = "#313874",
-    DARK = "#392725",
-    FAIRY = "#663878",
+  NORMAL = "#574F4A",
+  FIGHTING = "#4E637C",
+  FLYING = "#4E637C",
+  POISON = "#352166",
+  GROUND = "#572D1E",
+  ROCK = "#5F442D",
+  BUG = "#5F5010",
+  GHOST = "#323D5B",
+  STEEL = "#415C5F",
+  FIRE = "#7C1818",
+  WATER = "#1C4E80",
+  GRASS = "#4F6729",
+  ELECTRIC = "#804618",
+  PSYCHIC = "#782155",
+  ICE = "#2D5C74",
+  DRAGON = "#313874",
+  DARK = "#392725",
+  FAIRY = "#663878",
 }

 export enum ShadowColor {
-    GREY = "#636363",
-    PURPLE = "#6b5a73",
-    LIGHT_GREY = "#d0d0c8",
-    BROWN = "#69402a",
-    PINK = "#fca2a2",
-    BRIGHT_RED = "#f83018",
-    RED = "#984038",
-    MAROON = "#632929",
-    GREEN = "#306850",
-    BLUE = "#006090",
-    LIGHT_YELLOW = "#ded6b5",
-    YELLOW = "#ebd773",
-    DARK_YELLOW = "#a0a060",
-    ORANGE = "#c07800",
-    LIGHT_ORANGE = "#ffbd73",
+  GREY = "#636363",
+  PURPLE = "#6b5a73",
+  LIGHT_GREY = "#d0d0c8",
+  BROWN = "#69402a",
+  PINK = "#fca2a2",
+  BRIGHT_RED = "#f83018",
+  RED = "#984038",
+  MAROON = "#632929",
+  GREEN = "#306850",
+  BLUE = "#006090",
+  LIGHT_YELLOW = "#ded6b5",
+  YELLOW = "#ebd773",
+  DARK_YELLOW = "#a0a060",
+  ORANGE = "#c07800",
+  LIGHT_ORANGE = "#ffbd73",
 }
--- a/src/enums/command.ts
+++ b/src/enums/command.ts
@ -3,5 +3,5 @@ export enum Command {
  BALL,
  POKEMON,
  RUN,
-  TERA
+  TERA,
 }
--- a/src/enums/devices.ts
+++ b/src/enums/devices.ts
@ -1,4 +1,4 @@
 export enum Device {
-    GAMEPAD,
-    KEYBOARD,
+  GAMEPAD,
+  KEYBOARD,
 }
--- a/src/enums/drop-down-column.ts
+++ b/src/enums/drop-down-column.ts
@ -5,5 +5,5 @@ export enum DropDownColumn {
  CAUGHT,
  UNLOCKS,
  MISC,
-  SORT
+  SORT,
 }
--- a/src/enums/dynamic-phase-type.ts
+++ b/src/enums/dynamic-phase-type.ts
@ -3,5 +3,5 @@
 */
 // TODO: We currently assume these are in order
 export enum DynamicPhaseType {
-  POST_SUMMON
+  POST_SUMMON,
 }
--- a/src/enums/ease-type.ts
+++ b/src/enums/ease-type.ts
@ -1,15 +1,15 @@
 export enum EaseType {
-    NONE,
-    LINEAR = "Linear",
-    QUADRATIC = "Quad",
-    CUBIC = "Cubic",
-    QUARTIC = "Quart",
-    QUINTIC = "Quint",
-    SINUSOIDAL = "Sine",
-    EXPONENTIAL = "Expo",
-    CIRCULAR = "Circ",
-    ELASTIC = "Elastic",
-    BACK = "Back",
-    BOUNCE = "Bounce",
-    STEPPED = "Stepped",
+  NONE,
+  LINEAR = "Linear",
+  QUADRATIC = "Quad",
+  CUBIC = "Cubic",
+  QUARTIC = "Quart",
+  QUINTIC = "Quint",
+  SINUSOIDAL = "Sine",
+  EXPONENTIAL = "Expo",
+  CIRCULAR = "Circ",
+  ELASTIC = "Elastic",
+  BACK = "Back",
+  BOUNCE = "Bounce",
+  STEPPED = "Stepped",
 }
--- a/src/enums/egg-source-types.ts
+++ b/src/enums/egg-source-types.ts
@ -1,7 +1,7 @@
 export enum EggSourceType {
-    GACHA_MOVE,
-    GACHA_LEGENDARY,
-    GACHA_SHINY,
-    SAME_SPECIES_EGG,
-    EVENT
+  GACHA_MOVE,
+  GACHA_LEGENDARY,
+  GACHA_SHINY,
+  SAME_SPECIES_EGG,
+  EVENT,
 }
--- a/src/enums/egg-type.ts
+++ b/src/enums/egg-type.ts
@ -2,5 +2,5 @@ export enum EggTier {
  COMMON,
  RARE,
  EPIC,
-  LEGENDARY
+  LEGENDARY,
 }
--- a/src/enums/encounter-anims.ts
+++ b/src/enums/encounter-anims.ts
@ -7,5 +7,5 @@ export enum EncounterAnim {
  MAGMA_BG,
  MAGMA_SPOUT,
  SMOKESCREEN,
-  DANCE
+  DANCE,
 }
--- a/src/enums/exp-gains-speed.ts
+++ b/src/enums/exp-gains-speed.ts
@ -7,5 +7,5 @@ export enum ExpGainsSpeed {
  /** Faster speed. */
  FASTER,
  /** Skip gaining exp animation. */
-  SKIP
+  SKIP,
 }
--- a/src/enums/exp-notification.ts
+++ b/src/enums/exp-notification.ts
@ -5,5 +5,5 @@ export enum ExpNotification {
  /** Display smaller flyout showing level gained on gaining a new level. */
  ONLY_LEVEL_UP,
  /** Do not show any flyouts for EXP gains or levelups. */
-  SKIP
+  SKIP,
 }
--- a/src/enums/field-position.ts
+++ b/src/enums/field-position.ts
@ -1,5 +1,5 @@
 export enum FieldPosition {
  CENTER,
  LEFT,
-  RIGHT
+  RIGHT,
 }
--- a/src/enums/fixed-boss-waves.ts
+++ b/src/enums/fixed-boss-waves.ts
@ -18,5 +18,5 @@ export enum ClassicFixedBossWaves {
  ELITE_FOUR_3 = 186,
  ELITE_FOUR_4 = 188,
  CHAMPION = 190,
-  RIVAL_6 = 195
+  RIVAL_6 = 195,
 }
--- a/src/enums/form-change-item.ts
+++ b/src/enums/form-change-item.ts
@ -96,8 +96,8 @@ export enum FormChangeItem {
  DRACO_PLATE,
  DREAD_PLATE,
  PIXIE_PLATE,
-  BLANK_PLATE,// TODO: Find a potential use for this
-  LEGEND_PLATE,// TODO: Find a potential use for this
+  BLANK_PLATE, // TODO: Find a potential use for this
+  LEGEND_PLATE, // TODO: Find a potential use for this
  FIGHTING_MEMORY,
  FLYING_MEMORY,
  POISON_MEMORY,
@ -115,5 +115,5 @@ export enum FormChangeItem {
  DRAGON_MEMORY,
  DARK_MEMORY,
  FAIRY_MEMORY,
-  NORMAL_MEMORY
+  NORMAL_MEMORY,
 }
--- a/src/enums/gacha-types.ts
+++ b/src/enums/gacha-types.ts
@ -1,9 +1,9 @@
 import type { ObjectValues } from "#types/type-helpers";

 export const GachaType = Object.freeze({
-    MOVE: 0,
-    LEGENDARY: 1,
-    SHINY: 2
+  MOVE: 0,
+  LEGENDARY: 1,
+  SHINY: 2,
 });

 export type GachaType = ObjectValues<typeof GachaType>;
--- a/src/enums/game-data-type.ts
+++ b/src/enums/game-data-type.ts
@ -7,5 +7,5 @@ export enum GameDataType {
  SETTINGS,
  TUTORIALS,
  SEEN_DIALOGUES,
-  RUN_HISTORY
+  RUN_HISTORY,
 }
--- a/src/enums/game-modes.ts
+++ b/src/enums/game-modes.ts
@ -3,5 +3,5 @@ export enum GameModes {
  ENDLESS,
  SPLICED_ENDLESS,
  DAILY,
-  CHALLENGE
+  CHALLENGE,
 }
--- a/src/enums/hit-result.ts
+++ b/src/enums/hit-result.ts
@ -11,5 +11,5 @@ export enum HitResult {
  INDIRECT,
  IMMUNE,
  CONFUSION,
-  INDIRECT_KO
+  INDIRECT_KO,
 }
--- a/src/enums/learn-move-situation.ts
+++ b/src/enums/learn-move-situation.ts
@ -3,6 +3,6 @@ export enum LearnMoveSituation {
  LEVEL_UP,
  RELEARN,
  EVOLUTION,
-  EVOLUTION_FUSED,// If fusionSpecies has Evolved
-  EVOLUTION_FUSED_BASE
+  EVOLUTION_FUSED, // If fusionSpecies has Evolved
+  EVOLUTION_FUSED_BASE,
 }
--- a/src/enums/learn-move-type.ts
+++ b/src/enums/learn-move-type.ts
@ -4,5 +4,5 @@ export enum LearnMoveType {
  /** For learning a move via Memory Mushroom */
  MEMORY,
  /** For learning a move via TM */
-  TM
+  TM,
 }
--- a/src/enums/modifier-pool-type.ts
+++ b/src/enums/modifier-pool-type.ts
@ -3,5 +3,5 @@ export enum ModifierPoolType {
  WILD,
  TRAINER,
  ENEMY_BUFF,
-  DAILY_STARTER
+  DAILY_STARTER,
 }
--- a/src/enums/money-format.ts
+++ b/src/enums/money-format.ts
@ -1,4 +1,4 @@
 export enum MoneyFormat {
  NORMAL,
-  ABBREVIATED
+  ABBREVIATED,
 }
--- a/src/enums/move-anims-common.ts
+++ b/src/enums/move-anims-common.ts
@ -1,20 +1,20 @@
 export enum AnimFrameTarget {
  USER,
  TARGET,
-  GRAPHIC
+  GRAPHIC,
 }

 export enum AnimFocus {
  TARGET = 1,
  USER,
  USER_TARGET,
-  SCREEN
+  SCREEN,
 }

 export enum AnimBlendType {
  NORMAL,
  ADD,
-  SUBTRACT
+  SUBTRACT,
 }

 export enum ChargeAnim {
@ -38,7 +38,7 @@ export enum ChargeAnim {
  SOLAR_BLADE_CHARGING,
  BEAK_BLAST_CHARGING,
  METEOR_BEAM_CHARGING,
-  ELECTRO_SHOT_CHARGING
+  ELECTRO_SHOT_CHARGING,
 }

 export enum CommonAnim {
@ -91,5 +91,5 @@ export enum CommonAnim {
  ELECTRIC_TERRAIN,
  GRASSY_TERRAIN,
  PSYCHIC_TERRAIN,
-  LOCK_ON = 2120
+  LOCK_ON = 2120,
 }
--- a/src/enums/move-category.ts
+++ b/src/enums/move-category.ts
@ -1,5 +1,5 @@
 export enum MoveCategory {
  PHYSICAL,
  SPECIAL,
-  STATUS
+  STATUS,
 }
--- a/src/enums/move-effect-trigger.ts
+++ b/src/enums/move-effect-trigger.ts
@ -2,5 +2,5 @@ export enum MoveEffectTrigger {
  PRE_APPLY,
  POST_APPLY,
  /** Triggers one time after all target effects have applied */
-  POST_TARGET
+  POST_TARGET,
 }
--- a/src/enums/move-flags.ts
+++ b/src/enums/move-flags.ts
@ -50,5 +50,5 @@ export enum MoveFlags {
  /** Indicates a move is able to be redirected to allies in a double battle if the attacker faints */
  REDIRECT_COUNTER = 1 << 18,
  /** Indicates a move is able to be reflected by {@linkcode AbilityId.MAGIC_BOUNCE} and {@linkcode MoveId.MAGIC_COAT} */
-  REFLECTABLE = 1 << 19
+  REFLECTABLE = 1 << 19,
 }
--- a/src/enums/move-result.ts
+++ b/src/enums/move-result.ts
@ -3,5 +3,5 @@ export enum MoveResult {
  SUCCESS,
  FAIL,
  MISS,
-  OTHER
+  OTHER,
 }
--- a/src/enums/move-source-type.ts
+++ b/src/enums/move-source-type.ts
@ -2,11 +2,11 @@
 * Used for challenge types that modify movesets, these denote the various sources of moves for pokemon.
 */
 export enum MoveSourceType {
-  LEVEL_UP,// Currently unimplemented for move access
-  RELEARNER,// Relearner moves currently unimplemented
+  LEVEL_UP, // Currently unimplemented for move access
+  RELEARNER, // Relearner moves currently unimplemented
  COMMON_TM,
  GREAT_TM,
  ULTRA_TM,
  COMMON_EGG,
-  RARE_EGG
+  RARE_EGG,
 }
--- a/src/enums/move-target.ts
+++ b/src/enums/move-target.ts
@ -25,5 +25,5 @@ export enum MoveTarget {
  ENEMY_SIDE,
  BOTH_SIDES,
  PARTY,
-  CURSE
+  CURSE,
 }
--- a/src/enums/move-use-mode.ts
+++ b/src/enums/move-use-mode.ts
@ -1,6 +1,3 @@
-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";

 /**
@ -15,9 +12,9 @@ import type { ObjectValues } from "#types/type-helpers";
 */
 export const MoveUseMode = {
  /**
-  * This move was used normally (i.e. clicking on the button) or called via Instruct.
-  * It deducts PP from the user's moveset (failing if out of PP), and interacts normally with other moves and abilities.
-  */
+   * This move was used normally (i.e. clicking on the button) or called via Instruct.
+   * It deducts PP from the user's moveset (failing if out of PP), and interacts normally with other moves and abilities.
+   */
  NORMAL: 1,

  /**
@ -71,7 +68,7 @@ export const MoveUseMode = {
   * @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
+  DELAYED_ATTACK: 6,
 } as const;

 export type MoveUseMode = ObjectValues<typeof MoveUseMode>;
@ -96,7 +93,7 @@ export type MoveUseMode = ObjectValues<typeof MoveUseMode>;
 * | {@linkcode MoveUseMode.DELAYED_ATTACK} | `true`  |
 */
 export function isVirtual(useMode: MoveUseMode): boolean {
-  return useMode >= MoveUseMode.INDIRECT
+  return useMode >= MoveUseMode.INDIRECT;
 }

 /**
@ -161,4 +158,4 @@ export function isIgnorePP(useMode: MoveUseMode): boolean {
 */
 export function isReflected(useMode: MoveUseMode): boolean {
  return useMode === MoveUseMode.REFLECTED;
-}
+}
--- a/src/enums/multi-hit-type.ts
+++ b/src/enums/multi-hit-type.ts
@ -3,5 +3,5 @@ export enum MultiHitType {
  _2_TO_5,
  _3,
  _10,
-  BEAT_UP
+  BEAT_UP,
 }
--- a/src/enums/mystery-encounter-mode.ts
+++ b/src/enums/mystery-encounter-mode.ts
@ -8,5 +8,5 @@ export enum MysteryEncounterMode {
  /** Enables special boss music during encounter */
  BOSS_BATTLE,
  /** If there is no battle in the {@linkcode MysteryEncounter} or option selected */
-  NO_BATTLE
+  NO_BATTLE,
 }
--- a/src/enums/mystery-encounter-option-mode.ts
+++ b/src/enums/mystery-encounter-option-mode.ts
@ -6,5 +6,5 @@ export enum MysteryEncounterOptionMode {
  /** Default style on requirements not met, special style on requirements met */
  DEFAULT_OR_SPECIAL,
  /** Disabled on requirements not met, special style on requirements met */
-  DISABLED_OR_SPECIAL
+  DISABLED_OR_SPECIAL,
 }
--- a/src/enums/mystery-encounter-tier.ts
+++ b/src/enums/mystery-encounter-tier.ts
@ -7,5 +7,5 @@ export enum MysteryEncounterTier {
  GREAT = 40,
  ULTRA = 19,
  ROGUE = 3,
-  MASTER = 0 // Not currently used
+  MASTER = 0, // Not currently used
 }
--- a/src/enums/mystery-encounter-type.ts
+++ b/src/enums/mystery-encounter-type.ts
@ -29,5 +29,5 @@ export enum MysteryEncounterType {
  FUN_AND_GAMES,
  UNCOMMON_BREED,
  GLOBAL_TRADE_SYSTEM,
-  THE_EXPERT_POKEMON_BREEDER
+  THE_EXPERT_POKEMON_BREEDER,
 }
--- a/src/enums/party-member-strength.ts
+++ b/src/enums/party-member-strength.ts
@ -4,5 +4,5 @@ export enum PartyMemberStrength {
  WEAK,
  AVERAGE,
  STRONG,
-  STRONGER
+  STRONGER,
 }
--- a/src/enums/passive.ts
+++ b/src/enums/passive.ts
@ -3,5 +3,5 @@
 */
 export enum Passive {
  UNLOCKED = 1,
-  ENABLED = 2
+  ENABLED = 2,
 }
--- a/src/enums/player-gender.ts
+++ b/src/enums/player-gender.ts
@ -4,5 +4,5 @@
 export enum PlayerGender {
  UNSET,
  MALE,
-  FEMALE
+  FEMALE,
 }
--- a/Show More
+++ b/Show More