Merge 238691c8bf into 5d4b805c13

Removed division by 6 in starter-select-ui-handler.ts

.github/CODEOWNERS

@@ -3,9 +3,6 @@
 # everything (whole code-base) - Junior Devs
 * @pagefaultgames/junior-dev-team
 
-# github actions/templates etc. - Dev Leads
-/.github @pagefaultgames/senior-dev-team
-
 # Art Team
 /public/**/*.png @pagefaultgames/art-team
 /public/**/*.json @pagefaultgames/art-team
@@ -19,4 +16,11 @@
 /public/audio @pagefaultgames/composer-team
 
 # Balance Files; contain actual code logic and must also be owned by dev team
-/src/data/balance @pagefaultgames/balance-team @pagefaultgames/junior-dev-team
+/src/data/balance @pagefaultgames/balance-team @pagefaultgames/junior-dev-team
+/src/data/trainers @pagefaultgames/balance-team @pagefaultgames/junior-dev-team
+
+# GitHub actions/templates etc. - Senior Devs
+# Should be defined last in the file to make sure these always override all other definitions
+/.github @pagefaultgames/senior-dev-team
+package.json @pagefaultgames/senior-dev-team
+pnpm-lock.yaml @pagefaultgames/senior-dev-team

public/images/trainer/rocket_boss_giovanni_1.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "rocket_boss_giovanni_1.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 79,
+				"h": 79
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 39,
+						"h": 79
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 79
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 39,
+						"h": 79
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:d6c5e1804414106d43a7c46f83468d39:1f3f7898a58950988acac6ee7167e012:5f742cbdaafcd5ae864f18ec2af7512a$"
+	}
+}

public/locales

@@ -1 +1 @@
-Subproject commit fa35780fed762017c89d1e9ece8a2779dff56c4d
+Subproject commit ab2716d5440c25f73986664aa3f3131821c3c392

src/@types/move-types.ts

@@ -16,7 +16,7 @@ export type * from "#moves/move";
  * Map of move subclass names to their respective classes.
  * Does not include the ChargeMove subclasses. For that, use `ChargingMoveClassMap`.
  *
- * @privateremarks
+ * @privateRemarks
  * The `never` field (`declare private _: never`) in some classes is necessary
  * to ensure typescript does not improperly narrow a failed `is` guard to `never`.
  *

src/@types/rewards.ts

