Merge 4939a9f6f4 into da7903ab92

public/locales

@@ -1 +1 @@
-Subproject commit 1ea8f865e30d1940caa0fceeabf37ae2e4689471
+Subproject commit ab2716d5440c25f73986664aa3f3131821c3c392

src/data/balance/tms.ts

@@ -45736,285 +45736,6 @@ export const tmSpecies: TmSpecies = {
     SpeciesId.HISUI_ARCANINE,
     SpeciesId.HISUI_AVALUGG,
   ],
-  [MoveId.SHOCK_WAVE]: [
-    SpeciesId.RATTATA,
-    SpeciesId.RATICATE,
-    SpeciesId.PIKACHU,
-    SpeciesId.RAICHU,
-    SpeciesId.NIDORAN_F,
-    SpeciesId.NIDORINA,
-    SpeciesId.NIDOQUEEN,
-    SpeciesId.NIDORAN_M,
-    SpeciesId.NIDORINO,
-    SpeciesId.NIDOKING,
-    SpeciesId.CLEFAIRY,
-    SpeciesId.CLEFABLE,
-    SpeciesId.JIGGLYPUFF,
-    SpeciesId.WIGGLYTUFF,
-    SpeciesId.MEOWTH,
-    SpeciesId.PERSIAN,
-    SpeciesId.ABRA,
-    SpeciesId.KADABRA,
-    SpeciesId.ALAKAZAM,
-    SpeciesId.MAGNEMITE,
-    SpeciesId.MAGNETON,
-    SpeciesId.GRIMER,
-    SpeciesId.MUK,
-    SpeciesId.VOLTORB,
-    SpeciesId.ELECTRODE,
-    SpeciesId.LICKITUNG,
-    SpeciesId.KOFFING,
-    SpeciesId.WEEZING,
-    SpeciesId.RHYHORN,
-    SpeciesId.RHYDON,
-    SpeciesId.CHANSEY,
-    SpeciesId.TANGELA,
-    SpeciesId.KANGASKHAN,
-    SpeciesId.MR_MIME,
-    SpeciesId.ELECTABUZZ,
-    SpeciesId.TAUROS,
-    SpeciesId.LAPRAS,
-    SpeciesId.JOLTEON,
-    SpeciesId.PORYGON,
-    SpeciesId.SNORLAX,
-    SpeciesId.ZAPDOS,
-    SpeciesId.DRATINI,
-    SpeciesId.DRAGONAIR,
-    SpeciesId.DRAGONITE,
-    SpeciesId.MEWTWO,
-    SpeciesId.MEW,
-    SpeciesId.SENTRET,
-    SpeciesId.FURRET,
-    SpeciesId.CHINCHOU,
-    SpeciesId.LANTURN,
-    SpeciesId.PICHU,
-    SpeciesId.CLEFFA,
-    SpeciesId.IGGLYBUFF,
-    SpeciesId.TOGEPI,
-    SpeciesId.TOGETIC,
-    SpeciesId.MAREEP,
-    SpeciesId.FLAAFFY,
-    SpeciesId.AMPHAROS,
-    SpeciesId.AIPOM,
-    SpeciesId.MISDREAVUS,
-    SpeciesId.GIRAFARIG,
-    SpeciesId.DUNSPARCE,
-    SpeciesId.SNUBBULL,
-    SpeciesId.GRANBULL,
-    SpeciesId.QWILFISH,
-    SpeciesId.PORYGON2,
-    SpeciesId.STANTLER,
-    SpeciesId.ELEKID,
-    SpeciesId.MILTANK,
-    SpeciesId.BLISSEY,
-    SpeciesId.RAIKOU,
-    SpeciesId.TYRANITAR,
-    SpeciesId.LUGIA,
-    SpeciesId.HO_OH,
-    SpeciesId.CELEBI,
-    SpeciesId.ZIGZAGOON,
-    SpeciesId.LINOONE,
-    SpeciesId.WINGULL,
-    SpeciesId.PELIPPER,
-    SpeciesId.RALTS,
-    SpeciesId.KIRLIA,
-    SpeciesId.GARDEVOIR,
-    SpeciesId.SLAKOTH,
-    SpeciesId.VIGOROTH,
-    SpeciesId.SLAKING,
-    SpeciesId.WHISMUR,
-    SpeciesId.LOUDRED,
-    SpeciesId.EXPLOUD,
-    SpeciesId.NOSEPASS,
-    SpeciesId.SKITTY,
-    SpeciesId.DELCATTY,
-    SpeciesId.SABLEYE,
-    SpeciesId.ARON,
-    SpeciesId.LAIRON,
-    SpeciesId.AGGRON,
-    SpeciesId.ELECTRIKE,
-    SpeciesId.MANECTRIC,
-    SpeciesId.PLUSLE,
-    SpeciesId.MINUN,
-    SpeciesId.VOLBEAT,
-    SpeciesId.ILLUMISE,
-    SpeciesId.GULPIN,
-    SpeciesId.SWALOT,
-    SpeciesId.SPOINK,
-    SpeciesId.GRUMPIG,
-    SpeciesId.SPINDA,
-    SpeciesId.ZANGOOSE,
-    SpeciesId.CASTFORM,
-    SpeciesId.KECLEON,
-    SpeciesId.SHUPPET,
-    SpeciesId.BANETTE,
-    SpeciesId.CHIMECHO,
-    SpeciesId.ABSOL,
-    SpeciesId.REGIROCK,
-    SpeciesId.REGICE,
-    SpeciesId.REGISTEEL,
-    SpeciesId.LATIAS,
-    SpeciesId.LATIOS,
-    SpeciesId.KYOGRE,
-    SpeciesId.GROUDON,
-    SpeciesId.RAYQUAZA,
-    SpeciesId.JIRACHI,
-    SpeciesId.DEOXYS,
-    SpeciesId.BIDOOF,
-    SpeciesId.BIBAREL,
-    SpeciesId.SHINX,
-    SpeciesId.LUXIO,
-    SpeciesId.LUXRAY,
-    SpeciesId.CRANIDOS,
-    SpeciesId.RAMPARDOS,
-    SpeciesId.SHIELDON,
-    SpeciesId.BASTIODON,
-    SpeciesId.PACHIRISU,
-    SpeciesId.AMBIPOM,
-    SpeciesId.DRIFLOON,
-    SpeciesId.DRIFBLIM,
-    SpeciesId.BUNEARY,
-    SpeciesId.LOPUNNY,
-    SpeciesId.MISMAGIUS,
-    SpeciesId.GLAMEOW,
-    SpeciesId.PURUGLY,
-    SpeciesId.CHINGLING,
-    SpeciesId.MIME_JR,
-    SpeciesId.HAPPINY,
-    SpeciesId.SPIRITOMB,
-    SpeciesId.MUNCHLAX,
-    SpeciesId.MAGNEZONE,
-    SpeciesId.LICKILICKY,
-    SpeciesId.RHYPERIOR,
-    SpeciesId.TANGROWTH,
-    SpeciesId.ELECTIVIRE,
-    SpeciesId.TOGEKISS,
-    SpeciesId.PORYGON_Z,
-    SpeciesId.GALLADE,
-    SpeciesId.PROBOPASS,
-    SpeciesId.FROSLASS,
-    SpeciesId.ROTOM,
-    SpeciesId.UXIE,
-    SpeciesId.MESPRIT,
-    SpeciesId.AZELF,
-    SpeciesId.DIALGA,
-    SpeciesId.PALKIA,
-    SpeciesId.REGIGIGAS,
-    SpeciesId.GIRATINA,
-    SpeciesId.DARKRAI,
-    SpeciesId.ARCEUS,
-    SpeciesId.VICTINI,
-    SpeciesId.PATRAT,
-    SpeciesId.WATCHOG,
-    SpeciesId.LILLIPUP,
-    SpeciesId.HERDIER,
-    SpeciesId.STOUTLAND,
-    SpeciesId.MUNNA,
-    SpeciesId.MUSHARNA,
-    SpeciesId.BLITZLE,
-    SpeciesId.ZEBSTRIKA,
-    SpeciesId.WOOBAT,
-    SpeciesId.SWOOBAT,
-    SpeciesId.SIGILYPH,
-    SpeciesId.YAMASK,
-    SpeciesId.COFAGRIGUS,
-    SpeciesId.MINCCINO,
-    SpeciesId.CINCCINO,
-    SpeciesId.GOTHITA,
-    SpeciesId.GOTHORITA,
-    SpeciesId.GOTHITELLE,
-    SpeciesId.SOLOSIS,
-    SpeciesId.DUOSION,
-    SpeciesId.REUNICLUS,
-    SpeciesId.EMOLGA,
-    SpeciesId.FRILLISH,
-    SpeciesId.JELLICENT,
-    SpeciesId.JOLTIK,
-    SpeciesId.GALVANTULA,
-    SpeciesId.KLINK,
-    SpeciesId.KLANG,
-    SpeciesId.KLINKLANG,
-    SpeciesId.EELEKTRIK,
-    SpeciesId.EELEKTROSS,
-    SpeciesId.ELGYEM,
-    SpeciesId.BEHEEYEM,
-    SpeciesId.LITWICK,
-    SpeciesId.LAMPENT,
-    SpeciesId.CHANDELURE,
-    SpeciesId.AXEW,
-    SpeciesId.FRAXURE,
-    SpeciesId.HAXORUS,
-    SpeciesId.STUNFISK,
-    SpeciesId.DRUDDIGON,
-    SpeciesId.GOLETT,
-    SpeciesId.GOLURK,
-    SpeciesId.DEINO,
-    SpeciesId.ZWEILOUS,
-    SpeciesId.HYDREIGON,
-    SpeciesId.THUNDURUS,
-    SpeciesId.ZEKROM,
-    SpeciesId.MELOETTA,
-    SpeciesId.GENESECT,
-    SpeciesId.BRAIXEN,
-    SpeciesId.DELPHOX,
-    SpeciesId.ESPURR,
-    SpeciesId.MEOWSTIC,
-    SpeciesId.HONEDGE,
-    SpeciesId.DOUBLADE,
-    SpeciesId.AEGISLASH,
-    SpeciesId.SKRELP,
-    SpeciesId.DRAGALGE,
-    SpeciesId.HELIOPTILE,
-    SpeciesId.HELIOLISK,
-    SpeciesId.DEDENNE,
-    SpeciesId.GOOMY,
-    SpeciesId.SLIGGOO,
-    SpeciesId.GOODRA,
-    SpeciesId.ZYGARDE,
-    SpeciesId.HOOPA,
-    SpeciesId.YUNGOOS,
-    SpeciesId.GUMSHOOS,
-    SpeciesId.GRUBBIN,
-    SpeciesId.CHARJABUG,
-    SpeciesId.VIKAVOLT,
-    SpeciesId.PASSIMIAN,
-    SpeciesId.TURTONATOR,
-    SpeciesId.TOGEDEMARU,
-    SpeciesId.DRAMPA,
-    SpeciesId.KOMMO_O,
-    SpeciesId.TAPU_KOKO,
-    SpeciesId.SOLGALEO,
-    SpeciesId.LUNALA,
-    SpeciesId.PHEROMOSA,
-    SpeciesId.XURKITREE,
-    SpeciesId.CELESTEELA,
-    SpeciesId.GUZZLORD,
-    SpeciesId.NECROZMA,
-    SpeciesId.MAGEARNA,
-    SpeciesId.NAGANADEL,
-    SpeciesId.ZERAORA,
-    SpeciesId.TOXTRICITY,
-    SpeciesId.MR_RIME,
-    SpeciesId.REGIELEKI,
-    SpeciesId.WYRDEER,
-    SpeciesId.FARIGIRAF,
-    SpeciesId.DUDUNSPARCE,
-    SpeciesId.MIRAIDON,
-    SpeciesId.RAGING_BOLT,
-    SpeciesId.ALOLA_RATTATA,
-    SpeciesId.ALOLA_RATICATE,
-    SpeciesId.ALOLA_RAICHU,
-    SpeciesId.ALOLA_MEOWTH,
-    SpeciesId.ALOLA_PERSIAN,
-    SpeciesId.ALOLA_GRAVELER,
-    SpeciesId.ALOLA_GOLEM,
-    SpeciesId.ALOLA_GRIMER,
-    SpeciesId.ALOLA_MUK,
-    SpeciesId.GALAR_WEEZING,
-    SpeciesId.GALAR_MR_MIME,
-    SpeciesId.HISUI_SLIGGOO,
-    SpeciesId.HISUI_GOODRA,
-  ],
   [MoveId.WATER_PULSE]: [
     SpeciesId.SQUIRTLE,
     SpeciesId.WARTORTLE,
@@ -69026,7 +68747,6 @@ export const tmPoolTiers: TmPoolTiers = {
   [MoveId.LEAF_BLADE]: ModifierTier.ULTRA,
   [MoveId.DRAGON_DANCE]: ModifierTier.GREAT,
   [MoveId.ROCK_BLAST]: ModifierTier.GREAT,
-  [MoveId.SHOCK_WAVE]: ModifierTier.GREAT,
   [MoveId.WATER_PULSE]: ModifierTier.GREAT,
   [MoveId.ROOST]: ModifierTier.GREAT,
   [MoveId.GRAVITY]: ModifierTier.COMMON,

src/data/mystery-encounters/encounters/dark-deal-encounter.ts

@@ -99,7 +99,6 @@ export const DarkDealEncounter: MysteryEncounter = MysteryEncounterBuilder.withE
   MysteryEncounterType.DARK_DEAL,
 )
   .withEncounterTier(MysteryEncounterTier.ROGUE)
-  .withDisallowedChallenges(Challenges.HARDCORE)
   .withIntroSpriteConfigs([
     {
       spriteKey: "dark_deal_scientist",

src/data/mystery-encounters/utils/encounter-pokemon-utils.ts

@@ -673,8 +673,6 @@ export async function catchPokemon(
   globalScene.gameData.updateSpeciesDexIvs(pokemon.species.getRootSpeciesId(true), pokemon.ivs);
 
   return new Promise(resolve => {
-    const addStatus = new BooleanHolder(true);
-    applyChallenges(ChallengeType.POKEMON_ADD_TO_PARTY, pokemon, addStatus);
     const doPokemonCatchMenu = () => {
       const end = () => {
         // Ensure the pokemon is in the enemy party in all situations
@@ -710,7 +708,9 @@ export async function catchPokemon(
         });
       };
       Promise.all([pokemon.hideInfo(), globalScene.gameData.setPokemonCaught(pokemon)]).then(() => {
-        if (!(isObtain || addStatus.value)) {
+        const addStatus = new BooleanHolder(true);
+        applyChallenges(ChallengeType.POKEMON_ADD_TO_PARTY, pokemon, addStatus);
+        if (!addStatus.value) {
           removePokemon();
           end();
           return;
@@ -807,16 +807,10 @@ export async function catchPokemon(
     };
 
     if (showCatchObtainMessage) {
-      let catchMessage: string;
-      if (isObtain) {
-        catchMessage = "battle:pokemonObtained";
-      } else if (addStatus.value) {
-        catchMessage = "battle:pokemonCaught";
-      } else {
-        catchMessage = "battle:pokemonCaughtButChallenge";
-      }
       globalScene.ui.showText(
-        i18next.t(catchMessage, { pokemonName: pokemon.getNameToRender() }),
+        i18next.t(isObtain ? "battle:pokemonObtained" : "battle:pokemonCaught", {
+          pokemonName: pokemon.getNameToRender(),
+        }),
         null,
         doPokemonCatchMenu,
         0,

src/phases/attempt-capture-phase.ts

@@ -253,11 +253,8 @@ export class AttemptCapturePhase extends PokemonPhase {
 
     globalScene.gameData.updateSpeciesDexIvs(pokemon.species.getRootSpeciesId(true), pokemon.ivs);
 
-    const addStatus = new BooleanHolder(true);
-    applyChallenges(ChallengeType.POKEMON_ADD_TO_PARTY, pokemon, addStatus);
-
     globalScene.ui.showText(
-      i18next.t(addStatus.value ? "battle:pokemonCaught" : "battle:pokemonCaughtButChallenge", {
+      i18next.t("battle:pokemonCaught", {
         pokemonName: getPokemonNameWithAffix(pokemon),
       }),
       null,
@@ -293,6 +290,8 @@ export class AttemptCapturePhase extends PokemonPhase {
           });
         };
         Promise.all([pokemon.hideInfo(), globalScene.gameData.setPokemonCaught(pokemon)]).then(() => {
+          const addStatus = new BooleanHolder(true);
+          applyChallenges(ChallengeType.POKEMON_ADD_TO_PARTY, pokemon, addStatus);
           if (!addStatus.value) {
             removePokemon();
             end();

src/phases/select-biome-phase.ts

@@ -16,10 +16,8 @@ export class SelectBiomePhase extends BattlePhase {
 
     globalScene.resetSeed();
 
-    const gameMode = globalScene.gameMode;
     const currentBiome = globalScene.arena.biomeType;
-    const currentWaveIndex = globalScene.currentBattle.waveIndex;
+    const nextWaveIndex = globalScene.currentBattle.waveIndex + 1;
-    const nextWaveIndex = currentWaveIndex + 1;
 
     const setNextBiome = (nextBiome: BiomeId) => {
       if (nextWaveIndex % 10 === 1) {
@@ -28,15 +26,6 @@ export class SelectBiomePhase extends BattlePhase {
         applyChallenges(ChallengeType.PARTY_HEAL, healStatus);
         if (healStatus.value) {
           globalScene.phaseManager.unshiftNew("PartyHealPhase", false);
-        } else {
-          globalScene.phaseManager.unshiftNew(
-            "SelectModifierPhase",
-            undefined,
-            undefined,
-            gameMode.isFixedBattle(currentWaveIndex)
-              ? gameMode.getFixedBattle(currentWaveIndex).customModifierRewardSettings
-              : undefined,
-          );
         }
       }
       globalScene.phaseManager.unshiftNew("SwitchBiomePhase", nextBiome);
@@ -44,12 +33,12 @@ export class SelectBiomePhase extends BattlePhase {
     };
 
     if (
-      (gameMode.isClassic && gameMode.isWaveFinal(nextWaveIndex + 9)) ||
+      (globalScene.gameMode.isClassic && globalScene.gameMode.isWaveFinal(nextWaveIndex + 9)) ||
-      (gameMode.isDaily && gameMode.isWaveFinal(nextWaveIndex)) ||
+      (globalScene.gameMode.isDaily && globalScene.gameMode.isWaveFinal(nextWaveIndex)) ||
-      (gameMode.hasShortBiomes && !(nextWaveIndex % 50))
+      (globalScene.gameMode.hasShortBiomes && !(nextWaveIndex % 50))
     ) {
       setNextBiome(BiomeId.END);
-    } else if (gameMode.hasRandomBiomes) {
+    } else if (globalScene.gameMode.hasRandomBiomes) {
       setNextBiome(this.generateNextBiome(nextWaveIndex));
     } else if (Array.isArray(biomeLinks[currentBiome])) {
       const biomes: BiomeId[] = (biomeLinks[currentBiome] as (BiomeId | [BiomeId, number])[])
@@ -84,6 +73,9 @@ export class SelectBiomePhase extends BattlePhase {
   }
 
   generateNextBiome(waveIndex: number): BiomeId {
-    return waveIndex % 50 === 0 ? BiomeId.END : globalScene.generateRandomBiome(waveIndex);
+    if (!(waveIndex % 50)) {
+      return BiomeId.END;
+    }
+    return globalScene.generateRandomBiome(waveIndex);
   }
 }

src/phases/victory-phase.ts

@@ -3,9 +3,13 @@ import { globalScene } from "#app/global-scene";
 import { modifierTypes } from "#data/data-lists";
 import { BattleType } from "#enums/battle-type";
 import type { BattlerIndex } from "#enums/battler-index";
+import { ChallengeType } from "#enums/challenge-type";
 import { ClassicFixedBossWaves } from "#enums/fixed-boss-waves";
+import type { CustomModifierSettings } from "#modifiers/modifier-type";
 import { handleMysteryEncounterVictory } from "#mystery-encounters/encounter-phase-utils";
 import { PokemonPhase } from "#phases/pokemon-phase";
+import { applyChallenges } from "#utils/challenge-utils";
+import { BooleanHolder } from "#utils/common";
 
 export class VictoryPhase extends PokemonPhase {
   public readonly phaseName = "VictoryPhase";
@@ -45,19 +49,15 @@ export class VictoryPhase extends PokemonPhase {
       if (globalScene.currentBattle.battleType === BattleType.TRAINER) {
         globalScene.phaseManager.pushNew("TrainerVictoryPhase");
       }
-
+      if (globalScene.gameMode.isEndless || !globalScene.gameMode.isWaveFinal(globalScene.currentBattle.waveIndex)) {
-      const gameMode = globalScene.gameMode;
-      const currentWaveIndex = globalScene.currentBattle.waveIndex;
-
-      if (gameMode.isEndless || !gameMode.isWaveFinal(currentWaveIndex)) {
         globalScene.phaseManager.pushNew("EggLapsePhase");
-        if (gameMode.isClassic) {
+        if (globalScene.gameMode.isClassic) {
-          switch (currentWaveIndex) {
+          switch (globalScene.currentBattle.waveIndex) {
             case ClassicFixedBossWaves.RIVAL_1:
             case ClassicFixedBossWaves.RIVAL_2:
               // Get event modifiers for this wave
               timedEventManager
-                .getFixedBattleEventRewards(currentWaveIndex)
+                .getFixedBattleEventRewards(globalScene.currentBattle.waveIndex)
                 .map(r => globalScene.phaseManager.pushNew("ModifierRewardPhase", modifierTypes[r]));
               break;
             case ClassicFixedBossWaves.EVIL_BOSS_2:
@@ -66,53 +66,59 @@ export class VictoryPhase extends PokemonPhase {
               break;
           }
         }
-        if (currentWaveIndex % 10) {
+        const healStatus = new BooleanHolder(globalScene.currentBattle.waveIndex % 10 === 0);
+        applyChallenges(ChallengeType.PARTY_HEAL, healStatus);
+        if (!healStatus.value) {
           globalScene.phaseManager.pushNew(
             "SelectModifierPhase",
             undefined,
             undefined,
-            gameMode.isFixedBattle(currentWaveIndex)
+            this.getFixedBattleCustomModifiers(),
-              ? gameMode.getFixedBattle(currentWaveIndex).customModifierRewardSettings
-              : undefined,
           );
-        } else if (gameMode.isDaily) {
+        } else if (globalScene.gameMode.isDaily) {
           globalScene.phaseManager.pushNew("ModifierRewardPhase", modifierTypes.EXP_CHARM);
-          if (currentWaveIndex > 10 && !gameMode.isWaveFinal(currentWaveIndex)) {
+          if (
+            globalScene.currentBattle.waveIndex > 10 &&
+            !globalScene.gameMode.isWaveFinal(globalScene.currentBattle.waveIndex)
+          ) {
             globalScene.phaseManager.pushNew("ModifierRewardPhase", modifierTypes.GOLDEN_POKEBALL);
           }
         } else {
-          const superExpWave = !gameMode.isEndless ? (globalScene.offsetGym ? 0 : 20) : 10;
+          const superExpWave = !globalScene.gameMode.isEndless ? (globalScene.offsetGym ? 0 : 20) : 10;
-          if (gameMode.isEndless && currentWaveIndex === 10) {
+          if (globalScene.gameMode.isEndless && globalScene.currentBattle.waveIndex === 10) {
             globalScene.phaseManager.pushNew("ModifierRewardPhase", modifierTypes.EXP_SHARE);
           }
-          if (currentWaveIndex <= 750 && (currentWaveIndex <= 500 || currentWaveIndex % 30 === superExpWave)) {
+          if (
+            globalScene.currentBattle.waveIndex <= 750 &&
+            (globalScene.currentBattle.waveIndex <= 500 || globalScene.currentBattle.waveIndex % 30 === superExpWave)
+          ) {
             globalScene.phaseManager.pushNew(
               "ModifierRewardPhase",
-              currentWaveIndex % 30 !== superExpWave || currentWaveIndex > 250
+              globalScene.currentBattle.waveIndex % 30 !== superExpWave || globalScene.currentBattle.waveIndex > 250
                 ? modifierTypes.EXP_CHARM
                 : modifierTypes.SUPER_EXP_CHARM,
             );
           }
-          if (currentWaveIndex <= 150 && !(currentWaveIndex % 50)) {
+          if (globalScene.currentBattle.waveIndex <= 150 && !(globalScene.currentBattle.waveIndex % 50)) {
             globalScene.phaseManager.pushNew("ModifierRewardPhase", modifierTypes.GOLDEN_POKEBALL);
           }
-          if (gameMode.isEndless && !(currentWaveIndex % 50)) {
+          if (globalScene.gameMode.isEndless && !(globalScene.currentBattle.waveIndex % 50)) {
             globalScene.phaseManager.pushNew(
               "ModifierRewardPhase",
-              !(currentWaveIndex % 250) ? modifierTypes.VOUCHER_PREMIUM : modifierTypes.VOUCHER_PLUS,
+              !(globalScene.currentBattle.waveIndex % 250) ? modifierTypes.VOUCHER_PREMIUM : modifierTypes.VOUCHER_PLUS,
             );
             globalScene.phaseManager.pushNew("AddEnemyBuffModifierPhase");
           }
         }
 
-        if (gameMode.hasRandomBiomes || globalScene.isNewBiome()) {
+        if (globalScene.gameMode.hasRandomBiomes || globalScene.isNewBiome()) {
           globalScene.phaseManager.pushNew("SelectBiomePhase");
         }
 
         globalScene.phaseManager.pushNew("NewBattlePhase");
       } else {
         globalScene.currentBattle.battleType = BattleType.CLEAR;
-        globalScene.score += gameMode.getClearScoreBonus();
+        globalScene.score += globalScene.gameMode.getClearScoreBonus();
         globalScene.updateScoreText();
         globalScene.phaseManager.pushNew("GameOverPhase", true);
       }
@@ -120,4 +126,18 @@ export class VictoryPhase extends PokemonPhase {
 
     this.end();
   }
+
+  /**
+   * If this wave is a fixed battle with special custom modifier rewards,
+   * will pass those settings to the upcoming {@linkcode SelectModifierPhase}`.
+   */
+  getFixedBattleCustomModifiers(): CustomModifierSettings | undefined {
+    const gameMode = globalScene.gameMode;
+    const waveIndex = globalScene.currentBattle.waveIndex;
+    if (gameMode.isFixedBattle(waveIndex)) {
+      return gameMode.getFixedBattle(waveIndex).customModifierRewardSettings;
+    }
+
+    return undefined;
+  }
 }

src/system/achv.ts

@@ -448,8 +448,6 @@ export function getAchievementDescription(localizationKey: string): string {
       return i18next.t("achv:FLIP_STATS.description", { context: genderStr });
     case "FLIP_INVERSE":
       return i18next.t("achv:FLIP_INVERSE.description", { context: genderStr });
-    case "NUZLOCKE":
-      return i18next.t("achv:NUZLOCKE.description", { context: genderStr });
     case "BREEDERS_IN_SPACE":
       return i18next.t("achv:BREEDERS_IN_SPACE.description", {
         context: genderStr,

src/ui/pokedex-mon-container.ts

@@ -208,26 +208,6 @@ export class PokedexMonContainer extends Phaser.GameObjects.Container {
     );
     this.checkIconId(defaultProps.female, defaultProps.formIndex, defaultProps.shiny, defaultProps.variant);
     this.add(this.icon);
-
-    [
-      this.hiddenAbilityIcon,
-      this.favoriteIcon,
-      this.classicWinIcon,
-      this.candyUpgradeIcon,
-      this.candyUpgradeOverlayIcon,
-      this.eggMove1Icon,
-      this.tmMove1Icon,
-      this.eggMove2Icon,
-      this.tmMove2Icon,
-      this.passive1Icon,
-      this.passive2Icon,
-      this.passive1OverlayIcon,
-      this.passive2OverlayIcon,
-    ].forEach(icon => {
-      if (icon) {
-        this.bringToTop(icon);
-      }
-    });
   }
 
   checkIconId(female, formIndex, shiny, variant) {

src/ui/pokedex-ui-handler.ts

@@ -410,11 +410,6 @@ export class PokedexUiHandler extends MessageUiHandler {
       new DropDownLabel(i18next.t("filterBar:hasHiddenAbility"), undefined, DropDownState.ON),
       new DropDownLabel(i18next.t("filterBar:noHiddenAbility"), undefined, DropDownState.EXCLUDE),
     ];
-    const seenSpeciesLabels = [
-      new DropDownLabel(i18next.t("filterBar:seenSpecies"), undefined, DropDownState.OFF),
-      new DropDownLabel(i18next.t("filterBar:isSeen"), undefined, DropDownState.ON),
-      new DropDownLabel(i18next.t("filterBar:isUnseen"), undefined, DropDownState.EXCLUDE),
-    ];
     const eggLabels = [
       new DropDownLabel(i18next.t("filterBar:egg"), undefined, DropDownState.OFF),
       new DropDownLabel(i18next.t("filterBar:eggPurchasable"), undefined, DropDownState.ON),
@@ -428,7 +423,6 @@ export class PokedexUiHandler extends MessageUiHandler {
       new DropDownOption("FAVORITE", favoriteLabels),
       new DropDownOption("WIN", winLabels),
       new DropDownOption("HIDDEN_ABILITY", hiddenAbilityLabels),
-      new DropDownOption("SEEN_SPECIES", seenSpeciesLabels),
       new DropDownOption("EGG", eggLabels),
       new DropDownOption("POKERUS", pokerusLabels),
     ];
@@ -798,15 +792,13 @@ export class PokedexUiHandler extends MessageUiHandler {
     this.starterSelectMessageBoxContainer.setVisible(!!text?.length);
   }
 
-  isSeen(species: PokemonSpecies, dexEntry: DexEntry, seenFilter?: boolean): boolean {
+  isSeen(species: PokemonSpecies, dexEntry: DexEntry): boolean {
     if (dexEntry?.seenAttr) {
       return true;
     }
-    if (!seenFilter) {
+
-      const starterDexEntry = globalScene.gameData.dexData[this.getStarterSpeciesId(species.speciesId)];
+    const starterDexEntry = globalScene.gameData.dexData[this.getStarterSpeciesId(species.speciesId)];
-      return !!starterDexEntry?.caughtAttr;
+    return !!starterDexEntry?.caughtAttr;
-    }
-    return false;
   }
 
   /**
@@ -1625,21 +1617,6 @@ export class PokedexUiHandler extends MessageUiHandler {
         }
       });
 
-      // Seen Filter
-      const dexEntry = globalScene.gameData.dexData[species.speciesId];
-      const isItSeen = this.isSeen(species, dexEntry, true);
-      const fitsSeen = this.filterBar.getVals(DropDownColumn.MISC).some(misc => {
-        if (misc.val === "SEEN_SPECIES" && misc.state === DropDownState.ON) {
-          return isItSeen;
-        }
-        if (misc.val === "SEEN_SPECIES" && misc.state === DropDownState.EXCLUDE) {
-          return !isItSeen;
-        }
-        if (misc.val === "SEEN_SPECIES" && misc.state === DropDownState.OFF) {
-          return true;
-        }
-      });
-
       // Egg Purchasable Filter
       const isEggPurchasable = this.isSameSpeciesEggAvailable(species.speciesId);
       const fitsEgg = this.filterBar.getVals(DropDownColumn.MISC).some(misc => {
@@ -1681,7 +1658,6 @@ export class PokedexUiHandler extends MessageUiHandler {
         fitsFavorite &&
         fitsWin &&
         fitsHA &&
-        fitsSeen &&
         fitsEgg &&
         fitsPokerus
       ) {

src/ui/run-info-ui-handler.ts

@@ -210,8 +210,7 @@ export class RunInfoUiHandler extends UiHandler {
     this.runContainer.add(headerText);
     const runName = addTextObject(0, 0, this.runInfo.name, TextStyle.WINDOW);
     runName.setOrigin(0, 0);
-    const runNameX = headerText.width / 6 + headerText.x + 4;
+    runName.setPositionRelative(headerBg, 60, 4);
-    runName.setPositionRelative(headerBg, runNameX, 4);
     this.runContainer.add(runName);
   }
 

test/challenges/limited-catch.test.ts

@@ -1,10 +1,8 @@
 import { AbilityId } from "#enums/ability-id";
 import { Challenges } from "#enums/challenges";
 import { MoveId } from "#enums/move-id";
-import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { PokeballType } from "#enums/pokeball";
 import { SpeciesId } from "#enums/species-id";
-import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils";
 import { GameManager } from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
@@ -54,18 +52,4 @@ describe("Challenges - Limited Catch", () => {
 
     expect(game.scene.getPlayerParty()).toHaveLength(1);
   });
-
-  it("should allow gift Pokémon from Mystery Encounters to be added to party", async () => {
-    game.override
-      .mysteryEncounterChance(100)
-      .mysteryEncounter(MysteryEncounterType.THE_POKEMON_SALESMAN)
-      .startingWave(12);
-    game.scene.money = 20000;
-
-    await game.challengeMode.runToSummon([SpeciesId.NUZLEAF]);
-
-    await runMysteryEncounterToEnd(game, 1);
-
-    expect(game.scene.getPlayerParty()).toHaveLength(2);
-  });
 });

test/challenges/limited-support.test.ts

@@ -3,7 +3,6 @@ import { Challenges } from "#enums/challenges";
 import { MoveId } from "#enums/move-id";
 import { SpeciesId } from "#enums/species-id";
 import { UiMode } from "#enums/ui-mode";
-import { ExpBoosterModifier } from "#modifiers/modifier";
 import { GameManager } from "#test/test-utils/game-manager";
 import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler";
 import Phaser from "phaser";
@@ -76,7 +75,6 @@ describe("Challenges - Limited Support", () => {
     await game.doKillOpponents();
     await game.toNextWave();
 
-    expect(game.scene.getModifiers(ExpBoosterModifier)).toHaveLength(1);
     expect(playerPokemon).not.toHaveFullHp();
 
     game.move.use(MoveId.SPLASH);