@@ -44,3 +44,10 @@ export type RewardPool = {
 export interface RewardPoolWeights {
   [tier: string]: number[];
 }
+
+export type SilentReward =
+  | TrainerItemId
+  | typeof RewardId.VOUCHER
+  | typeof RewardId.VOUCHER_PLUS
+  | typeof RewardId.VOUCHER_PREMIUM
+  | typeof RewardId.ROGUE_BALL;

src/battle-scene.ts

@@ -65,7 +65,7 @@ import { PlayerGender } from "#enums/player-gender";
 import { PokeballType } from "#enums/pokeball";
 import type { PokemonAnimType } from "#enums/pokemon-anim-type";
 import { PokemonType } from "#enums/pokemon-type";
-import { HeldItemPoolType, RewardPoolType } from "#enums/reward-pool-type";
+import { HeldItemPoolType } from "#enums/reward-pool-type";
 import { ShopCursorTarget } from "#enums/shop-cursor-target";
 import { SpeciesId } from "#enums/species-id";
 import { StatusEffect } from "#enums/status-effect";
@@ -87,7 +87,6 @@ import { type ApplyTrainerItemsParams, applyTrainerItems } from "#items/apply-tr
 import type { HeldItemConfiguration } from "#items/held-item-data-types";
 import { assignEnemyHeldItemsForWave, assignItemsFromConfiguration } from "#items/held-item-pool";
 import type { MatchExact, Reward } from "#items/reward";
-import { getRewardPoolForType } from "#items/reward-pool-utils";
 import { type EnemyAttackStatusEffectChanceTrainerItem, TrainerItemEffect } from "#items/trainer-item";
 import {
   isTrainerItemPool,
@@ -233,8 +232,8 @@ export class BattleScene extends SceneBase {
   public battleStyle: BattleStyle = BattleStyle.SWITCH;
   /**
    * Defines whether or not to show type effectiveness hints
-   * - true: No hints
+   * - true: Show hints for moves
-   * - false: Show hints for moves
+   * - false: No hints
    */
   public typeHints = false;
 
@@ -469,8 +468,8 @@ export class BattleScene extends SceneBase {
 
     this.uiContainer = uiContainer;
 
-    const overlayWidth = this.game.canvas.width / 6;
+    const overlayWidth = this.scaledCanvas.width;
-    const overlayHeight = this.game.canvas.height / 6 - 48;
+    const overlayHeight = this.scaledCanvas.height - 48;
     this.fieldOverlay = this.add.rectangle(0, overlayHeight * -1 - 48, overlayWidth, overlayHeight, 0x424242);
     this.fieldOverlay.setName("rect-field-overlay");
     this.fieldOverlay.setOrigin(0, 0);
@@ -528,34 +527,29 @@ export class BattleScene extends SceneBase {
     this.candyBar.setup();
     this.fieldUI.add(this.candyBar);
 
-    this.biomeWaveText = addTextObject(
+    this.biomeWaveText = addTextObject(this.scaledCanvas.width - 2, 0, startingWave.toString(), TextStyle.BATTLE_INFO);
-      this.game.canvas.width / 6 - 2,
-      0,
-      startingWave.toString(),
-      TextStyle.BATTLE_INFO,
-    );
     this.biomeWaveText.setName("text-biome-wave");
     this.biomeWaveText.setOrigin(1, 0.5);
     this.fieldUI.add(this.biomeWaveText);
 
-    this.moneyText = addTextObject(this.game.canvas.width / 6 - 2, 0, "", TextStyle.MONEY);
+    this.moneyText = addTextObject(this.scaledCanvas.width - 2, 0, "", TextStyle.MONEY);
     this.moneyText.setName("text-money");
     this.moneyText.setOrigin(1, 0.5);
     this.fieldUI.add(this.moneyText);
 
-    this.scoreText = addTextObject(this.game.canvas.width / 6 - 2, 0, "", TextStyle.PARTY, { fontSize: "54px" });
+    this.scoreText = addTextObject(this.scaledCanvas.width - 2, 0, "", TextStyle.PARTY, { fontSize: "54px" });
     this.scoreText.setName("text-score");
     this.scoreText.setOrigin(1, 0.5);
     this.fieldUI.add(this.scoreText);
 
-    this.luckText = addTextObject(this.game.canvas.width / 6 - 2, 0, "", TextStyle.PARTY, { fontSize: "54px" });
+    this.luckText = addTextObject(this.scaledCanvas.width - 2, 0, "", TextStyle.PARTY, { fontSize: "54px" });
     this.luckText.setName("text-luck");
     this.luckText.setOrigin(1, 0.5);
     this.luckText.setVisible(false);
     this.fieldUI.add(this.luckText);
 
     this.luckLabelText = addTextObject(
-      this.game.canvas.width / 6 - 2,
+      this.scaledCanvas.width - 2,
       0,
       i18next.t("common:luckIndicator"),
       TextStyle.PARTY,
@@ -577,10 +571,7 @@ export class BattleScene extends SceneBase {
     this.spriteSparkleHandler = new PokemonSpriteSparkleHandler();
     this.spriteSparkleHandler.setup();
 
-    this.pokemonInfoContainer = new PokemonInfoContainer(
+    this.pokemonInfoContainer = new PokemonInfoContainer(this.scaledCanvas.width + 52, -this.scaledCanvas.height + 66);
-      this.game.canvas.width / 6 + 52,
-      -(this.game.canvas.height / 6) + 66,
-    );
     this.pokemonInfoContainer.setup();
 
     this.fieldUI.add(this.pokemonInfoContainer);
@@ -1234,15 +1225,7 @@ export class BattleScene extends SceneBase {
         ...allSpecies,
         ...allMoves,
         ...allAbilities,
-        ...getEnumValues(RewardPoolType)
+        //TODO: do we need to add items and rewards here?
-          .map(mpt => getRewardPoolForType(mpt))
-          .flatMap(mp =>
-            Object.values(mp)
-              .flat()
-              .map(mt => mt.reward)
-              .filter(mt => "localize" in mt)
-              .map(lpb => lpb as unknown as Localizable),
-          ),
       ];
       for (const item of localizable) {
         item.localize();
@@ -2049,7 +2032,7 @@ export class BattleScene extends SceneBase {
     } else {
       this.luckText.setTint(0xffef5c, 0x47ff69, 0x6b6bff, 0xff6969);
     }
-    this.luckLabelText.setX(this.game.canvas.width / 6 - 2 - (this.luckText.displayWidth + 2));
+    this.luckLabelText.setX(this.scaledCanvas.width - 2 - (this.luckText.displayWidth + 2));
     this.tweens.add({
       targets: labels,
       duration: duration,
@@ -2083,7 +2066,7 @@ export class BattleScene extends SceneBase {
     const enemyItemCount = this.enemyItemBar.totalVisibleLength;
     const biomeWaveTextHeight = this.biomeWaveText.getBottomLeft().y - this.biomeWaveText.getTopLeft().y;
     this.biomeWaveText.setY(
-      -(this.game.canvas.height / 6) +
+      -this.scaledCanvas.height +
         (enemyItemCount ? (enemyItemCount <= 12 ? 15 : 24) : 0) +
         biomeWaveTextHeight / 2,
     );
@@ -2095,7 +2078,7 @@ export class BattleScene extends SceneBase {
     const offsetY = (this.scoreText.visible ? this.scoreText : this.moneyText).y + 15;
     this.partyExpBar.setY(offsetY);
     this.candyBar.setY(offsetY + 15);
-    this.ui?.achvBar.setY(this.game.canvas.height / 6 + offsetY);
+    this.ui?.achvBar.setY(this.scaledCanvas.height + offsetY);
   }
 
   /**
@@ -2784,74 +2767,6 @@ export class BattleScene extends SceneBase {
     });
   }
 
-  // TODO @Wlowscha: Fix this
-  /**
-   * Attempt to discard one or more copies of a held item.
-   * @param itemModifier - The {@linkcode PokemonHeldItemModifier} being discarded
-   * @param discardQuantity - The number of copies to remove (up to the amount currently held); default `1`
-   * @returns Whether the item was successfully discarded.
-   * Removing fewer items than requested is still considered a success.
-   */
-  tryDiscardHeldItemModifier(itemModifier: PokemonHeldItemModifier, discardQuantity = 1): boolean {
-    const countTaken = Math.min(discardQuantity, itemModifier.stackCount);
-    itemModifier.stackCount -= countTaken;
-
-    if (itemModifier.stackCount > 0) {
-      return true;
-    }
-
-    return this.removeModifier(itemModifier);
-  }
-
-  canTransferHeldItemModifier(itemModifier: PokemonHeldItemModifier, target: Pokemon, transferQuantity = 1): boolean {
-    const mod = itemModifier.clone() as PokemonHeldItemModifier;
-    const source = mod.pokemonId ? mod.getPokemon() : null;
-    const cancelled = new BooleanHolder(false);
-
-    if (source && source.isPlayer() !== target.isPlayer()) {
-      applyAbAttrs("BlockItemTheftAbAttr", { pokemon: source, cancelled });
-    }
-
-    if (cancelled.value) {
-      return false;
-    }
-
-    const matchingModifier = this.findModifier(
-      m => m instanceof PokemonHeldItemModifier && m.matchType(mod) && m.pokemonId === target.id,
-      target.isPlayer(),
-    ) as PokemonHeldItemModifier;
-
-    if (matchingModifier) {
-      const maxStackCount = matchingModifier.getMaxStackCount();
-      if (matchingModifier.stackCount >= maxStackCount) {
-        return false;
-      }
-      const countTaken = Math.min(transferQuantity, mod.stackCount, maxStackCount - matchingModifier.stackCount);
-      mod.stackCount -= countTaken;
-    } else {
-      const countTaken = Math.min(transferQuantity, mod.stackCount);
-      mod.stackCount -= countTaken;
-    }
-
-    const removeOld = mod.stackCount === 0;
-
-    return !removeOld || !source || this.hasModifier(itemModifier, !source.isPlayer());
-  }
-
-  removePartyMemberModifiers(partyMemberIndex: number): Promise<void> {
-    return new Promise(resolve => {
-      const pokemonId = this.getPlayerParty()[partyMemberIndex].id;
-      const modifiersToRemove = this.modifiers.filter(
-        m => m instanceof PokemonHeldItemModifier && (m as PokemonHeldItemModifier).pokemonId === pokemonId,
-      );
-      for (const m of modifiersToRemove) {
-        this.modifiers.splice(this.modifiers.indexOf(m), 1);
-      }
-      this.updateModifiers();
-      resolve();
-    });
-  }
-
   assignTrainerItemsFromSaveData(saveData: TrainerItemSaveData, isPlayer: boolean) {
     const manager = isPlayer ? this.trainerItems : this.enemyTrainerItems;
     for (const item of saveData) {

src/constants.ts

@@ -94,3 +94,10 @@ export const AVERAGE_ENCOUNTERS_PER_RUN_TARGET = 12;
  * So anti-variance adds -15/256 to the spawn weight check for ME spawn.
  */
 export const ANTI_VARIANCE_WEIGHT_MODIFIER = 15;
+
+/**
+ * The chance (out of 1) that a different title logo will show when the title screen is drawn.
+ * Inverted during April Fools (such that this becomes the chance for the _normal_ title logo is displayed).
+ * Default: `10000` (0.01%)
+ */
+export const FAKE_TITLE_LOGO_CHANCE = 10000;

src/data/abilities/ability.ts

@@ -1284,7 +1284,7 @@ export class PostDefendContactApplyTagChanceAbAttr extends PostDefendAbAttr {
 /**
  * Set stat stages when the user gets hit by a critical hit
  *
- * @privateremarks
+ * @privateRemarks
  * It is the responsibility of the caller to ensure that this ability attribute is only applied
  * when the user has been hit by a critical hit; such an event is not checked here.
  *
@@ -2043,7 +2043,7 @@ export class AllyStatMultiplierAbAttr extends AbAttr {
 
   /**
    * @param stat - The stat being modified
-   * @param multipler - The multiplier to apply to the stat
+   * @param multiplier - The multiplier to apply to the stat
    * @param ignorable - Whether the multiplier can be ignored by mold breaker-like moves and abilities
    */
   constructor(stat: BattleStat, multiplier: number, ignorable = true) {
@@ -5465,7 +5465,7 @@ export class PostFaintContactDamageAbAttr extends PostFaintAbAttr {
  * Attribute used for abilities that damage opponents causing the user to faint
  * equal to the amount of damage the last attack inflicted.
  *
- * Used for {@linkcode Abilities.INNARDS_OUT}.
+ * Used for {@linkcode AbilityId.INNARDS_OUT | Innards Out}.
  * @sealed
  */
 export class PostFaintHPDamageAbAttr extends PostFaintAbAttr {
@@ -6414,23 +6414,23 @@ export class PostDamageForceSwitchAbAttr extends PostDamageAbAttr {
   public override canApply({ pokemon, source, damage }: PostDamageAbAttrParams): boolean {
     const moveHistory = pokemon.getMoveHistory();
     // Will not activate when the Pokémon's HP is lowered by cutting its own HP
-    const fordbiddenAttackingMoves = [MoveId.BELLY_DRUM, MoveId.SUBSTITUTE, MoveId.CURSE, MoveId.PAIN_SPLIT];
+    const forbiddenAttackingMoves = [MoveId.BELLY_DRUM, MoveId.SUBSTITUTE, MoveId.CURSE, MoveId.PAIN_SPLIT];
     if (moveHistory.length > 0) {
       const lastMoveUsed = moveHistory[moveHistory.length - 1];
-      if (fordbiddenAttackingMoves.includes(lastMoveUsed.move)) {
+      if (forbiddenAttackingMoves.includes(lastMoveUsed.move)) {
         return false;
       }
     }
 
     // Dragon Tail and Circle Throw switch out Pokémon before the Ability activates.
-    const fordbiddenDefendingMoves = [MoveId.DRAGON_TAIL, MoveId.CIRCLE_THROW];
+    const forbiddenDefendingMoves = [MoveId.DRAGON_TAIL, MoveId.CIRCLE_THROW];
     if (source) {
       const enemyMoveHistory = source.getMoveHistory();
       if (enemyMoveHistory.length > 0) {
         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 (
-          fordbiddenDefendingMoves.includes(enemyLastMoveUsed.move) ||
+          forbiddenDefendingMoves.includes(enemyLastMoveUsed.move) ||
           (enemyLastMoveUsed.move === MoveId.SKY_DROP && enemyLastMoveUsed.result === MoveResult.OTHER)
         ) {
           return false;
@@ -7277,7 +7277,7 @@ export function initAbilities() {
       .attr(HealFromBerryUseAbAttr, 1 / 3),
     new Ability(AbilityId.PROTEAN, 6)
       .attr(PokemonTypeChangeAbAttr)
-      // .condition((p) => !p.summonData.abilitiesApplied.includes(Abilities.PROTEAN)) //Gen 9 Implementation
+      // .condition((p) => !p.summonData.abilitiesApplied.includes(AbilityId.PROTEAN)) //Gen 9 Implementation
       // TODO: needs testing on interaction with weather blockage
       .edgeCase(),
     new Ability(AbilityId.FUR_COAT, 6)
@@ -7536,7 +7536,7 @@ export function initAbilities() {
       .attr(PostSummonStatStageChangeAbAttr, [ Stat.DEF ], 1, true),
     new Ability(AbilityId.LIBERO, 8)
       .attr(PokemonTypeChangeAbAttr)
-    //.condition((p) => !p.summonData.abilitiesApplied.includes(Abilities.LIBERO)), //Gen 9 Implementation
+    //.condition((p) => !p.summonData.abilitiesApplied.includes(AbilityId.LIBERO)), //Gen 9 Implementation
       // TODO: needs testing on interaction with weather blockage
       .edgeCase(),
     new Ability(AbilityId.BALL_FETCH, 8)

src/data/balance/egg-moves.ts

@@ -15,7 +15,7 @@ export const speciesEggMoves = {
   [SpeciesId.SPEAROW]: [ MoveId.FLOATY_FALL, MoveId.EXTREME_SPEED, MoveId.KNOCK_OFF, MoveId.TRIPLE_ARROWS ],
   [SpeciesId.EKANS]: [ MoveId.NOXIOUS_TORQUE, MoveId.DRAGON_DANCE, MoveId.SLACK_OFF, MoveId.SHED_TAIL ],
   [SpeciesId.SANDSHREW]: [ MoveId.HIGH_HORSEPOWER, MoveId.DIRE_CLAW, MoveId.SHORE_UP, MoveId.MIGHTY_CLEAVE ],
-  [SpeciesId.NIDORAN_F]: [ MoveId.CALM_MIND, MoveId.MOONLIGHT, MoveId.MALIGNANT_CHAIN, MoveId.SANDSEAR_STORM ],
+  [SpeciesId.NIDORAN_F]: [ MoveId.BANEFUL_BUNKER, MoveId.MOONLIGHT, MoveId.BARB_BARRAGE, MoveId.THOUSAND_WAVES ],
   [SpeciesId.NIDORAN_M]: [ MoveId.DRAGON_DANCE, MoveId.MOUNTAIN_GALE, MoveId.NOXIOUS_TORQUE, MoveId.PRECIPICE_BLADES ],
   [SpeciesId.VULPIX]: [ MoveId.MOONBLAST, MoveId.INFERNAL_PARADE, MoveId.MORNING_SUN, MoveId.TAIL_GLOW ],
   [SpeciesId.ZUBAT]: [ MoveId.FLOATY_FALL, MoveId.DIRE_CLAW, MoveId.SWORDS_DANCE, MoveId.COLLISION_COURSE ],
@@ -293,7 +293,7 @@ export const speciesEggMoves = {
   [SpeciesId.ARCHEN]: [ MoveId.ROOST, MoveId.EARTHQUAKE, MoveId.FLOATY_FALL, MoveId.MIGHTY_CLEAVE ],
   [SpeciesId.TRUBBISH]: [ MoveId.COIL, MoveId.RECOVER, MoveId.DIRE_CLAW, MoveId.GIGATON_HAMMER ],
   [SpeciesId.ZORUA]: [ MoveId.MALIGNANT_CHAIN, MoveId.MOONBLAST, MoveId.SECRET_SWORD, MoveId.FIERY_WRATH ],
-  [SpeciesId.MINCCINO]: [ MoveId.ICICLE_SPEAR, MoveId.TIDY_UP, MoveId.KNOCK_OFF, MoveId.POPULATION_BOMB ],
+  [SpeciesId.MINCCINO]: [ MoveId.ICICLE_SPEAR, MoveId.TIDY_UP, MoveId.LOW_KICK, MoveId.POPULATION_BOMB ],
   [SpeciesId.GOTHITA]: [ MoveId.RECOVER, MoveId.MOONBLAST, MoveId.AURA_SPHERE, MoveId.LUMINA_CRASH ],
   [SpeciesId.SOLOSIS]: [ MoveId.MIST_BALL, MoveId.SPEED_SWAP, MoveId.FLAMETHROWER, MoveId.LIGHT_OF_RUIN ],
   [SpeciesId.DUCKLETT]: [ MoveId.SPLISHY_SPLASH, MoveId.SANDSEAR_STORM, MoveId.WILDBOLT_STORM, MoveId.QUIVER_DANCE ],
@@ -310,7 +310,7 @@ export const speciesEggMoves = {
   [SpeciesId.TYNAMO]: [ MoveId.SCALD, MoveId.STRENGTH_SAP, MoveId.FIRE_LASH, MoveId.AURA_WHEEL ],
   [SpeciesId.ELGYEM]: [ MoveId.THUNDERCLAP, MoveId.BADDY_BAD, MoveId.AURA_SPHERE, MoveId.PHOTON_GEYSER ],
   [SpeciesId.LITWICK]: [ MoveId.GIGA_DRAIN, MoveId.EARTH_POWER, MoveId.MOONBLAST, MoveId.TORCH_SONG ],
-  [SpeciesId.AXEW]: [ MoveId.STONE_AXE, MoveId.DIRE_CLAW, MoveId.BITTER_BLADE, MoveId.GLAIVE_RUSH ],
+  [SpeciesId.AXEW]: [ MoveId.STONE_AXE, MoveId.DIRE_CLAW, MoveId.RAGING_FURY, MoveId.BITTER_BLADE ],
   [SpeciesId.CUBCHOO]: [ MoveId.MOUNTAIN_GALE, MoveId.AQUA_STEP, MoveId.ICE_SHARD, MoveId.COLLISION_COURSE ],
   [SpeciesId.CRYOGONAL]: [ MoveId.FREEZING_GLARE, MoveId.AURORA_VEIL, MoveId.NASTY_PLOT, MoveId.ORIGIN_PULSE ],
   [SpeciesId.SHELMET]: [ MoveId.POWER_GEM, MoveId.NASTY_PLOT, MoveId.EARTH_POWER, MoveId.STEAM_ERUPTION ],
@@ -448,7 +448,7 @@ export const speciesEggMoves = {
   [SpeciesId.ROOKIDEE]: [ MoveId.ROOST, MoveId.BODY_PRESS, MoveId.KINGS_SHIELD, MoveId.BEHEMOTH_BASH ],
   [SpeciesId.BLIPBUG]: [ MoveId.HEAL_ORDER, MoveId.LUSTER_PURGE, MoveId.SLEEP_POWDER, MoveId.TAIL_GLOW ],
   [SpeciesId.NICKIT]: [ MoveId.BADDY_BAD, MoveId.MYSTICAL_FIRE, MoveId.SPARKLY_SWIRL, MoveId.MAKE_IT_RAIN ],
-  [SpeciesId.GOSSIFLEUR]: [ MoveId.PARTING_SHOT, MoveId.STRENGTH_SAP, MoveId.SAPPY_SEED, MoveId.SEED_FLARE ],
+  [SpeciesId.GOSSIFLEUR]: [ MoveId.BATON_PASS, MoveId.TAILWIND, MoveId.SAPPY_SEED, MoveId.SPORE ],
   [SpeciesId.WOOLOO]: [ MoveId.NUZZLE, MoveId.MILK_DRINK, MoveId.BODY_PRESS, MoveId.MULTI_ATTACK ],
   [SpeciesId.CHEWTLE]: [ MoveId.ICE_FANG, MoveId.PSYCHIC_FANGS, MoveId.SHELL_SMASH, MoveId.MIGHTY_CLEAVE ],
   [SpeciesId.YAMPER]: [ MoveId.ICE_FANG, MoveId.SWORDS_DANCE, MoveId.THUNDER_FANG, MoveId.BOLT_STRIKE ],
@@ -514,7 +514,7 @@ export const speciesEggMoves = {
   [SpeciesId.TAROUNTULA]: [ MoveId.STONE_AXE, MoveId.LEECH_LIFE, MoveId.FAKE_OUT, MoveId.SPORE ],
   [SpeciesId.NYMBLE]: [ MoveId.KNOCK_OFF, MoveId.FELL_STINGER, MoveId.ATTACK_ORDER, MoveId.WICKED_BLOW ],
   [SpeciesId.PAWMI]: [ MoveId.DRAIN_PUNCH, MoveId.METEOR_MASH, MoveId.JET_PUNCH, MoveId.PLASMA_FISTS ],
-  [SpeciesId.TANDEMAUS]: [ MoveId.BATON_PASS, MoveId.COVET, MoveId.SIZZLY_SLIDE, MoveId.REVIVAL_BLESSING ],
+  [SpeciesId.TANDEMAUS]: [ MoveId.BATON_PASS, MoveId.FAKE_OUT, MoveId.POWER_UP_PUNCH, MoveId.REVIVAL_BLESSING ],
   [SpeciesId.FIDOUGH]: [ MoveId.SOFT_BOILED, MoveId.HIGH_HORSEPOWER, MoveId.SIZZLY_SLIDE, MoveId.TIDY_UP ],
   [SpeciesId.SMOLIV]: [ MoveId.STRENGTH_SAP, MoveId.EARTH_POWER, MoveId.CALM_MIND, MoveId.BOOMBURST ],
   [SpeciesId.SQUAWKABILLY]: [ MoveId.PARTING_SHOT, MoveId.EARTHQUAKE, MoveId.FLARE_BLITZ, MoveId.EXTREME_SPEED ],

src/data/balance/passives.ts

@@ -36,9 +36,9 @@ export const starterPassiveAbilities: StarterPassiveAbilities = {
   [SpeciesId.ARBOK]: { 0: AbilityId.REGENERATOR },
   [SpeciesId.SANDSHREW]: { 0: AbilityId.TOUGH_CLAWS },
   [SpeciesId.SANDSLASH]: { 0: AbilityId.TOUGH_CLAWS },
-  [SpeciesId.NIDORAN_F]: { 0: AbilityId.FLARE_BOOST },
+  [SpeciesId.NIDORAN_F]: { 0: AbilityId.TOXIC_DEBRIS },
-  [SpeciesId.NIDORINA]: { 0: AbilityId.FLARE_BOOST },
+  [SpeciesId.NIDORINA]: { 0: AbilityId.TOXIC_DEBRIS },
-  [SpeciesId.NIDOQUEEN]: { 0: AbilityId.FLARE_BOOST },
+  [SpeciesId.NIDOQUEEN]: { 0: AbilityId.TOXIC_DEBRIS },
   [SpeciesId.NIDORAN_M]: { 0: AbilityId.GUTS },
   [SpeciesId.NIDORINO]: { 0: AbilityId.GUTS },
   [SpeciesId.NIDOKING]: { 0: AbilityId.GUTS },
@@ -220,8 +220,8 @@ export const starterPassiveAbilities: StarterPassiveAbilities = {
   [SpeciesId.YANMEGA]: { 0: AbilityId.SHEER_FORCE },
   [SpeciesId.WOOPER]: { 0: AbilityId.WATER_VEIL },
   [SpeciesId.QUAGSIRE]: { 0: AbilityId.COMATOSE },
-  [SpeciesId.MURKROW]: { 0: AbilityId.DARK_AURA },
+  [SpeciesId.MURKROW]: { 0: AbilityId.UNNERVE },
-  [SpeciesId.HONCHKROW]: { 0: AbilityId.DARK_AURA },
+  [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 },
@@ -391,7 +391,7 @@ export const starterPassiveAbilities: StarterPassiveAbilities = {
   [SpeciesId.BANETTE]: { 0: AbilityId.SHADOW_SHIELD, 1: AbilityId.SHADOW_SHIELD },
   [SpeciesId.DUSKULL]: { 0: AbilityId.UNNERVE },
   [SpeciesId.DUSCLOPS]: { 0: AbilityId.UNNERVE },
-  [SpeciesId.DUSKNOIR]: { 0: AbilityId.UNNERVE },
+  [SpeciesId.DUSKNOIR]: { 0: AbilityId.LEVITATE },
   [SpeciesId.TROPIUS]: { 0: AbilityId.RIPEN },
   [SpeciesId.ABSOL]: { 0: AbilityId.SHARPNESS, 1: AbilityId.SHARPNESS },
   [SpeciesId.WYNAUT]: { 0: AbilityId.STURDY },
@@ -640,9 +640,9 @@ export const starterPassiveAbilities: StarterPassiveAbilities = {
   [SpeciesId.LITWICK]: { 0: AbilityId.SHADOW_TAG },
   [SpeciesId.LAMPENT]: { 0: AbilityId.SHADOW_TAG },
   [SpeciesId.CHANDELURE]: { 0: AbilityId.SHADOW_TAG },
-  [SpeciesId.AXEW]: { 0: AbilityId.DRAGONS_MAW },
+  [SpeciesId.AXEW]: { 0: AbilityId.OWN_TEMPO },
-  [SpeciesId.FRAXURE]: { 0: AbilityId.DRAGONS_MAW },
+  [SpeciesId.FRAXURE]: { 0: AbilityId.OWN_TEMPO },
-  [SpeciesId.HAXORUS]: { 0: AbilityId.DRAGONS_MAW },
+  [SpeciesId.HAXORUS]: { 0: AbilityId.OWN_TEMPO },
   [SpeciesId.CUBCHOO]: { 0: AbilityId.FUR_COAT },
   [SpeciesId.BEARTIC]: { 0: AbilityId.FUR_COAT },
   [SpeciesId.CRYOGONAL]: { 0: AbilityId.SNOW_WARNING },
@@ -827,7 +827,7 @@ export const starterPassiveAbilities: StarterPassiveAbilities = {
   [SpeciesId.TAPU_LELE]: { 0: AbilityId.BERSERK },
   [SpeciesId.TAPU_BULU]: { 0: AbilityId.FLOWER_VEIL },
   [SpeciesId.TAPU_FINI]: { 0: AbilityId.FAIRY_AURA },
-  [SpeciesId.COSMOG]: { 0: AbilityId.PICKUP },
+  [SpeciesId.COSMOG]: { 0: AbilityId.POWER_SPOT },
   [SpeciesId.COSMOEM]: { 0: AbilityId.POWER_SPOT },
   [SpeciesId.SOLGALEO]: { 0: AbilityId.BEAST_BOOST },
   [SpeciesId.LUNALA]: { 0: AbilityId.BEAST_BOOST },
@@ -1044,7 +1044,7 @@ 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.DARK_AURA, 2: AbilityId.FLASH_FIRE, 3: AbilityId.MERCILESS, 4: AbilityId.FILTER, 5: AbilityId.SCRAPPY },
+  [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 },

src/data/balance/pokemon-species.ts

@@ -1618,11 +1618,11 @@ export function initSpecies() {
     new PokemonSpecies(SpeciesId.VAROOM, 9, false, false, false, "Single-Cyl Pokémon", PokemonType.STEEL, PokemonType.POISON, 1, 35, AbilityId.OVERCOAT, AbilityId.NONE, AbilityId.SLOW_START, 300, 45, 70, 63, 30, 45, 47, 190, 50, 60, GrowthRate.MEDIUM_FAST, 50, false),
     new PokemonSpecies(SpeciesId.REVAVROOM, 9, false, false, false, "Multi-Cyl Pokémon", PokemonType.STEEL, PokemonType.POISON, 1.8, 120, AbilityId.OVERCOAT, AbilityId.NONE, AbilityId.FILTER, 500, 80, 119, 90, 54, 67, 90, 75, 50, 175, GrowthRate.MEDIUM_FAST, 50, false, false,
       new PokemonForm("Normal", "", PokemonType.STEEL, PokemonType.POISON, 1.8, 120, AbilityId.OVERCOAT, AbilityId.NONE, AbilityId.FILTER, 500, 80, 119, 90, 54, 67, 90, 75, 50, 175, false, null, true),
-      new PokemonForm("Segin Starmobile", "segin-starmobile", PokemonType.STEEL, PokemonType.DARK, 1.8, 240, AbilityId.INTIMIDATE, AbilityId.NONE, AbilityId.INTIMIDATE, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175, false, null, false, true),
+      new PokemonForm("Segin Starmobile", "segin-starmobile", PokemonType.STEEL, PokemonType.DARK, 1.8, 240, AbilityId.OVERCOAT, AbilityId.NONE, AbilityId.OVERCOAT, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175, false, null, false, true),
-      new PokemonForm("Schedar Starmobile", "schedar-starmobile", PokemonType.STEEL, PokemonType.FIRE, 1.8, 240, AbilityId.SPEED_BOOST, AbilityId.NONE, AbilityId.SPEED_BOOST, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175, false, null, false, true),
+      new PokemonForm("Schedar Starmobile", "schedar-starmobile", PokemonType.STEEL, PokemonType.FIRE, 1.8, 240, AbilityId.OVERCOAT, AbilityId.NONE, AbilityId.OVERCOAT, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175, false, null, false, true),
-      new PokemonForm("Navi Starmobile", "navi-starmobile", PokemonType.STEEL, PokemonType.POISON, 1.8, 240, AbilityId.TOXIC_DEBRIS, AbilityId.NONE, AbilityId.TOXIC_DEBRIS, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175, false, null, false, true),
+      new PokemonForm("Navi Starmobile", "navi-starmobile", PokemonType.STEEL, PokemonType.POISON, 1.8, 240, AbilityId.OVERCOAT, AbilityId.NONE, AbilityId.OVERCOAT, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175, false, null, false, true),
-      new PokemonForm("Ruchbah Starmobile", "ruchbah-starmobile", PokemonType.STEEL, PokemonType.FAIRY, 1.8, 240, AbilityId.MISTY_SURGE, AbilityId.NONE, AbilityId.MISTY_SURGE, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175, false, null, false, true),
+      new PokemonForm("Ruchbah Starmobile", "ruchbah-starmobile", PokemonType.STEEL, PokemonType.FAIRY, 1.8, 240, AbilityId.OVERCOAT, AbilityId.NONE, AbilityId.OVERCOAT, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175, false, null, false, true),
-      new PokemonForm("Caph Starmobile", "caph-starmobile", PokemonType.STEEL, PokemonType.FIGHTING, 1.8, 240, AbilityId.STAMINA, AbilityId.NONE, AbilityId.STAMINA, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175, false, null, false, true)
+      new PokemonForm("Caph Starmobile", "caph-starmobile", PokemonType.STEEL, PokemonType.FIGHTING, 1.8, 240, AbilityId.OVERCOAT, AbilityId.NONE, AbilityId.OVERCOAT, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175, false, null, false, true)
     ),
     new PokemonSpecies(SpeciesId.CYCLIZAR, 9, false, false, false, "Mount Pokémon", PokemonType.DRAGON, PokemonType.NORMAL, 1.6, 63, AbilityId.SHED_SKIN, AbilityId.NONE, AbilityId.REGENERATOR, 501, 70, 95, 65, 85, 65, 121, 190, 50, 175, GrowthRate.MEDIUM_SLOW, 50, false),
     new PokemonSpecies(SpeciesId.ORTHWORM, 9, false, false, false, "Earthworm Pokémon", PokemonType.STEEL, null, 2.5, 310, AbilityId.EARTH_EATER, AbilityId.NONE, AbilityId.SAND_VEIL, 480, 70, 85, 145, 60, 55, 65, 25, 50, 240, GrowthRate.SLOW, 50, false),

src/data/balance/signature-species.ts

@@ -30,7 +30,7 @@ export const signatureSpecies: SignatureSpecies = new Proxy({
   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.SABLEYE],
+  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],

src/data/balance/starters.ts

@@ -566,7 +566,7 @@ export const speciesStarterCosts = {
   [SpeciesId.FLITTLE]: 3,
   [SpeciesId.TINKATINK]: 4,
   [SpeciesId.WIGLETT]: 2,
-  [SpeciesId.BOMBIRDIER]: 3,
+  [SpeciesId.BOMBIRDIER]: 4,
   [SpeciesId.FINIZEN]: 3,
   [SpeciesId.VAROOM]: 4,
   [SpeciesId.CYCLIZAR]: 4,

src/data/challenge.ts

@@ -1,17 +1,13 @@
 import type { FixedBattleConfig } from "#app/battle";
 import { getRandomTrainerFunc } from "#app/battle";
 import { defaultStarterSpecies } from "#app/constants";
-import { globalScene } from "#app/global-scene";
-import { pokemonEvolutions } from "#balance/pokemon-evolutions";
 import { speciesStarterCosts } from "#balance/starters";
-import { pokemonFormChanges } from "#data/pokemon-forms";
 import type { PokemonSpecies } from "#data/pokemon-species";
 import { BattleType } from "#enums/battle-type";
-import { ChallengeType } from "#enums/challenge-type";
 import { Challenges } from "#enums/challenges";
 import { TypeColor, TypeShadow } from "#enums/color";
 import { ClassicFixedBossWaves } from "#enums/fixed-boss-waves";
-import type { MoveId } from "#enums/move-id";
+import { MoveId } from "#enums/move-id";
 import type { MoveSourceType } from "#enums/move-source-type";
 import { Nature } from "#enums/nature";
 import { PokemonType } from "#enums/pokemon-type";
@@ -19,11 +15,12 @@ import { RarityTier } from "#enums/reward-tier";
 import { SpeciesId } from "#enums/species-id";
 import { TrainerType } from "#enums/trainer-type";
 import { TrainerVariant } from "#enums/trainer-variant";
-import type { Pokemon } from "#field/pokemon";
+import type { EnemyPokemon, PlayerPokemon, Pokemon } from "#field/pokemon";
 import { Trainer } from "#field/trainer";
+import type { ModifierTypeOption } from "#modifiers/modifier-type";
 import { PokemonMove } from "#moves/pokemon-move";
 import type { DexAttrProps, GameData } from "#system/game-data";
-import { BooleanHolder, isBetween, type NumberHolder, randSeedItem } from "#utils/common";
+import { type BooleanHolder, isBetween, type NumberHolder, randSeedItem } from "#utils/common";
 import { deepCopy } from "#utils/data";
 import { getPokemonSpecies, getPokemonSpeciesForm } from "#utils/pokemon-utils";
 import { toCamelCase, toSnakeCase } from "#utils/strings";
@@ -341,6 +338,83 @@ export abstract class Challenge {
   applyFlipStat(_pokemon: Pokemon, _baseStats: number[]) {
     return false;
   }
+
+  /**
+   * An apply function for PARTY_HEAL. Derived classes should alter this.
+   * @param _status - Whether party healing is enabled or not
+   * @returns Whether this function did anything
+   */
+  applyPartyHeal(_status: BooleanHolder): boolean {
+    return false;
+  }
+
+  /**
+   * An apply function for SHOP. Derived classes should alter this.
+   * @param _status - Whether the shop is or is not available after a wave
+   * @returns Whether this function did anything
+   */
+  applyShop(_status: BooleanHolder) {
+    return false;
+  }
+
+  /**
+   * An apply function for POKEMON_ADD_TO_PARTY. Derived classes should alter this.
+   * @param _pokemon - The pokemon being caught
+   * @param _status - Whether the pokemon can be added to the party or not
+   * @return Whether this function did anything
+   */
+  applyPokemonAddToParty(_pokemon: EnemyPokemon, _status: BooleanHolder): boolean {
+    return false;
+  }
+
+  /**
+   * An apply function for POKEMON_FUSION. Derived classes should alter this.
+   * @param _pokemon - The pokemon being checked
+   * @param _status - Whether the selected pokemon is allowed to fuse or not
+   * @returns Whether this function did anything
+   */
+  applyPokemonFusion(_pokemon: PlayerPokemon, _status: BooleanHolder): boolean {
+    return false;
+  }
+
+  /**
+   * An apply function for POKEMON_MOVE. Derived classes should alter this.
+   * @param _moveId - The {@linkcode MoveId} being checked
+   * @param _status - A {@linkcode BooleanHolder} containing the move's usability status
+   * @returns Whether this function did anything
+   */
+  applyPokemonMove(_moveId: MoveId, _status: BooleanHolder): boolean {
+    return false;
+  }
+
+  /**
+   * An apply function for SHOP_ITEM. Derived classes should alter this.
+   * @param _shopItem - The item being checked
+   * @param _status - Whether the item should be added to the shop or not
+   * @returns Whether this function did anything
+   */
+  applyShopItem(_shopItem: ModifierTypeOption | null, _status: BooleanHolder): boolean {
+    return false;
+  }
+
+  /**
+   * An apply function for WAVE_REWARD. Derived classes should alter this.
+   * @param _reward - The reward being checked
+   * @param _status - Whether the reward should be added to the reward options or not
+   * @returns Whether this function did anything
+   */
+  applyWaveReward(_reward: ModifierTypeOption | null, _status: BooleanHolder): boolean {
+    return false;
+  }
+
+  /**
+   * An apply function for PREVENT_REVIVE. Derived classes should alter this.
+   * @param _status - Whether fainting is a permanent status or not
+   * @returns Whether this function did anything
+   */
+  applyPreventRevive(_status: BooleanHolder): boolean {
+    return false;
+  }
 }
 
 type ChallengeCondition = (data: GameData) => boolean;
@@ -864,208 +938,108 @@ export class LowerStarterPointsChallenge extends Challenge {
 }
 
 /**
- * Apply all challenges that modify starter choice.
+ * Implements a No Support challenge
- * @param challengeType {@link ChallengeType} ChallengeType.STARTER_CHOICE
- * @param pokemon {@link PokemonSpecies} The pokemon to check the validity of.
- * @param valid {@link BooleanHolder} A BooleanHolder, the value gets set to false if the pokemon isn't allowed.
- * @param dexAttr {@link DexAttrProps} The dex attributes of the pokemon.
- * @returns True if any challenge was successfully applied.
  */
-export function applyChallenges(
+export class LimitedSupportChallenge extends Challenge {
-  challengeType: ChallengeType.STARTER_CHOICE,
+  constructor() {
-  pokemon: PokemonSpecies,
+    super(Challenges.LIMITED_SUPPORT, 3);
-  valid: BooleanHolder,
+  }
-  dexAttr: DexAttrProps,
-): boolean;
-/**
- * Apply all challenges that modify available total starter points.
- * @param challengeType {@link ChallengeType} ChallengeType.STARTER_POINTS
- * @param points {@link NumberHolder} The amount of points you have available.
- * @returns True if any challenge was successfully applied.
- */
-export function applyChallenges(challengeType: ChallengeType.STARTER_POINTS, points: NumberHolder): boolean;
-/**
- * Apply all challenges that modify the cost of a starter.
- * @param challengeType {@link ChallengeType} ChallengeType.STARTER_COST
- * @param species {@link SpeciesId} The pokemon to change the cost of.
- * @param points {@link NumberHolder} The cost of the pokemon.
- * @returns True if any challenge was successfully applied.
- */
-export function applyChallenges(
-  challengeType: ChallengeType.STARTER_COST,
-  species: SpeciesId,
-  cost: NumberHolder,
-): boolean;
-/**
- * Apply all challenges that modify a starter after selection.
- * @param challengeType {@link ChallengeType} ChallengeType.STARTER_MODIFY
- * @param pokemon {@link Pokemon} The starter pokemon to modify.
- * @returns True if any challenge was successfully applied.
- */
-export function applyChallenges(challengeType: ChallengeType.STARTER_MODIFY, pokemon: Pokemon): boolean;
-/**
- * Apply all challenges that what pokemon you can have in battle.
- * @param challengeType {@link ChallengeType} ChallengeType.POKEMON_IN_BATTLE
- * @param pokemon {@link Pokemon} The pokemon to check the validity of.
- * @param valid {@link BooleanHolder} A BooleanHolder, the value gets set to false if the pokemon isn't allowed.
- * @returns True if any challenge was successfully applied.
- */
-export function applyChallenges(
-  challengeType: ChallengeType.POKEMON_IN_BATTLE,
-  pokemon: Pokemon,
-  valid: BooleanHolder,
-): boolean;
-/**
- * Apply all challenges that modify what fixed battles there are.
- * @param challengeType {@link ChallengeType} ChallengeType.FIXED_BATTLES
- * @param waveIndex {@link Number} The current wave index.
- * @param battleConfig {@link FixedBattleConfig} The battle config to modify.
- * @returns True if any challenge was successfully applied.
- */
-export function applyChallenges(
-  challengeType: ChallengeType.FIXED_BATTLES,
-  waveIndex: number,
-  battleConfig: FixedBattleConfig,
-): boolean;
-/**
- * Apply all challenges that modify type effectiveness.
- * @param challengeType {@linkcode ChallengeType} ChallengeType.TYPE_EFFECTIVENESS
- * @param effectiveness {@linkcode NumberHolder} The current effectiveness of the move.
- * @returns True if any challenge was successfully applied.
- */
-export function applyChallenges(challengeType: ChallengeType.TYPE_EFFECTIVENESS, effectiveness: NumberHolder): boolean;
-/**
- * Apply all challenges that modify what level AI are.
- * @param challengeType {@link ChallengeType} ChallengeType.AI_LEVEL
- * @param level {@link NumberHolder} The generated level of the pokemon.
- * @param levelCap {@link Number} The maximum level cap for the current wave.
- * @param isTrainer {@link Boolean} Whether this is a trainer pokemon.
- * @param isBoss {@link Boolean} Whether this is a non-trainer boss pokemon.
- * @returns True if any challenge was successfully applied.
- */
-export function applyChallenges(
-  challengeType: ChallengeType.AI_LEVEL,
-  level: NumberHolder,
-  levelCap: number,
-  isTrainer: boolean,
-  isBoss: boolean,
-): boolean;
-/**
- * Apply all challenges that modify how many move slots the AI has.
- * @param challengeType {@link ChallengeType} ChallengeType.AI_MOVE_SLOTS
- * @param pokemon {@link Pokemon} The pokemon being considered.
- * @param moveSlots {@link NumberHolder} The amount of move slots.
- * @returns True if any challenge was successfully applied.
- */
-export function applyChallenges(
-  challengeType: ChallengeType.AI_MOVE_SLOTS,
-  pokemon: Pokemon,
-  moveSlots: NumberHolder,
-): boolean;
-/**
- * Apply all challenges that modify whether a pokemon has its passive.
- * @param challengeType {@link ChallengeType} ChallengeType.PASSIVE_ACCESS
- * @param pokemon {@link Pokemon} The pokemon to modify.
- * @param hasPassive {@link BooleanHolder} Whether it has its passive.
- * @returns True if any challenge was successfully applied.
- */
-export function applyChallenges(
-  challengeType: ChallengeType.PASSIVE_ACCESS,
-  pokemon: Pokemon,
-  hasPassive: BooleanHolder,
-): boolean;
-/**
- * Apply all challenges that modify the game modes settings.
- * @param challengeType {@link ChallengeType} ChallengeType.GAME_MODE_MODIFY
- * @returns True if any challenge was successfully applied.
- */
-export function applyChallenges(challengeType: ChallengeType.GAME_MODE_MODIFY): boolean;
-/**
- * Apply all challenges that modify what level a pokemon can access a move.
- * @param challengeType {@link ChallengeType} ChallengeType.MOVE_ACCESS
- * @param pokemon {@link Pokemon} What pokemon would learn the move.
- * @param moveSource {@link MoveSourceType} What source the pokemon would get the move from.
- * @param move {@link MoveId} The move in question.
- * @param level {@link NumberHolder} The level threshold for access.
- * @returns True if any challenge was successfully applied.
- */
-export function applyChallenges(
-  challengeType: ChallengeType.MOVE_ACCESS,
-  pokemon: Pokemon,
-  moveSource: MoveSourceType,
-  move: MoveId,
-  level: NumberHolder,
-): boolean;
-/**
- * Apply all challenges that modify what weight a pokemon gives to move generation
- * @param challengeType {@link ChallengeType} ChallengeType.MOVE_WEIGHT
- * @param pokemon {@link Pokemon} What pokemon would learn the move.
- * @param moveSource {@link MoveSourceType} What source the pokemon would get the move from.
- * @param move {@link MoveId} The move in question.
- * @param weight {@link NumberHolder} The weight of the move.
- * @returns True if any challenge was successfully applied.
- */
-export function applyChallenges(
-  challengeType: ChallengeType.MOVE_WEIGHT,
-  pokemon: Pokemon,
-  moveSource: MoveSourceType,
-  move: MoveId,
-  weight: NumberHolder,
-): boolean;
 
-export function applyChallenges(challengeType: ChallengeType.FLIP_STAT, pokemon: Pokemon, baseStats: number[]): boolean;
+  override applyPartyHeal(status: BooleanHolder): boolean {
-
+    if (status.value) {
-export function applyChallenges(challengeType: ChallengeType, ...args: any[]): boolean {
+      status.value = this.value === 2;
-  let ret = false;
+      return true;
-  globalScene.gameMode.challenges.forEach(c => {
-    if (c.value !== 0) {
-      switch (challengeType) {
-        case ChallengeType.STARTER_CHOICE:
-          ret ||= c.applyStarterChoice(args[0], args[1], args[2]);
-          break;
-        case ChallengeType.STARTER_POINTS:
-          ret ||= c.applyStarterPoints(args[0]);
-          break;
-        case ChallengeType.STARTER_COST:
-          ret ||= c.applyStarterCost(args[0], args[1]);
-          break;
-        case ChallengeType.STARTER_MODIFY:
-          ret ||= c.applyStarterModify(args[0]);
-          break;
-        case ChallengeType.POKEMON_IN_BATTLE:
-          ret ||= c.applyPokemonInBattle(args[0], args[1]);
-          break;
-        case ChallengeType.FIXED_BATTLES:
-          ret ||= c.applyFixedBattle(args[0], args[1]);
-          break;
-        case ChallengeType.TYPE_EFFECTIVENESS:
-          ret ||= c.applyTypeEffectiveness(args[0]);
-          break;
-        case ChallengeType.AI_LEVEL:
-          ret ||= c.applyLevelChange(args[0], args[1], args[2], args[3]);
-          break;
-        case ChallengeType.AI_MOVE_SLOTS:
-          ret ||= c.applyMoveSlot(args[0], args[1]);
-          break;
-        case ChallengeType.PASSIVE_ACCESS:
-          ret ||= c.applyPassiveAccess(args[0], args[1]);
-          break;
-        case ChallengeType.GAME_MODE_MODIFY:
-          ret ||= c.applyGameModeModify();
-          break;
-        case ChallengeType.MOVE_ACCESS:
-          ret ||= c.applyMoveAccessLevel(args[0], args[1], args[2], args[3]);
-          break;
-        case ChallengeType.MOVE_WEIGHT:
-          ret ||= c.applyMoveWeight(args[0], args[1], args[2], args[3]);
-          break;
-        case ChallengeType.FLIP_STAT:
-          ret ||= c.applyFlipStat(args[0], args[1]);
-          break;
-      }
     }
-  });
+    return false;
-  return ret;
+  }
+
+  override applyShop(status: BooleanHolder): boolean {
+    if (status.value) {
+      status.value = this.value === 1;
+      return true;
+    }
+    return false;
+  }
+
+  static override loadChallenge(source: LimitedSupportChallenge | any): LimitedSupportChallenge {
+    const newChallenge = new LimitedSupportChallenge();
+    newChallenge.value = source.value;
+    newChallenge.severity = source.severity;
+    return newChallenge;
+  }
+}
+
+/**
+ * Implements a Limited Catch challenge
+ */
+export class LimitedCatchChallenge extends Challenge {
+  constructor() {
+    super(Challenges.LIMITED_CATCH, 1);
+  }
+
+  override applyPokemonAddToParty(pokemon: EnemyPokemon, status: BooleanHolder): boolean {
+    if (status.value) {
+      status.value = pokemon.metWave % 10 === 1;
+      return true;
+    }
+    return false;
+  }
+
+  static override loadChallenge(source: LimitedCatchChallenge | any): LimitedCatchChallenge {
+    const newChallenge = new LimitedCatchChallenge();
+    newChallenge.value = source.value;
+    newChallenge.severity = source.severity;
+    return newChallenge;
+  }
+}
+
+/**
+ * Implements a Permanent Faint challenge
+ */
+export class HardcoreChallenge extends Challenge {
+  constructor() {
+    super(Challenges.HARDCORE, 1);
+  }
+
+  override applyPokemonFusion(pokemon: PlayerPokemon, status: BooleanHolder): boolean {
+    if (!status.value) {
+      status.value = pokemon.isFainted();
+      return true;
+    }
+    return false;
+  }
+
+  override applyShopItem(shopItem: ModifierTypeOption | null, status: BooleanHolder): boolean {
+    status.value = shopItem?.type.group !== "revive";
+    return true;
+  }
+
+  override applyWaveReward(reward: ModifierTypeOption | null, status: BooleanHolder): boolean {
+    return this.applyShopItem(reward, status);
+  }
+
+  override applyPokemonMove(moveId: MoveId, status: BooleanHolder) {
+    if (status.value) {
+      status.value = moveId !== MoveId.REVIVAL_BLESSING;
+      return true;
+    }
+    return false;
+  }
+
+  override applyPreventRevive(status: BooleanHolder): boolean {
+    if (!status.value) {
+      status.value = true;
+      return true;
+    }
+    return false;
+  }
+
+  static override loadChallenge(source: HardcoreChallenge | any): HardcoreChallenge {
+    const newChallenge = new HardcoreChallenge();
+    newChallenge.value = source.value;
+    newChallenge.severity = source.severity;
+    return newChallenge;
+  }
 }
 
 /**
@@ -1089,6 +1063,12 @@ export function copyChallenge(source: Challenge | any): Challenge {
       return InverseBattleChallenge.loadChallenge(source);
     case Challenges.FLIP_STAT:
       return FlipStatChallenge.loadChallenge(source);
+    case Challenges.LIMITED_CATCH:
+      return LimitedCatchChallenge.loadChallenge(source);
+    case Challenges.LIMITED_SUPPORT:
+      return LimitedSupportChallenge.loadChallenge(source);
+    case Challenges.HARDCORE:
+      return HardcoreChallenge.loadChallenge(source);
   }
   throw new Error("Unknown challenge copied");
 }
@@ -1097,87 +1077,13 @@ export const allChallenges: Challenge[] = [];
 
 export function initChallenges() {
   allChallenges.push(
+    new FreshStartChallenge(),
+    new HardcoreChallenge(),
+    new LimitedCatchChallenge(),
+    new LimitedSupportChallenge(),
     new SingleGenerationChallenge(),
     new SingleTypeChallenge(),
-    new FreshStartChallenge(),
     new InverseBattleChallenge(),
     new FlipStatChallenge(),
   );
 }
-
-/**
- * Apply all challenges to the given starter (and form) to check its validity.
- * Differs from {@linkcode checkSpeciesValidForChallenge} which only checks form changes.
- * @param species - The {@linkcode PokemonSpecies} to check the validity of.
- * @param dexAttr - The {@linkcode DexAttrProps | dex attributes} of the species, including its form index.
- * @param soft - If `true`, allow it if it could become valid through evolution or form change.
- * @returns `true` if the species is considered valid.
- */
-export function checkStarterValidForChallenge(species: PokemonSpecies, props: DexAttrProps, soft: boolean) {
-  if (!soft) {
-    const isValidForChallenge = new BooleanHolder(true);
-    applyChallenges(ChallengeType.STARTER_CHOICE, species, isValidForChallenge, props);
-    return isValidForChallenge.value;
-  }
-  // We check the validity of every evolution and form change, and require that at least one is valid
-  const speciesToCheck = [species.speciesId];
-  while (speciesToCheck.length) {
-    const checking = speciesToCheck.pop();
-    // Linter complains if we don't handle this
-    if (!checking) {
-      return false;
-    }
-    const checkingSpecies = getPokemonSpecies(checking);
-    if (checkSpeciesValidForChallenge(checkingSpecies, props, true)) {
-      return true;
-    }
-    if (checking && pokemonEvolutions.hasOwnProperty(checking)) {
-      pokemonEvolutions[checking].forEach(e => {
-        // Form check to deal with cases such as Basculin -> Basculegion
-        // TODO: does this miss anything if checking forms of a stage 2 Pokémon?
-        if (!e?.preFormKey || e.preFormKey === species.forms[props.formIndex].formKey) {
-          speciesToCheck.push(e.speciesId);
-        }
-      });
-    }
-  }
-  return false;
-}
-
-/**
- * Apply all challenges to the given species (and form) to check its validity.
- * Differs from {@linkcode checkStarterValidForChallenge} which also checks evolutions.
- * @param species - The {@linkcode PokemonSpecies} to check the validity of.
- * @param dexAttr - The {@linkcode DexAttrProps | dex attributes} of the species, including its form index.
- * @param soft - If `true`, allow it if it could become valid through a form change.
- * @returns `true` if the species is considered valid.
- */
-function checkSpeciesValidForChallenge(species: PokemonSpecies, props: DexAttrProps, soft: boolean) {
-  const isValidForChallenge = new BooleanHolder(true);
-  applyChallenges(ChallengeType.STARTER_CHOICE, species, isValidForChallenge, props);
-  if (!soft || !pokemonFormChanges.hasOwnProperty(species.speciesId)) {
-    return isValidForChallenge.value;
-  }
-  // If the form in props is valid, return true before checking other form changes
-  if (soft && isValidForChallenge.value) {
-    return true;
-  }
-
-  const result = pokemonFormChanges[species.speciesId].some(f1 => {
-    // Exclude form changes that require the mon to be on the field to begin with
-    if (!("item" in f1.trigger)) {
-      return false;
-    }
-
-    return species.forms.some((f2, formIndex) => {
-      if (f1.formKey === f2.formKey) {
-        const formProps = { ...props, formIndex };
-        const isFormValidForChallenge = new BooleanHolder(true);
-        applyChallenges(ChallengeType.STARTER_CHOICE, species, isFormValidForChallenge, formProps);
-        return isFormValidForChallenge.value;
-      }
-      return false;
-    });
-  });
-  return result;
-}

src/data/data-lists.ts

@@ -10,5 +10,7 @@ export const allAbilities: Ability[] = [];
 export const allMoves: Move[] = [];
 export const allSpecies: PokemonSpecies[] = [];
 
+//@ts-expect-error
 export const allHeldItems: Record<HeldItemId, HeldItem> = {};
+//@ts-expect-error
 export const allTrainerItems: Record<TrainerItemId, TrainerItem> = {};

src/data/moves/move.ts

@@ -22,7 +22,6 @@ import {
   TypeBoostTag,
 } from "#data/battler-tags";
 import { getBerryEffectFunc } from "#data/berry";
-import { applyChallenges } from "#data/challenge";
 import { allAbilities, allHeldItems, allMoves } from "#data/data-lists";
 import { SpeciesFormChangeRevertWeatherFormTrigger } from "#data/form-change-triggers";
 import { DelayedAttackTag } from "#data/positional-tags/positional-tag";
@@ -89,6 +88,7 @@ import { BooleanHolder, type Constructor, isNullOrUndefined, NumberHolder, randS
 import { getEnumValues } from "#utils/enums";
 import { toTitleCase } from "#utils/strings";
 import i18next from "i18next";
+import { applyChallenges } from "#utils/challenge-utils";
 
 /**
  * A function used to conditionally determine execution of a given {@linkcode MoveAttr}.
@@ -120,7 +120,7 @@ export abstract class Move implements Localizable {
   /**
    * Check if the move is of the given subclass without requiring `instanceof`.
    *
-   * ⚠️ Does _not_ work for {@linkcode ChargingAttackMove} and {@linkcode ChargingSelfStatusMove} subclasses. For those,
+   * ! Does _not_ work for {@linkcode ChargingAttackMove} and {@linkcode ChargingSelfStatusMove} subclasses. For those,
    * use {@linkcode isChargingMove} instead.
    *
    * @param moveKind - The string name of the move to check against
@@ -6903,13 +6903,19 @@ export class RandomMoveAttr extends CallMoveAttr {
    * @param move Move being used
    * @param args Unused
    */
-  override apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+  override apply(user: Pokemon, target: Pokemon, _move: Move, args: any[]): boolean {
+    // TODO: Move this into the constructor to avoid constructing this every call
     const moveIds = getEnumValues(MoveId).map(m => !this.invalidMoves.has(m) && !allMoves[m].name.endsWith(" (N)") ? m : MoveId.NONE);
     let moveId: MoveId = MoveId.NONE;
+    const moveStatus = new BooleanHolder(true);
     do {
       moveId = this.getMoveOverride() ?? moveIds[user.randBattleSeedInt(moveIds.length)];
+      moveStatus.value = moveId !== MoveId.NONE;
+      if (user.isPlayer()) {
+          applyChallenges(ChallengeType.POKEMON_MOVE, moveId, moveStatus);
+      }
     }
-    while (moveId === MoveId.NONE);
+    while (!moveStatus.value);
     return super.apply(user, target, allMoves[moveId], args);
   }
 }

src/data/moves/pokemon-move.ts

@@ -1,8 +1,10 @@
 import { allMoves } from "#data/data-lists";
-import type { MoveId } from "#enums/move-id";
+import { ChallengeType } from "#enums/challenge-type";
+import { MoveId } from "#enums/move-id";
 import type { Pokemon } from "#field/pokemon";
 import type { Move } from "#moves/move";
-import { toDmgValue } from "#utils/common";
+import { applyChallenges } from "#utils/challenge-utils";
+import { BooleanHolder, toDmgValue } from "#utils/common";
 
 /**
  * Wrapper class for the {@linkcode Move} class for Pokemon to interact with.
@@ -45,16 +47,18 @@ export class PokemonMove {
    * @returns Whether this {@linkcode PokemonMove} can be selected by this Pokemon.
    */
   isUsable(pokemon: Pokemon, ignorePp = false, ignoreRestrictionTags = false): boolean {
+    const move = this.getMove();
     // TODO: Add Sky Drop's 1 turn stall
-    if (this.moveId && !ignoreRestrictionTags && pokemon.isMoveRestricted(this.moveId, pokemon)) {
+    const usability = new BooleanHolder(
-      return false;
+      !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);
     }
-
+    return usability.value;
-    if (this.getMove().name.endsWith(" (N)")) {
-      return false;
-    }
-
-    return ignorePp || this.ppUsed < this.getMovePp() || this.getMove().pp === -1;
   }
 
   getMove(): Move {

src/data/mystery-encounters/encounters/a-trainers-test-encounter.ts

@@ -63,12 +63,12 @@ export const ATrainersTestEncounter: MysteryEncounter = MysteryEncounterBuilder.
         break;
       case 3:
         trainerType = TrainerType.MIRA;
-        spriteKeys = getSpriteKeysFromSpecies(SpeciesId.ALAKAZAM, false, 1);
+        spriteKeys = getSpriteKeysFromSpecies(SpeciesId.ALAKAZAM);
         trainerNameKey = "mira";
         break;
       case 4:
         trainerType = TrainerType.RILEY;
-        spriteKeys = getSpriteKeysFromSpecies(SpeciesId.LUCARIO, false, 1);
+        spriteKeys = getSpriteKeysFromSpecies(SpeciesId.LUCARIO);
         trainerNameKey = "riley";
         break;
       default:
@@ -150,7 +150,7 @@ export const ATrainersTestEncounter: MysteryEncounter = MysteryEncounterBuilder.
     },
     async () => {
       const encounter = globalScene.currentBattle.mysteryEncounter!;
-      // Battle the stat trainer for an Egg and great allRewards
+      // Battle the stat trainer for an Egg and great rewards
       const config: EnemyPartyConfig = encounter.enemyPartyConfigs[0];
 
       await transitionMysteryEncounterIntroVisuals();
@@ -164,8 +164,8 @@ export const ATrainersTestEncounter: MysteryEncounter = MysteryEncounterBuilder.
       encounter.setDialogueToken("eggType", i18next.t(`${namespace}:eggTypes.epic`));
       setEncounterRewards(
         {
-          guaranteedRewardSpecs: [RewardId.SACRED_ASH],
+          guaranteedRewardSpecs: [RewardId.RELIC_GOLD],
-          guaranteedRarityTiers: [RarityTier.ROGUE, RarityTier.ULTRA],
+          guaranteedRarityTiers: [RarityTier.ROGUE, RarityTier.ROGUE],
           fillRemaining: true,
         },
         [eggOptions],

src/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter.ts

@@ -1,7 +1,7 @@
 import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 import { globalScene } from "#app/global-scene";
 import { speciesStarterCosts } from "#balance/starters";
-import { allRewards, allTrainerItems } from "#data/data-lists";
+import { allTrainerItems } from "#data/data-lists";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
@@ -136,7 +136,7 @@ export const AnOfferYouCantRefuseEncounter: MysteryEncounter = MysteryEncounterB
       })
       .withOptionPhase(async () => {
         // Give the player a Shiny Charm
-        globalScene.phaseManager.unshiftNew("RewardPhase", allRewards.SHINY_CHARM);
+        globalScene.phaseManager.unshiftNew("RewardPhase", TrainerItemId.SHINY_CHARM);
         leaveEncounterWithoutBattle(true);
       })
       .build(),
@@ -184,7 +184,7 @@ export const AnOfferYouCantRefuseEncounter: MysteryEncounter = MysteryEncounterB
       ],
     },
     async () => {
-      // Leave encounter with no allRewards or exp
+      // Leave encounter with no rewards or exp
       leaveEncounterWithoutBattle(true);
       return true;
     },

src/data/mystery-encounters/encounters/berries-abound-encounter.ts

@@ -297,7 +297,7 @@ export const BerriesAboundEncounter: MysteryEncounter = MysteryEncounterBuilder.
       ],
     },
     async () => {
-      // Leave encounter with no allRewards or exp
+      // Leave encounter with no rewards or exp
       leaveEncounterWithoutBattle(true);
       return true;
     },

src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts

@@ -39,7 +39,7 @@ import {
 } from "#mystery-encounters/mystery-encounter-requirements";
 import { getRandomPartyMemberFunc, trainerConfigs } from "#trainers/trainer-config";
 import { TrainerPartyCompoundTemplate, TrainerPartyTemplate } from "#trainers/trainer-party-template";
-import type { OptionSelectItem } from "#ui/abstact-option-select-ui-handler";
+import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler";
 import { MoveInfoOverlay } from "#ui/move-info-overlay";
 import { isNullOrUndefined, randSeedInt, randSeedShuffle } from "#utils/common";
 import i18next from "i18next";
@@ -689,15 +689,13 @@ function doBugTypeMoveTutor(): Promise<void> {
     const moveOptions = globalScene.currentBattle.mysteryEncounter!.misc.moveTutorOptions;
     await showEncounterDialogue(`${namespace}:battle_won`, `${namespace}:speaker`);
 
-    const overlayScale = 1;
     const moveInfoOverlay = new MoveInfoOverlay({
       delayVisibility: false,
-      scale: overlayScale,
       onSide: true,
       right: true,
       x: 1,
-      y: -MoveInfoOverlay.getHeight(overlayScale, true) - 1,
+      y: -MoveInfoOverlay.getHeight(true) - 1,
-      width: globalScene.game.canvas.width / 6 - 2,
+      width: globalScene.scaledCanvas.width - 2,
     });
     globalScene.ui.add(moveInfoOverlay);
 

src/data/mystery-encounters/encounters/clowning-around-encounter.ts

@@ -40,7 +40,7 @@ import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
 import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
 import { trainerConfigs } from "#trainers/trainer-config";
 import { TrainerPartyCompoundTemplate, TrainerPartyTemplate } from "#trainers/trainer-party-template";
-import type { OptionSelectConfig } from "#ui/abstact-option-select-ui-handler";
+import type { OptionSelectConfig } from "#ui/abstract-option-select-ui-handler";
 import { randSeedInt, randSeedShuffle } from "#utils/common";
 import { getPokemonSpecies } from "#utils/pokemon-utils";
 import i18next from "i18next";

src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts

@@ -37,7 +37,7 @@ import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encou
 import { MoveRequirement } from "#mystery-encounters/mystery-encounter-requirements";
 import { DANCING_MOVES } from "#mystery-encounters/requirement-groups";
 import { PokemonData } from "#system/pokemon-data";
-import type { OptionSelectItem } from "#ui/abstact-option-select-ui-handler";
+import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler";
 import { getPokemonSpecies } from "#utils/pokemon-utils";
 import i18next from "i18next";
 

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

@@ -1,11 +1,11 @@
 import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 import { globalScene } from "#app/global-scene";
-import { allRewards } from "#data/data-lists";
 import { Challenges } from "#enums/challenges";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import type { PokemonType } from "#enums/pokemon-type";
+import { RewardId } from "#enums/reward-id";
 import { SpeciesId } from "#enums/species-id";
 import type { HeldItemConfiguration } from "#items/held-item-data-types";
 import type { EnemyPartyConfig, EnemyPokemonConfig } from "#mystery-encounters/encounter-phase-utils";
@@ -22,12 +22,8 @@ const namespace = "mysteryEncounters/darkDeal";
 
 /** Exclude Ultra Beasts (inludes Cosmog/Solgaleo/Lunala/Necrozma), Paradox (includes Miraidon/Koraidon), Eternatus, and Mythicals */
 const excludedBosses = [
-  SpeciesId.NECROZMA,
-  SpeciesId.COSMOG,
-  SpeciesId.COSMOEM,
-  SpeciesId.SOLGALEO,
-  SpeciesId.LUNALA,
   SpeciesId.ETERNATUS,
+  /** UBs */
   SpeciesId.NIHILEGO,
   SpeciesId.BUZZWOLE,
   SpeciesId.PHEROMOSA,
@@ -39,6 +35,12 @@ const excludedBosses = [
   SpeciesId.NAGANADEL,
   SpeciesId.STAKATAKA,
   SpeciesId.BLACEPHALON,
+  SpeciesId.COSMOG,
+  SpeciesId.COSMOEM,
+  SpeciesId.SOLGALEO,
+  SpeciesId.LUNALA,
+  SpeciesId.NECROZMA,
+  /** Paradox */
   SpeciesId.GREAT_TUSK,
   SpeciesId.SCREAM_TAIL,
   SpeciesId.BRUTE_BONNET,
@@ -46,10 +48,10 @@ const excludedBosses = [
   SpeciesId.SLITHER_WING,
   SpeciesId.SANDY_SHOCKS,
   SpeciesId.ROARING_MOON,
-  SpeciesId.KORAIDON,
   SpeciesId.WALKING_WAKE,
   SpeciesId.GOUGING_FIRE,
   SpeciesId.RAGING_BOLT,
+  SpeciesId.KORAIDON,
   SpeciesId.IRON_TREADS,
   SpeciesId.IRON_BUNDLE,
   SpeciesId.IRON_HANDS,
@@ -57,22 +59,23 @@ const excludedBosses = [
   SpeciesId.IRON_MOTH,
   SpeciesId.IRON_THORNS,
   SpeciesId.IRON_VALIANT,
-  SpeciesId.MIRAIDON,
   SpeciesId.IRON_LEAVES,
   SpeciesId.IRON_BOULDER,
   SpeciesId.IRON_CROWN,
+  SpeciesId.MIRAIDON,
+  /** Mythical */
   SpeciesId.MEW,
   SpeciesId.CELEBI,
-  SpeciesId.DEOXYS,
   SpeciesId.JIRACHI,
-  SpeciesId.DARKRAI,
+  SpeciesId.DEOXYS,
   SpeciesId.PHIONE,
   SpeciesId.MANAPHY,
-  SpeciesId.ARCEUS,
+  SpeciesId.DARKRAI,
   SpeciesId.SHAYMIN,
+  SpeciesId.ARCEUS,
   SpeciesId.VICTINI,
-  SpeciesId.MELOETTA,
   SpeciesId.KELDEO,
+  SpeciesId.MELOETTA,
   SpeciesId.GENESECT,
   SpeciesId.DIANCIE,
   SpeciesId.HOOPA,
@@ -80,9 +83,9 @@ const excludedBosses = [
   SpeciesId.MAGEARNA,
   SpeciesId.MARSHADOW,
   SpeciesId.ZERAORA,
-  SpeciesId.ZARUDE,
   SpeciesId.MELTAN,
   SpeciesId.MELMETAL,
+  SpeciesId.ZARUDE,
   SpeciesId.PECHARUNT,
 ];
 
@@ -160,7 +163,7 @@ export const DarkDealEncounter: MysteryEncounter = MysteryEncounterBuilder.withE
       .withOptionPhase(async () => {
         // Give the player 5 Rogue Balls
         const encounter = globalScene.currentBattle.mysteryEncounter!;
-        globalScene.phaseManager.unshiftNew("RewardPhase", allRewards.ROGUE_BALL);
+        globalScene.phaseManager.unshiftNew("RewardPhase", RewardId.ROGUE_BALL);
 
         // Start encounter with random legendary (7-10 starter strength) that has level additive
         // If this is a mono-type challenge, always ensure the required type is filtered for
@@ -204,7 +207,7 @@ export const DarkDealEncounter: MysteryEncounter = MysteryEncounterBuilder.withE
       ],
     },
     async () => {
-      // Leave encounter with no allRewards or exp
+      // Leave encounter with no rewards or exp
       leaveEncounterWithoutBattle(true);
       return true;
     },

src/data/mystery-encounters/encounters/delibirdy-encounter.ts

@@ -1,11 +1,12 @@
 import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 import { timedEventManager } from "#app/global-event-manager";
 import { globalScene } from "#app/global-scene";
-import { allHeldItems, allRewards } from "#data/data-lists";
+import { allHeldItems } from "#data/data-lists";
 import { HeldItemCategoryId, HeldItemId, isItemInCategory } from "#enums/held-item-id";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
+import { RewardId } from "#enums/reward-id";
 import { SpeciesId } from "#enums/species-id";
 import { TrainerItemId } from "#enums/trainer-item-id";
 import type { PlayerPokemon, Pokemon } from "#field/pokemon";
@@ -24,7 +25,7 @@ import {
   MoneyRequirement,
 } from "#mystery-encounters/mystery-encounter-requirements";
 import i18next from "#plugins/i18n";
-import type { OptionSelectItem } from "#ui/abstact-option-select-ui-handler";
+import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler";
 import { randSeedItem } from "#utils/common";
 import { getPokemonSpecies } from "#utils/pokemon-utils";
 
@@ -61,10 +62,10 @@ const doEventReward = () => {
       return !fullStack;
     });
     if (candidates.length > 0) {
-      globalScene.phaseManager.unshiftNew("RewardPhase", allRewards[randSeedItem(candidates)]);
+      globalScene.phaseManager.unshiftNew("RewardPhase", randSeedItem(candidates));
     } else {
       // At max stacks, give a Voucher instead
-      globalScene.phaseManager.unshiftNew("RewardPhase", allRewards.VOUCHER);
+      globalScene.phaseManager.unshiftNew("RewardPhase", RewardId.VOUCHER);
     }
   }
 };
@@ -168,7 +169,7 @@ export const DelibirdyEncounter: MysteryEncounter = MysteryEncounterBuilder.with
           // At max stacks, give the first party pokemon a Shell Bell instead
           backupOption();
         } else {
-          globalScene.phaseManager.unshiftNew("RewardPhase", allRewards.AMULET_COIN);
+          globalScene.phaseManager.unshiftNew("RewardPhase", TrainerItemId.AMULET_COIN);
           doEventReward();
         }
 
@@ -238,7 +239,7 @@ export const DelibirdyEncounter: MysteryEncounter = MysteryEncounterBuilder.with
             // At max stacks, give the first party pokemon a Shell Bell instead
             backupOption();
           } else {
-            globalScene.phaseManager.unshiftNew("RewardPhase", allRewards.CANDY_JAR);
+            globalScene.phaseManager.unshiftNew("RewardPhase", TrainerItemId.CANDY_JAR);
             doEventReward();
           }
         } else {
@@ -249,7 +250,7 @@ export const DelibirdyEncounter: MysteryEncounter = MysteryEncounterBuilder.with
             // At max stacks, give the first party pokemon a Shell Bell instead
             backupOption();
           } else {
-            globalScene.phaseManager.unshiftNew("RewardPhase", allRewards.BERRY_POUCH);
+            globalScene.phaseManager.unshiftNew("RewardPhase", TrainerItemId.BERRY_POUCH);
             doEventReward();
           }
         }
@@ -321,7 +322,7 @@ export const DelibirdyEncounter: MysteryEncounter = MysteryEncounterBuilder.with
           // At max stacks, give the first party pokemon a Shell Bell instead
           backupOption();
         } else {
-          globalScene.phaseManager.unshiftNew("RewardPhase", allRewards.HEALING_CHARM);
+          globalScene.phaseManager.unshiftNew("RewardPhase", TrainerItemId.HEALING_CHARM);
           doEventReward();
         }
 

src/data/mystery-encounters/encounters/field-trip-encounter.ts

@@ -4,8 +4,11 @@ import { MoveCategory } from "#enums/move-category";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
+import { RewardId } from "#enums/reward-id";
 import { Stat } from "#enums/stat";
+import { TrainerItemId } from "#enums/trainer-item-id";
 import type { PlayerPokemon } from "#field/pokemon";
+import { generateRewardOptionFromId } from "#items/reward-utils";
 import type { PokemonMove } from "#moves/pokemon-move";
 import {
   leaveEncounterWithoutBattle,
@@ -16,7 +19,7 @@ import {
 import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter";
 import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
 import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
-import type { OptionSelectItem } from "#ui/abstact-option-select-ui-handler";
+import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler";
 import i18next from "i18next";
 
 /** i18n namespace for the encounter */
@@ -93,16 +96,16 @@ export const FieldTripEncounter: MysteryEncounter = MysteryEncounterBuilder.with
       .withOptionPhase(async () => {
         const encounter = globalScene.currentBattle.mysteryEncounter!;
         if (encounter.misc.correctMove) {
-          const modifiers = [
+          const rewards = [
-            generateRewardOptionFromId(RewardId.TEMP_STAT_STAGE_BOOSTER, [Stat.ATK])!,
+            generateRewardOptionFromId({ id: RewardId.TEMP_STAT_STAGE_BOOSTER, args: Stat.ATK })!,
-            generateRewardOptionFromId(RewardId.TEMP_STAT_STAGE_BOOSTER, [Stat.DEF])!,
+            generateRewardOptionFromId({ id: RewardId.TEMP_STAT_STAGE_BOOSTER, args: Stat.DEF })!,
-            generateRewardOptionFromId(RewardId.TEMP_STAT_STAGE_BOOSTER, [Stat.SPD])!,
+            generateRewardOptionFromId({ id: RewardId.TEMP_STAT_STAGE_BOOSTER, args: Stat.SPD })!,
             generateRewardOptionFromId(RewardId.DIRE_HIT)!,
             generateRewardOptionFromId(RewardId.RARER_CANDY)!,
           ];
 
           setEncounterRewards({
-            guaranteedRewardOptions: modifiers,
+            guaranteedRewardOptions: rewards,
             fillRemaining: false,
           });
         }
@@ -141,16 +144,16 @@ export const FieldTripEncounter: MysteryEncounter = MysteryEncounterBuilder.with
       .withOptionPhase(async () => {
         const encounter = globalScene.currentBattle.mysteryEncounter!;
         if (encounter.misc.correctMove) {
-          const modifiers = [
+          const rewards = [
-            generateRewardOptionFromId(RewardId.TEMP_STAT_STAGE_BOOSTER, [Stat.SPATK])!,
+            generateRewardOptionFromId({ id: RewardId.TEMP_STAT_STAGE_BOOSTER, args: Stat.SPATK })!,
-            generateRewardOptionFromId(RewardId.TEMP_STAT_STAGE_BOOSTER, [Stat.SPDEF])!,
+            generateRewardOptionFromId({ id: RewardId.TEMP_STAT_STAGE_BOOSTER, args: Stat.SPDEF })!,
-            generateRewardOptionFromId(RewardId.TEMP_STAT_STAGE_BOOSTER, [Stat.SPD])!,
+            generateRewardOptionFromId({ id: RewardId.TEMP_STAT_STAGE_BOOSTER, args: Stat.SPD })!,
             generateRewardOptionFromId(RewardId.DIRE_HIT)!,
             generateRewardOptionFromId(RewardId.RARER_CANDY)!,
           ];
 
           setEncounterRewards({
-            guaranteedRewardOptions: modifiers,
+            guaranteedRewardOptions: rewards,
             fillRemaining: false,
           });
         }
@@ -189,16 +192,16 @@ export const FieldTripEncounter: MysteryEncounter = MysteryEncounterBuilder.with
       .withOptionPhase(async () => {
         const encounter = globalScene.currentBattle.mysteryEncounter!;
         if (encounter.misc.correctMove) {
-          const modifiers = [
+          const rewards = [
-            generateRewardOptionFromId(RewardId.TEMP_STAT_STAGE_BOOSTER, [Stat.ACC])!,
+            generateRewardOptionFromId({ id: RewardId.TEMP_STAT_STAGE_BOOSTER, args: Stat.ACC })!,
-            generateRewardOptionFromId(RewardId.TEMP_STAT_STAGE_BOOSTER, [Stat.SPD])!,
+            generateRewardOptionFromId({ id: RewardId.TEMP_STAT_STAGE_BOOSTER, args: Stat.SPD })!,
             generateRewardOptionFromId(RewardId.GREAT_BALL)!,
-            generateRewardOptionFromId(RewardId.IV_SCANNER)!,
+            generateRewardOptionFromId(TrainerItemId.IV_SCANNER)!,
             generateRewardOptionFromId(RewardId.RARER_CANDY)!,
           ];
 
           setEncounterRewards({
-            guaranteedRewardOptions: modifiers,
+            guaranteedRewardOptions: rewards,
             fillRemaining: false,
           });
         }

src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts

@@ -250,7 +250,6 @@ export const FieryFalloutEncounter: MysteryEncounter = MysteryEncounterBuilder.w
         }
       }
 
-      // No allRewards
       leaveEncounterWithoutBattle(true);
     },
   )

src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts

@@ -99,7 +99,7 @@ export const FightOrFlightEncounter: MysteryEncounter = MysteryEncounterBuilder.
             : RarityTier.GREAT;
     generateRewardPoolWeights(getRewardPoolForType(RewardPoolType.PLAYER), globalScene.getPlayerParty(), 0);
     let item: RewardOption | null = null;
-    // TMs and Candy Jar excluded from possible allRewards as they're too swingy in value for a singular item reward
+    // TMs and Candy Jar excluded from possible rewards as they're too swingy in value for a singular item reward
     while (!item || isTmReward(item.type) || (item.type as TrainerItemReward).itemId === TrainerItemId.CANDY_JAR) {
       item = generatePlayerRewardOptions(1, globalScene.getPlayerParty(), [], {
         guaranteedRarityTiers: [tier],
@@ -201,7 +201,7 @@ export const FightOrFlightEncounter: MysteryEncounter = MysteryEncounterBuilder.
       ],
     },
     async () => {
-      // Leave encounter with no allRewards or exp
+      // Leave encounter with no rewards or exp
       leaveEncounterWithoutBattle(true);
       return true;
     },

src/data/mystery-encounters/encounters/global-trade-system-encounter.ts

@@ -39,7 +39,7 @@ import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encou
 import { PartySizeRequirement } from "#mystery-encounters/mystery-encounter-requirements";
 import { PokemonData } from "#system/pokemon-data";
 import { MusicPreference } from "#system/settings";
-import type { OptionSelectItem } from "#ui/abstact-option-select-ui-handler";
+import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler";
 import { isNullOrUndefined, NumberHolder, randInt, randSeedInt, randSeedItem, randSeedShuffle } from "#utils/common";
 import { getPokemonSpecies } from "#utils/pokemon-utils";
 import i18next from "i18next";
@@ -426,7 +426,7 @@ export const GlobalTradeSystemEncounter: MysteryEncounter = MysteryEncounterBuil
 
         generateRewardPoolWeights(getRewardPoolForType(RewardPoolType.PLAYER), party, 0);
         let item: RewardOption | null = null;
-        // TMs excluded from possible allRewards
+        // TMs excluded from possible rewards
         while (!item || isTmReward(item.type)) {
           item = generatePlayerRewardOptions(1, party, [], {
             guaranteedRarityTiers: [tier],
@@ -462,7 +462,7 @@ export const GlobalTradeSystemEncounter: MysteryEncounter = MysteryEncounterBuil
       ],
     },
     async () => {
-      // Leave encounter with no allRewards or exp
+      // Leave encounter with no rewards or exp
       leaveEncounterWithoutBattle(true);
       return true;
     },
@@ -542,14 +542,14 @@ function generateTradeOption(alreadyUsedSpecies: PokemonSpecies[], originalBst?:
 
 function showTradeBackground() {
   return new Promise<void>(resolve => {
-    const tradeContainer = globalScene.add.container(0, -globalScene.game.canvas.height / 6);
+    const tradeContainer = globalScene.add.container(0, -globalScene.scaledCanvas.height);
     tradeContainer.setName("Trade Background");
 
     const flyByStaticBg = globalScene.add.rectangle(
       0,
       0,
-      globalScene.game.canvas.width / 6,
+      globalScene.scaledCanvas.width,
-      globalScene.game.canvas.height / 6,
+      globalScene.scaledCanvas.height,
       0,
     );
     flyByStaticBg.setName("Black Background");

src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts

@@ -143,7 +143,7 @@ export const MysteriousChestEncounter: MysteryEncounter = MysteryEncounterBuilde
           setEncounterRewards({
             guaranteedRarityTiers: [RarityTier.COMMON, RarityTier.COMMON, RarityTier.GREAT, RarityTier.GREAT],
           });
-          // Display result message then proceed to allRewards
+          // Display result message then proceed to rewards
           queueEncounterMessage(`${namespace}:option.1.normal`);
           leaveEncounterWithoutBattle();
         } else if (roll >= RAND_LENGTH - COMMON_REWARDS_PERCENT - ULTRA_REWARDS_PERCENT) {
@@ -151,7 +151,7 @@ export const MysteriousChestEncounter: MysteryEncounter = MysteryEncounterBuilde
           setEncounterRewards({
             guaranteedRarityTiers: [RarityTier.ULTRA, RarityTier.ULTRA, RarityTier.ULTRA],
           });
-          // Display result message then proceed to allRewards
+          // Display result message then proceed to rewards
           queueEncounterMessage(`${namespace}:option.1.good`);
           leaveEncounterWithoutBattle();
         } else if (roll >= RAND_LENGTH - COMMON_REWARDS_PERCENT - ULTRA_REWARDS_PERCENT - ROGUE_REWARDS_PERCENT) {
@@ -159,7 +159,7 @@ export const MysteriousChestEncounter: MysteryEncounter = MysteryEncounterBuilde
           setEncounterRewards({
             guaranteedRarityTiers: [RarityTier.ROGUE, RarityTier.ROGUE],
           });
-          // Display result message then proceed to allRewards
+          // Display result message then proceed to rewards
           queueEncounterMessage(`${namespace}:option.1.great`);
           leaveEncounterWithoutBattle();
         } else if (
@@ -170,7 +170,7 @@ export const MysteriousChestEncounter: MysteryEncounter = MysteryEncounterBuilde
           setEncounterRewards({
             guaranteedRarityTiers: [RarityTier.MASTER],
           });
-          // Display result message then proceed to allRewards
+          // Display result message then proceed to rewards
           queueEncounterMessage(`${namespace}:option.1.amazing`);
           leaveEncounterWithoutBattle();
         } else {
@@ -208,7 +208,7 @@ export const MysteriousChestEncounter: MysteryEncounter = MysteryEncounterBuilde
       ],
     },
     async () => {
-      // Leave encounter with no allRewards or exp
+      // Leave encounter with no rewards or exp
       leaveEncounterWithoutBattle(true);
       return true;
     },

src/data/mystery-encounters/encounters/safari-zone-encounter.ts

@@ -125,7 +125,7 @@ export const SafariZoneEncounter: MysteryEncounter = MysteryEncounterBuilder.wit
       ],
     },
     async () => {
-      // Leave encounter with no allRewards or exp
+      // Leave encounter with no rewards or exp
       leaveEncounterWithoutBattle(true);
       return true;
     },

src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts

@@ -227,7 +227,7 @@ export const ShadyVitaminDealerEncounter: MysteryEncounter = MysteryEncounterBui
       ],
     },
     async () => {
-      // Leave encounter with no allRewards or exp
+      // Leave encounter with no rewards or exp
       leaveEncounterWithoutBattle(true);
       return true;
     },

src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts

@@ -52,37 +52,6 @@ class BreederSpeciesEvolution {
 }
 
 const POOL_1_POKEMON: (SpeciesId | BreederSpeciesEvolution)[][] = [
-  [SpeciesId.MUNCHLAX, new BreederSpeciesEvolution(SpeciesId.SNORLAX, SECOND_STAGE_EVOLUTION_WAVE)],
-  [
-    SpeciesId.HAPPINY,
-    new BreederSpeciesEvolution(SpeciesId.CHANSEY, FIRST_STAGE_EVOLUTION_WAVE),
-    new BreederSpeciesEvolution(SpeciesId.BLISSEY, FINAL_STAGE_EVOLUTION_WAVE),
-  ],
-  [
-    SpeciesId.MAGBY,
-    new BreederSpeciesEvolution(SpeciesId.MAGMAR, FIRST_STAGE_EVOLUTION_WAVE),
-    new BreederSpeciesEvolution(SpeciesId.MAGMORTAR, FINAL_STAGE_EVOLUTION_WAVE),
-  ],
-  [
-    SpeciesId.ELEKID,
-    new BreederSpeciesEvolution(SpeciesId.ELECTABUZZ, FIRST_STAGE_EVOLUTION_WAVE),
-    new BreederSpeciesEvolution(SpeciesId.ELECTIVIRE, FINAL_STAGE_EVOLUTION_WAVE),
-  ],
-  [SpeciesId.RIOLU, new BreederSpeciesEvolution(SpeciesId.LUCARIO, SECOND_STAGE_EVOLUTION_WAVE)],
-  [
-    SpeciesId.BUDEW,
-    new BreederSpeciesEvolution(SpeciesId.ROSELIA, FIRST_STAGE_EVOLUTION_WAVE),
-    new BreederSpeciesEvolution(SpeciesId.ROSERADE, FINAL_STAGE_EVOLUTION_WAVE),
-  ],
-  [SpeciesId.TOXEL, new BreederSpeciesEvolution(SpeciesId.TOXTRICITY, SECOND_STAGE_EVOLUTION_WAVE)],
-  [
-    SpeciesId.MIME_JR,
-    new BreederSpeciesEvolution(SpeciesId.GALAR_MR_MIME, FIRST_STAGE_EVOLUTION_WAVE),
-    new BreederSpeciesEvolution(SpeciesId.MR_RIME, FINAL_STAGE_EVOLUTION_WAVE),
-  ],
-];
-
-const POOL_2_POKEMON: (SpeciesId | BreederSpeciesEvolution)[][] = [
   [
     SpeciesId.PICHU,
     new BreederSpeciesEvolution(SpeciesId.PIKACHU, FIRST_STAGE_EVOLUTION_WAVE),
@@ -93,24 +62,63 @@ const POOL_2_POKEMON: (SpeciesId | BreederSpeciesEvolution)[][] = [
     new BreederSpeciesEvolution(SpeciesId.PIKACHU, FIRST_STAGE_EVOLUTION_WAVE),
     new BreederSpeciesEvolution(SpeciesId.ALOLA_RAICHU, FINAL_STAGE_EVOLUTION_WAVE),
   ],
-  [SpeciesId.SMOOCHUM, new BreederSpeciesEvolution(SpeciesId.JYNX, SECOND_STAGE_EVOLUTION_WAVE)],
-  [SpeciesId.TYROGUE, new BreederSpeciesEvolution(SpeciesId.HITMONLEE, SECOND_STAGE_EVOLUTION_WAVE)],
-  [SpeciesId.TYROGUE, new BreederSpeciesEvolution(SpeciesId.HITMONCHAN, SECOND_STAGE_EVOLUTION_WAVE)],
-  [SpeciesId.TYROGUE, new BreederSpeciesEvolution(SpeciesId.HITMONTOP, SECOND_STAGE_EVOLUTION_WAVE)],
   [
     SpeciesId.IGGLYBUFF,
     new BreederSpeciesEvolution(SpeciesId.JIGGLYPUFF, FIRST_STAGE_EVOLUTION_WAVE),
     new BreederSpeciesEvolution(SpeciesId.WIGGLYTUFF, FINAL_STAGE_EVOLUTION_WAVE),
   ],
+  [
+    SpeciesId.TOGEPI,
+    new BreederSpeciesEvolution(SpeciesId.TOGETIC, FIRST_STAGE_EVOLUTION_WAVE),
+    new BreederSpeciesEvolution(SpeciesId.TOGEKISS, FINAL_STAGE_EVOLUTION_WAVE),
+  ],
+  [SpeciesId.TYROGUE, new BreederSpeciesEvolution(SpeciesId.HITMONLEE, SECOND_STAGE_EVOLUTION_WAVE)],
+  [SpeciesId.TYROGUE, new BreederSpeciesEvolution(SpeciesId.HITMONCHAN, SECOND_STAGE_EVOLUTION_WAVE)],
+  [SpeciesId.TYROGUE, new BreederSpeciesEvolution(SpeciesId.HITMONTOP, SECOND_STAGE_EVOLUTION_WAVE)],
+  [SpeciesId.SMOOCHUM, new BreederSpeciesEvolution(SpeciesId.JYNX, FIRST_STAGE_EVOLUTION_WAVE)],
   [
     SpeciesId.AZURILL,
     new BreederSpeciesEvolution(SpeciesId.MARILL, FIRST_STAGE_EVOLUTION_WAVE),
     new BreederSpeciesEvolution(SpeciesId.AZUMARILL, FINAL_STAGE_EVOLUTION_WAVE),
   ],
-  [SpeciesId.WYNAUT, new BreederSpeciesEvolution(SpeciesId.WOBBUFFET, SECOND_STAGE_EVOLUTION_WAVE)],
+  [
+    SpeciesId.BUDEW,
+    new BreederSpeciesEvolution(SpeciesId.ROSELIA, FIRST_STAGE_EVOLUTION_WAVE),
+    new BreederSpeciesEvolution(SpeciesId.ROSERADE, FINAL_STAGE_EVOLUTION_WAVE),
+  ],
   [SpeciesId.CHINGLING, new BreederSpeciesEvolution(SpeciesId.CHIMECHO, SECOND_STAGE_EVOLUTION_WAVE)],
   [SpeciesId.BONSLY, new BreederSpeciesEvolution(SpeciesId.SUDOWOODO, SECOND_STAGE_EVOLUTION_WAVE)],
+  [SpeciesId.MIME_JR, new BreederSpeciesEvolution(SpeciesId.MR_MIME, SECOND_STAGE_EVOLUTION_WAVE)],
+  [
+    SpeciesId.MIME_JR,
+    new BreederSpeciesEvolution(SpeciesId.GALAR_MR_MIME, SECOND_STAGE_EVOLUTION_WAVE),
+    new BreederSpeciesEvolution(SpeciesId.MR_RIME, FINAL_STAGE_EVOLUTION_WAVE),
+  ],
+  [
+    SpeciesId.HAPPINY,
+    new BreederSpeciesEvolution(SpeciesId.CHANSEY, FIRST_STAGE_EVOLUTION_WAVE),
+    new BreederSpeciesEvolution(SpeciesId.BLISSEY, FINAL_STAGE_EVOLUTION_WAVE),
+  ],
   [SpeciesId.MANTYKE, new BreederSpeciesEvolution(SpeciesId.MANTINE, SECOND_STAGE_EVOLUTION_WAVE)],
+  [SpeciesId.TOXEL, new BreederSpeciesEvolution(SpeciesId.TOXTRICITY, SECOND_STAGE_EVOLUTION_WAVE)],
+];
+
+const POOL_2_POKEMON: (SpeciesId | BreederSpeciesEvolution)[][] = [
+  [SpeciesId.DITTO],
+  [
+    SpeciesId.ELEKID,
+    new BreederSpeciesEvolution(SpeciesId.ELECTABUZZ, FIRST_STAGE_EVOLUTION_WAVE),
+    new BreederSpeciesEvolution(SpeciesId.ELECTIVIRE, FINAL_STAGE_EVOLUTION_WAVE),
+  ],
+  [
+    SpeciesId.MAGBY,
+    new BreederSpeciesEvolution(SpeciesId.MAGMAR, FIRST_STAGE_EVOLUTION_WAVE),
+    new BreederSpeciesEvolution(SpeciesId.MAGMORTAR, FINAL_STAGE_EVOLUTION_WAVE),
+  ],
+  [SpeciesId.WYNAUT, new BreederSpeciesEvolution(SpeciesId.WOBBUFFET, SECOND_STAGE_EVOLUTION_WAVE)],
+  [SpeciesId.MUNCHLAX, new BreederSpeciesEvolution(SpeciesId.SNORLAX, SECOND_STAGE_EVOLUTION_WAVE)],
+  [SpeciesId.RIOLU, new BreederSpeciesEvolution(SpeciesId.LUCARIO, SECOND_STAGE_EVOLUTION_WAVE)],
+  [SpeciesId.AUDINO],
 ];
 
 /**
@@ -304,7 +312,7 @@ export const TheExpertPokemonBreederEncounter: MysteryEncounter = MysteryEncount
         // Remove all Pokemon from the party except the chosen Pokemon
         removePokemonFromPartyAndStoreHeldItems(encounter, pokemon1);
 
-        // Configure outro dialogue for egg allRewards
+        // Configure outro dialogue for egg rewards
         encounter.dialogue.outro = [
           {
             speaker: trainerNameKey,
@@ -363,7 +371,7 @@ export const TheExpertPokemonBreederEncounter: MysteryEncounter = MysteryEncount
         // Remove all Pokemon from the party except the chosen Pokemon
         removePokemonFromPartyAndStoreHeldItems(encounter, pokemon2);
 
-        // Configure outro dialogue for egg allRewards
+        // Configure outro dialogue for egg rewards
         encounter.dialogue.outro = [
           {
             speaker: trainerNameKey,
@@ -422,7 +430,7 @@ export const TheExpertPokemonBreederEncounter: MysteryEncounter = MysteryEncount
         // Remove all Pokemon from the party except the chosen Pokemon
         removePokemonFromPartyAndStoreHeldItems(encounter, pokemon3);
 
-        // Configure outro dialogue for egg allRewards
+        // Configure outro dialogue for egg rewards
         encounter.dialogue.outro = [
           {
             speaker: trainerNameKey,
@@ -502,7 +510,7 @@ function getPartyConfig(): EnemyPartyConfig {
         shiny: true,
         variant: 1,
         nature: Nature.MODEST,
-        moveSet: [MoveId.MOONBLAST, MoveId.MYSTICAL_FIRE, MoveId.ICE_BEAM, MoveId.THUNDERBOLT],
+        moveSet: [MoveId.DAZZLING_GLEAM, MoveId.MYSTICAL_FIRE, MoveId.ICE_BEAM, MoveId.THUNDERBOLT], // Make this one have an item gimmick when we have more items/finish implementations
         ivs: [31, 31, 31, 31, 31, 31],
       },
       {
@@ -515,7 +523,7 @@ function getPartyConfig(): EnemyPartyConfig {
         shiny: true,
         variant: 2,
         nature: Nature.BOLD,
-        moveSet: [MoveId.TRI_ATTACK, MoveId.STORED_POWER, MoveId.TAKE_HEART, MoveId.MOONLIGHT],
+        moveSet: [MoveId.TRI_ATTACK, MoveId.STORED_POWER, MoveId.CALM_MIND, MoveId.MOONLIGHT],
         ivs: [31, 31, 31, 31, 31, 31],
       },
     );
@@ -640,7 +648,7 @@ function onGameOver() {
   const chosenPokemon = encounter.misc.chosenPokemon;
   chosenPokemon.friendship = 0;
 
-  // Clear all allRewards that would have been earned
+  // Clear all rewards that would have been earned
   encounter.doEncounterRewards = undefined;
 
   // Set flag that encounter was failed

src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts

@@ -238,7 +238,7 @@ export const ThePokemonSalesmanEncounter: MysteryEncounter = MysteryEncounterBui
       ],
     },
     async () => {
-      // Leave encounter with no allRewards or exp
+      // Leave encounter with no rewards or exp
       leaveEncounterWithoutBattle(true);
       return true;
     },

src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts

@@ -1,7 +1,6 @@
 import { applyAbAttrs } from "#abilities/apply-ab-attrs";
 import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 import { globalScene } from "#app/global-scene";
-import { allRewards } from "#data/data-lists";
 import { SpeciesFormChangeAbilityTrigger } from "#data/form-change-triggers";
 import { AbilityId } from "#enums/ability-id";
 import { BattlerTagType } from "#enums/battler-tag-type";
@@ -119,7 +118,7 @@ export const TheWinstrateChallengeEncounter: MysteryEncounter = MysteryEncounter
       ],
     },
     async () => {
-      // Spawn 5 trainer battles back to back with Macho Brace in allRewards
+      // Spawn 5 trainer battles back to back with Macho Brace in rewards
       globalScene.currentBattle.mysteryEncounter!.doContinueEncounter = async () => {
         await endTrainerBattleAndShowDialogue();
       };
@@ -158,13 +157,13 @@ async function spawnNextTrainerOrEndEncounter() {
     await showEncounterDialogue(`${namespace}:victory`, `${namespace}:speaker`);
 
     // Give 10x Voucher
-    const reward = allRewards[RewardId.VOUCHER_PREMIUM]();
+    const reward = generateRewardOptionFromId(RewardId.VOUCHER_PREMIUM).type;
     globalScene.applyReward(reward as Reward, {});
     globalScene.playSound("item_fanfare");
     await showEncounterText(i18next.t("battle:rewardGain", { modifierName: (reward as Reward).name }));
 
     await showEncounterDialogue(`${namespace}:victory_2`, `${namespace}:speaker`);
-    globalScene.ui.clearText(); // Clears "Winstrate" title from screen as allRewards get animated in
+    globalScene.ui.clearText(); // Clears "Winstrate" title from screen as rewards get animated in
     const machoBrace = generateRewardOptionFromId(HeldItemId.MACHO_BRACE)!;
     machoBrace.type.tier = RarityTier.MASTER;
     setEncounterRewards({

src/data/mystery-encounters/encounters/training-session-encounter.ts

@@ -25,7 +25,7 @@ import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter";
 import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
 import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
 import { PokemonData } from "#system/pokemon-data";
-import type { OptionSelectItem } from "#ui/abstact-option-select-ui-handler";
+import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler";
 import { isNullOrUndefined, randSeedShuffle } from "#utils/common";
 import { getEnumValues } from "#utils/enums";
 import i18next from "i18next";
@@ -346,7 +346,7 @@ export const TrainingSessionEncounter: MysteryEncounter = MysteryEncounterBuilde
       ],
     },
     async () => {
-      // Leave encounter with no allRewards or exp
+      // Leave encounter with no rewards or exp
       leaveEncounterWithoutBattle(true);
       return true;
     },

src/data/mystery-encounters/encounters/trash-to-treasure-encounter.ts

@@ -14,16 +14,16 @@ import { TrainerItemId } from "#enums/trainer-item-id";
 import { assignItemToFirstFreePokemon } from "#items/item-utility";
 import { PokemonMove } from "#moves/pokemon-move";
 import { showEncounterText } from "#mystery-encounters/encounter-dialogue-utils";
-import type { EnemyPartyConfig, EnemyPokemonConfig } from "#mystery-encounters/encounter-phase-utils";
 import {
+  type EnemyPartyConfig,
+  type EnemyPokemonConfig,
   initBattleWithEnemyConfig,
   leaveEncounterWithoutBattle,
   loadCustomMovesForEncounter,
   setEncounterRewards,
   transitionMysteryEncounterIntroVisuals,
 } from "#mystery-encounters/encounter-phase-utils";
-import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter";
+import { type MysteryEncounter, MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
-import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
 import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
 import i18next from "#plugins/i18n";
 import { randSeedInt } from "#utils/common";
@@ -167,7 +167,8 @@ export const TrashToTreasureEncounter: MysteryEncounter = MysteryEncounterBuilde
         const encounter = globalScene.currentBattle.mysteryEncounter!;
 
         setEncounterRewards({
-          guaranteedRarityTiers: [RarityTier.ROGUE, RarityTier.ROGUE, RarityTier.ULTRA, RarityTier.GREAT],
+          guaranteedRewardSpecs: [HeldItemId.LEFTOVERS],
+          guaranteedRarityTiers: [RarityTier.ROGUE, RarityTier.ULTRA, RarityTier.GREAT],
           fillRemaining: true,
         });
         encounter.startOfBattleEffects.push(

src/data/mystery-encounters/encounters/weird-dream-encounter.ts

@@ -46,6 +46,7 @@ const namespace = "mysteryEncounters/weirdDream";
 
 /** Exclude Ultra Beasts, Paradox, Eternatus, and all legendary/mythical/trio pokemon that are below 570 BST */
 const EXCLUDED_TRANSFORMATION_SPECIES = [
+  SpeciesId.ARCEUS,
   SpeciesId.ETERNATUS,
   /** UBs */
   SpeciesId.NIHILEGO,
@@ -81,20 +82,19 @@ const EXCLUDED_TRANSFORMATION_SPECIES = [
   SpeciesId.IRON_BOULDER,
   SpeciesId.IRON_CROWN,
   /** These are banned so they don't appear in the < 570 BST pool */
+  SpeciesId.PHIONE,
+  SpeciesId.TYPE_NULL,
   SpeciesId.COSMOG,
+  SpeciesId.COSMOEM,
   SpeciesId.MELTAN,
   SpeciesId.KUBFU,
-  SpeciesId.COSMOEM,
-  SpeciesId.POIPOLE,
-  SpeciesId.TERAPAGOS,
-  SpeciesId.TYPE_NULL,
-  SpeciesId.CALYREX,
-  SpeciesId.NAGANADEL,
   SpeciesId.URSHIFU,
+  SpeciesId.CALYREX,
   SpeciesId.OGERPON,
   SpeciesId.OKIDOGI,
   SpeciesId.MUNKIDORI,
   SpeciesId.FEZANDIPITI,
+  SpeciesId.TERAPAGOS,
 ];
 
 const SUPER_LEGENDARY_BST_THRESHOLD = 600;
@@ -225,6 +225,7 @@ export const WeirdDreamEncounter: MysteryEncounter = MysteryEncounterBuilder.wit
             RewardId.MINT,
             RewardId.MINT,
             RewardId.MINT,
+            RewardId.MINT,
           ],
           fillRemaining: false,
         });
@@ -638,15 +639,15 @@ function getTransformedSpecies(
 }
 
 function doShowDreamBackground() {
-  const transformationContainer = globalScene.add.container(0, -globalScene.game.canvas.height / 6);
+  const transformationContainer = globalScene.add.container(0, -globalScene.scaledCanvas.height);
   transformationContainer.name = "Dream Background";
 
   // In case it takes a bit for video to load
   const transformationStaticBg = globalScene.add.rectangle(
     0,
     0,
-    globalScene.game.canvas.width / 6,
+    globalScene.scaledCanvas.width,
-    globalScene.game.canvas.height / 6,
+    globalScene.scaledCanvas.height,
     0,
   );
   transformationStaticBg.setName("Black Background");

src/data/mystery-encounters/mystery-encounter-option.ts

@@ -156,7 +156,7 @@ export class MysteryEncounterOption implements IMysteryEncounterOption {
         return true;
       }
       console.log(
-        "Mystery Encounter Edge Case: Requirement not met due to primay pokemon overlapping with support pokemon. There's no valid primary pokemon left.",
+        "Mystery Encounter Edge Case: Requirement not met due to primary pokemon overlapping with support pokemon. There's no valid primary pokemon left.",
       );
       return false;
     }

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

@@ -174,11 +174,11 @@ export class MysteryEncounter implements IMysteryEncounter {
   onVisualsStart?: () => boolean;
   /** Event triggered prior to {@linkcode CommandPhase}, during {@linkcode TurnInitPhase} */
   onTurnStart?: () => boolean;
-  /** Event prior to any allRewards logic in {@linkcode MysteryEncounterRewardsPhase} */
+  /** Event prior to any reward logic in {@linkcode MysteryEncounterRewardsPhase} */
   onRewards?: () => Promise<void>;
-  /** Will provide the player party EXP before allRewards are displayed for that wave */
+  /** Will provide the player party EXP before rewards are displayed for that wave */
   doEncounterExp?: () => boolean;
-  /** Will provide the player a allRewards shop for that wave */
+  /** Will provide the player a reward shop for that wave */
   doEncounterRewards?: () => boolean;
   /** Will execute callback during VictoryPhase of a continuousEncounter */
   doContinueEncounter?: () => Promise<void>;
@@ -238,7 +238,7 @@ export class MysteryEncounter implements IMysteryEncounter {
   encounterMode: MysteryEncounterMode;
   /**
    * Flag for checking if it's the first time a shop is being shown for an encounter.
-   * Defaults to true so that the first shop does not override the specified allRewards.
+   * Defaults to true so that the first shop does not override the specified rewards.
    * Will be set to false after a shop is shown (so can't reroll same rarity items for free)
    */
   lockEncounterRarityTiers: boolean;
@@ -576,7 +576,7 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
    */
 
   /**
-   * @statif Defines the type of encounter which is used as an identifier, should be tied to a unique MysteryEncounterType
+   * @static Defines the type of encounter which is used as an identifier, should be tied to a unique MysteryEncounterType
    * NOTE: if new functions are added to {@linkcode MysteryEncounter} class
    * @param encounterType
    * @returns this
@@ -605,7 +605,7 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
   }
 
   /**
-   * Defines an option + phasefor the encounter.
+   * Defines an option + phase for the encounter.
    * Use for easy/streamlined options.
    * There should be at least 2 options defined and no more than 4.
    * If complex use {@linkcode MysteryEncounterBuilder.withOption}
@@ -627,7 +627,7 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
   }
 
   /**
-   * Defines an option + phasefor the encounter.
+   * Defines an option + phase for the encounter.
    * Use for easy/streamlined options.
    * There should be at least 2 options defined and no more than 4.
    * If complex use {@linkcode MysteryEncounterBuilder.withOption}
@@ -928,34 +928,6 @@ export class MysteryEncounterBuilder implements Partial<IMysteryEncounter> {
     });
   }
 
-  /**
-   * Can set custom encounter allRewards via this callback function
-   * If allRewards are always deterministic for an encounter, this is a good way to set them
-   *
-   * NOTE: If allRewards are dependent on options selected, runtime data, etc.,
-   * It may be better to programmatically set doEncounterRewards elsewhere.
-   * There is a helper function in mystery-encounter utils, setEncounterRewards(), which can be called programmatically to set allRewards
-   * @param doEncounterRewards Synchronous callback function to perform during allRewards phase of the encounter
-   * @returns
-   */
-  withRewards(doEncounterRewards: () => boolean): this & Required<Pick<IMysteryEncounter, "doEncounterRewards">> {
-    return Object.assign(this, { doEncounterRewards: doEncounterRewards });
-  }
-
-  /**
-   * Can set custom encounter exp via this callback function
-   * If exp always deterministic for an encounter, this is a good way to set them
-   *
-   * NOTE: If allRewards are dependent on options selected, runtime data, etc.,
-   * It may be better to programmatically set doEncounterExp elsewhere.
-   * There is a helper function in mystery-encounter utils, setEncounterExp(), which can be called programmatically to set allRewards
-   * @param doEncounterExp Synchronous callback function to perform during allRewards phase of the encounter
-   * @returns
-   */
-  withExp(doEncounterExp: () => boolean): this & Required<Pick<IMysteryEncounter, "doEncounterExp">> {
-    return Object.assign(this, { doEncounterExp: doEncounterExp });
-  }
-
   /**
    * Can be used to perform init logic before intro visuals are shown and before the MysteryEncounterPhase begins
    * Useful for performing things like procedural generation of intro sprites, etc.

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

@@ -6,7 +6,7 @@ import { isNullOrUndefined } from "#utils/common";
 import i18next from "i18next";
 
 /**
- * Will inject all relevant dialogue tokens that exist in the {@linkcode BattlegScene.currentBattle.mysteryEncounter.dialogueTokens}, into i18n text.
+ * Will inject all relevant dialogue tokens that exist in the {@linkcode globalScene.currentBattle.mysteryEncounter.dialogueTokens}, into i18n text.
  * Also adds BBCodeText fragments for colored text, if applicable
  * @param keyOrString
  * @param primaryStyle Can define a text style to be applied to the entire string. Must be defined for BBCodeText styles to be applied correctly

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

@@ -37,7 +37,7 @@ import type { Variant } from "#sprites/variant";
 import type { PokemonData } from "#system/pokemon-data";
 import type { TrainerConfig } from "#trainers/trainer-config";
 import { trainerConfigs } from "#trainers/trainer-config";
-import type { OptionSelectConfig, OptionSelectItem } from "#ui/abstact-option-select-ui-handler";
+import type { OptionSelectConfig, OptionSelectItem } from "#ui/abstract-option-select-ui-handler";
 import type { PartyOption, PokemonSelectFilter } from "#ui/party-ui-handler";
 import { PartyUiMode } from "#ui/party-ui-handler";
 import { coerceArray, isNullOrUndefined, randomString, randSeedInt, randSeedItem } from "#utils/common";
@@ -686,7 +686,7 @@ export function selectOptionThenPokemon(
 /**
  * Will initialize reward phases to follow the mystery encounter
  * Can have shop displayed or skipped
- * @param customShopRewards - adds a shop phase with the specified allRewards / reward tiers
+ * @param customShopRewards - adds a shop phase with the specified reward tiers
  * @param eggRewards
  * @param preRewardsCallback - can execute an arbitrary callback before the new phases if necessary (useful for updating items/party/injecting new phases before {@linkcode MysteryEncounterRewardsPhase})
  */
@@ -768,8 +768,8 @@ export function initSubsequentOptionSelect(optionSelectSettings: OptionSelectSet
 
 /**
  * Can be used to exit an encounter without any battles or followup
- * Will skip any shops and allRewards, and queue the next encounter phase as normal
+ * Will skip any shops and rewards, and queue the next encounter phase as normal
- * @param addHealPhase - when true, will add a shop phase to end of encounter with 0 allRewards but healing items are available
+ * @param addHealPhase - when true, will add a shop phase to end of encounter with 0 rewards but healing items are available
  * @param encounterMode - Can set custom encounter mode if necessary (may be required for forcing Pokemon to return before next phase)
  */
 export function leaveEncounterWithoutBattle(

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

@@ -13,6 +13,7 @@ import type { PokemonSpecies } from "#data/pokemon-species";
 import { getStatusEffectCatchRateMultiplier } from "#data/status-effect";
 import type { AbilityId } from "#enums/ability-id";
 import type { HeldItemId } from "#enums/held-item-id";
+import { ChallengeType } from "#enums/challenge-type";
 import { PlayerGender } from "#enums/player-gender";
 import type { PokeballType } from "#enums/pokeball";
 import type { PokemonType } from "#enums/pokemon-type";
@@ -31,7 +32,8 @@ import { achvs } from "#system/achv";
 import type { PartyOption } from "#ui/party-ui-handler";
 import { PartyUiMode } from "#ui/party-ui-handler";
 import { SummaryUiMode } from "#ui/summary-ui-handler";
-import { isNullOrUndefined, randSeedInt } from "#utils/common";
+import { applyChallenges } from "#utils/challenge-utils";
+import { BooleanHolder, isNullOrUndefined, randSeedInt } from "#utils/common";
 import { getPokemonSpecies } from "#utils/pokemon-utils";
 import i18next from "i18next";
 
@@ -647,6 +649,25 @@ export async function catchPokemon(
         }
       };
       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();
+          if (newPokemon) {
+            newPokemon.loadAssets().then(end);
+          } else {
+            end();
+          }
+        });
+      };
+      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();
+          return;
+        }
         if (globalScene.getPlayerParty().length === 6) {
           const promptRelease = () => {
             globalScene.ui.showText(

src/enums/ability-id.ts

@@ -1,624 +1,624 @@
 export enum AbilityId {
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/None_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/None_(ability) | Source} */
   NONE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Stench_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Stench_(ability) | Source} */
   STENCH,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Drizzle_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Drizzle_(ability) | Source} */
   DRIZZLE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Speed_Boost_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Speed_Boost_(ability) | Source} */
   SPEED_BOOST,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Battle_Armor_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Battle_Armor_(ability) | Source} */
   BATTLE_ARMOR,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Sturdy_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Sturdy_(ability) | Source} */
   STURDY,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Damp_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Damp_(ability) | Source} */
   DAMP,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Limber_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Limber_(ability) | Source} */
   LIMBER,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Sand_Veil_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Sand_Veil_(ability) | Source} */
   SAND_VEIL,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Static_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Static_(ability) | Source} */
   STATIC,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Volt_Absorb_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Volt_Absorb_(ability) | Source} */
   VOLT_ABSORB,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Water_Absorb_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Water_Absorb_(ability) | Source} */
   WATER_ABSORB,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Oblivious_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Oblivious_(ability) | Source} */
   OBLIVIOUS,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Cloud_Nine_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Cloud_Nine_(ability) | Source} */
   CLOUD_NINE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Compound_Eyes_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Compound_Eyes_(ability) | Source} */
   COMPOUND_EYES,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Insomnia_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Insomnia_(ability) | Source} */
   INSOMNIA,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Color_Change_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Color_Change_(ability) | Source} */
   COLOR_CHANGE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Immunity_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Immunity_(ability) | Source} */
   IMMUNITY,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Flash_Fire_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Flash_Fire_(ability) | Source} */
   FLASH_FIRE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Shield_Dust_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Shield_Dust_(ability) | Source} */
   SHIELD_DUST,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Own_Tempo_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Own_Tempo_(ability) | Source} */
   OWN_TEMPO,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Suction_Cups_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Suction_Cups_(ability) | Source} */
   SUCTION_CUPS,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Intimidate_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Intimidate_(ability) | Source} */
   INTIMIDATE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Shadow_Tag_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Shadow_Tag_(ability) | Source} */
   SHADOW_TAG,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Rough_Skin_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Rough_Skin_(ability) | Source} */
   ROUGH_SKIN,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Wonder_Guard_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Wonder_Guard_(ability) | Source} */
   WONDER_GUARD,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Levitate_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Levitate_(ability) | Source} */
   LEVITATE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Effect_Spore_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Effect_Spore_(ability) | Source} */
   EFFECT_SPORE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Synchronize_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Synchronize_(ability) | Source} */
   SYNCHRONIZE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Clear_Body_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Clear_Body_(ability) | Source} */
   CLEAR_BODY,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Natural_Cure_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Natural_Cure_(ability) | Source} */
   NATURAL_CURE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Lightning_Rod_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Lightning_Rod_(ability) | Source} */
   LIGHTNING_ROD,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Serene_Grace_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Serene_Grace_(ability) | Source} */
   SERENE_GRACE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Swift_Swim_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Swift_Swim_(ability) | Source} */
   SWIFT_SWIM,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Chlorophyll_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Chlorophyll_(ability) | Source} */
   CHLOROPHYLL,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Illuminate_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Illuminate_(ability) | Source} */
   ILLUMINATE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Trace_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Trace_(ability) | Source} */
   TRACE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Huge_Power_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Huge_Power_(ability) | Source} */
   HUGE_POWER,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Poison_Point_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Poison_Point_(ability) | Source} */
   POISON_POINT,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Inner_Focus_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Inner_Focus_(ability) | Source} */
   INNER_FOCUS,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Magma_Armor_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Magma_Armor_(ability) | Source} */
   MAGMA_ARMOR,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Water_Veil_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Water_Veil_(ability) | Source} */
   WATER_VEIL,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Magnet_Pull_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Magnet_Pull_(ability) | Source} */
   MAGNET_PULL,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Soundproof_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Soundproof_(ability) | Source} */
   SOUNDPROOF,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Rain_Dish_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Rain_Dish_(ability) | Source} */
   RAIN_DISH,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Sand_Stream_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Sand_Stream_(ability) | Source} */
   SAND_STREAM,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Pressure_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Pressure_(ability) | Source} */
   PRESSURE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Thick_Fat_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Thick_Fat_(ability) | Source} */
   THICK_FAT,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Early_Bird_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Early_Bird_(ability) | Source} */
   EARLY_BIRD,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Flame_Body_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Flame_Body_(ability) | Source} */
   FLAME_BODY,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Run_Away_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Run_Away_(ability) | Source} */
   RUN_AWAY,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Keen_Eye_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Keen_Eye_(ability) | Source} */
   KEEN_EYE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Hyper_Cutter_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Hyper_Cutter_(ability) | Source} */
   HYPER_CUTTER,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Pickup_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Pickup_(ability) | Source} */
   PICKUP,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Truant_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Truant_(ability) | Source} */
   TRUANT,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Hustle_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Hustle_(ability) | Source} */
   HUSTLE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Cute_Charm_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Cute_Charm_(ability) | Source} */
   CUTE_CHARM,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Plus_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Plus_(ability) | Source} */
   PLUS,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Minus_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Minus_(ability) | Source} */
   MINUS,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Forecast_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Forecast_(ability) | Source} */
   FORECAST,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Sticky_Hold_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Sticky_Hold_(ability) | Source} */
   STICKY_HOLD,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Shed_Skin_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Shed_Skin_(ability) | Source} */
   SHED_SKIN,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Guts_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Guts_(ability) | Source} */
   GUTS,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Marvel_Scale_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Marvel_Scale_(ability) | Source} */
   MARVEL_SCALE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Liquid_Ooze_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Liquid_Ooze_(ability) | Source} */
   LIQUID_OOZE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Overgrow_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Overgrow_(ability) | Source} */
   OVERGROW,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Blaze_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Blaze_(ability) | Source} */
   BLAZE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Torrent_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Torrent_(ability) | Source} */
   TORRENT,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Swarm_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Swarm_(ability) | Source} */
   SWARM,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Rock_Head_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Rock_Head_(ability) | Source} */
   ROCK_HEAD,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Drought_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Drought_(ability) | Source} */
   DROUGHT,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Arena_Trap_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Arena_Trap_(ability) | Source} */
   ARENA_TRAP,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Vital_Spirit_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Vital_Spirit_(ability) | Source} */
   VITAL_SPIRIT,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/White_Smoke_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/White_Smoke_(ability) | Source} */
   WHITE_SMOKE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Pure_Power_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Pure_Power_(ability) | Source} */
   PURE_POWER,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Shell_Armor_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Shell_Armor_(ability) | Source} */
   SHELL_ARMOR,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Air_Lock_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Air_Lock_(ability) | Source} */
   AIR_LOCK,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Tangled_Feet_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Tangled_Feet_(ability) | Source} */
   TANGLED_FEET,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Motor_Drive_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Motor_Drive_(ability) | Source} */
   MOTOR_DRIVE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Rivalry_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Rivalry_(ability) | Source} */
   RIVALRY,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Steadfast_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Steadfast_(ability) | Source} */
   STEADFAST,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Snow_Cloak_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Snow_Cloak_(ability) | Source} */
   SNOW_CLOAK,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Gluttony_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Gluttony_(ability) | Source} */
   GLUTTONY,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Anger_Point_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Anger_Point_(ability) | Source} */
   ANGER_POINT,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Unburden_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Unburden_(ability) | Source} */
   UNBURDEN,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Heatproof_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Heatproof_(ability) | Source} */
   HEATPROOF,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Simple_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Simple_(ability) | Source} */
   SIMPLE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Dry_Skin_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Dry_Skin_(ability) | Source} */
   DRY_SKIN,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Download_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Download_(ability) | Source} */
   DOWNLOAD,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Iron_Fist_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Iron_Fist_(ability) | Source} */
   IRON_FIST,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Poison_Heal_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Poison_Heal_(ability) | Source} */
   POISON_HEAL,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Adaptability_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Adaptability_(ability) | Source} */
   ADAPTABILITY,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Skill_Link_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Skill_Link_(ability) | Source} */
   SKILL_LINK,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Hydration_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Hydration_(ability) | Source} */
   HYDRATION,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Solar_Power_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Solar_Power_(ability) | Source} */
   SOLAR_POWER,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Quick_Feet_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Quick_Feet_(ability) | Source} */
   QUICK_FEET,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Normalize_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Normalize_(ability) | Source} */
   NORMALIZE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Sniper_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Sniper_(ability) | Source} */
   SNIPER,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Magic_Guard_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Magic_Guard_(ability) | Source} */
   MAGIC_GUARD,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/No_Guard_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/No_Guard_(ability) | Source} */
   NO_GUARD,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Stall_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Stall_(ability) | Source} */
   STALL,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Technician_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Technician_(ability) | Source} */
   TECHNICIAN,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Leaf_Guard_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Leaf_Guard_(ability) | Source} */
   LEAF_GUARD,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Klutz_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Klutz_(ability) | Source} */
   KLUTZ,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Mold_Breaker_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Mold_Breaker_(ability) | Source} */
   MOLD_BREAKER,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Super_Luck_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Super_Luck_(ability) | Source} */
   SUPER_LUCK,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Aftermath_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Aftermath_(ability) | Source} */
   AFTERMATH,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Anticipation_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Anticipation_(ability) | Source} */
   ANTICIPATION,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Forewarn_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Forewarn_(ability) | Source} */
   FOREWARN,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Unaware_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Unaware_(ability) | Source} */
   UNAWARE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Tinted_Lens_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Tinted_Lens_(ability) | Source} */
   TINTED_LENS,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Filter_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Filter_(ability) | Source} */
   FILTER,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Slow_Start_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Slow_Start_(ability) | Source} */
   SLOW_START,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Scrappy_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Scrappy_(ability) | Source} */
   SCRAPPY,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Storm_Drain_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Storm_Drain_(ability) | Source} */
   STORM_DRAIN,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Ice_Body_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Ice_Body_(ability) | Source} */
   ICE_BODY,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Solid_Rock_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Solid_Rock_(ability) | Source} */
   SOLID_ROCK,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Snow_Warning_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Snow_Warning_(ability) | Source} */
   SNOW_WARNING,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Honey_Gather_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Honey_Gather_(ability) | Source} */
   HONEY_GATHER,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Frisk_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Frisk_(ability) | Source} */
   FRISK,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Reckless_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Reckless_(ability) | Source} */
   RECKLESS,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Multitype_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Multitype_(ability) | Source} */
   MULTITYPE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Flower_Gift_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Flower_Gift_(ability) | Source} */
   FLOWER_GIFT,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Bad_Dreams_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Bad_Dreams_(ability) | Source} */
   BAD_DREAMS,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Pickpocket_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Pickpocket_(ability) | Source} */
   PICKPOCKET,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Sheer_Force_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Sheer_Force_(ability) | Source} */
   SHEER_FORCE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Contrary_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Contrary_(ability) | Source} */
   CONTRARY,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Unnerve_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Unnerve_(ability) | Source} */
   UNNERVE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Defiant_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Defiant_(ability) | Source} */
   DEFIANT,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Defeatist_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Defeatist_(ability) | Source} */
   DEFEATIST,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Cursed_Body_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Cursed_Body_(ability) | Source} */
   CURSED_BODY,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Healer_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Healer_(ability) | Source} */
   HEALER,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Friend_Guard_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Friend_Guard_(ability) | Source} */
   FRIEND_GUARD,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Weak_Armor_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Weak_Armor_(ability) | Source} */
   WEAK_ARMOR,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Heavy_Metal_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Heavy_Metal_(ability) | Source} */
   HEAVY_METAL,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Light_Metal_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Light_Metal_(ability) | Source} */
   LIGHT_METAL,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Multiscale_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Multiscale_(ability) | Source} */
   MULTISCALE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Toxic_Boost_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Toxic_Boost_(ability) | Source} */
   TOXIC_BOOST,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Flare_Boost_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Flare_Boost_(ability) | Source} */
   FLARE_BOOST,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Harvest_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Harvest_(ability) | Source} */
   HARVEST,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Telepathy_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Telepathy_(ability) | Source} */
   TELEPATHY,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Moody_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Moody_(ability) | Source} */
   MOODY,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Overcoat_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Overcoat_(ability) | Source} */
   OVERCOAT,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Poison_Touch_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Poison_Touch_(ability) | Source} */
   POISON_TOUCH,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Regenerator_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Regenerator_(ability) | Source} */
   REGENERATOR,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Big_Pecks_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Big_Pecks_(ability) | Source} */
   BIG_PECKS,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Sand_Rush_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Sand_Rush_(ability) | Source} */
   SAND_RUSH,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Wonder_Skin_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Wonder_Skin_(ability) | Source} */
   WONDER_SKIN,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Analytic_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Analytic_(ability) | Source} */
   ANALYTIC,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Illusion_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Illusion_(ability) | Source} */
   ILLUSION,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Imposter_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Imposter_(ability) | Source} */
   IMPOSTER,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Infiltrator_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Infiltrator_(ability) | Source} */
   INFILTRATOR,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Mummy_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Mummy_(ability) | Source} */
   MUMMY,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Moxie_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Moxie_(ability) | Source} */
   MOXIE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Justified_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Justified_(ability) | Source} */
   JUSTIFIED,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Rattled_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Rattled_(ability) | Source} */
   RATTLED,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Magic_Bounce_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Magic_Bounce_(ability) | Source} */
   MAGIC_BOUNCE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Sap_Sipper_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Sap_Sipper_(ability) | Source} */
   SAP_SIPPER,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Prankster_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Prankster_(ability) | Source} */
   PRANKSTER,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Sand_Force_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Sand_Force_(ability) | Source} */
   SAND_FORCE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Iron_Barbs_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Iron_Barbs_(ability) | Source} */
   IRON_BARBS,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Zen_Mode_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Zen_Mode_(ability) | Source} */
   ZEN_MODE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Victory_Star_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Victory_Star_(ability) | Source} */
   VICTORY_STAR,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Turboblaze_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Turboblaze_(ability) | Source} */
   TURBOBLAZE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Teravolt_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Teravolt_(ability) | Source} */
   TERAVOLT,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Aroma_Veil_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Aroma_Veil_(ability) | Source} */
   AROMA_VEIL,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Flower_Veil_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Flower_Veil_(ability) | Source} */
   FLOWER_VEIL,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Cheek_Pouch_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Cheek_Pouch_(ability) | Source} */
   CHEEK_POUCH,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Protean_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Protean_(ability) | Source} */
   PROTEAN,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Fur_Coat_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Fur_Coat_(ability) | Source} */
   FUR_COAT,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Magician_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Magician_(ability) | Source} */
   MAGICIAN,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Bulletproof_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Bulletproof_(ability) | Source} */
   BULLETPROOF,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Competitive_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Competitive_(ability) | Source} */
   COMPETITIVE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Strong_Jaw_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Strong_Jaw_(ability) | Source} */
   STRONG_JAW,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Refrigerate_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Refrigerate_(ability) | Source} */
   REFRIGERATE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Sweet_Veil_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Sweet_Veil_(ability) | Source} */
   SWEET_VEIL,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Stance_Change_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Stance_Change_(ability) | Source} */
   STANCE_CHANGE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Gale_Wings_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Gale_Wings_(ability) | Source} */
   GALE_WINGS,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Mega_Launcher_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Mega_Launcher_(ability) | Source} */
   MEGA_LAUNCHER,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Grass_Pelt_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Grass_Pelt_(ability) | Source} */
   GRASS_PELT,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Symbiosis_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Symbiosis_(ability) | Source} */
   SYMBIOSIS,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Tough_Claws_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Tough_Claws_(ability) | Source} */
   TOUGH_CLAWS,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Pixilate_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Pixilate_(ability) | Source} */
   PIXILATE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Gooey_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Gooey_(ability) | Source} */
   GOOEY,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Aerilate_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Aerilate_(ability) | Source} */
   AERILATE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Parental_Bond_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Parental_Bond_(ability) | Source} */
   PARENTAL_BOND,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Dark_Aura_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Dark_Aura_(ability) | Source} */
   DARK_AURA,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Fairy_Aura_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Fairy_Aura_(ability) | Source} */
   FAIRY_AURA,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Aura_Break_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Aura_Break_(ability) | Source} */
   AURA_BREAK,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Primordial_Sea_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Primordial_Sea_(ability) | Source} */
   PRIMORDIAL_SEA,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Desolate_Land_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Desolate_Land_(ability) | Source} */
   DESOLATE_LAND,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Delta_Stream_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Delta_Stream_(ability) | Source} */
   DELTA_STREAM,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Stamina_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Stamina_(ability) | Source} */
   STAMINA,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Wimp_Out_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Wimp_Out_(ability) | Source} */
   WIMP_OUT,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Emergency_Exit_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Emergency_Exit_(ability) | Source} */
   EMERGENCY_EXIT,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Water_Compaction_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Water_Compaction_(ability) | Source} */
   WATER_COMPACTION,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Merciless_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Merciless_(ability) | Source} */
   MERCILESS,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Shields_Down_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Shields_Down_(ability) | Source} */
   SHIELDS_DOWN,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Stakeout_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Stakeout_(ability) | Source} */
   STAKEOUT,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Water_Bubble_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Water_Bubble_(ability) | Source} */
   WATER_BUBBLE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Steelworker_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Steelworker_(ability) | Source} */
   STEELWORKER,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Berserk_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Berserk_(ability) | Source} */
   BERSERK,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Slush_Rush_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Slush_Rush_(ability) | Source} */
   SLUSH_RUSH,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Long_Reach_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Long_Reach_(ability) | Source} */
   LONG_REACH,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Liquid_Voice_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Liquid_Voice_(ability) | Source} */
   LIQUID_VOICE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Triage_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Triage_(ability) | Source} */
   TRIAGE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Galvanize_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Galvanize_(ability) | Source} */
   GALVANIZE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Surge_Surfer_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Surge_Surfer_(ability) | Source} */
   SURGE_SURFER,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Schooling_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Schooling_(ability) | Source} */
   SCHOOLING,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Disguise_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Disguise_(ability) | Source} */
   DISGUISE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Battle_Bond_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Battle_Bond_(ability) | Source} */
   BATTLE_BOND,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Power_Construct_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Power_Construct_(ability) | Source} */
   POWER_CONSTRUCT,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Corrosion_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Corrosion_(ability) | Source} */
   CORROSION,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Comatose_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Comatose_(ability) | Source} */
   COMATOSE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Queenly_Majesty_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Queenly_Majesty_(ability) | Source} */
   QUEENLY_MAJESTY,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Innards_Out_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Innards_Out_(ability) | Source} */
   INNARDS_OUT,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Dancer_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Dancer_(ability) | Source} */
   DANCER,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Battery_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Battery_(ability) | Source} */
   BATTERY,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Fluffy_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Fluffy_(ability) | Source} */
   FLUFFY,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Dazzling_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Dazzling_(ability) | Source} */
   DAZZLING,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Soul_Heart_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Soul_Heart_(ability) | Source} */
   SOUL_HEART,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Tangling_Hair_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Tangling_Hair_(ability) | Source} */
   TANGLING_HAIR,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Receiver_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Receiver_(ability) | Source} */
   RECEIVER,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Power_Of_Alchemy_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Power_Of_Alchemy_(ability) | Source} */
   POWER_OF_ALCHEMY,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Beast_Boost_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Beast_Boost_(ability) | Source} */
   BEAST_BOOST,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Rks_System_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Rks_System_(ability) | Source} */
   RKS_SYSTEM,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Electric_Surge_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Electric_Surge_(ability) | Source} */
   ELECTRIC_SURGE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Psychic_Surge_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Psychic_Surge_(ability) | Source} */
   PSYCHIC_SURGE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Misty_Surge_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Misty_Surge_(ability) | Source} */
   MISTY_SURGE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Grassy_Surge_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Grassy_Surge_(ability) | Source} */
   GRASSY_SURGE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Full_Metal_Body_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Full_Metal_Body_(ability) | Source} */
   FULL_METAL_BODY,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Shadow_Shield_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Shadow_Shield_(ability) | Source} */
   SHADOW_SHIELD,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Prism_Armor_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Prism_Armor_(ability) | Source} */
   PRISM_ARMOR,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Neuroforce_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Neuroforce_(ability) | Source} */
   NEUROFORCE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Intrepid_Sword_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Intrepid_Sword_(ability) | Source} */
   INTREPID_SWORD,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Dauntless_Shield_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Dauntless_Shield_(ability) | Source} */
   DAUNTLESS_SHIELD,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Libero_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Libero_(ability) | Source} */
   LIBERO,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Ball_Fetch_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Ball_Fetch_(ability) | Source} */
   BALL_FETCH,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Cotton_Down_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Cotton_Down_(ability) | Source} */
   COTTON_DOWN,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Propeller_Tail_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Propeller_Tail_(ability) | Source} */
   PROPELLER_TAIL,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Mirror_Armor_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Mirror_Armor_(ability) | Source} */
   MIRROR_ARMOR,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Gulp_Missile_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Gulp_Missile_(ability) | Source} */
   GULP_MISSILE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Stalwart_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Stalwart_(ability) | Source} */
   STALWART,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Steam_Engine_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Steam_Engine_(ability) | Source} */
   STEAM_ENGINE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Punk_Rock_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Punk_Rock_(ability) | Source} */
   PUNK_ROCK,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Sand_Spit_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Sand_Spit_(ability) | Source} */
   SAND_SPIT,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Ice_Scales_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Ice_Scales_(ability) | Source} */
   ICE_SCALES,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Ripen_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Ripen_(ability) | Source} */
   RIPEN,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Ice_Face_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Ice_Face_(ability) | Source} */
   ICE_FACE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Power_Spot_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Power_Spot_(ability) | Source} */
   POWER_SPOT,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Mimicry_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Mimicry_(ability) | Source} */
   MIMICRY,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Screen_Cleaner_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Screen_Cleaner_(ability) | Source} */
   SCREEN_CLEANER,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Steely_Spirit_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Steely_Spirit_(ability) | Source} */
   STEELY_SPIRIT,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Perish_Body_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Perish_Body_(ability) | Source} */
   PERISH_BODY,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Wandering_Spirit_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Wandering_Spirit_(ability) | Source} */
   WANDERING_SPIRIT,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Gorilla_Tactics_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Gorilla_Tactics_(ability) | Source} */
   GORILLA_TACTICS,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Neutralizing_Gas_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Neutralizing_Gas_(ability) | Source} */
   NEUTRALIZING_GAS,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Pastel_Veil_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Pastel_Veil_(ability) | Source} */
   PASTEL_VEIL,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Hunger_Switch_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Hunger_Switch_(ability) | Source} */
   HUNGER_SWITCH,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Quick_Draw_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Quick_Draw_(ability) | Source} */
   QUICK_DRAW,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Unseen_Fist_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Unseen_Fist_(ability) | Source} */
   UNSEEN_FIST,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Curious_Medicine_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Curious_Medicine_(ability) | Source} */
   CURIOUS_MEDICINE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Transistor_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Transistor_(ability) | Source} */
   TRANSISTOR,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Dragons_Maw_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Dragons_Maw_(ability) | Source} */
   DRAGONS_MAW,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Chilling_Neigh_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Chilling_Neigh_(ability) | Source} */
   CHILLING_NEIGH,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Grim_Neigh_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Grim_Neigh_(ability) | Source} */
   GRIM_NEIGH,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/As_One_Glastrier_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/As_One_Glastrier_(ability) | Source} */
   AS_ONE_GLASTRIER,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/As_One_Spectrier_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/As_One_Spectrier_(ability) | Source} */
   AS_ONE_SPECTRIER,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Lingering_Aroma_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Lingering_Aroma_(ability) | Source} */
   LINGERING_AROMA,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Seed_Sower_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Seed_Sower_(ability) | Source} */
   SEED_SOWER,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Thermal_Exchange_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Thermal_Exchange_(ability) | Source} */
   THERMAL_EXCHANGE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Anger_Shell_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Anger_Shell_(ability) | Source} */
   ANGER_SHELL,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Purifying_Salt_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Purifying_Salt_(ability) | Source} */
   PURIFYING_SALT,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Well_Baked_Body_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Well_Baked_Body_(ability) | Source} */
   WELL_BAKED_BODY,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Wind_Rider_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Wind_Rider_(ability) | Source} */
   WIND_RIDER,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Guard_Dog_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Guard_Dog_(ability) | Source} */
   GUARD_DOG,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Rocky_Payload_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Rocky_Payload_(ability) | Source} */
   ROCKY_PAYLOAD,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Wind_Power_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Wind_Power_(ability) | Source} */
   WIND_POWER,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Zero_To_Hero_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Zero_To_Hero_(ability) | Source} */
   ZERO_TO_HERO,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Commander_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Commander_(ability) | Source} */
   COMMANDER,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Electromorphosis_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Electromorphosis_(ability) | Source} */
   ELECTROMORPHOSIS,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Protosynthesis_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Protosynthesis_(ability) | Source} */
   PROTOSYNTHESIS,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Quark_Drive_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Quark_Drive_(ability) | Source} */
   QUARK_DRIVE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Good_As_Gold_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Good_As_Gold_(ability) | Source} */
   GOOD_AS_GOLD,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Vessel_Of_Ruin_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Vessel_Of_Ruin_(ability) | Source} */
   VESSEL_OF_RUIN,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Sword_Of_Ruin_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Sword_Of_Ruin_(ability) | Source} */
   SWORD_OF_RUIN,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Tablets_Of_Ruin_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Tablets_Of_Ruin_(ability) | Source} */
   TABLETS_OF_RUIN,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Beads_Of_Ruin_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Beads_Of_Ruin_(ability) | Source} */
   BEADS_OF_RUIN,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Orichalcum_Pulse_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Orichalcum_Pulse_(ability) | Source} */
   ORICHALCUM_PULSE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Hadron_Engine_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Hadron_Engine_(ability) | Source} */
   HADRON_ENGINE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Opportunist_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Opportunist_(ability) | Source} */
   OPPORTUNIST,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Cud_Chew_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Cud_Chew_(ability) | Source} */
   CUD_CHEW,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Sharpness_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Sharpness_(ability) | Source} */
   SHARPNESS,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Supreme_Overlord_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Supreme_Overlord_(ability) | Source} */
   SUPREME_OVERLORD,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Costar_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Costar_(ability) | Source} */
   COSTAR,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Toxic_Debris_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Toxic_Debris_(ability) | Source} */
   TOXIC_DEBRIS,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Armor_Tail_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Armor_Tail_(ability) | Source} */
   ARMOR_TAIL,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Earth_Eater_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Earth_Eater_(ability) | Source} */
   EARTH_EATER,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Mycelium_Might_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Mycelium_Might_(ability) | Source} */
   MYCELIUM_MIGHT,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Minds_Eye_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Minds_Eye_(ability) | Source} */
   MINDS_EYE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Supersweet_Syrup_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Supersweet_Syrup_(ability) | Source} */
   SUPERSWEET_SYRUP,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Hospitality_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Hospitality_(ability) | Source} */
   HOSPITALITY,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Toxic_Chain_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Toxic_Chain_(ability) | Source} */
   TOXIC_CHAIN,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Embody_Aspect_Teal_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Embody_Aspect_Teal_(ability) | Source} */
   EMBODY_ASPECT_TEAL,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Embody_Aspect_Wellspring_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Embody_Aspect_Wellspring_(ability) | Source} */
   EMBODY_ASPECT_WELLSPRING,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Embody_Aspect_Hearthflame_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Embody_Aspect_Hearthflame_(ability) | Source} */
   EMBODY_ASPECT_HEARTHFLAME,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Embody_Aspect_Cornerstone_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Embody_Aspect_Cornerstone_(ability) | Source} */
   EMBODY_ASPECT_CORNERSTONE,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Tera_Shift_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Tera_Shift_(ability) | Source} */
   TERA_SHIFT,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Tera_Shell_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Tera_Shell_(ability) | Source} */
   TERA_SHELL,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Teraform_Zero_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Teraform_Zero_(ability) | Source} */
   TERAFORM_ZERO,
-  /**{@link https://bulbapedia.bulbagarden.net/wiki/Poison_Puppeteer_(ability) | Source} */
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Poison_Puppeteer_(ability) | Source} */
   POISON_PUPPETEER,
 }

src/enums/challenge-type.ts

@@ -65,5 +65,45 @@ export enum ChallengeType {
   /**
    * Modifies what the pokemon stats for Flip Stat Mode.
    */
-  FLIP_STAT
+  FLIP_STAT,
+  /**
+   * Challenges which conditionally enable or disable automatic party healing during biome transitions
+   * @see {@linkcode Challenge.applyPartyHealAvailability}
+   */
+  PARTY_HEAL,
+  /**
+   * Challenges which conditionally enable or disable the shop
+   * @see {@linkcode Challenge.applyShopAvailability}
+   */
+  SHOP,
+  /**
+   * Challenges which validate whether a pokemon can be added to the player's party or not
+   * @see {@linkcode Challenge.applyCatchAvailability}
+   */
+  POKEMON_ADD_TO_PARTY,
+  /**
+   * Challenges which validate whether a pokemon is allowed to fuse or not
+   * @see {@linkcode Challenge.applyFusionAvailability}
+   */
+  POKEMON_FUSION,
+  /**
+   * Challenges which validate whether particular moves can or cannot be used
+   * @see {@linkcode Challenge.applyMoveAvailability}
+   */
+  POKEMON_MOVE,
+  /**
+   * Challenges which validate whether particular items are or are not sold in the shop
+   * @see {@linkcode Challenge.applyShopItems}
+   */
+  SHOP_ITEM,
+  /**
+   * Challenges which validate whether particular items will be given as a reward after a wave
+   * @see {@linkcode Challenge.applyWaveRewards}
+   */
+  WAVE_REWARD,
+  /**
+   * Challenges which prevent recovery from fainting
+   * @see {@linkcode Challenge.applyPermanentFaint}
+   */
+  PREVENT_REVIVE,
 }

src/enums/challenges.ts

@@ -6,4 +6,7 @@ export enum Challenges {
     FRESH_START,
     INVERSE_BATTLE,
     FLIP_STAT,
+    LIMITED_CATCH,
+    LIMITED_SUPPORT,
+    HARDCORE,
 }

src/field/arena.ts

@@ -537,6 +537,7 @@ export class Arena {
       case BiomeId.ABYSS:
       case BiomeId.SPACE:
       case BiomeId.TEMPLE:
+      case BiomeId.LABORATORY:
         return 16;
       default:
         return 0;

src/field/damage-number-handler.ts

@@ -30,7 +30,7 @@ export class DamageNumberHandler {
     const baseScale = target.getSpriteScale() / 6;
     const damageNumber = addTextObject(
       target.x,
-      -(globalScene.game.canvas.height / 6) + target.y - target.getSprite().height / 2,
+      -globalScene.scaledCanvas.height + target.y - target.getSprite().height / 2,
       formatStat(amount, true),
       TextStyle.SUMMARY,
     );

src/field/pokemon.ts

@@ -39,7 +39,6 @@ import {
   TrappedTag,
   TypeImmuneTag,
 } from "#data/battler-tags";
-import { applyChallenges } from "#data/challenge";
 import { allAbilities, allMoves } from "#data/data-lists";
 import { getLevelTotalExp } from "#data/exp";
 import {
@@ -134,6 +133,7 @@ import { EnemyBattleInfo } from "#ui/enemy-battle-info";
 import type { PartyOption } from "#ui/party-ui-handler";
 import { PartyUiHandler, PartyUiMode } from "#ui/party-ui-handler";
 import { PlayerBattleInfo } from "#ui/player-battle-info";
+import { applyChallenges } from "#utils/challenge-utils";
 import {
   BooleanHolder,
   type Constructor,
@@ -4033,7 +4033,7 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
    * @param damage integer
    * @param ignoreSegments boolean, not currently used
    * @param preventEndure used to update damage if endure or sturdy
-   * @param ignoreFaintPhas  flag on whether to add FaintPhase if pokemon after applying damage faints
+   * @param ignoreFaintPhase  flag on whether to add FaintPhase if pokemon after applying damage faints
    * @returns integer representing damage dealt
    */
   damage(damage: number, _ignoreSegments = false, preventEndure = false, ignoreFaintPhase = false): number {
@@ -4546,8 +4546,17 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
     }
 
     const key = this.species.getCryKey(this.formIndex);
-    let rate = 0.85;
+    const crySoundConfig = { rate: 0.85, detune: 0 };
-    const cry = globalScene.playSound(key, { rate: rate }) as AnySound;
+    if (this.isPlayer()) {
+      // If fainting is permanent, emphasize impact
+      const preventRevive = new BooleanHolder(false);
+      applyChallenges(ChallengeType.PREVENT_REVIVE, preventRevive);
+      if (preventRevive.value) {
+        crySoundConfig.detune = -100;
+        crySoundConfig.rate = 0.7;
+      }
+    }
+    const cry = globalScene.playSound(key, crySoundConfig) as AnySound;
     if (!cry || globalScene.fieldVolume === 0) {
       callback();
       return;
@@ -4566,7 +4575,7 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
       delay: fixedInt(delay),
       repeat: -1,
       callback: () => {
-        frameThreshold = sprite.anims.msPerFrame / rate;
+        frameThreshold = sprite.anims.msPerFrame / crySoundConfig.rate;
         frameProgress += delay;
         while (frameProgress > frameThreshold) {
           if (sprite.anims.duration) {
@@ -4576,8 +4585,7 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
           frameProgress -= frameThreshold;
         }
         if (cry && !cry.pendingRemove) {
-          rate *= 0.99;
+          cry.setRate(crySoundConfig.rate * 0.99);
-          cry.setRate(rate);
         } else {
           faintCryTimer?.destroy();
           faintCryTimer = null;
@@ -5186,38 +5194,38 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
     }
   }
 
-  updateFusionPalette(ignoreOveride?: boolean): void {
+  updateFusionPalette(ignoreOverride?: boolean): void {
-    if (!this.getFusionSpeciesForm(ignoreOveride)) {
+    if (!this.getFusionSpeciesForm(ignoreOverride)) {
       [this.getSprite(), this.getTintSprite()]
         .filter(s => !!s)
         .map(s => {
-          s.pipelineData[`spriteColors${ignoreOveride && this.summonData.speciesForm ? "Base" : ""}`] = [];
+          s.pipelineData[`spriteColors${ignoreOverride && this.summonData.speciesForm ? "Base" : ""}`] = [];
-          s.pipelineData[`fusionSpriteColors${ignoreOveride && this.summonData.speciesForm ? "Base" : ""}`] = [];
+          s.pipelineData[`fusionSpriteColors${ignoreOverride && this.summonData.speciesForm ? "Base" : ""}`] = [];
         });
       return;
     }
 
-    const speciesForm = this.getSpeciesForm(ignoreOveride);
+    const speciesForm = this.getSpeciesForm(ignoreOverride);
-    const fusionSpeciesForm = this.getFusionSpeciesForm(ignoreOveride);
+    const fusionSpeciesForm = this.getFusionSpeciesForm(ignoreOverride);
 
     const spriteKey = speciesForm.getSpriteKey(
-      this.getGender(ignoreOveride) === Gender.FEMALE,
+      this.getGender(ignoreOverride) === Gender.FEMALE,
       speciesForm.formIndex,
       this.shiny,
       this.variant,
     );
     const backSpriteKey = speciesForm
-      .getSpriteKey(this.getGender(ignoreOveride) === Gender.FEMALE, speciesForm.formIndex, this.shiny, this.variant)
+      .getSpriteKey(this.getGender(ignoreOverride) === Gender.FEMALE, speciesForm.formIndex, this.shiny, this.variant)
       .replace("pkmn__", "pkmn__back__");
     const fusionSpriteKey = fusionSpeciesForm.getSpriteKey(
-      this.getFusionGender(ignoreOveride) === Gender.FEMALE,
+      this.getFusionGender(ignoreOverride) === Gender.FEMALE,
       fusionSpeciesForm.formIndex,
       this.fusionShiny,
       this.fusionVariant,
     );
     const fusionBackSpriteKey = fusionSpeciesForm
       .getSpriteKey(
-        this.getFusionGender(ignoreOveride) === Gender.FEMALE,
+        this.getFusionGender(ignoreOverride) === Gender.FEMALE,
         fusionSpeciesForm.formIndex,
         this.fusionShiny,
         this.fusionVariant,
@@ -5502,8 +5510,8 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
     [this.getSprite(), this.getTintSprite()]
       .filter(s => !!s)
       .map(s => {
-        s.pipelineData[`spriteColors${ignoreOveride && this.summonData.speciesForm ? "Base" : ""}`] = spriteColors;
+        s.pipelineData[`spriteColors${ignoreOverride && this.summonData.speciesForm ? "Base" : ""}`] = spriteColors;
-        s.pipelineData[`fusionSpriteColors${ignoreOveride && this.summonData.speciesForm ? "Base" : ""}`] =
+        s.pipelineData[`fusionSpriteColors${ignoreOverride && this.summonData.speciesForm ? "Base" : ""}`] =
           fusionSpriteColors;
       });
 

src/game-mode.ts

@@ -2,8 +2,7 @@ import { FixedBattleConfig } from "#app/battle";
 import { CHALLENGE_MODE_MYSTERY_ENCOUNTER_WAVES, CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants";
 import { globalScene } from "#app/global-scene";
 import Overrides from "#app/overrides";
-import type { Challenge } from "#data/challenge";
+import { allChallenges, type Challenge, copyChallenge } from "#data/challenge";
-import { allChallenges, applyChallenges, copyChallenge } from "#data/challenge";
 import { getDailyStartingBiome } from "#data/daily-run";
 import { allSpecies } from "#data/data-lists";
 import type { PokemonSpecies } from "#data/pokemon-species";
@@ -14,7 +13,8 @@ import { GameModes } from "#enums/game-modes";
 import { SpeciesId } from "#enums/species-id";
 import type { Arena } from "#field/arena";
 import { classicFixedBattles, type FixedBattleConfigs } from "#trainers/fixed-battle-configs";
-import { isNullOrUndefined, randSeedInt, randSeedItem } from "#utils/common";
+import { applyChallenges } from "#utils/challenge-utils";
+import { BooleanHolder, isNullOrUndefined, randSeedInt, randSeedItem } from "#utils/common";
 import i18next from "i18next";
 
 interface GameModeConfig {
@@ -311,6 +311,16 @@ export class GameMode implements GameModeConfig {
     return this.battleConfig[waveIndex];
   }
 
+  /**
+   * Check if the current game mode has the shop enabled or not
+   * @returns Whether the shop is available in the current mode
+   */
+  public getShopStatus(): boolean {
+    const status = new BooleanHolder(!this.hasNoShop);
+    applyChallenges(ChallengeType.SHOP, status);
+    return status.value;
+  }
+
   getClearScoreBonus(): number {
     switch (this.modeId) {
       case GameModes.CLASSIC:

src/items/all-rewards.ts

@@ -80,8 +80,8 @@ export const allRewards = {
   // Pokemon consumables
   [RewardId.RARE_CANDY]: new PokemonLevelIncrementReward("modifierType:ModifierType.RARE_CANDY", "rare_candy"),
 
-  [RewardId.EVOLUTION_ITEM]: new EvolutionItemRewardGenerator(false, RewardId.EVOLUTION_ITEM),
+  [RewardId.EVOLUTION_ITEM]: new EvolutionItemRewardGenerator(false),
-  [RewardId.RARE_EVOLUTION_ITEM]: new EvolutionItemRewardGenerator(true, RewardId.RARE_EVOLUTION_ITEM),
+  [RewardId.RARE_EVOLUTION_ITEM]: new EvolutionItemRewardGenerator(true),
 
   [RewardId.POTION]: new PokemonHpRestoreReward("modifierType:ModifierType.POTION", "potion", RewardId.POTION, 20, 10),
   [RewardId.SUPER_POTION]: new PokemonHpRestoreReward(
@@ -161,8 +161,8 @@ export const allRewards = {
   [RewardId.DNA_SPLICERS]: new FusePokemonReward("modifierType:ModifierType.DNA_SPLICERS", "dna_splicers"),
 
   // Form change items
-  [RewardId.FORM_CHANGE_ITEM]: new FormChangeItemRewardGenerator(false, RewardId.FORM_CHANGE_ITEM),
+  [RewardId.FORM_CHANGE_ITEM]: new FormChangeItemRewardGenerator(false),
-  [RewardId.RARE_FORM_CHANGE_ITEM]: new FormChangeItemRewardGenerator(true, RewardId.RARE_FORM_CHANGE_ITEM),
+  [RewardId.RARE_FORM_CHANGE_ITEM]: new FormChangeItemRewardGenerator(true),
 
   // Held items
 
@@ -177,13 +177,13 @@ export const allRewards = {
 
   // Trainer items
 
-  [RewardId.LURE]: new LapsingTrainerItemReward(TrainerItemId.LURE, RewardId.LURE),
+  [RewardId.LURE]: new LapsingTrainerItemReward(TrainerItemId.LURE),
-  [RewardId.SUPER_LURE]: new LapsingTrainerItemReward(TrainerItemId.SUPER_LURE, RewardId.SUPER_LURE),
+  [RewardId.SUPER_LURE]: new LapsingTrainerItemReward(TrainerItemId.SUPER_LURE),
-  [RewardId.MAX_LURE]: new LapsingTrainerItemReward(TrainerItemId.MAX_LURE, RewardId.MAX_LURE),
+  [RewardId.MAX_LURE]: new LapsingTrainerItemReward(TrainerItemId.MAX_LURE),
 
   [RewardId.TEMP_STAT_STAGE_BOOSTER]: new TempStatStageBoosterRewardGenerator(),
 
-  [RewardId.DIRE_HIT]: new LapsingTrainerItemReward(TrainerItemId.DIRE_HIT, RewardId.TEMP_STAT_STAGE_BOOSTER),
+  [RewardId.DIRE_HIT]: new LapsingTrainerItemReward(TrainerItemId.DIRE_HIT),
 } as const satisfies {
   [k in RewardId]: Reward | RewardGenerator;
 };

src/items/held-items/item-steal.ts

@@ -79,9 +79,8 @@ export abstract class ItemTransferHeldItem extends HeldItem {
 }
 
 /**
- * Modifier for held items that steal items from the enemy at the end of
+ * Held item that steal items from the enemy at the end of
  * each turn.
- * @see {@linkcode allRewards[MINI_BLACK_HOLE]}
  */
 export class TurnEndItemStealHeldItem extends ItemTransferHeldItem {
   public effects: HeldItemEffect[] = [HeldItemEffect.TURN_END_ITEM_STEAL];
@@ -120,10 +119,8 @@ export class TurnEndItemStealHeldItem extends ItemTransferHeldItem {
 }
 
 /**
- * Modifier for held items that add a chance to steal items from the target of a
+ * Held item that adds a chance to steal items from the target of a
  * successful attack.
- * @see {@linkcode allRewards[GRIP_CLAW]}
- * @see {@linkcode HeldItemTransferModifier}
  */
 export class ContactItemStealChanceHeldItem extends ItemTransferHeldItem {
   public effects: HeldItemEffect[] = [HeldItemEffect.CONTACT_ITEM_STEAL_CHANCE];

src/items/init-reward-pools.ts

@@ -1,7 +1,3 @@
-/* biome-ignore-start lint/correctness/noUnusedImports: tsdoc imports */
-import { initRewards, Reward } from "#items/reward";
-/* biome-ignore-end lint/correctness/noUnusedImports: tsdoc imports */
-
 import { timedEventManager } from "#app/global-event-manager";
 import { globalScene } from "#app/global-scene";
 import { pokemonEvolutions } from "#balance/pokemon-evolutions";

src/items/reward-pool-utils.ts

@@ -184,7 +184,7 @@ export function generatePlayerRewardOptions(
   }
 
   // Applies overrides for testing
-  overridePlayerRewardOptions(options, party);
+  overridePlayerRewardOptions(options);
 
   return options;
 }

src/items/reward-utils.ts

@@ -7,6 +7,7 @@ import type { RewardPoolId, RewardSpecs } from "#types/rewards";
 import { heldItemRarities } from "./held-item-default-tiers";
 import {
   HeldItemReward,
+  NoneReward,
   type PokemonMoveReward,
   type RememberMoveReward,
   type Reward,
@@ -45,7 +46,7 @@ export function generateRewardOptionFromId<T extends RewardPoolId>(
   cost = 0,
   tierOverride?: RarityTier,
   upgradeCount = 0,
-): RewardOption | null {
+): RewardOption {
   // Destructure specs into individual parameters
   const pregenArgs = typeof specs === "object" ? specs.args : undefined;
   const id: RewardPoolId = typeof specs === "object" ? specs.id : specs;
@@ -62,13 +63,13 @@ export function generateRewardOptionFromId<T extends RewardPoolId>(
     return new RewardOption(reward, upgradeCount, tier, cost);
   }
 
-  const rewardFunc = allRewards[id] as Reward | RewardGenerator;
+  const tempReward = allRewards[id] as Reward | RewardGenerator;
-  const reward = rewardFunc instanceof RewardGenerator ? rewardFunc.generateReward(pregenArgs) : rewardFunc;
+  let reward = tempReward instanceof RewardGenerator ? tempReward.generateReward(pregenArgs) : tempReward;
-  if (reward) {
+  if (!reward) {
-    const tier = tierOverride ?? rewardRarities[id];
+    reward = new NoneReward();
-    return new RewardOption(reward, upgradeCount, tier, cost);
   }
-  return null;
+  const tier = tierOverride ?? rewardRarities[id];
+  return new RewardOption(reward, upgradeCount, tier, cost);
 }
 
 export function getPlayerShopRewardOptionsForWave(waveIndex: number, baseCost: number): RewardOption[] {

src/items/reward.ts

@@ -349,7 +349,6 @@ export class HeldItemReward extends PokemonReward {
       soundName,
     );
     this.itemId = itemId;
-    this.id = RewardId.HELD_ITEM;
   }
 
   get name(): string {
@@ -375,7 +374,6 @@ export class TrainerItemReward extends Reward {
   constructor(itemId: TrainerItemId, group?: string, soundName?: string) {
     super("", "", group, soundName);
     this.itemId = itemId;
-    this.id = RewardId.TRAINER_ITEM;
   }
 
   get name(): string {
@@ -396,11 +394,6 @@ export class TrainerItemReward extends Reward {
 }
 
 export class LapsingTrainerItemReward extends TrainerItemReward {
-  constructor(itemId: TrainerItemId, id?: RewardId) {
-    super(itemId);
-    this.id = id ?? RewardId.TRAINER_ITEM;
-  }
-
   apply(): boolean {
     return globalScene.trainerItems.add(this.itemId, allTrainerItems[this.itemId].getMaxStackCount());
   }
@@ -554,7 +547,10 @@ export class PokemonHpRestoreReward extends PokemonReward {
   }
 
   apply({ pokemon }: PokemonRewardParams): boolean {
-    return restorePokemonHp(pokemon, this.restorePercent, this.restorePoints, this.healStatus, false);
+    return restorePokemonHp(pokemon, this.restorePercent, {
+      pointsToRestore: this.restorePoints,
+      healStatus: this.healStatus,
+    });
   }
 }
 
@@ -591,7 +587,7 @@ export class PokemonReviveReward extends PokemonHpRestoreReward {
   }
 
   apply({ pokemon }: PokemonRewardParams): boolean {
-    return restorePokemonHp(pokemon, this.restorePercent, 0, false, true);
+    return restorePokemonHp(pokemon, this.restorePercent, { fainted: true });
   }
 }
 
@@ -603,7 +599,7 @@ export class AllPokemonFullReviveReward extends Reward {
 
   apply(): boolean {
     for (const pokemon of globalScene.getPlayerParty()) {
-      restorePokemonHp(pokemon, 100, 0, false, true);
+      restorePokemonHp(pokemon, 100, { fainted: true });
     }
 
     return true;
@@ -1519,5 +1515,9 @@ export class RewardOption {
 }
 
 export class NoneReward extends Reward {
+  constructor() {
+    super("", "");
+  }
+
   override apply(): void {}
 }

src/items/trainer-item.ts

@@ -4,10 +4,11 @@ import { getStatusEffectDescriptor, getStatusEffectHealText } from "#data/status
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { getStatKey, Stat, type TempBattleStat } from "#enums/stat";
 import { StatusEffect } from "#enums/status-effect";
+import { TextStyle } from "#enums/text-style";
 import { TrainerItemId, TrainerItemNames } from "#enums/trainer-item-id";
 import type { Pokemon } from "#field/pokemon";
 import type { TrainerItemManager } from "#items/trainer-item-manager";
-import { addTextObject, TextStyle } from "#ui/text";
+import { addTextObject } from "#ui/text";
 import { type BooleanHolder, hslToHex, type NumberHolder, randSeedFloat, toDmgValue } from "#utils/common";
 import i18next from "i18next";
 

src/loading-scene.ts

@@ -29,6 +29,7 @@ export class LoadingScene extends SceneBase {
 
     this.loadImage("loading_bg", "arenas");
     this.loadImage("logo", "");
+    this.loadImage("logo_fake", "");
 
     // Load menu images
     this.loadAtlas("bg", "ui");

src/phase.ts

@@ -11,7 +11,7 @@ export abstract class Phase {
   /**
    * The string name of the phase, used to identify the phase type for {@linkcode is}
    *
-   * @privateremarks
+   * @privateRemarks
    *
    * When implementing a phase, you must set the `phaseName` property to the name of the phase.
    */

src/phases/attempt-capture-phase.ts

@@ -12,6 +12,7 @@ import {
 } from "#data/pokeball";
 import { getStatusEffectCatchRateMultiplier } from "#data/status-effect";
 import { BattlerIndex } from "#enums/battler-index";
+import { ChallengeType } from "#enums/challenge-type";
 import type { PokeballType } from "#enums/pokeball";
 import { StatusEffect } from "#enums/status-effect";
 import { UiMode } from "#enums/ui-mode";
@@ -22,6 +23,8 @@ import { achvs } from "#system/achv";
 import type { PartyOption } from "#ui/party-ui-handler";
 import { PartyUiMode } from "#ui/party-ui-handler";
 import { SummaryUiMode } from "#ui/summary-ui-handler";
+import { applyChallenges } from "#utils/challenge-utils";
+import { BooleanHolder } from "#utils/common";
 import i18next from "i18next";
 
 // TODO: Refactor and split up to allow for overriding capture chance
@@ -283,6 +286,13 @@ 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();
+            return;
+          }
           if (globalScene.getPlayerParty().length === PLAYER_PARTY_MAX_SIZE) {
             const promptRelease = () => {
               globalScene.ui.showText(

src/phases/command-phase.ts

@@ -9,6 +9,7 @@ import { ArenaTagType } from "#enums/arena-tag-type";
 import { BattleType } from "#enums/battle-type";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { BiomeId } from "#enums/biome-id";
+import { ChallengeType } from "#enums/challenge-type";
 import { Command } from "#enums/command";
 import { FieldPosition } from "#enums/field-position";
 import { MoveId } from "#enums/move-id";
@@ -21,6 +22,8 @@ import type { MoveTargetSet } from "#moves/move";
 import { getMoveTargets } from "#moves/move-utils";
 import { FieldPhase } from "#phases/field-phase";
 import type { TurnMove } from "#types/turn-move";
+import { applyChallenges } from "#utils/challenge-utils";
+import { BooleanHolder } from "#utils/common";
 import i18next from "i18next";
 
 export class CommandPhase extends FieldPhase {
@@ -109,7 +112,7 @@ export class CommandPhase extends FieldPhase {
    * Clear out all unusable moves in front of the currently acting pokemon's move queue.
    */
   // TODO: Refactor move queue handling to ensure that this method is not necessary.
-  private clearUnusuableMoves(): void {
+  private clearUnusableMoves(): void {
     const playerPokemon = this.getPokemon();
     const moveQueue = playerPokemon.getMoveQueue();
     if (moveQueue.length === 0) {
@@ -140,7 +143,7 @@ export class CommandPhase extends FieldPhase {
    * @returns Whether a queued move was successfully set to be executed.
    */
   private tryExecuteQueuedMove(): boolean {
-    this.clearUnusuableMoves();
+    this.clearUnusableMoves();
     const playerPokemon = globalScene.getPlayerField()[this.fieldIndex];
     const moveQueue = playerPokemon.getMoveQueue();
 
@@ -210,16 +213,27 @@ export class CommandPhase extends FieldPhase {
     const move = user.getMoveset()[cursor];
     globalScene.ui.setMode(UiMode.MESSAGE);
 
-    // Decides between a Disabled, Not Implemented, or No PP translation message
+    // Set the translation key for why the move cannot be selected
-    const errorMessage = user.isMoveRestricted(move.moveId, user)
+    let cannotSelectKey: string;
-      ? user.getRestrictingTag(move.moveId, user)!.selectionDeniedText(user, move.moveId)
+    const moveStatus = new BooleanHolder(true);
-      : move.getName().endsWith(" (N)")
+    applyChallenges(ChallengeType.POKEMON_MOVE, move.moveId, moveStatus);
-        ? "battle:moveNotImplemented"
+    if (!moveStatus.value) {
-        : "battle:moveNoPP";
+      cannotSelectKey = "battle:moveCannotUseChallenge";
+    } else if (move.getPpRatio() === 0) {
+      cannotSelectKey = "battle:moveNoPP";
+    } else if (move.getName().endsWith(" (N)")) {
+      cannotSelectKey = "battle:moveNotImplemented";
+    } else if (user.isMoveRestricted(move.moveId, user)) {
+      cannotSelectKey = user.getRestrictingTag(move.moveId, user)!.selectionDeniedText(user, move.moveId);
+    } else {
+      // TODO: Consider a message that signals a being unusable for an unknown reason
+      cannotSelectKey = "";
+    }
+
     const moveName = move.getName().replace(" (N)", ""); // Trims off the indicator
 
     globalScene.ui.showText(
-      i18next.t(errorMessage, { moveName: moveName }),
+      i18next.t(cannotSelectKey, { moveName: moveName }),
       null,
       () => {
         globalScene.ui.clearText();

src/phases/egg-hatch-phase.ts

@@ -148,9 +148,9 @@ export class EggHatchPhase extends Phase {
 
       this.eggHatchOverlay = globalScene.add.rectangle(
         0,
-        -globalScene.game.canvas.height / 6,
+        -globalScene.scaledCanvas.height,
-        globalScene.game.canvas.width / 6,
+        globalScene.scaledCanvas.width,
-        globalScene.game.canvas.height / 6,
+        globalScene.scaledCanvas.height,
         0xffffff,
       );
       this.eggHatchOverlay.setOrigin(0, 0);

src/phases/end-card-phase.ts

@@ -25,8 +25,8 @@ export class EndCardPhase extends Phase {
     globalScene.field.add(this.endCard);
 
     this.text = addTextObject(
-      globalScene.game.canvas.width / 12,
+      globalScene.scaledCanvas.width / 2,
-      globalScene.game.canvas.height / 6 - 16,
+      globalScene.scaledCanvas.height - 16,
       i18next.t("battle:congratulations"),
       TextStyle.SUMMARY,
       { fontSize: "128px" },

src/phases/evolution-phase.ts

@@ -90,16 +90,16 @@ export class EvolutionPhase extends Phase {
       .setVisible(false);
 
     this.evolutionBgOverlay = globalScene.add
-      .rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6, 0x262626)
+      .rectangle(0, 0, globalScene.scaledCanvas.width, globalScene.scaledCanvas.height, 0x262626)
       .setOrigin(0)
       .setAlpha(0);
     this.evolutionContainer.add([this.evolutionBaseBg, this.evolutionBgOverlay, this.evolutionBg]);
 
     this.evolutionOverlay = globalScene.add.rectangle(
       0,
-      -globalScene.game.canvas.height / 6,
+      -globalScene.scaledCanvas.height,
-      globalScene.game.canvas.width / 6,
+      globalScene.scaledCanvas.width,
-      globalScene.game.canvas.height / 6 - 48,
+      globalScene.scaledCanvas.height - 48,
       0xffffff,
     );
     this.evolutionOverlay.setOrigin(0).setAlpha(0);

src/phases/game-over-phase.ts

@@ -2,11 +2,11 @@ import { pokerogueApi } from "#api/pokerogue-api";
 import { clientSessionId } from "#app/account";
 import { globalScene } from "#app/global-scene";
 import { pokemonEvolutions } from "#balance/pokemon-evolutions";
-import { allRewards } from "#data/data-lists";
 import { getCharVariantFromDialogue } from "#data/dialogue";
 import type { PokemonSpecies } from "#data/pokemon-species";
 import { BattleType } from "#enums/battle-type";
 import { PlayerGender } from "#enums/player-gender";
+import { RewardId } from "#enums/reward-id";
 import { TrainerType } from "#enums/trainer-type";
 import { UiMode } from "#enums/ui-mode";
 import { Unlockables } from "#enums/unlockables";
@@ -151,10 +151,10 @@ export class GameOverPhase extends BattlePhase {
               this.handleUnlocks();
 
               for (const species of this.firstRibbons) {
-                globalScene.phaseManager.unshiftNew("RibbonRewardPhase", allRewards.VOUCHER_PLUS, species);
+                globalScene.phaseManager.unshiftNew("RibbonRewardPhase", RewardId.VOUCHER_PLUS, species);
               }
               if (!firstClear) {
-                globalScene.phaseManager.unshiftNew("GameOverRewardPhase", allRewards.VOUCHER_PREMIUM);
+                globalScene.phaseManager.unshiftNew("GameOverRewardPhase", RewardId.VOUCHER_PREMIUM);
               }
             }
             this.getRunHistoryEntry().then(runHistoryEntry => {

src/phases/game-over-reward-phase.ts

@@ -7,15 +7,14 @@ export class GameOverRewardPhase extends RewardPhase {
   public readonly phaseName = "GameOverRewardPhase";
   doReward(): Promise<void> {
     return new Promise<void>(resolve => {
-      const newModifier = this.reward.newModifier();
+      globalScene.applyReward(this.reward, {});
-      globalScene.addModifier(newModifier);
       // Sound loaded into game as is
       globalScene.playSound("level_up_fanfare");
       globalScene.ui.setMode(UiMode.MESSAGE);
       globalScene.ui.fadeIn(250).then(() => {
         globalScene.ui.showText(
           i18next.t("battle:rewardGain", {
-            modifierName: newModifier?.type.name,
+            modifierName: this.reward.name,
           }),
           null,
           () => {

src/phases/move-effect-phase.ts

@@ -823,6 +823,7 @@ export class MoveEffectPhase extends PokemonPhase {
     const substitute = target.getTag(SubstituteTag);
     const isBlockedBySubstitute = substitute && this.move.hitsSubstitute(user, target);
     if (isBlockedBySubstitute) {
+      user.turnData.totalDamageDealt += Math.min(dmg, substitute.hp);
       substitute.hp -= dmg;
     } else if (!target.isPlayer() && dmg >= target.hp) {
       globalScene.applyPlayerItems(TrainerItemEffect.ENEMY_ENDURE_CHANCE, { pokemon: target });

src/phases/mystery-encounter-phases.ts

@@ -532,13 +532,13 @@ export class MysteryEncounterRewardsPhase extends Phase {
         } else {
           this.doEncounterRewardsAndContinue();
         }
-        // Do not use ME's seedOffset for allRewards, these should always be consistent with waveIndex (once per wave)
+        // Do not use ME's seedOffset for rewards, these should always be consistent with waveIndex (once per wave)
       }, globalScene.currentBattle.waveIndex * 1000);
     }
   }
 
   /**
-   * Queues encounter EXP and allRewards phases, {@linkcode PostMysteryEncounterPhase}, and ends phase
+   * Queues encounter EXP and reward phases, {@linkcode PostMysteryEncounterPhase}, and ends phase
    */
   doEncounterRewardsAndContinue() {
     const encounter = globalScene.currentBattle.mysteryEncounter!;

src/phases/party-heal-phase.ts

@@ -1,6 +1,8 @@
 import { globalScene } from "#app/global-scene";
+import { ChallengeType } from "#enums/challenge-type";
 import { BattlePhase } from "#phases/battle-phase";
-import { fixedInt } from "#utils/common";
+import { applyChallenges } from "#utils/challenge-utils";
+import { BooleanHolder, fixedInt } from "#utils/common";
 
 export class PartyHealPhase extends BattlePhase {
   public readonly phaseName = "PartyHealPhase";
@@ -20,7 +22,14 @@ export class PartyHealPhase extends BattlePhase {
       globalScene.fadeOutBgm(1000, false);
     }
     globalScene.ui.fadeOut(1000).then(() => {
+      const preventRevive = new BooleanHolder(false);
+      applyChallenges(ChallengeType.PREVENT_REVIVE, preventRevive);
       for (const pokemon of globalScene.getPlayerParty()) {
+        // Prevent reviving fainted pokemon during certain challenges
+        if (pokemon.isFainted() && preventRevive.value) {
+          continue;
+        }
+
         pokemon.hp = pokemon.getMaxHp();
         pokemon.resetStatus(true, false, false, true);
         for (const move of pokemon.moveset) {

src/phases/reward-phase.ts

@@ -1,6 +1,8 @@
 import { globalScene } from "#app/global-scene";
-import type { Reward, RewardGenerator } from "#items/reward";
+import type { Reward } from "#items/reward";
+import { generateRewardOptionFromId } from "#items/reward-utils";
 import { BattlePhase } from "#phases/battle-phase";
+import type { SilentReward } from "#types/rewards";
 import i18next from "i18next";
 
 export class RewardPhase extends BattlePhase {
@@ -9,10 +11,10 @@ export class RewardPhase extends BattlePhase {
   public readonly phaseName: "RewardPhase" | "RibbonRewardPhase" | "GameOverRewardPhase" = "RewardPhase";
   protected reward: Reward;
 
-  constructor(rewardFunc: Reward | RewardGenerator) {
+  constructor(rewardId: SilentReward) {
     super();
 
-    this.reward = rewardFunc();
+    this.reward = generateRewardOptionFromId(rewardId)?.type;
   }
 
   start() {
@@ -23,7 +25,7 @@ export class RewardPhase extends BattlePhase {
 
   doReward(): Promise<void> {
     return new Promise<void>(resolve => {
-      globalScene.applyReward(this.reward);
+      globalScene.applyReward(this.reward, {});
       globalScene.playSound("item_fanfare");
       globalScene.ui.showText(
         i18next.t("battle:rewardGain", {

src/phases/ribbon-reward-phase.ts

@@ -1,31 +1,30 @@
 import { globalScene } from "#app/global-scene";
 import type { PokemonSpecies } from "#data/pokemon-species";
 import { UiMode } from "#enums/ui-mode";
-import type { Reward, RewardGenerator } from "#items/reward";
 import { RewardPhase } from "#phases/reward-phase";
+import type { SilentReward } from "#types/rewards";
 import i18next from "i18next";
 
 export class RibbonRewardPhase extends RewardPhase {
   public readonly phaseName = "RibbonRewardPhase";
   private species: PokemonSpecies;
 
-  constructor(rewardFunc: Reward | RewardGenerator, species: PokemonSpecies) {
+  constructor(rewardId: SilentReward, species: PokemonSpecies) {
-    super(rewardFunc);
+    super(rewardId);
 
     this.species = species;
   }
 
   doReward(): Promise<void> {
     return new Promise<void>(resolve => {
-      const newModifier = this.reward.newModifier();
+      globalScene.applyReward(this.reward, {});
-      globalScene.addModifier(newModifier);
       globalScene.playSound("level_up_fanfare");
       globalScene.ui.setMode(UiMode.MESSAGE);
       globalScene.ui.showText(
         i18next.t("battle:beatModeFirstTime", {
           speciesName: this.species.name,
           gameMode: globalScene.gameMode.getName(),
-          newModifier: newModifier?.type.name,
+          newModifier: this.reward.name,
         }),
         null,
         () => {

src/phases/select-biome-phase.ts

@@ -2,10 +2,12 @@ import { globalScene } from "#app/global-scene";
 import { biomeLinks, getBiomeName } from "#balance/biomes";
 import { BiomeId } from "#enums/biome-id";
 import { TrainerItemId } from "#enums/trainer-item-id";
+import { ChallengeType } from "#enums/challenge-type";
 import { UiMode } from "#enums/ui-mode";
 import { BattlePhase } from "#phases/battle-phase";
-import type { OptionSelectItem } from "#ui/abstact-option-select-ui-handler";
+import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler";
-import { randSeedInt } from "#utils/common";
+import { applyChallenges } from "#utils/challenge-utils";
+import { BooleanHolder, randSeedInt } from "#utils/common";
 
 export class SelectBiomePhase extends BattlePhase {
   public readonly phaseName = "SelectBiomePhase";
@@ -19,7 +21,11 @@ export class SelectBiomePhase extends BattlePhase {
 
     const setNextBiome = (nextBiome: BiomeId) => {
       if (nextWaveIndex % 10 === 1) {
-        globalScene.phaseManager.unshiftNew("PartyHealPhase", false);
+        const healStatus = new BooleanHolder(true);
+        applyChallenges(ChallengeType.PARTY_HEAL, healStatus);
+        if (healStatus.value) {
+          globalScene.phaseManager.unshiftNew("PartyHealPhase", false);
+        }
       }
       globalScene.phaseManager.unshiftNew("SwitchBiomePhase", nextBiome);
       this.end();

src/phases/select-reward-phase.ts

@@ -108,7 +108,7 @@ export class SelectRewardPhase extends BattlePhase {
             default:
               return false;
           }
-        // Pick an option from the allRewards
+        // Pick an option from the rewards
         case 1:
           return this.selectRewardOption(cursor, rewardSelectCallback);
         // Pick an option from the shop
@@ -121,7 +121,7 @@ export class SelectRewardPhase extends BattlePhase {
     this.resetRewardSelect(rewardSelectCallback);
   }
 
-  // Pick a reward from among the allRewards and apply it
+  // Pick a reward from among the rewards and apply it
   private selectRewardOption(cursor: number, rewardSelectCallback: RewardSelectCallback): boolean {
     if (this.typeOptions.length === 0) {
       globalScene.ui.clearText();
@@ -175,7 +175,6 @@ export class SelectRewardPhase extends BattlePhase {
     return cost === -1;
   }
 
-  // Reroll allRewards
   private rerollRewards() {
     const rerollCost = this.getRerollCost(globalScene.lockRarityTiers);
     if (rerollCost < 0 || globalScene.money < rerollCost) {

src/phases/select-starter-phase.ts

@@ -1,7 +1,6 @@
 import { globalScene } from "#app/global-scene";
 import Overrides from "#app/overrides";
 import { Phase } from "#app/phase";
-import { applyChallenges } from "#data/challenge";
 import { SpeciesFormChangeMoveLearnedTrigger } from "#data/form-change-triggers";
 import { Gender } from "#data/gender";
 import { ChallengeType } from "#enums/challenge-type";
@@ -10,6 +9,7 @@ import { UiMode } from "#enums/ui-mode";
 import { overrideHeldItems, overrideTrainerItems } from "#items/item-overrides";
 import { SaveSlotUiMode } from "#ui/save-slot-select-ui-handler";
 import type { Starter } from "#ui/starter-select-ui-handler";
+import { applyChallenges } from "#utils/challenge-utils";
 import { isNullOrUndefined } from "#utils/common";
 import { getPokemonSpecies } from "#utils/pokemon-utils";
 import SoundFade from "phaser3-rex-plugins/plugins/soundfade";

src/phases/title-phase.ts

@@ -14,7 +14,7 @@ import { getBiomeKey } from "#field/arena";
 import { assignDailyRunStarterHeldItems } from "#items/held-item-pool";
 import type { SessionSaveData } from "#system/game-data";
 import { vouchers } from "#system/voucher";
-import type { OptionSelectConfig, OptionSelectItem } from "#ui/abstact-option-select-ui-handler";
+import type { OptionSelectConfig, OptionSelectItem } from "#ui/abstract-option-select-ui-handler";
 import { SaveSlotUiMode } from "#ui/save-slot-select-ui-handler";
 import { isLocal, isLocalServerConnected, isNullOrUndefined } from "#utils/common";
 import i18next from "i18next";

src/phases/trainer-item-reward-phase.ts

@@ -1,40 +0,0 @@
-import { globalScene } from "#app/global-scene";
-import { type Reward, RewardGenerator } from "#items/reward";
-import { BattlePhase } from "#phases/battle-phase";
-import i18next from "i18next";
-
-export class RewardPhase extends BattlePhase {
-  // RibbonRewardPhase extends RewardPhase and to make typescript happy
-  // we need to use a union type here
-  public readonly phaseName: "RewardPhase" | "RibbonRewardPhase" | "GameOverRewardPhase" = "RewardPhase";
-  protected reward: Reward;
-
-  constructor(rewardFunc: Reward | RewardGenerator) {
-    super();
-
-    const reward = rewardFunc();
-    this.reward = reward instanceof RewardGenerator ? reward.generateReward() : reward;
-  }
-
-  start() {
-    super.start();
-
-    this.doReward().then(() => this.end());
-  }
-
-  doReward(): Promise<void> {
-    return new Promise<void>(resolve => {
-      globalScene.applyReward(this.reward);
-      globalScene.playSound("item_fanfare");
-      globalScene.ui.showText(
-        i18next.t("battle:rewardGain", {
-          modifierName: this.reward.name,
-        }),
-        null,
-        () => resolve(),
-        null,
-        true,
-      );
-    });
-  }
-}

src/phases/trainer-victory-phase.ts

@@ -1,8 +1,8 @@
 import { timedEventManager } from "#app/global-event-manager";
 import { globalScene } from "#app/global-scene";
-import { allRewards } from "#data/data-lists";
 import { getCharVariantFromDialogue } from "#data/dialogue";
 import { BiomeId } from "#enums/biome-id";
+import { RewardId } from "#enums/reward-id";
 import { TrainerSlot } from "#enums/trainer-slot";
 import { TrainerType } from "#enums/trainer-type";
 import { BattlePhase } from "#phases/battle-phase";
@@ -20,9 +20,11 @@ export class TrainerVictoryPhase extends BattlePhase {
 
     globalScene.phaseManager.unshiftNew("MoneyRewardPhase", globalScene.currentBattle.trainer?.config.moneyMultiplier!); // TODO: is this bang correct?
 
-    const rewardFuncs = globalScene.currentBattle.trainer?.config.rewardFuncs!; // TODO: is this bang correct?
+    const silentRewards = globalScene.currentBattle.trainer?.config.silentRewards; // TODO: is this bang correct?
-    for (const rewardFunc of rewardFuncs) {
+    if (silentRewards) {
-      globalScene.phaseManager.unshiftNew("RewardPhase", rewardFunc);
+      for (const id of silentRewards) {
+        globalScene.phaseManager.unshiftNew("RewardPhase", id);
+      }
     }
 
     const trainerType = globalScene.currentBattle.trainer?.config.trainerType!; // TODO: is this bang correct?
@@ -35,14 +37,14 @@ export class TrainerVictoryPhase extends BattlePhase {
         if (timedEventManager.getUpgradeUnlockedVouchers()) {
           globalScene.phaseManager.unshiftNew(
             "RewardPhase",
-            [allRewards.VOUCHER_PLUS, allRewards.VOUCHER_PLUS, allRewards.VOUCHER_PLUS, allRewards.VOUCHER_PREMIUM][
+            [RewardId.VOUCHER_PLUS, RewardId.VOUCHER_PLUS, RewardId.VOUCHER_PLUS, RewardId.VOUCHER_PREMIUM][
               vouchers[TrainerType[trainerType]].voucherType
             ],
           );
         } else {
           globalScene.phaseManager.unshiftNew(
             "RewardPhase",
-            [allRewards.VOUCHER, allRewards.VOUCHER, allRewards.VOUCHER_PLUS, allRewards.VOUCHER_PREMIUM][
+            [RewardId.VOUCHER, RewardId.VOUCHER, RewardId.VOUCHER_PLUS, RewardId.VOUCHER_PREMIUM][
               vouchers[TrainerType[trainerType]].voucherType
             ],
           );

src/phases/victory-phase.ts

@@ -1,12 +1,16 @@
 import { timedEventManager } from "#app/global-event-manager";
 import { globalScene } from "#app/global-scene";
-import { allRewards } 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 { RewardId } from "#enums/reward-id";
+import { TrainerItemId } from "#enums/trainer-item-id";
 import type { CustomRewardSettings } from "#items/reward-pool-utils";
 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";
@@ -55,15 +59,17 @@ export class VictoryPhase extends PokemonPhase {
               // Get event modifiers for this wave
               timedEventManager
                 .getFixedBattleEventRewards(globalScene.currentBattle.waveIndex)
-                .map(r => globalScene.phaseManager.pushNew("RewardPhase", allRewards[r]));
+                .map(r => globalScene.phaseManager.pushNew("RewardPhase", r));
               break;
             case ClassicFixedBossWaves.EVIL_BOSS_2:
-              // Should get Lock Capsule on 165 before shop phase so it can be used in the allRewards shop
+              // Should get Lock Capsule on 165 before shop phase so it can be used in the reward shop
-              globalScene.phaseManager.pushNew("RewardPhase", allRewards.LOCK_CAPSULE);
+              globalScene.phaseManager.pushNew("RewardPhase", TrainerItemId.LOCK_CAPSULE);
               break;
           }
         }
-        if (globalScene.currentBattle.waveIndex % 10) {
+        const healStatus = new BooleanHolder(globalScene.currentBattle.waveIndex % 10 === 0);
+        applyChallenges(ChallengeType.PARTY_HEAL, healStatus);
+        if (!healStatus.value) {
           globalScene.phaseManager.pushNew(
             "SelectRewardPhase",
             undefined,
@@ -71,17 +77,17 @@ export class VictoryPhase extends PokemonPhase {
             this.getFixedBattleCustomRewards(),
           );
         } else if (globalScene.gameMode.isDaily) {
-          globalScene.phaseManager.pushNew("RewardPhase", allRewards.EXP_CHARM);
+          globalScene.phaseManager.pushNew("RewardPhase", TrainerItemId.EXP_CHARM);
           if (
             globalScene.currentBattle.waveIndex > 10 &&
             !globalScene.gameMode.isWaveFinal(globalScene.currentBattle.waveIndex)
           ) {
-            globalScene.phaseManager.pushNew("RewardPhase", allRewards.GOLDEN_POKEBALL);
+            globalScene.phaseManager.pushNew("RewardPhase", TrainerItemId.GOLDEN_POKEBALL);
           }
         } else {
           const superExpWave = !globalScene.gameMode.isEndless ? (globalScene.offsetGym ? 0 : 20) : 10;
           if (globalScene.gameMode.isEndless && globalScene.currentBattle.waveIndex === 10) {
-            globalScene.phaseManager.pushNew("RewardPhase", allRewards.EXP_SHARE);
+            globalScene.phaseManager.pushNew("RewardPhase", TrainerItemId.EXP_SHARE);
           }
           if (
             globalScene.currentBattle.waveIndex <= 750 &&
@@ -90,17 +96,17 @@ export class VictoryPhase extends PokemonPhase {
             globalScene.phaseManager.pushNew(
               "RewardPhase",
               globalScene.currentBattle.waveIndex % 30 !== superExpWave || globalScene.currentBattle.waveIndex > 250
-                ? allRewards.EXP_CHARM
+                ? TrainerItemId.EXP_CHARM
-                : allRewards.SUPER_EXP_CHARM,
+                : TrainerItemId.SUPER_EXP_CHARM,
             );
           }
           if (globalScene.currentBattle.waveIndex <= 150 && !(globalScene.currentBattle.waveIndex % 50)) {
-            globalScene.phaseManager.pushNew("RewardPhase", allRewards.GOLDEN_POKEBALL);
+            globalScene.phaseManager.pushNew("RewardPhase", TrainerItemId.GOLDEN_POKEBALL);
           }
           if (globalScene.gameMode.isEndless && !(globalScene.currentBattle.waveIndex % 50)) {
             globalScene.phaseManager.pushNew(
               "RewardPhase",
-              !(globalScene.currentBattle.waveIndex % 250) ? allRewards.VOUCHER_PREMIUM : allRewards.VOUCHER_PLUS,
+              !(globalScene.currentBattle.waveIndex % 250) ? RewardId.VOUCHER_PREMIUM : RewardId.VOUCHER_PLUS,
             );
             globalScene.phaseManager.pushNew("AddEnemyTokenPhase");
           }
@@ -123,7 +129,7 @@ export class VictoryPhase extends PokemonPhase {
   }
 
   /**
-   * If this wave is a fixed battle with special custom modifier allRewards,
+   * If this wave is a fixed battle with special custom rewards,
    * will pass those settings to the upcoming {@linkcode SelectRewardPhase}`.
    */
   getFixedBattleCustomRewards(): CustomRewardSettings | undefined {

src/system/achv.ts

@@ -5,6 +5,7 @@ import {
   FlipStatChallenge,
   FreshStartChallenge,
   InverseBattleChallenge,
+  LimitedCatchChallenge,
   SingleGenerationChallenge,
   SingleTypeChallenge,
 } from "#data/challenge";
@@ -922,6 +923,19 @@ export const achvs = {
       c.value > 0 &&
       globalScene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0),
   ).setSecret(),
+  // TODO: Decide on icon
+  NUZLOCKE: new ChallengeAchv(
+    "NUZLOCKE",
+    "",
+    "NUZLOCKE.description",
+    "leaf_stone",
+    100,
+    c =>
+      c instanceof LimitedCatchChallenge &&
+      c.value > 0 &&
+      globalScene.gameMode.challenges.some(c => c.id === Challenges.HARDCORE && c.value > 0) &&
+      globalScene.gameMode.challenges.some(c => c.id === Challenges.FRESH_START && c.value > 0),
+  ),
   BREEDERS_IN_SPACE: new Achv("BREEDERS_IN_SPACE", "", "BREEDERS_IN_SPACE.description", "moon_stone", 50).setSecret(),
 };
 

src/system/game-data.ts

@@ -11,7 +11,6 @@ import { speciesEggMoves } from "#balance/egg-moves";
 import { pokemonPrevolutions } from "#balance/pokemon-evolutions";
 import { speciesStarterCosts } from "#balance/starters";
 import { ArenaTrapTag } from "#data/arena-tag";
-import { applyChallenges } from "#data/challenge";
 import { allMoves, allSpecies } from "#data/data-lists";
 import type { Egg } from "#data/egg";
 import { pokemonFormChanges } from "#data/pokemon-forms";
@@ -60,6 +59,7 @@ import { VoucherType, vouchers } from "#system/voucher";
 import { trainerConfigs } from "#trainers/trainer-config";
 import type { DexData, DexEntry } from "#types/dex-data";
 import { RUN_HISTORY_LIMIT } from "#ui/run-history-ui-handler";
+import { applyChallenges } from "#utils/challenge-utils";
 import { executeIf, fixedInt, isLocal, NumberHolder, randInt, randSeedItem } from "#utils/common";
 import { decrypt, encrypt } from "#utils/data";
 import { getEnumKeys } from "#utils/enums";

src/system/settings/settings-gamepad.ts

@@ -144,7 +144,7 @@ export function setSettingGamepad(setting: SettingGamepad, value: number): boole
                 handler: () => changeGamepadHandler(g),
               })),
               {
-                label: i18next.t("settings:cancelContollerChoice"),
+                label: i18next.t("settings:cancelControllerChoice"),
                 handler: cancelHandler,
               },
             ],

src/timed-event-manager.ts

@@ -8,6 +8,7 @@ import { SpeciesId } from "#enums/species-id";
 import { TextStyle } from "#enums/text-style";
 import { TrainerItemId } from "#enums/trainer-item-id";
 import { WeatherType } from "#enums/weather-type";
+import type { SilentReward } from "#types/rewards";
 import { addTextObject } from "#ui/text";
 import type { nil } from "#utils/common";
 import { isNullOrUndefined } from "#utils/common";
@@ -41,7 +42,7 @@ interface EventMysteryEncounterTier {
 
 interface EventWaveReward {
   wave: number;
-  type: string;
+  type: SilentReward;
 }
 
 type EventMusicReplacement = [string, string];
@@ -66,7 +67,7 @@ interface TimedEvent extends EventBanner {
   mysteryEncounterTierChanges?: EventMysteryEncounterTier[];
   luckBoostedSpecies?: SpeciesId[];
   boostFusions?: boolean; //MODIFIER REWORK PLEASE
-  classicWaveRewards?: EventWaveReward[]; // Rival battle allRewards
+  classicWaveRewards?: EventWaveReward[]; // Rival battle rewards
   trainerShinyChance?: number; // Odds over 65536 of trainer mon generating as shiny
   music?: EventMusicReplacement[];
   dailyRunChallenges?: EventChallenge[];
@@ -131,10 +132,10 @@ const timedEvents: TimedEvent[] = [
       },
     ],
     classicWaveRewards: [
-      { wave: 8, type: "SHINY_CHARM" },
+      { wave: 8, type: TrainerItemId.SHINY_CHARM },
-      { wave: 8, type: "ABILITY_CHARM" },
+      { wave: 8, type: TrainerItemId.ABILITY_CHARM },
-      { wave: 8, type: "CATCHING_CHARM" },
+      { wave: 8, type: TrainerItemId.CATCHING_CHARM },
-      { wave: 25, type: "SHINY_CHARM" },
+      { wave: 25, type: TrainerItemId.SHINY_CHARM },
     ],
   },
   {
@@ -202,10 +203,10 @@ const timedEvents: TimedEvent[] = [
       SpeciesId.BLOODMOON_URSALUNA,
     ],
     classicWaveRewards: [
-      { wave: 8, type: "SHINY_CHARM" },
+      { wave: 8, type: TrainerItemId.SHINY_CHARM },
-      { wave: 8, type: "ABILITY_CHARM" },
+      { wave: 8, type: TrainerItemId.ABILITY_CHARM },
-      { wave: 8, type: "CATCHING_CHARM" },
+      { wave: 8, type: TrainerItemId.CATCHING_CHARM },
-      { wave: 25, type: "SHINY_CHARM" },
+      { wave: 25, type: TrainerItemId.SHINY_CHARM },
     ],
   },
   {
@@ -242,10 +243,10 @@ const timedEvents: TimedEvent[] = [
     ],
     luckBoostedSpecies: [SpeciesId.LUVDISC],
     classicWaveRewards: [
-      { wave: 8, type: "SHINY_CHARM" },
+      { wave: 8, type: TrainerItemId.SHINY_CHARM },
-      { wave: 8, type: "ABILITY_CHARM" },
+      { wave: 8, type: TrainerItemId.ABILITY_CHARM },
-      { wave: 8, type: "CATCHING_CHARM" },
+      { wave: 8, type: TrainerItemId.CATCHING_CHARM },
-      { wave: 25, type: "SHINY_CHARM" },
+      { wave: 25, type: TrainerItemId.SHINY_CHARM },
     ],
   },
   {
@@ -293,10 +294,10 @@ const timedEvents: TimedEvent[] = [
       SpeciesId.ETERNAL_FLOETTE,
     ],
     classicWaveRewards: [
-      { wave: 8, type: "SHINY_CHARM" },
+      { wave: 8, type: TrainerItemId.SHINY_CHARM },
-      { wave: 8, type: "ABILITY_CHARM" },
+      { wave: 8, type: TrainerItemId.ABILITY_CHARM },
-      { wave: 8, type: "CATCHING_CHARM" },
+      { wave: 8, type: TrainerItemId.CATCHING_CHARM },
-      { wave: 25, type: "SHINY_CHARM" },
+      { wave: 25, type: TrainerItemId.SHINY_CHARM },
     ],
   },
   {
@@ -354,10 +355,10 @@ const timedEvents: TimedEvent[] = [
       { species: SpeciesId.APPLIN },
     ],
     classicWaveRewards: [
-      { wave: 8, type: "SHINY_CHARM" },
+      { wave: 8, type: TrainerItemId.SHINY_CHARM },
-      { wave: 8, type: "ABILITY_CHARM" },
+      { wave: 8, type: TrainerItemId.ABILITY_CHARM },
-      { wave: 8, type: "CATCHING_CHARM" },
+      { wave: 8, type: TrainerItemId.CATCHING_CHARM },
-      { wave: 25, type: "SHINY_CHARM" },
+      { wave: 25, type: TrainerItemId.SHINY_CHARM },
     ],
   },
   {
@@ -384,10 +385,10 @@ const timedEvents: TimedEvent[] = [
       { species: SpeciesId.ALOLA_MEOWTH },
     ],
     classicWaveRewards: [
-      { wave: 8, type: "SHINY_CHARM" },
+      { wave: 8, type: TrainerItemId.SHINY_CHARM },
-      { wave: 8, type: "ABILITY_CHARM" },
+      { wave: 8, type: TrainerItemId.ABILITY_CHARM },
-      { wave: 8, type: "CATCHING_CHARM" },
+      { wave: 8, type: TrainerItemId.CATCHING_CHARM },
-      { wave: 25, type: "SHINY_CHARM" },
+      { wave: 25, type: TrainerItemId.SHINY_CHARM },
     ],
   },
 ];
@@ -405,6 +406,16 @@ export class TimedEventManager {
     return timedEvents.some((te: TimedEvent) => this.isActive(te));
   }
 
+  /**
+   * Check whether the current event is active and for April Fools.
+   * @returns Whether the April Fools event is currently active.
+   */
+  isAprilFoolsActive(): boolean {
+    return timedEvents.some(
+      te => this.isActive(te) && te.hasOwnProperty("bannerKey") && te.bannerKey!.startsWith("aprf"),
+    );
+  }
+
   activeEventHasBanner(): boolean {
     const activeEvents = timedEvents.filter(te => this.isActive(te) && te.hasOwnProperty("bannerKey"));
     return activeEvents.length > 0;
@@ -568,11 +579,11 @@ export class TimedEventManager {
   /**
    * Gets all the modifier types associated with a certain wave during an event
    * @see EventWaveReward
-   * @param wave the wave to check for associated allRewards
+   * @param wave the wave to check for associated rewards
-   * @returns array of strings of the event modifier reward types
+   * @returns array of strings of the event reward types
    */
-  getFixedBattleEventRewards(wave: number): string[] {
+  getFixedBattleEventRewards(wave: number): SilentReward[] {
-    const ret: string[] = [];
+    const ret: SilentReward[] = [];
     timedEvents
       .filter(te => this.isActive(te) && !isNullOrUndefined(te.classicWaveRewards))
       .map(te => {
@@ -661,7 +672,7 @@ export class TimedEventDisplay extends Phaser.GameObjects.Container {
       console.log(this.event.bannerKey);
       const padding = 5;
       const showTimer = this.event.eventType !== EventType.NO_TIMER_DISPLAY;
-      const yPosition = globalScene.game.canvas.height / 6 - padding - (showTimer ? 10 : 0) - (this.event.yOffset ?? 0);
+      const yPosition = globalScene.scaledCanvas.height - padding - (showTimer ? 10 : 0) - (this.event.yOffset ?? 0);
       this.banner = new Phaser.GameObjects.Image(globalScene, this.availableWidth / 2, yPosition - padding, key);
       this.banner.setName("img-event-banner");
       this.banner.setOrigin(0.5, 1);

src/ui/abstract-option-select-ui-handler.ts

@@ -66,7 +66,7 @@ export abstract class AbstractOptionSelectUiHandler extends UiHandler {
   setup() {
     const ui = this.getUi();
 
-    this.optionSelectContainer = globalScene.add.container(globalScene.game.canvas.width / 6 - 1, -48);
+    this.optionSelectContainer = globalScene.add.container(globalScene.scaledCanvas.width - 1, -48);
     this.optionSelectContainer.setName(`option-select-${this.mode ? UiMode[this.mode] : "UNKNOWN"}`);
     this.optionSelectContainer.setVisible(false);
     ui.add(this.optionSelectContainer);
@@ -135,7 +135,7 @@ export abstract class AbstractOptionSelectUiHandler extends UiHandler {
     this.optionSelectText.setName("text-option-select");
     this.optionSelectTextContainer.add(this.optionSelectText);
     this.optionSelectContainer.setPosition(
-      globalScene.game.canvas.width / 6 - 1 - (this.config?.xOffset || 0),
+      globalScene.scaledCanvas.width - 1 - (this.config?.xOffset || 0),
       -48 + (this.config?.yOffset || 0),
     );
     this.optionSelectBg.width = Math.max(this.optionSelectText.displayWidth + 24, this.getWindowWidth());

src/ui/achv-bar.ts

@@ -21,7 +21,7 @@ export class AchvBar extends Phaser.GameObjects.Container {
   public shown: boolean;
 
   constructor() {
-    super(globalScene, globalScene.game.canvas.width / 6, 0);
+    super(globalScene, globalScene.scaledCanvas.width, 0);
     this.playerGender = globalScene.gameData.gender;
   }
 
@@ -118,7 +118,7 @@ export class AchvBar extends Phaser.GameObjects.Container {
 
     globalScene.tweens.add({
       targets: this,
-      x: globalScene.game.canvas.width / 6 - this.bg.width / 2,
+      x: globalScene.scaledCanvas.width - this.bg.width / 2,
       duration: 500,
       ease: "Sine.easeOut",
     });
@@ -136,7 +136,7 @@ export class AchvBar extends Phaser.GameObjects.Container {
 
     globalScene.tweens.add({
       targets: this,
-      x: globalScene.game.canvas.width / 6,
+      x: globalScene.scaledCanvas.width,
       duration: 500,
       ease: "Sine.easeIn",
       onComplete: () => {

src/ui/achvs-ui-handler.ts

@@ -72,9 +72,9 @@ export class AchvsUiHandler extends MessageUiHandler {
     const ui = this.getUi();
 
     /** Width of the global canvas / 6 */
-    const WIDTH = globalScene.game.canvas.width / 6;
+    const WIDTH = globalScene.scaledCanvas.width;
     /** Height of the global canvas / 6 */
-    const HEIGHT = globalScene.game.canvas.height / 6;
+    const HEIGHT = globalScene.scaledCanvas.height;
 
     this.mainContainer = globalScene.add.container(1, -HEIGHT + 1);
 

src/ui/arena-flyout.ts

@@ -36,7 +36,7 @@ interface ArenaEffectInfo {
   /** The enum string representation of the effect */
   name: string;
   /** {@linkcode ArenaEffectType} type of effect */
-  effecType: ArenaEffectType;
+  effectType: ArenaEffectType;
 
   /** The maximum duration set by the effect */
   maxDuration: number;
@@ -246,7 +246,7 @@ export class ArenaFlyout extends Phaser.GameObjects.Container {
 
       // Creates a proxy object to decide which text object needs to be updated
       let textObject: Phaser.GameObjects.Text;
-      switch (fieldEffectInfo.effecType) {
+      switch (fieldEffectInfo.effectType) {
         case ArenaEffectType.PLAYER:
           textObject = this.flyoutTextPlayer;
           break;
@@ -300,7 +300,7 @@ export class ArenaFlyout extends Phaser.GameObjects.Container {
 
         const existingTrapTagIndex = isArenaTrapTag
           ? this.fieldEffectInfo.findIndex(
-              e => tagAddedEvent.arenaTagType === e.tagType && arenaEffectType === e.effecType,
+              e => tagAddedEvent.arenaTagType === e.tagType && arenaEffectType === e.effectType,
             )
           : -1;
         let name: string = getFieldEffectText(ArenaTagType[tagAddedEvent.arenaTagType]);
@@ -318,7 +318,7 @@ export class ArenaFlyout extends Phaser.GameObjects.Container {
 
         this.fieldEffectInfo.push({
           name,
-          effecType: arenaEffectType,
+          effectType: arenaEffectType,
           maxDuration: tagAddedEvent.duration,
           duration: tagAddedEvent.duration,
           tagType: tagAddedEvent.arenaTagType,
@@ -353,7 +353,7 @@ export class ArenaFlyout extends Phaser.GameObjects.Container {
               ? WeatherType[fieldEffectChangedEvent.newWeatherType]
               : TerrainType[fieldEffectChangedEvent.newTerrainType],
           ),
-          effecType:
+          effectType:
             fieldEffectChangedEvent instanceof WeatherChangedEvent ? ArenaEffectType.WEATHER : ArenaEffectType.TERRAIN,
           maxDuration: fieldEffectChangedEvent.duration,
           duration: fieldEffectChangedEvent.duration,

src/ui/autocomplete-ui-handler.ts

@@ -1,6 +1,6 @@
 import { Button } from "#enums/buttons";
 import { UiMode } from "#enums/ui-mode";
-import { AbstractOptionSelectUiHandler } from "#ui/abstact-option-select-ui-handler";
+import { AbstractOptionSelectUiHandler } from "#ui/abstract-option-select-ui-handler";
 
 export class AutoCompleteUiHandler extends AbstractOptionSelectUiHandler {
   modalContainer: Phaser.GameObjects.Container;

src/ui/ball-ui-handler.ts

@@ -37,7 +37,7 @@ export class BallUiHandler extends UiHandler {
     const optionsText = addTextObject(0, 0, optionsTextContent, TextStyle.WINDOW, { align: "right", maxLines: 6 });
     const optionsTextWidth = optionsText.displayWidth;
     this.pokeballSelectContainer = globalScene.add.container(
-      globalScene.game.canvas.width / 6 - 51 - Math.max(64, optionsTextWidth),
+      globalScene.scaledCanvas.width - 51 - Math.max(64, optionsTextWidth),
       -49,
     );
     this.pokeballSelectContainer.setVisible(false);

src/ui/base-stats-overlay.ts

@@ -16,7 +16,6 @@ interface BaseStatsOverlaySettings {
 
 const HEIGHT = 120;
 const BORDER = 8;
-const GLOBAL_SCALE = 6;
 const shortStats = ["HP", "ATK", "DEF", "SPATK", "SPDEF", "SPD"];
 
 export class BaseStatsOverlay extends Phaser.GameObjects.Container implements InfoToggle {
@@ -109,7 +108,7 @@ export class BaseStatsOverlay extends Phaser.GameObjects.Container implements In
 
   // width of this element
   static getWidth(_scale: number): number {
-    return globalScene.game.canvas.width / GLOBAL_SCALE / 2;
+    return globalScene.scaledCanvas.width / 2;
   }
 
   // height of this element

src/ui/battle-info/player-battle-info.ts

@@ -39,7 +39,7 @@ export class PlayerBattleInfo extends BattleInfo {
         statOverflow: 1,
       },
     };
-    super(Math.floor(globalScene.game.canvas.width / 6) - 10, -72, true, posParams);
+    super(Math.floor(globalScene.scaledCanvas.width) - 10, -72, true, posParams);
 
     this.hpNumbersContainer = globalScene.add.container(-15, 10).setName("container_hp");
 
@@ -198,11 +198,11 @@ export class PlayerBattleInfo extends BattleInfo {
     this.lastLevelCapped = isLevelCapped;
 
     if (this.lastExp !== pokemon.exp || this.lastLevel !== pokemon.level) {
-      const durationMultipler = Math.max(
+      const durationMultiplier = Math.max(
         Phaser.Tweens.Builders.GetEaseFunction("Cubic.easeIn")(1 - Math.min(pokemon.level - this.lastLevel, 10) / 10),
         0.1,
       );
-      await this.updatePokemonExp(pokemon, false, durationMultipler);
+      await this.updatePokemonExp(pokemon, false, durationMultiplier);
     } else if (isLevelCapped !== oldLevelCapped) {
       this.setLevel(pokemon.level);
     }

src/ui/battle-message-ui-handler.ts

@@ -94,7 +94,7 @@ export class BattleMessageUiHandler extends MessageUiHandler {
 
     this.levelUpStatsContainer = levelUpStatsContainer;
 
-    const levelUpStatsLabelsContent = addTextObject(globalScene.game.canvas.width / 6 - 73, -94, "", TextStyle.WINDOW, {
+    const levelUpStatsLabelsContent = addTextObject(globalScene.scaledCanvas.width - 73, -94, "", TextStyle.WINDOW, {
       maxLines: 6,
     });
     let levelUpStatsLabelText = "";
@@ -106,7 +106,7 @@ export class BattleMessageUiHandler extends MessageUiHandler {
     levelUpStatsLabelsContent.x -= levelUpStatsLabelsContent.displayWidth;
 
     const levelUpStatsBg = addWindow(
-      globalScene.game.canvas.width / 6,
+      globalScene.scaledCanvas.width,
       -100,
       80 + levelUpStatsLabelsContent.displayWidth,
       100,
@@ -117,7 +117,7 @@ export class BattleMessageUiHandler extends MessageUiHandler {
     levelUpStatsContainer.add(levelUpStatsLabelsContent);
 
     const levelUpStatsIncrContent = addTextObject(
-      globalScene.game.canvas.width / 6 - 50,
+      globalScene.scaledCanvas.width - 50,
       -94,
       "+\n+\n+\n+\n+\n+",
       TextStyle.WINDOW,
@@ -128,7 +128,7 @@ export class BattleMessageUiHandler extends MessageUiHandler {
     this.levelUpStatsIncrContent = levelUpStatsIncrContent;
 
     const levelUpStatsValuesContent = addBBCodeTextObject(
-      globalScene.game.canvas.width / 6 - 7,
+      globalScene.scaledCanvas.width - 7,
       -94,
       "",
       TextStyle.WINDOW,

src/ui/candy-bar.ts

@@ -19,7 +19,7 @@ export class CandyBar extends Phaser.GameObjects.Container {
   public shown: boolean;
 
   constructor() {
-    super(globalScene, globalScene.game.canvas.width / 6, -(globalScene.game.canvas.height / 6) + 15);
+    super(globalScene, globalScene.scaledCanvas.width, -globalScene.scaledCanvas.height + 15);
   }
 
   setup(): void {
@@ -80,7 +80,7 @@ export class CandyBar extends Phaser.GameObjects.Container {
 
       this.tween = globalScene.tweens.add({
         targets: this,
-        x: globalScene.game.canvas.width / 6 - (this.bg.width - 5),
+        x: globalScene.scaledCanvas.width - (this.bg.width - 5),
         duration: 500,
         ease: "Sine.easeOut",
         onComplete: () => {
@@ -111,7 +111,7 @@ export class CandyBar extends Phaser.GameObjects.Container {
 
       this.tween = globalScene.tweens.add({
         targets: this,
-        x: globalScene.game.canvas.width / 6,
+        x: globalScene.scaledCanvas.width,
         duration: 500,
         ease: "Sine.easeIn",
         onComplete: () => {

src/ui/challenges-select-ui-handler.ts

@@ -58,11 +58,11 @@ export class GameChallengesUiHandler extends UiHandler {
 
     this.widestTextBox = 0;
 
-    this.challengesContainer = globalScene.add.container(1, -(globalScene.game.canvas.height / 6) + 1);
+    this.challengesContainer = globalScene.add.container(1, -globalScene.scaledCanvas.height + 1);
     this.challengesContainer.setName("challenges");
 
     this.challengesContainer.setInteractive(
-      new Phaser.Geom.Rectangle(0, 0, globalScene.game.canvas.width / 6, globalScene.game.canvas.height / 6),
+      new Phaser.Geom.Rectangle(0, 0, globalScene.scaledCanvas.width, globalScene.scaledCanvas.height),
       Phaser.Geom.Rectangle.Contains,
     );
 
@@ -79,7 +79,7 @@ export class GameChallengesUiHandler extends UiHandler {
     this.challengesContainer.add(bgOverlay);
 
     // TODO: Change this back to /9 when adding in difficulty
-    const headerBg = addWindow(0, 0, globalScene.game.canvas.width / 6, 24);
+    const headerBg = addWindow(0, 0, globalScene.scaledCanvas.width, 24);
     headerBg.setName("window-header-bg");
     headerBg.setOrigin(0, 0);
 

src/ui/char-sprite.ts

@@ -10,7 +10,7 @@ export class CharSprite extends Phaser.GameObjects.Container {
   public shown: boolean;
 
   constructor() {
-    super(globalScene, globalScene.game.canvas.width / 6 + 32, -42);
+    super(globalScene, globalScene.scaledCanvas.width + 32, -42);
   }
 
   setup(): void {
@@ -49,7 +49,7 @@ export class CharSprite extends Phaser.GameObjects.Container {
 
       globalScene.tweens.add({
         targets: this,
-        x: globalScene.game.canvas.width / 6 - 102,
+        x: globalScene.scaledCanvas.width - 102,
         duration: 750,
         ease: "Cubic.easeOut",
         onComplete: () => {
@@ -95,7 +95,7 @@ export class CharSprite extends Phaser.GameObjects.Container {
 
       globalScene.tweens.add({
         targets: this,
-        x: globalScene.game.canvas.width / 6 + 32,
+        x: globalScene.scaledCanvas.width + 32,
         duration: 750,
         ease: "Cubic.easeIn",
         onComplete: () => {

src/ui/command-ui-handler.ts

@@ -42,7 +42,7 @@ export class CommandUiHandler extends UiHandler {
     ui.add(this.commandsContainer);
 
     this.teraButton = globalScene.add.sprite(-32, 15, "button_tera");
-    this.teraButton.setName("terrastallize-button");
+    this.teraButton.setName("terastallize-button");
     this.teraButton.setScale(1.3);
     this.teraButton.setFrame("fire");
     this.teraButton.setPipeline(globalScene.spritePipeline, {