CONTRIBUTING.md

@@ -81,7 +81,7 @@ For example, here is how you could test a scenario where the player Pokemon has
 ```typescript
 const overrides = {
   ABILITY_OVERRIDE: AbilityId.DROUGHT,
-  ENEMY_MOVESET_OVERRIDE: MoveId.WATER_GUN,
+  OPP_MOVESET_OVERRIDE: MoveId.WATER_GUN,
 } satisfies Partial<InstanceType<typeof DefaultOverrides>>;
 ```
 

public/images/ui/party_slot_main_short.json

@@ -1,146 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "party_slot_main_short.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 110,
-				"h": 294
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "party_slot_main_short",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 110,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 110,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 110,
-						"h": 41
-					}
-				},
-				{
-					"filename": "party_slot_main_short_sel",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 110,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 110,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 41,
-						"w": 110,
-						"h": 41
-					}
-				},
-				{
-					"filename": "party_slot_main_short_fnt",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 110,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 110,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 82,
-						"w": 110,
-						"h": 41
-					}
-				},
-				{
-					"filename": "party_slot_main_short_fnt_sel",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 110,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 110,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 123,
-						"w": 110,
-						"h": 41
-					}
-				},
-				{
-					"filename": "party_slot_main_short_swap",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 110,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 110,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 164,
-						"w": 110,
-						"h": 41
-					}
-				},
-				{
-					"filename": "party_slot_main_short_swap_sel",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 110,
-						"h": 41
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 110,
-						"h": 41
-					},
-					"frame": {
-						"x": 0,
-						"y": 205,
-						"w": 110,
-						"h": 41
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:29685f2f538901cf5bf7f0ed2ea867c3:a080ea6c8cccd1e03244214053e79796:565f7afc5ca419b6ba8dbce51ea30818$"
-	}
-}

src/@types/dex-data.ts

@@ -1,5 +1,3 @@
-import type { RibbonData } from "#system/ribbons/ribbon-data";
-
 export interface DexData {
   [key: number]: DexEntry;
 }
@@ -12,5 +10,4 @@ export interface DexEntry {
   caughtCount: number;
   hatchedCount: number;
   ivs: number[];
-  ribbons: RibbonData;
 }

src/@types/helpers/type-helpers.ts

@@ -103,12 +103,3 @@ export type CoerceNullPropertiesToUndefined<T extends object> = {
  * @typeParam T - The type to render partial
  */
 export type AtLeastOne<T extends object> = Partial<T> & ObjectValues<{ [K in keyof T]: Pick<Required<T>, K> }>;
-
-/** Type helper that adds a brand to a type, used for nominal typing.
- *
- * @remarks
- * Brands should be either a string or unique symbol. This prevents overlap with other types.
- */
-export declare class Brander<B> {
-  private __brand: B;
-}

src/battle-scene.ts

@@ -104,7 +104,6 @@ import {
   getLuckString,
   getLuckTextTint,
   getPartyLuckValue,
-  type ModifierType,
   PokemonHeldItemModifierType,
 } from "#modifiers/modifier-type";
 import { MysteryEncounter } from "#mystery-encounters/mystery-encounter";
@@ -944,17 +943,17 @@ export class BattleScene extends SceneBase {
     dataSource?: PokemonData,
     postProcess?: (enemyPokemon: EnemyPokemon) => void,
   ): EnemyPokemon {
-    if (Overrides.ENEMY_LEVEL_OVERRIDE > 0) {
+    if (Overrides.OPP_LEVEL_OVERRIDE > 0) {
-      level = Overrides.ENEMY_LEVEL_OVERRIDE;
+      level = Overrides.OPP_LEVEL_OVERRIDE;
     }
-    if (Overrides.ENEMY_SPECIES_OVERRIDE) {
+    if (Overrides.OPP_SPECIES_OVERRIDE) {
-      species = getPokemonSpecies(Overrides.ENEMY_SPECIES_OVERRIDE);
+      species = getPokemonSpecies(Overrides.OPP_SPECIES_OVERRIDE);
       // The fact that a Pokemon is a boss or not can change based on its Species and level
       boss = this.getEncounterBossSegments(this.currentBattle.waveIndex, level, species) > 1;
     }
 
     const pokemon = new EnemyPokemon(species, level, trainerSlot, boss, shinyLock, dataSource);
-    if (Overrides.ENEMY_FUSION_OVERRIDE) {
+    if (Overrides.OPP_FUSION_OVERRIDE) {
       pokemon.generateFusionSpecies();
     }
 
@@ -1204,9 +1203,7 @@ export class BattleScene extends SceneBase {
     this.updateScoreText();
     this.scoreText.setVisible(false);
 
-    [this.luckLabelText, this.luckText].forEach(t => {
+    [this.luckLabelText, this.luckText].map(t => t.setVisible(false));
-      t.setVisible(false);
-    });
 
     this.newArena(Overrides.STARTING_BIOME_OVERRIDE || BiomeId.TOWN);
 
@@ -1240,7 +1237,8 @@ export class BattleScene extends SceneBase {
             Object.values(mp)
               .flat()
               .map(mt => mt.modifierType)
-              .filter((mt): mt is ModifierType & Localizable => "localize" in mt && typeof mt.localize === "function"),
+              .filter(mt => "localize" in mt)
+              .map(lpb => lpb as unknown as Localizable),
           ),
       ];
       for (const item of localizable) {
@@ -1515,8 +1513,8 @@ export class BattleScene extends SceneBase {
     return this.currentBattle;
   }
 
-  newArena(biome: BiomeId, playerFaints = 0): Arena {
+  newArena(biome: BiomeId, playerFaints?: number): Arena {
-    this.arena = new Arena(biome, playerFaints);
+    this.arena = new Arena(biome, BiomeId[biome].toLowerCase(), playerFaints);
     this.eventTarget.dispatchEvent(new NewArenaEvent());
 
     this.arenaBg.pipelineData = {
@@ -1766,10 +1764,10 @@ export class BattleScene extends SceneBase {
   }
 
   getEncounterBossSegments(waveIndex: number, level: number, species?: PokemonSpecies, forceBoss = false): number {
-    if (Overrides.ENEMY_HEALTH_SEGMENTS_OVERRIDE > 1) {
+    if (Overrides.OPP_HEALTH_SEGMENTS_OVERRIDE > 1) {
-      return Overrides.ENEMY_HEALTH_SEGMENTS_OVERRIDE;
+      return Overrides.OPP_HEALTH_SEGMENTS_OVERRIDE;
     }
-    if (Overrides.ENEMY_HEALTH_SEGMENTS_OVERRIDE === 1) {
+    if (Overrides.OPP_HEALTH_SEGMENTS_OVERRIDE === 1) {
       // The rest of the code expects to be returned 0 and not 1 if the enemy is not a boss
       return 0;
     }
@@ -2713,9 +2711,7 @@ export class BattleScene extends SceneBase {
           }
         }
 
-        this.party.forEach(p => {
+        this.party.map(p => p.updateInfo(instant));
-          p.updateInfo(instant);
-        });
       } else {
         const args = [this];
         if (modifier.shouldApply(...args)) {

src/constants.ts

@@ -101,9 +101,3 @@ export const ANTI_VARIANCE_WEIGHT_MODIFIER = 15;
  * Default: `10000` (0.01%)
  */
 export const FAKE_TITLE_LOGO_CHANCE = 10000;
-
-/**
- * The ceiling on friendship amount that can be reached through the use of rare candies.
- * Using rare candies will never increase friendship beyond this value.
- */
-export const RARE_CANDY_FRIENDSHIP_CAP = 200;

src/data/abilities/ability.ts

@@ -74,7 +74,6 @@ import {
   randSeedItem,
   toDmgValue,
 } from "#utils/common";
-import { toCamelCase } from "#utils/strings";
 import i18next from "i18next";
 
 export class Ability implements Localizable {
@@ -110,9 +109,13 @@ export class Ability implements Localizable {
   }
 
   localize(): void {
-    const i18nKey = toCamelCase(AbilityId[this.id]);
+    const i18nKey = AbilityId[this.id]
+      .split("_")
+      .filter(f => f)
+      .map((f, i) => (i ? `${f[0]}${f.slice(1).toLowerCase()}` : f.toLowerCase()))
+      .join("") as string;
 
-    this.name = this.id ? `${i18next.t(`ability:${i18nKey}.name`)}${this.nameAppend}` : "";
+    this.name = this.id ? `${i18next.t(`ability:${i18nKey}.name`) as string}${this.nameAppend}` : "";
     this.description = this.id ? (i18next.t(`ability:${i18nKey}.description`) as string) : "";
   }
 

src/data/balance/pokemon-evolutions.ts

@@ -1866,16 +1866,17 @@ interface PokemonPrevolutions {
 export const pokemonPrevolutions: PokemonPrevolutions = {};
 
 export function initPokemonPrevolutions(): void {
-  // TODO: Why do we have empty strings in our array?
+  const megaFormKeys = [ SpeciesFormKey.MEGA, "", SpeciesFormKey.MEGA_X, "", SpeciesFormKey.MEGA_Y ].map(sfk => sfk as string);
-  const megaFormKeys = [ SpeciesFormKey.MEGA, "", SpeciesFormKey.MEGA_X, "", SpeciesFormKey.MEGA_Y ];
+  const prevolutionKeys = Object.keys(pokemonEvolutions);
-  for (const [pk, evolutions] of Object.entries(pokemonEvolutions)) {
+  prevolutionKeys.forEach(pk => {
+    const evolutions = pokemonEvolutions[pk];
     for (const ev of evolutions) {
       if (ev.evoFormKey && megaFormKeys.indexOf(ev.evoFormKey) > -1) {
         continue;
       }
       pokemonPrevolutions[ev.speciesId] = Number.parseInt(pk) as SpeciesId;
     }
-  }
+  });
 }
 
 

src/data/challenge.ts

@@ -20,7 +20,6 @@ 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 { RibbonData, type RibbonFlag } from "#system/ribbons/ribbon-data";
 import { type BooleanHolder, isBetween, type NumberHolder, randSeedItem } from "#utils/common";
 import { deepCopy } from "#utils/data";
 import { getPokemonSpecies, getPokemonSpeciesForm } from "#utils/pokemon-utils";
@@ -43,15 +42,6 @@ export abstract class Challenge {
 
   public conditions: ChallengeCondition[];
 
-  /**
-   * The Ribbon awarded on challenge completion, or 0 if the challenge has no ribbon or is not enabled
-   *
-   * @defaultValue 0
-   */
-  public get ribbonAwarded(): RibbonFlag {
-    return 0 as RibbonFlag;
-  }
-
   /**
    * @param id {@link Challenges} The enum value for the challenge
    */
@@ -433,12 +423,6 @@ type ChallengeCondition = (data: GameData) => boolean;
  * Implements a mono generation challenge.
  */
 export class SingleGenerationChallenge extends Challenge {
-  public override get ribbonAwarded(): RibbonFlag {
-    // NOTE: This logic will not work for the eventual mono gen 10 ribbon, as
-    // as its flag will not be in sequence with the other mono gen ribbons.
-    return this.value ? ((RibbonData.MONO_GEN_1 << (this.value - 1)) as RibbonFlag) : 0;
-  }
-
   constructor() {
     super(Challenges.SINGLE_GENERATION, 9);
   }
@@ -702,12 +686,6 @@ interface monotypeOverride {
  * Implements a mono type challenge.
  */
 export class SingleTypeChallenge extends Challenge {
-  public override get ribbonAwarded(): RibbonFlag {
-    // `this.value` represents the 1-based index of pokemon type
-    // `RibbonData.MONO_NORMAL` starts the flag position for the types,
-    // and we shift it by 1 for the specific type.
-    return this.value ? ((RibbonData.MONO_NORMAL << (this.value - 1)) as RibbonFlag) : 0;
-  }
   private static TYPE_OVERRIDES: monotypeOverride[] = [
     { species: SpeciesId.CASTFORM, type: PokemonType.NORMAL, fusion: false },
   ];
@@ -777,9 +755,6 @@ export class SingleTypeChallenge extends Challenge {
  * Implements a fresh start challenge.
  */
 export class FreshStartChallenge extends Challenge {
-  public override get ribbonAwarded(): RibbonFlag {
-    return this.value ? RibbonData.FRESH_START : 0;
-  }
   constructor() {
     super(Challenges.FRESH_START, 2);
   }
@@ -853,9 +828,6 @@ export class FreshStartChallenge extends Challenge {
  * Implements an inverse battle challenge.
  */
 export class InverseBattleChallenge extends Challenge {
-  public override get ribbonAwarded(): RibbonFlag {
-    return this.value ? RibbonData.INVERSE : 0;
-  }
   constructor() {
     super(Challenges.INVERSE_BATTLE, 1);
   }
@@ -889,9 +861,6 @@ export class InverseBattleChallenge extends Challenge {
  * Implements a flip stat challenge.
  */
 export class FlipStatChallenge extends Challenge {
-  public override get ribbonAwarded(): RibbonFlag {
-    return this.value ? RibbonData.FLIP_STATS : 0;
-  }
   constructor() {
     super(Challenges.FLIP_STAT, 1);
   }
@@ -972,9 +941,6 @@ export class LowerStarterPointsChallenge extends Challenge {
  * Implements a No Support challenge
  */
 export class LimitedSupportChallenge extends Challenge {
-  public override get ribbonAwarded(): RibbonFlag {
-    return this.value ? ((RibbonData.NO_HEAL << (this.value - 1)) as RibbonFlag) : 0;
-  }
   constructor() {
     super(Challenges.LIMITED_SUPPORT, 3);
   }
@@ -1007,9 +973,6 @@ export class LimitedSupportChallenge extends Challenge {
  * Implements a Limited Catch challenge
  */
 export class LimitedCatchChallenge extends Challenge {
-  public override get ribbonAwarded(): RibbonFlag {
-    return this.value ? RibbonData.LIMITED_CATCH : 0;
-  }
   constructor() {
     super(Challenges.LIMITED_CATCH, 1);
   }
@@ -1034,9 +997,6 @@ export class LimitedCatchChallenge extends Challenge {
  * Implements a Permanent Faint challenge
  */
 export class HardcoreChallenge extends Challenge {
-  public override get ribbonAwarded(): RibbonFlag {
-    return this.value ? RibbonData.HARDCORE : 0;
-  }
   constructor() {
     super(Challenges.HARDCORE, 1);
   }

src/data/egg-hatch-data.ts

@@ -47,7 +47,6 @@ export class EggHatchData {
       caughtCount: currDexEntry.caughtCount,
       hatchedCount: currDexEntry.hatchedCount,
       ivs: [...currDexEntry.ivs],
-      ribbons: currDexEntry.ribbons,
     };
     this.starterDataEntryBeforeUpdate = {
       moveset: currStarterDataEntry.moveset,

src/data/moves/move.ts

@@ -90,7 +90,7 @@ import type { ChargingMove, MoveAttrMap, MoveAttrString, MoveClassMap, MoveKindS
 import type { TurnMove } from "#types/turn-move";
 import { BooleanHolder, type Constructor, isNullOrUndefined, NumberHolder, randSeedFloat, randSeedInt, randSeedItem, toDmgValue } from "#utils/common";
 import { getEnumValues } from "#utils/enums";
-import { toCamelCase, toTitleCase } from "#utils/strings";
+import { toTitleCase } from "#utils/strings";
 import i18next from "i18next";
 import { applyChallenges } from "#utils/challenge-utils";
 
@@ -162,16 +162,10 @@ export abstract class Move implements Localizable {
   }
 
   localize(): void {
-    const i18nKey = toCamelCase(MoveId[this.id])
+    const i18nKey = MoveId[this.id].split("_").filter(f => f).map((f, i) => i ? `${f[0]}${f.slice(1).toLowerCase()}` : f.toLowerCase()).join("") as unknown as string;
 
-    if (this.id === MoveId.NONE) {
+    this.name = this.id ? `${i18next.t(`move:${i18nKey}.name`)}${this.nameAppend}` : "";
-      this.name = "";
+    this.effect = this.id ? `${i18next.t(`move:${i18nKey}.effect`)}${this.nameAppend}` : "";
-      this.effect = ""
-      return;
-    }
-
-    this.name = `${i18next.t(`move:${i18nKey}.name`)}${this.nameAppend}`;
-    this.effect = `${i18next.t(`move:${i18nKey}.effect`)}${this.nameAppend}`;
   }
 
   /**

src/data/pokemon-forms/form-change-triggers.ts

@@ -12,7 +12,6 @@ import { WeatherType } from "#enums/weather-type";
 import type { Pokemon } from "#field/pokemon";
 import type { PokemonFormChangeItemModifier } from "#modifiers/modifier";
 import { type Constructor, coerceArray } from "#utils/common";
-import { toCamelCase } from "#utils/strings";
 import i18next from "i18next";
 
 export abstract class SpeciesFormChangeTrigger {
@@ -144,7 +143,11 @@ export class SpeciesFormChangeMoveLearnedTrigger extends SpeciesFormChangeTrigge
     super();
     this.move = move;
     this.known = known;
-    const moveKey = toCamelCase(MoveId[this.move]);
+    const moveKey = MoveId[this.move]
+      .split("_")
+      .filter(f => f)
+      .map((f, i) => (i ? `${f[0]}${f.slice(1).toLowerCase()}` : f.toLowerCase()))
+      .join("") as unknown as string;
     this.description = known
       ? i18next.t("pokemonEvolutions:Forms.moveLearned", {
           move: i18next.t(`move:${moveKey}.name`),

src/field/arena.ts

@@ -54,7 +54,7 @@ export class Arena {
   public bgm: string;
   public ignoreAbilities: boolean;
   public ignoringEffectSource: BattlerIndex | null;
-  public playerTerasUsed = 0;
+  public playerTerasUsed: number;
   /**
    * Saves the number of times a party pokemon faints during a arena encounter.
    * {@linkcode globalScene.currentBattle.enemyFaints} is the corresponding faint counter for the enemy (this resets every wave).
@@ -68,11 +68,12 @@ export class Arena {
 
   public readonly eventTarget: EventTarget = new EventTarget();
 
-  constructor(biome: BiomeId, playerFaints = 0) {
+  constructor(biome: BiomeId, bgm: string, playerFaints = 0) {
     this.biomeType = biome;
-    this.bgm = BiomeId[biome].toLowerCase();
+    this.bgm = bgm;
     this.trainerPool = biomeTrainerPools[biome];
     this.updatePoolsForTimeOfDay();
+    this.playerTerasUsed = 0;
     this.playerFaints = playerFaints;
   }
 

src/field/pokemon.ts

@@ -1,7 +1,7 @@
 import type { Ability, PreAttackModifyDamageAbAttrParams } from "#abilities/ability";
 import { applyAbAttrs, applyOnGainAbAttrs, applyOnLoseAbAttrs } from "#abilities/apply-ab-attrs";
 import type { AnySound, BattleScene } from "#app/battle-scene";
-import { PLAYER_PARTY_MAX_SIZE, RARE_CANDY_FRIENDSHIP_CAP } from "#app/constants";
+import { PLAYER_PARTY_MAX_SIZE } from "#app/constants";
 import { timedEventManager } from "#app/global-event-manager";
 import { globalScene } from "#app/global-scene";
 import { getPokemonNameWithAffix } from "#app/messages";
@@ -139,8 +139,6 @@ import { populateVariantColors, variantColorCache, variantData } from "#sprites/
 import { achvs } from "#system/achv";
 import type { StarterDataEntry, StarterMoveset } from "#system/game-data";
 import type { PokemonData } from "#system/pokemon-data";
-import { RibbonData } from "#system/ribbons/ribbon-data";
-import { awardRibbonsToSpeciesLine } from "#system/ribbons/ribbon-methods";
 import type { AbAttrMap, AbAttrString, TypeMultiplierAbAttrParams } from "#types/ability-types";
 import type { DamageCalculationResult, DamageResult } from "#types/damage-result";
 import type { IllusionData } from "#types/illusion-data";
@@ -1827,7 +1825,7 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
     // Overrides moveset based on arrays specified in overrides.ts
     let overrideArray: MoveId | Array<MoveId> = this.isPlayer()
       ? Overrides.MOVESET_OVERRIDE
-      : Overrides.ENEMY_MOVESET_OVERRIDE;
+      : Overrides.OPP_MOVESET_OVERRIDE;
     overrideArray = coerceArray(overrideArray);
     if (overrideArray.length > 0) {
       if (!this.isPlayer()) {
@@ -2032,8 +2030,8 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
     if (Overrides.ABILITY_OVERRIDE && this.isPlayer()) {
       return allAbilities[Overrides.ABILITY_OVERRIDE];
     }
-    if (Overrides.ENEMY_ABILITY_OVERRIDE && this.isEnemy()) {
+    if (Overrides.OPP_ABILITY_OVERRIDE && this.isEnemy()) {
-      return allAbilities[Overrides.ENEMY_ABILITY_OVERRIDE];
+      return allAbilities[Overrides.OPP_ABILITY_OVERRIDE];
     }
     if (this.isFusion()) {
       if (!isNullOrUndefined(this.fusionCustomPokemonData?.ability) && this.fusionCustomPokemonData.ability !== -1) {
@@ -2062,8 +2060,8 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
     if (Overrides.PASSIVE_ABILITY_OVERRIDE && this.isPlayer()) {
       return allAbilities[Overrides.PASSIVE_ABILITY_OVERRIDE];
     }
-    if (Overrides.ENEMY_PASSIVE_ABILITY_OVERRIDE && this.isEnemy()) {
+    if (Overrides.OPP_PASSIVE_ABILITY_OVERRIDE && this.isEnemy()) {
-      return allAbilities[Overrides.ENEMY_PASSIVE_ABILITY_OVERRIDE];
+      return allAbilities[Overrides.OPP_PASSIVE_ABILITY_OVERRIDE];
     }
     if (!isNullOrUndefined(this.customPokemonData.passive) && this.customPokemonData.passive !== -1) {
       return allAbilities[this.customPokemonData.passive];
@@ -2130,14 +2128,14 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
     // returns override if valid for current case
     if (
       (Overrides.HAS_PASSIVE_ABILITY_OVERRIDE === false && this.isPlayer()) ||
-      (Overrides.ENEMY_HAS_PASSIVE_ABILITY_OVERRIDE === false && this.isEnemy())
+      (Overrides.OPP_HAS_PASSIVE_ABILITY_OVERRIDE === false && this.isEnemy())
     ) {
       return false;
     }
     if (
       ((Overrides.PASSIVE_ABILITY_OVERRIDE !== AbilityId.NONE || Overrides.HAS_PASSIVE_ABILITY_OVERRIDE) &&
         this.isPlayer()) ||
-      ((Overrides.ENEMY_PASSIVE_ABILITY_OVERRIDE !== AbilityId.NONE || Overrides.ENEMY_HAS_PASSIVE_ABILITY_OVERRIDE) &&
+      ((Overrides.OPP_PASSIVE_ABILITY_OVERRIDE !== AbilityId.NONE || Overrides.OPP_HAS_PASSIVE_ABILITY_OVERRIDE) &&
         this.isEnemy())
     ) {
       return true;
@@ -3003,8 +3001,8 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
 
     if (forStarter && this.isPlayer() && Overrides.STARTER_FUSION_SPECIES_OVERRIDE) {
       fusionOverride = getPokemonSpecies(Overrides.STARTER_FUSION_SPECIES_OVERRIDE);
-    } else if (this.isEnemy() && Overrides.ENEMY_FUSION_SPECIES_OVERRIDE) {
+    } else if (this.isEnemy() && Overrides.OPP_FUSION_SPECIES_OVERRIDE) {
-      fusionOverride = getPokemonSpecies(Overrides.ENEMY_FUSION_SPECIES_OVERRIDE);
+      fusionOverride = getPokemonSpecies(Overrides.OPP_FUSION_SPECIES_OVERRIDE);
     }
 
     this.fusionSpecies =
@@ -5824,59 +5822,45 @@ export class PlayerPokemon extends Pokemon {
       );
     });
   }
-  /**
-   * Add friendship to this Pokemon
-   *
-   * @remarks
-   * This adds friendship to the pokemon's friendship stat (used for evolution, return, etc.) and candy progress.
-   * For fusions, candy progress for each species in the fusion is halved.
-   *
-   * @param friendship - The amount of friendship to add. Negative values will reduce friendship, though not below 0.
-   * @param capped - If true, don't allow the friendship gain to exceed 200. Used to cap friendship gains from rare candies.
-   */
-  addFriendship(friendship: number, capped = false): void {
-    // Short-circuit friendship loss, which doesn't impact candy friendship
-    if (friendship <= 0) {
-      this.friendship = Math.max(this.friendship + friendship, 0);
-      return;
-    }
 
+  addFriendship(friendship: number): void {
+    if (friendship > 0) {
       const starterSpeciesId = this.species.getRootSpeciesId();
       const fusionStarterSpeciesId = this.isFusion() && this.fusionSpecies ? this.fusionSpecies.getRootSpeciesId() : 0;
-    const starterGameData = globalScene.gameData.starterData;
+      const starterData = [
-    const starterData: [StarterDataEntry, SpeciesId][] = [[starterGameData[starterSpeciesId], starterSpeciesId]];
+        globalScene.gameData.starterData[starterSpeciesId],
-    if (fusionStarterSpeciesId) {
+        fusionStarterSpeciesId ? globalScene.gameData.starterData[fusionStarterSpeciesId] : null,
-      starterData.push([starterGameData[fusionStarterSpeciesId], fusionStarterSpeciesId]);
+      ].filter(d => !!d);
-    }
       const amount = new NumberHolder(friendship);
       globalScene.applyModifier(PokemonFriendshipBoosterModifier, true, this, amount);
-    friendship = amount.value;
+      const candyFriendshipMultiplier = globalScene.gameMode.isClassic
-
-    const newFriendship = this.friendship + friendship;
-    // If capped is true, only adjust friendship if the new friendship is less than or equal to 200.
-    if (!capped || newFriendship <= RARE_CANDY_FRIENDSHIP_CAP) {
-      this.friendship = Math.min(newFriendship, 255);
-      if (newFriendship >= 255) {
-        globalScene.validateAchv(achvs.MAX_FRIENDSHIP);
-        awardRibbonsToSpeciesLine(this.species.speciesId, RibbonData.FRIENDSHIP);
-      }
-    }
-
-    let candyFriendshipMultiplier = globalScene.gameMode.isClassic
         ? timedEventManager.getClassicFriendshipMultiplier()
         : 1;
-    if (fusionStarterSpeciesId) {
+      const fusionReduction = fusionStarterSpeciesId
-      candyFriendshipMultiplier /= timedEventManager.areFusionsBoosted() ? 1.5 : 2;
+        ? timedEventManager.areFusionsBoosted()
+          ? 1.5 // Divide candy gain for fusions by 1.5 during events
+          : 2 // 2 for fusions outside events
+        : 1; // 1 for non-fused mons
+      const starterAmount = new NumberHolder(Math.floor((amount.value * candyFriendshipMultiplier) / fusionReduction));
+
+      // Add friendship to this PlayerPokemon
+      this.friendship = Math.min(this.friendship + amount.value, 255);
+      if (this.friendship === 255) {
+        globalScene.validateAchv(achvs.MAX_FRIENDSHIP);
       }
-    const candyFriendshipAmount = Math.floor(friendship * candyFriendshipMultiplier);
       // Add to candy progress for this mon's starter species and its fused species (if it has one)
-    starterData.forEach(([sd, id]: [StarterDataEntry, SpeciesId]) => {
+      starterData.forEach((sd: StarterDataEntry, i: number) => {
-      sd.friendship = (sd.friendship || 0) + candyFriendshipAmount;
+        const speciesId = !i ? starterSpeciesId : (fusionStarterSpeciesId as SpeciesId);
-      if (sd.friendship >= getStarterValueFriendshipCap(speciesStarterCosts[id])) {
+        sd.friendship = (sd.friendship || 0) + starterAmount.value;
-        globalScene.gameData.addStarterCandy(getPokemonSpecies(id), 1);
+        if (sd.friendship >= getStarterValueFriendshipCap(speciesStarterCosts[speciesId])) {
+          globalScene.gameData.addStarterCandy(getPokemonSpecies(speciesId), 1);
           sd.friendship = 0;
         }
       });
+    } else {
+      // Lose friendship upon fainting
+      this.friendship = Math.max(this.friendship + friendship, 0);
+    }
   }
 
   getPossibleEvolution(evolution: SpeciesFormEvolution | null): Promise<Pokemon> {
@@ -6257,22 +6241,22 @@ export class EnemyPokemon extends Pokemon {
       this.setBoss(boss, dataSource?.bossSegments);
     }
 
-    if (Overrides.ENEMY_STATUS_OVERRIDE) {
+    if (Overrides.OPP_STATUS_OVERRIDE) {
-      this.status = new Status(Overrides.ENEMY_STATUS_OVERRIDE, 0, 4);
+      this.status = new Status(Overrides.OPP_STATUS_OVERRIDE, 0, 4);
     }
 
-    if (Overrides.ENEMY_GENDER_OVERRIDE !== null) {
+    if (Overrides.OPP_GENDER_OVERRIDE !== null) {
-      this.gender = Overrides.ENEMY_GENDER_OVERRIDE;
+      this.gender = Overrides.OPP_GENDER_OVERRIDE;
     }
 
     const speciesId = this.species.speciesId;
 
     if (
-      speciesId in Overrides.ENEMY_FORM_OVERRIDES &&
+      speciesId in Overrides.OPP_FORM_OVERRIDES &&
-      !isNullOrUndefined(Overrides.ENEMY_FORM_OVERRIDES[speciesId]) &&
+      !isNullOrUndefined(Overrides.OPP_FORM_OVERRIDES[speciesId]) &&
-      this.species.forms[Overrides.ENEMY_FORM_OVERRIDES[speciesId]]
+      this.species.forms[Overrides.OPP_FORM_OVERRIDES[speciesId]]
     ) {
-      this.formIndex = Overrides.ENEMY_FORM_OVERRIDES[speciesId];
+      this.formIndex = Overrides.OPP_FORM_OVERRIDES[speciesId];
     } else if (globalScene.gameMode.isDaily && globalScene.gameMode.isWaveFinal(globalScene.currentBattle.waveIndex)) {
       const eventBoss = getDailyEventSeedBoss(globalScene.seed);
       if (!isNullOrUndefined(eventBoss)) {
@@ -6282,21 +6266,21 @@ export class EnemyPokemon extends Pokemon {
 
     if (!dataSource) {
       this.generateAndPopulateMoveset();
-      if (shinyLock || Overrides.ENEMY_SHINY_OVERRIDE === false) {
+      if (shinyLock || Overrides.OPP_SHINY_OVERRIDE === false) {
         this.shiny = false;
       } else {
         this.trySetShiny();
       }
 
-      if (!this.shiny && Overrides.ENEMY_SHINY_OVERRIDE) {
+      if (!this.shiny && Overrides.OPP_SHINY_OVERRIDE) {
         this.shiny = true;
         this.initShinySparkle();
       }
 
       if (this.shiny) {
         this.variant = this.generateShinyVariant();
-        if (Overrides.ENEMY_VARIANT_OVERRIDE !== null) {
+        if (Overrides.OPP_VARIANT_OVERRIDE !== null) {
-          this.variant = Overrides.ENEMY_VARIANT_OVERRIDE;
+          this.variant = Overrides.OPP_VARIANT_OVERRIDE;
         }
       }
 

src/loading-scene.ts

@@ -90,7 +90,6 @@ export class LoadingScene extends SceneBase {
     this.loadAtlas("shiny_icons", "ui");
     this.loadImage("ha_capsule", "ui", "ha_capsule.png");
     this.loadImage("champion_ribbon", "ui", "champion_ribbon.png");
-    this.loadImage("champion_ribbon_emerald", "ui", "champion_ribbon_emerald.png");
     this.loadImage("icon_spliced", "ui");
     this.loadImage("icon_lock", "ui", "icon_lock.png");
     this.loadImage("icon_stop", "ui", "icon_stop.png");
@@ -123,7 +122,6 @@ export class LoadingScene extends SceneBase {
     this.loadImage("party_bg_double", "ui");
     this.loadImage("party_bg_double_manage", "ui");
     this.loadAtlas("party_slot_main", "ui");
-    this.loadAtlas("party_slot_main_short", "ui");
     this.loadAtlas("party_slot", "ui");
     this.loadImage("party_slot_overlay_lv", "ui");
     this.loadImage("party_slot_hp_bar", "ui");
@@ -449,9 +447,7 @@ export class LoadingScene extends SceneBase {
     );
 
     if (!mobile) {
-      loadingGraphics.forEach(g => {
+      loadingGraphics.map(g => g.setVisible(false));
-        g.setVisible(false);
-      });
     }
 
     const intro = this.add.video(0, 0);

src/modifier/modifier.ts

@@ -121,8 +121,8 @@ export class ModifierBar extends Phaser.GameObjects.Container {
   }
 
   updateModifierOverflowVisibility(ignoreLimit: boolean) {
-    const modifierIcons = this.getAll().reverse() as Phaser.GameObjects.Container[];
+    const modifierIcons = this.getAll().reverse();
-    for (const modifier of modifierIcons.slice(iconOverflowIndex)) {
+    for (const modifier of modifierIcons.map(m => m as Phaser.GameObjects.Container).slice(iconOverflowIndex)) {
       modifier.setVisible(ignoreLimit);
     }
   }
@@ -2304,7 +2304,7 @@ export class PokemonLevelIncrementModifier extends ConsumablePokemonModifier {
       playerPokemon.levelExp = 0;
     }
 
-    playerPokemon.addFriendship(FRIENDSHIP_GAIN_FROM_RARE_CANDY, true);
+    playerPokemon.addFriendship(FRIENDSHIP_GAIN_FROM_RARE_CANDY);
 
     globalScene.phaseManager.unshiftNew(
       "LevelUpPhase",
@@ -3755,7 +3755,7 @@ export class EnemyFusionChanceModifier extends EnemyPersistentModifier {
 export function overrideModifiers(isPlayer = true): void {
   const modifiersOverride: ModifierOverride[] = isPlayer
     ? Overrides.STARTING_MODIFIER_OVERRIDE
-    : Overrides.ENEMY_MODIFIER_OVERRIDE;
+    : Overrides.OPP_MODIFIER_OVERRIDE;
   if (!modifiersOverride || modifiersOverride.length === 0 || !globalScene) {
     return;
   }
@@ -3797,7 +3797,7 @@ export function overrideModifiers(isPlayer = true): void {
 export function overrideHeldItems(pokemon: Pokemon, isPlayer = true): void {
   const heldItemsOverride: ModifierOverride[] = isPlayer
     ? Overrides.STARTING_HELD_ITEMS_OVERRIDE
-    : Overrides.ENEMY_HELD_ITEMS_OVERRIDE;
+    : Overrides.OPP_HELD_ITEMS_OVERRIDE;
   if (!heldItemsOverride || heldItemsOverride.length === 0 || !globalScene) {
     return;
   }

src/overrides.ts

@@ -179,24 +179,25 @@ class DefaultOverrides {
   // --------------------------
   // OPPONENT / ENEMY OVERRIDES
   // --------------------------
-  readonly ENEMY_SPECIES_OVERRIDE: SpeciesId | number = 0;
+  // TODO: rename `OPP_` to `ENEMY_`
+  readonly OPP_SPECIES_OVERRIDE: SpeciesId | number = 0;
   /**
    * This will make all opponents fused Pokemon
    */
-  readonly ENEMY_FUSION_OVERRIDE: boolean = false;
+  readonly OPP_FUSION_OVERRIDE: boolean = false;
   /**
    * This will override the species of the fusion only when the opponent is already a fusion
    */
-  readonly ENEMY_FUSION_SPECIES_OVERRIDE: SpeciesId | number = 0;
+  readonly OPP_FUSION_SPECIES_OVERRIDE: SpeciesId | number = 0;
-  readonly ENEMY_LEVEL_OVERRIDE: number = 0;
+  readonly OPP_LEVEL_OVERRIDE: number = 0;
-  readonly ENEMY_ABILITY_OVERRIDE: AbilityId = AbilityId.NONE;
+  readonly OPP_ABILITY_OVERRIDE: AbilityId = AbilityId.NONE;
-  readonly ENEMY_PASSIVE_ABILITY_OVERRIDE: AbilityId = AbilityId.NONE;
+  readonly OPP_PASSIVE_ABILITY_OVERRIDE: AbilityId = AbilityId.NONE;
-  readonly ENEMY_HAS_PASSIVE_ABILITY_OVERRIDE: boolean | null = null;
+  readonly OPP_HAS_PASSIVE_ABILITY_OVERRIDE: boolean | null = null;
-  readonly ENEMY_STATUS_OVERRIDE: StatusEffect = StatusEffect.NONE;
+  readonly OPP_STATUS_OVERRIDE: StatusEffect = StatusEffect.NONE;
-  readonly ENEMY_GENDER_OVERRIDE: Gender | null = null;
+  readonly OPP_GENDER_OVERRIDE: Gender | null = null;
-  readonly ENEMY_MOVESET_OVERRIDE: MoveId | Array<MoveId> = [];
+  readonly OPP_MOVESET_OVERRIDE: MoveId | Array<MoveId> = [];
-  readonly ENEMY_SHINY_OVERRIDE: boolean | null = null;
+  readonly OPP_SHINY_OVERRIDE: boolean | null = null;
-  readonly ENEMY_VARIANT_OVERRIDE: Variant | null = null;
+  readonly OPP_VARIANT_OVERRIDE: Variant | null = null;
   /**
    * Overrides the IVs of enemy pokemon. Values must never be outside the range `0` to `31`!
    * - If set to a number between `0` and `31`, set all IVs of all enemy pokemon to that number.
@@ -206,7 +207,7 @@ class DefaultOverrides {
   readonly ENEMY_IVS_OVERRIDE: number | number[] | null = null;
   /** Override the nature of all enemy pokemon to the specified nature. Disabled if `null`. */
   readonly ENEMY_NATURE_OVERRIDE: Nature | null = null;
-  readonly ENEMY_FORM_OVERRIDES: Partial<Record<SpeciesId, number>> = {};
+  readonly OPP_FORM_OVERRIDES: Partial<Record<SpeciesId, number>> = {};
   /**
    * Override to give the enemy Pokemon a given amount of health segments
    *
@@ -214,7 +215,7 @@ class DefaultOverrides {
    * 1: the Pokemon will have a single health segment and therefore will not be a boss
    * 2+: the Pokemon will be a boss with the given number of health segments
    */
-  readonly ENEMY_HEALTH_SEGMENTS_OVERRIDE: number = 0;
+  readonly OPP_HEALTH_SEGMENTS_OVERRIDE: number = 0;
 
   // -------------
   // EGG OVERRIDES
@@ -276,12 +277,12 @@ class DefaultOverrides {
    *
    * Note that any previous modifiers are cleared.
    */
-  readonly ENEMY_MODIFIER_OVERRIDE: ModifierOverride[] = [];
+  readonly OPP_MODIFIER_OVERRIDE: ModifierOverride[] = [];
 
   /** Override array of {@linkcode ModifierOverride}s used to provide held items to first party member when starting a new game. */
   readonly STARTING_HELD_ITEMS_OVERRIDE: ModifierOverride[] = [];
   /** Override array of {@linkcode ModifierOverride}s used to provide held items to enemies on spawn. */
-  readonly ENEMY_HELD_ITEMS_OVERRIDE: ModifierOverride[] = [];
+  readonly OPP_HELD_ITEMS_OVERRIDE: ModifierOverride[] = [];
 
   /**
    * Override array of {@linkcode ModifierOverride}s used to replace the generated item rolls after a wave.

src/phases/encounter-phase.ts

@@ -229,7 +229,7 @@ export class EncounterPhase extends BattlePhase {
         }),
       );
     } else {
-      const overridedBossSegments = Overrides.ENEMY_HEALTH_SEGMENTS_OVERRIDE > 1;
+      const overridedBossSegments = Overrides.OPP_HEALTH_SEGMENTS_OVERRIDE > 1;
       // for double battles, reduce the health segments for boss Pokemon unless there is an override
       if (!overridedBossSegments && battle.enemyParty.filter(p => p.isBoss()).length > 1) {
         for (const enemyPokemon of battle.enemyParty) {

src/phases/game-over-phase.ts

@@ -19,11 +19,8 @@ import { ChallengeData } from "#system/challenge-data";
 import type { SessionSaveData } from "#system/game-data";
 import { ModifierData as PersistentModifierData } from "#system/modifier-data";
 import { PokemonData } from "#system/pokemon-data";
-import { RibbonData, type RibbonFlag } from "#system/ribbons/ribbon-data";
-import { awardRibbonsToSpeciesLine } from "#system/ribbons/ribbon-methods";
 import { TrainerData } from "#system/trainer-data";
 import { trainerConfigs } from "#trainers/trainer-config";
-import { checkSpeciesValidForChallenge, isNuzlockeChallenge } from "#utils/challenge-utils";
 import { isLocal, isLocalServerConnected } from "#utils/common";
 import { getPokemonSpecies } from "#utils/pokemon-utils";
 import i18next from "i18next";
@@ -114,40 +111,6 @@ export class GameOverPhase extends BattlePhase {
     }
   }
 
-  /**
-   * Submethod of {@linkcode handleGameOver} that awards ribbons to Pokémon in the player's party based on the current
-   * game mode and challenges.
-   */
-  private awardRibbons(): void {
-    let ribbonFlags = 0;
-    if (globalScene.gameMode.isClassic) {
-      ribbonFlags |= RibbonData.CLASSIC;
-    }
-    if (isNuzlockeChallenge()) {
-      ribbonFlags |= RibbonData.NUZLOCKE;
-    }
-    for (const challenge of globalScene.gameMode.challenges) {
-      const ribbon = challenge.ribbonAwarded;
-      if (challenge.value && ribbon) {
-        ribbonFlags |= ribbon;
-      }
-    }
-    // Award ribbons to all Pokémon in the player's party that are considered valid
-    // for the current game mode and challenges.
-    for (const pokemon of globalScene.getPlayerParty()) {
-      const species = pokemon.species;
-      if (
-        checkSpeciesValidForChallenge(
-          species,
-          globalScene.gameData.getSpeciesDexAttrProps(species, pokemon.getDexAttr()),
-          false,
-        )
-      ) {
-        awardRibbonsToSpeciesLine(species.speciesId, ribbonFlags as RibbonFlag);
-      }
-    }
-  }
-
   handleGameOver(): void {
     const doGameOver = (newClear: boolean) => {
       globalScene.disableMenu = true;
@@ -159,12 +122,12 @@ export class GameOverPhase extends BattlePhase {
             globalScene.validateAchv(achvs.UNEVOLVED_CLASSIC_VICTORY);
             globalScene.gameData.gameStats.sessionsWon++;
             for (const pokemon of globalScene.getPlayerParty()) {
-              this.awardFirstClassicCompletion(pokemon);
+              this.awardRibbon(pokemon);
+
               if (pokemon.species.getRootSpeciesId() !== pokemon.species.getRootSpeciesId(true)) {
-                this.awardFirstClassicCompletion(pokemon, true);
+                this.awardRibbon(pokemon, true);
               }
             }
-            this.awardRibbons();
           } else if (globalScene.gameMode.isDaily && newClear) {
             globalScene.gameData.gameStats.dailyRunSessionsWon++;
           }
@@ -300,7 +263,7 @@ export class GameOverPhase extends BattlePhase {
     }
   }
 
-  awardFirstClassicCompletion(pokemon: Pokemon, forStarter = false): void {
+  awardRibbon(pokemon: Pokemon, forStarter = false): void {
     const speciesId = getPokemonSpecies(pokemon.species.speciesId);
     const speciesRibbonCount = globalScene.gameData.incrementRibbonCount(speciesId, forStarter);
     // first time classic win, award voucher

src/system/achv.ts

@@ -5,6 +5,7 @@ import {
   FlipStatChallenge,
   FreshStartChallenge,
   InverseBattleChallenge,
+  LimitedCatchChallenge,
   SingleGenerationChallenge,
   SingleTypeChallenge,
 } from "#data/challenge";
@@ -13,7 +14,6 @@ import { PlayerGender } from "#enums/player-gender";
 import { getShortenedStatKey, Stat } from "#enums/stat";
 import { TurnHeldItemTransferModifier } from "#modifiers/modifier";
 import type { ConditionFn } from "#types/common";
-import { isNuzlockeChallenge } from "#utils/challenge-utils";
 import { NumberHolder } from "#utils/common";
 import i18next from "i18next";
 import type { Modifier } from "typescript";
@@ -924,7 +924,18 @@ export const achvs = {
       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, isNuzlockeChallenge),
+  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

@@ -48,7 +48,6 @@ import { EggData } from "#system/egg-data";
 import { GameStats } from "#system/game-stats";
 import { ModifierData as PersistentModifierData } from "#system/modifier-data";
 import { PokemonData } from "#system/pokemon-data";
-import { RibbonData } from "#system/ribbons/ribbon-data";
 import { resetSettings, SettingKeys, setSetting } from "#system/settings";
 import { SettingGamepad, setSettingGamepad, settingGamepadDefaults } from "#system/settings-gamepad";
 import type { SettingKeyboard } from "#system/settings-keyboard";
@@ -208,12 +207,10 @@ export interface StarterData {
   [key: number]: StarterDataEntry;
 }
 
-// TODO: Rework into a bitmask
+export interface TutorialFlags {
-export type TutorialFlags = {
+  [key: string]: boolean;
-  [key in Tutorial]: boolean;
+}
-};
 
-// TODO: Rework into a bitmask
 export interface SeenDialogues {
   [key: string]: boolean;
 }
@@ -403,7 +400,7 @@ export class GameData {
   }
 
   public initSystem(systemDataStr: string, cachedSystemDataStr?: string): Promise<boolean> {
-    const { promise, resolve } = Promise.withResolvers<boolean>();
+    return new Promise<boolean>(resolve => {
       try {
         let systemData = this.parseSystemData(systemDataStr);
 
@@ -517,7 +514,7 @@ export class GameData {
         console.error(err);
         resolve(false);
       }
-    return promise;
+    });
   }
 
   /**
@@ -628,9 +625,6 @@ export class GameData {
         }
         return ret;
       }
-      if (k === "ribbons") {
-        return RibbonData.fromJSON(v);
-      }
 
       return k.endsWith("Attr") && !["natureAttr", "abilityAttr", "passiveAttr"].includes(k) ? BigInt(v ?? 0) : v;
     }) as SystemSaveData;
@@ -829,51 +823,52 @@ export class GameData {
     return true; // TODO: is `true` the correct return value?
   }
 
-  private loadGamepadSettings(): void {
+  private loadGamepadSettings(): boolean {
-    Object.values(SettingGamepad).forEach(setting => {
+    Object.values(SettingGamepad)
-      setSettingGamepad(setting, settingGamepadDefaults[setting]);
+      .map(setting => setting as SettingGamepad)
-    });
+      .forEach(setting => setSettingGamepad(setting, settingGamepadDefaults[setting]));
 
     if (!localStorage.hasOwnProperty("settingsGamepad")) {
-      return;
+      return false;
     }
     const settingsGamepad = JSON.parse(localStorage.getItem("settingsGamepad")!); // TODO: is this bang correct?
 
     for (const setting of Object.keys(settingsGamepad)) {
       setSettingGamepad(setting as SettingGamepad, settingsGamepad[setting]);
     }
+
+    return true; // TODO: is `true` the correct return value?
   }
 
-  /**
+  public saveTutorialFlag(tutorial: Tutorial, flag: boolean): boolean {
-   * Save the specified tutorial as having the specified completion status.
+    const key = getDataTypeKey(GameDataType.TUTORIALS);
-   * @param tutorial - The {@linkcode Tutorial} whose completion status is being saved
+    let tutorials: object = {};
-   * @param status - The completion status to set
+    if (localStorage.hasOwnProperty(key)) {
-   */
+      tutorials = JSON.parse(localStorage.getItem(key)!); // TODO: is this bang correct?
-  public saveTutorialFlag(tutorial: Tutorial, status: boolean): void {
+    }
-    // Grab the prior save data tutorial
-    const saveDataKey = getDataTypeKey(GameDataType.TUTORIALS);
-    const tutorials: TutorialFlags = localStorage.hasOwnProperty(saveDataKey)
-      ? JSON.parse(localStorage.getItem(saveDataKey)!)
-      : {};
 
-    // TODO: We shouldn't be storing this like that
+    Object.keys(Tutorial)
-    for (const key of Object.values(Tutorial)) {
+      .map(t => t as Tutorial)
+      .forEach(t => {
+        const key = Tutorial[t];
         if (key === tutorial) {
-        tutorials[key] = status;
+          tutorials[key] = flag;
         } else {
           tutorials[key] ??= false;
         }
-    }
+      });
 
-    localStorage.setItem(saveDataKey, JSON.stringify(tutorials));
+    localStorage.setItem(key, JSON.stringify(tutorials));
+
+    return true;
   }
 
   public getTutorialFlags(): TutorialFlags {
     const key = getDataTypeKey(GameDataType.TUTORIALS);
-    const ret: TutorialFlags = Object.values(Tutorial).reduce((acc, tutorial) => {
+    const ret: TutorialFlags = {};
-      acc[Tutorial[tutorial]] = false;
+    Object.values(Tutorial)
-      return acc;
+      .map(tutorial => tutorial as Tutorial)
-    }, {} as TutorialFlags);
+      .forEach(tutorial => (ret[Tutorial[tutorial]] = false));
 
     if (!localStorage.hasOwnProperty(key)) {
       return ret;
@@ -1638,7 +1633,6 @@ export class GameData {
         caughtCount: 0,
         hatchedCount: 0,
         ivs: [0, 0, 0, 0, 0, 0],
-        ribbons: new RibbonData(0),
       };
     }
 
@@ -1883,12 +1877,6 @@ export class GameData {
     });
   }
 
-  /**
-   * Increase the number of classic ribbons won with this species.
-   * @param species - The species to increment the ribbon count for
-   * @param forStarter - If true, will increment the ribbon count for the root species of the given species
-   * @returns The number of classic wins after incrementing.
-   */
   incrementRibbonCount(species: PokemonSpecies, forStarter = false): number {
     const speciesIdToIncrement: SpeciesId = species.getRootSpeciesId(forStarter);
 
@@ -2188,9 +2176,6 @@ export class GameData {
       if (!entry.hasOwnProperty("natureAttr") || (entry.caughtAttr && !entry.natureAttr)) {
         entry.natureAttr = this.defaultDexData?.[k].natureAttr || 1 << randInt(25, 1);
       }
-      if (!entry.hasOwnProperty("ribbons")) {
-        entry.ribbons = new RibbonData(0);
-      }
     }
   }
 

src/system/ribbons/ribbon-data.ts

@@ -1,148 +0,0 @@
-import type { Brander } from "#types/type-helpers";
-
-export type RibbonFlag = (number & Brander<"RibbonFlag">) | 0;
-
-/**
- * Class for ribbon data management. Usually constructed via the {@linkcode fromJSON} method.
- *
- * @remarks
- * Stores information about the ribbons earned by a species using a bitfield.
- */
-export class RibbonData {
-  /** Internal bitfield storing the unlock state for each ribbon */
-  private payload: number;
-
-  //#region Ribbons
-  //#region Monotype challenge ribbons
-  /** Ribbon for winning the normal monotype challenge */
-  public static readonly MONO_NORMAL = 0x1 as RibbonFlag;
-  /** Ribbon for winning the fighting monotype challenge */
-  public static readonly MONO_FIGHTING = 0x2 as RibbonFlag;
-  /** Ribbon for winning the flying monotype challenge */
-  public static readonly MONO_FLYING = 0x4 as RibbonFlag;
-  /** Ribbon for winning the poision monotype challenge */
-  public static readonly MONO_POISON = 0x8 as RibbonFlag;
-  /** Ribbon for winning the ground monotype challenge */
-  public static readonly MONO_GROUND = 0x10 as RibbonFlag;
-  /** Ribbon for winning the rock monotype challenge */
-  public static readonly MONO_ROCK = 0x20 as RibbonFlag;
-  /** Ribbon for winning the bug monotype challenge */
-  public static readonly MONO_BUG = 0x40 as RibbonFlag;
-  /** Ribbon for winning the ghost monotype challenge */
-  public static readonly MONO_GHOST = 0x80 as RibbonFlag;
-  /** Ribbon for winning the steel monotype challenge */
-  public static readonly MONO_STEEL = 0x100 as RibbonFlag;
-  /** Ribbon for winning the fire monotype challenge */
-  public static readonly MONO_FIRE = 0x200 as RibbonFlag;
-  /** Ribbon for winning the water monotype challenge */
-  public static readonly MONO_WATER = 0x400 as RibbonFlag;
-  /** Ribbon for winning the grass monotype challenge */
-  public static readonly MONO_GRASS = 0x800 as RibbonFlag;
-  /** Ribbon for winning the electric monotype challenge */
-  public static readonly MONO_ELECTRIC = 0x1000 as RibbonFlag;
-  /** Ribbon for winning the psychic monotype challenge */
-  public static readonly MONO_PSYCHIC = 0x2000 as RibbonFlag;
-  /** Ribbon for winning the ice monotype challenge */
-  public static readonly MONO_ICE = 0x4000 as RibbonFlag;
-  /** Ribbon for winning the dragon monotype challenge */
-  public static readonly MONO_DRAGON = 0x8000 as RibbonFlag;
-  /** Ribbon for winning the dark monotype challenge */
-  public static readonly MONO_DARK = 0x10000 as RibbonFlag;
-  /** Ribbon for winning the fairy monotype challenge */
-  public static readonly MONO_FAIRY = 0x20000 as RibbonFlag;
-  //#endregion Monotype ribbons
-
-  //#region Monogen ribbons
-  /** Ribbon for winning the the mono gen 1 challenge */
-  public static readonly MONO_GEN_1 = 0x40000 as RibbonFlag;
-  /** Ribbon for winning the the mono gen 2 challenge */
-  public static readonly MONO_GEN_2 = 0x80000 as RibbonFlag;
-  /** Ribbon for winning the mono gen 3 challenge */
-  public static readonly MONO_GEN_3 = 0x100000 as RibbonFlag;
-  /** Ribbon for winning the mono gen 4 challenge */
-  public static readonly MONO_GEN_4 = 0x200000 as RibbonFlag;
-  /** Ribbon for winning the mono gen 5 challenge */
-  public static readonly MONO_GEN_5 = 0x400000 as RibbonFlag;
-  /** Ribbon for winning the mono gen 6 challenge */
-  public static readonly MONO_GEN_6 = 0x800000 as RibbonFlag;
-  /** Ribbon for winning the mono gen 7 challenge */
-  public static readonly MONO_GEN_7 = 0x1000000 as RibbonFlag;
-  /** Ribbon for winning the mono gen 8 challenge */
-  public static readonly MONO_GEN_8 = 0x2000000 as RibbonFlag;
-  /** Ribbon for winning the mono gen 9 challenge */
-  public static readonly MONO_GEN_9 = 0x4000000 as RibbonFlag;
-  //#endregion Monogen ribbons
-
-  /** Ribbon for winning classic */
-  public static readonly CLASSIC = 0x8000000 as RibbonFlag;
-  /** Ribbon for winning the nuzzlocke challenge */
-  public static readonly NUZLOCKE = 0x10000000 as RibbonFlag;
-  /** Ribbon for reaching max friendship */
-  public static readonly FRIENDSHIP = 0x20000000 as RibbonFlag;
-  /** Ribbon for winning the flip stats challenge */
-  public static readonly FLIP_STATS = 0x40000000 as RibbonFlag;
-  /** Ribbon for winning the inverse challenge */
-  public static readonly INVERSE = 0x80000000 as RibbonFlag;
-  /** Ribbon for winning the fresh start challenge */
-  public static readonly FRESH_START = 0x100000000 as RibbonFlag;
-  /** Ribbon for winning the hardcore challenge */
-  public static readonly HARDCORE = 0x200000000 as RibbonFlag;
-  /** Ribbon for winning the limited catch challenge */
-  public static readonly LIMITED_CATCH = 0x400000000 as RibbonFlag;
-  /** Ribbon for winning the limited support challenge set to no heal */
-  public static readonly NO_HEAL = 0x800000000 as RibbonFlag;
-  /** Ribbon for winning the limited uspport challenge set to no shop */
-  public static readonly NO_SHOP = 0x1000000000 as RibbonFlag;
-  /** Ribbon for winning the limited support challenge set to both*/
-  public static readonly NO_SUPPORT = 0x2000000000 as RibbonFlag;
-
-  // NOTE: max possible ribbon flag is 0x20000000000000 (53 total ribbons)
-  // Once this is exceeded, bitfield needs to be changed to a bigint or even a uint array
-  // Note that this has no impact on serialization as it is stored in hex.
-
-  //#endregion Ribbons
-
-  /** Create a new instance of RibbonData. Generally, {@linkcode fromJSON} is used instead. */
-  constructor(value: number) {
-    this.payload = value;
-  }
-
-  /** Serialize the bitfield payload as a hex encoded string */
-  public toJSON(): string {
-    return this.payload.toString(16);
-  }
-
-  /**
-   * Decode a hexadecimal string representation of the bitfield into a `RibbonData` instance
-   *
-   * @param value - Hexadecimal string representation of the bitfield (without the leading 0x)
-   * @returns A new instance of `RibbonData` initialized with the provided bitfield.
-   */
-  public static fromJSON(value: string): RibbonData {
-    try {
-      return new RibbonData(Number.parseInt(value, 16));
-    } catch {
-      return new RibbonData(0);
-    }
-  }
-
-  /**
-   * Award one or more ribbons to the ribbon data by setting the corresponding flags in the bitfield.
-   *
-   * @param flags - The flags to set. Can be a single flag or multiple flags.
-   */
-  public award(...flags: [RibbonFlag, ...RibbonFlag[]]): void {
-    for (const f of flags) {
-      this.payload |= f;
-    }
-  }
-
-  /**
-   * Check if a specific ribbon has been awarded
-   * @param flag - The ribbon to check
-   * @returns Whether the specified flag has been awarded
-   */
-  public has(flag: RibbonFlag): boolean {
-    return !!(this.payload & flag);
-  }
-}

src/system/ribbons/ribbon-methods.ts

@@ -1,20 +0,0 @@
-import { globalScene } from "#app/global-scene";
-import { pokemonPrevolutions } from "#balance/pokemon-evolutions";
-import type { SpeciesId } from "#enums/species-id";
-import type { RibbonFlag } from "#system/ribbons/ribbon-data";
-import { isNullOrUndefined } from "#utils/common";
-
-/**
- * Award one or more ribbons to a species and its pre-evolutions
- *
- * @param id - The ID of the species to award ribbons to
- * @param ribbons - The ribbon(s) to award (use bitwise OR to combine multiple)
- */
-export function awardRibbonsToSpeciesLine(id: SpeciesId, ribbons: RibbonFlag): void {
-  const dexData = globalScene.gameData.dexData;
-  dexData[id].ribbons.award(ribbons);
-  // Mark all pre-evolutions of the Pokémon with the same ribbon flags.
-  for (let prevoId = pokemonPrevolutions[id]; !isNullOrUndefined(prevoId); prevoId = pokemonPrevolutions[prevoId]) {
-    dexData[id].ribbons.award(ribbons);
-  }
-}

src/ui/party-ui-handler.ts

@@ -31,11 +31,6 @@ import { toTitleCase } from "#utils/strings";
 import i18next from "i18next";
 import type BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext";
 
-const DISCARD_BUTTON_X = 60;
-const DISCARD_BUTTON_X_DOUBLES = 64;
-const DISCARD_BUTTON_Y = -73;
-const DISCARD_BUTTON_Y_DOUBLES = -58;
-
 const defaultMessage = i18next.t("partyUiHandler:choosePokemon");
 
 /**
@@ -306,7 +301,7 @@ export class PartyUiHandler extends MessageUiHandler {
     const partyMessageText = addTextObject(10, 8, defaultMessage, TextStyle.WINDOW, { maxLines: 2 });
     partyMessageText.setName("text-party-msg");
 
-    partyMessageText.setOrigin(0);
+    partyMessageText.setOrigin(0, 0);
     partyMessageBoxContainer.add(partyMessageText);
 
     this.message = partyMessageText;
@@ -322,8 +317,10 @@ export class PartyUiHandler extends MessageUiHandler {
     this.iconAnimHandler = new PokemonIconAnimHandler();
     this.iconAnimHandler.setup();
 
-    const partyDiscardModeButton = new PartyDiscardModeButton(DISCARD_BUTTON_X, DISCARD_BUTTON_Y, this);
+    const partyDiscardModeButton = new PartyDiscardModeButton(60, -globalScene.game.canvas.height / 15 - 1, this);
+
     partyContainer.add(partyDiscardModeButton);
+
     this.partyDiscardModeButton = partyDiscardModeButton;
 
     // prepare move overlay
@@ -1236,7 +1233,7 @@ export class PartyUiHandler extends MessageUiHandler {
     }
     if (!this.optionsCursorObj) {
       this.optionsCursorObj = globalScene.add.image(0, 0, "cursor");
-      this.optionsCursorObj.setOrigin(0);
+      this.optionsCursorObj.setOrigin(0, 0);
       this.optionsContainer.add(this.optionsCursorObj);
     }
     this.optionsCursorObj.setPosition(
@@ -1608,7 +1605,7 @@ export class PartyUiHandler extends MessageUiHandler {
         optionText.setColor("#40c8f8");
         optionText.setShadowColor("#006090");
       }
-      optionText.setOrigin(0);
+      optionText.setOrigin(0, 0);
 
       /** For every item that has stack bigger than 1, display the current quantity selection */
       const itemModifiers = this.getItemModifiers(pokemon);
@@ -1805,7 +1802,6 @@ class PartySlot extends Phaser.GameObjects.Container {
   private selected: boolean;
   private transfer: boolean;
   private slotIndex: number;
-  private isBenched: boolean;
   private pokemon: PlayerPokemon;
 
   private slotBg: Phaser.GameObjects.Image;
@@ -1816,7 +1812,6 @@ class PartySlot extends Phaser.GameObjects.Container {
   public slotHpText: Phaser.GameObjects.Text;
   public slotDescriptionLabel: Phaser.GameObjects.Text; // this is used to show text instead of the HP bar i.e. for showing "Able"/"Not Able" for TMs when you try to learn them
 
-  private slotBgKey: string;
   private pokemonIcon: Phaser.GameObjects.Container;
   private iconAnimHandler: PokemonIconAnimHandler;
 
@@ -1827,34 +1822,19 @@ class PartySlot extends Phaser.GameObjects.Container {
     partyUiMode: PartyUiMode,
     tmMoveId: MoveId,
   ) {
-    const isBenched = slotIndex >= globalScene.currentBattle.getBattlerCount();
+    super(
-    const isDoubleBattle = globalScene.currentBattle.double;
+      globalScene,
-    const isItemManageMode = partyUiMode === PartyUiMode.MODIFIER_TRANSFER || partyUiMode === PartyUiMode.DISCARD;
+      slotIndex >= globalScene.currentBattle.getBattlerCount() ? 230.5 : 64,
-
+      slotIndex >= globalScene.currentBattle.getBattlerCount()
-    /*
+        ? -184 +
-     * Here we determine the position of the slot.
+            (globalScene.currentBattle.double ? -40 : 0) +
-     * The x coordinate depends on whether the pokemon is on the field or in the bench.
+            (28 + (globalScene.currentBattle.double ? 8 : 0)) * slotIndex
-     * The y coordinate depends on various factors, such as the number of pokémon on the field,
+        : partyUiMode === PartyUiMode.MODIFIER_TRANSFER
-     * and whether the transfer/discard button is also on the screen.
+          ? -124 + (globalScene.currentBattle.double ? -20 : 0) + slotIndex * 55
-     */
+          : -124 + (globalScene.currentBattle.double ? -8 : 0) + slotIndex * 64,
-    const slotPositionX = isBenched ? 143 : 9;
+    );
-
-    let slotPositionY: number;
-    if (isBenched) {
-      slotPositionY = -196 + (isDoubleBattle ? -40 : 0);
-      slotPositionY += (28 + (isDoubleBattle ? 8 : 0)) * slotIndex;
-    } else {
-      slotPositionY = -148.5;
-      if (isDoubleBattle) {
-        slotPositionY += isItemManageMode ? -20 : -8;
-      }
-      slotPositionY += (isItemManageMode ? (isDoubleBattle ? 47 : 55) : 64) * slotIndex;
-    }
-
-    super(globalScene, slotPositionX, slotPositionY);
 
     this.slotIndex = slotIndex;
-    this.isBenched = isBenched;
     this.pokemon = pokemon;
     this.iconAnimHandler = iconAnimHandler;
 
@@ -1868,75 +1848,27 @@ class PartySlot extends Phaser.GameObjects.Container {
   setup(partyUiMode: PartyUiMode, tmMoveId: MoveId) {
     const currentLanguage = i18next.resolvedLanguage ?? "en";
     const offsetJa = currentLanguage === "ja";
-    const isItemManageMode = partyUiMode === PartyUiMode.MODIFIER_TRANSFER || partyUiMode === PartyUiMode.DISCARD;
 
-    this.slotBgKey = this.isBenched
+    const battlerCount = globalScene.currentBattle.getBattlerCount();
-      ? "party_slot"
-      : isItemManageMode && globalScene.currentBattle.double
-        ? "party_slot_main_short"
-        : "party_slot_main";
-    const fullSlotBgKey = this.pokemon.hp ? this.slotBgKey : `${this.slotBgKey}${"_fnt"}`;
-    this.slotBg = globalScene.add.sprite(0, 0, this.slotBgKey, fullSlotBgKey);
-    this.slotBg.setOrigin(0);
-    this.add(this.slotBg);
 
-    const genderSymbol = getGenderSymbol(this.pokemon.getGender(true));
+    const slotKey = `party_slot${this.slotIndex >= battlerCount ? "" : "_main"}`;
-    const isFusion = this.pokemon.isFusion();
 
-    // Here we define positions and offsets
+    const slotBg = globalScene.add.sprite(0, 0, slotKey, `${slotKey}${this.pokemon.hp ? "" : "_fnt"}`);
-    // Base values are for the active pokemon; they are changed for benched pokemon,
+    this.slotBg = slotBg;
-    // or for active pokemon if in a double battle in item management mode.
 
-    // icon position relative to slot background
+    this.add(slotBg);
-    let slotPb = { x: 4, y: 4 };
-    // name position relative to slot background
-    let namePosition = { x: 24, y: 10 + (offsetJa ? 2 : 0) };
-    // maximum allowed length of name; must accomodate fusion symbol
-    let maxNameTextWidth = 76 - (isFusion ? 8 : 0);
-    // "Lv." label position relative to slot background
-    let levelLabelPosition = { x: 24 + 8, y: 10 + 12 };
-    // offset from "Lv." to the level number; should not be changed.
-    const levelTextToLevelLabelOffset = { x: 9, y: offsetJa ? 1.5 : 0 };
-    // offests from "Lv." to gender, spliced and status icons, these depend on the type of slot.
-    let genderTextToLevelLabelOffset = { x: 68 - (isFusion ? 8 : 0), y: -9 };
-    let splicedIconToLevelLabelOffset = { x: 68, y: 3.5 - 12 };
-    let statusIconToLevelLabelOffset = { x: 55, y: 0 };
-    // offset from the name to the shiny icon (on the left); should not be changed.
-    const shinyIconToNameOffset = { x: -9, y: 3 };
-    // hp bar position relative to slot background
-    let hpBarPosition = { x: 8, y: 31 };
-    // offsets of hp bar overlay (showing the remaining hp) and number; should not be changed.
-    const hpOverlayToBarOffset = { x: 16, y: 2 };
-    const hpTextToBarOffset = { x: -3, y: -2 + (offsetJa ? 2 : 0) };
-    // description position relative to slot background
-    let descriptionLabelPosition = { x: 32, y: 46 };
 
-    // If in item management mode, the active slots are shorter
+    const slotPb = globalScene.add.sprite(
-    if (isItemManageMode && globalScene.currentBattle.double && !this.isBenched) {
+      this.slotIndex >= battlerCount ? -85.5 : -51,
-      namePosition.y -= 8;
+      this.slotIndex >= battlerCount ? 0 : -20.5,
-      levelLabelPosition.y -= 8;
+      "party_pb",
-      hpBarPosition.y -= 8;
+    );
-      descriptionLabelPosition.y -= 8;
+    this.slotPb = slotPb;
-    }
 
-    // Benched slots have significantly different parameters
+    this.add(slotPb);
-    if (this.isBenched) {
-      slotPb = { x: 2, y: 12 };
-      namePosition = { x: 21, y: 2 + (offsetJa ? 2 : 0) };
-      maxNameTextWidth = 52;
-      levelLabelPosition = { x: 21 + 8, y: 2 + 12 };
-      genderTextToLevelLabelOffset = { x: 36, y: 0 };
-      splicedIconToLevelLabelOffset = { x: 36 + (genderSymbol ? 8 : 0), y: 0.5 };
-      statusIconToLevelLabelOffset = { x: 43, y: 0 };
-      hpBarPosition = { x: 72, y: 6 };
-      descriptionLabelPosition = { x: 94, y: 16 };
-    }
 
-    this.slotPb = globalScene.add.sprite(0, 0, "party_pb");
+    this.pokemonIcon = globalScene.addPokemonIcon(this.pokemon, slotPb.x, slotPb.y, 0.5, 0.5, true);
-    this.slotPb.setPosition(slotPb.x, slotPb.y);
-    this.add(this.slotPb);
 
-    this.pokemonIcon = globalScene.addPokemonIcon(this.pokemon, this.slotPb.x, this.slotPb.y, 0.5, 0.5, true);
     this.add(this.pokemonIcon);
 
     this.iconAnimHandler.addOrUpdate(this.pokemonIcon, PokemonIconAnimMode.PASSIVE);
@@ -1950,7 +1882,7 @@ class PartySlot extends Phaser.GameObjects.Container {
     const nameSizeTest = addTextObject(0, 0, displayName, TextStyle.PARTY);
     nameTextWidth = nameSizeTest.displayWidth;
 
-    while (nameTextWidth > maxNameTextWidth) {
+    while (nameTextWidth > (this.slotIndex >= battlerCount ? 52 : 76 - (this.pokemon.fusionSpecies ? 8 : 0))) {
       displayName = `${displayName.slice(0, displayName.endsWith(".") ? -2 : -1).trimEnd()}.`;
       nameSizeTest.setText(displayName);
       nameTextWidth = nameSizeTest.displayWidth;
@@ -1959,59 +1891,78 @@ class PartySlot extends Phaser.GameObjects.Container {
     nameSizeTest.destroy();
 
     this.slotName = addTextObject(0, 0, displayName, TextStyle.PARTY);
-    this.slotName.setPositionRelative(this.slotBg, namePosition.x, namePosition.y);
+    this.slotName.setPositionRelative(
-    this.slotName.setOrigin(0);
+      slotBg,
+      this.slotIndex >= battlerCount ? 21 : 24,
+      (this.slotIndex >= battlerCount ? 2 : 10) + (offsetJa ? 2 : 0),
+    );
+    this.slotName.setOrigin(0, 0);
 
-    const slotLevelLabel = globalScene.add
+    const slotLevelLabel = globalScene.add.image(0, 0, "party_slot_overlay_lv");
-      .image(0, 0, "party_slot_overlay_lv")
+    slotLevelLabel.setPositionRelative(
-      .setPositionRelative(this.slotBg, levelLabelPosition.x, levelLabelPosition.y)
+      slotBg,
-      .setOrigin(0);
+      (this.slotIndex >= battlerCount ? 21 : 24) + 8,
+      (this.slotIndex >= battlerCount ? 2 : 10) + 12,
+    );
+    slotLevelLabel.setOrigin(0, 0);
 
     const slotLevelText = addTextObject(
       0,
       0,
       this.pokemon.level.toString(),
       this.pokemon.level < globalScene.getMaxExpLevel() ? TextStyle.PARTY : TextStyle.PARTY_RED,
-    )
+    );
-      .setPositionRelative(slotLevelLabel, levelTextToLevelLabelOffset.x, levelTextToLevelLabelOffset.y)
+    slotLevelText.setPositionRelative(slotLevelLabel, 9, offsetJa ? 1.5 : 0);
-      .setOrigin(0, 0.25);
+    slotLevelText.setOrigin(0, 0.25);
+
     slotInfoContainer.add([this.slotName, slotLevelLabel, slotLevelText]);
 
+    const genderSymbol = getGenderSymbol(this.pokemon.getGender(true));
+
     if (genderSymbol) {
-      const slotGenderText = addTextObject(0, 0, genderSymbol, TextStyle.PARTY)
+      const slotGenderText = addTextObject(0, 0, genderSymbol, TextStyle.PARTY);
-        .setColor(getGenderColor(this.pokemon.getGender(true)))
+      slotGenderText.setColor(getGenderColor(this.pokemon.getGender(true)));
-        .setShadowColor(getGenderColor(this.pokemon.getGender(true), true))
+      slotGenderText.setShadowColor(getGenderColor(this.pokemon.getGender(true), true));
-        .setPositionRelative(slotLevelLabel, genderTextToLevelLabelOffset.x, genderTextToLevelLabelOffset.y)
+      if (this.slotIndex >= battlerCount) {
-        .setOrigin(0, 0.25);
+        slotGenderText.setPositionRelative(slotLevelLabel, 36, 0);
+      } else {
+        slotGenderText.setPositionRelative(this.slotName, 76 - (this.pokemon.fusionSpecies ? 8 : 0), 3);
+      }
+      slotGenderText.setOrigin(0, 0.25);
+
       slotInfoContainer.add(slotGenderText);
     }
 
-    if (isFusion) {
+    if (this.pokemon.fusionSpecies) {
-      const splicedIcon = globalScene.add
+      const splicedIcon = globalScene.add.image(0, 0, "icon_spliced");
-        .image(0, 0, "icon_spliced")
+      splicedIcon.setScale(0.5);
-        .setScale(0.5)
+      splicedIcon.setOrigin(0, 0);
-        .setOrigin(0)
+      if (this.slotIndex >= battlerCount) {
-        .setPositionRelative(slotLevelLabel, splicedIconToLevelLabelOffset.x, splicedIconToLevelLabelOffset.y);
+        splicedIcon.setPositionRelative(slotLevelLabel, 36 + (genderSymbol ? 8 : 0), 0.5);
+      } else {
+        splicedIcon.setPositionRelative(this.slotName, 76, 3.5);
+      }
+
       slotInfoContainer.add(splicedIcon);
     }
 
     if (this.pokemon.status) {
-      const statusIndicator = globalScene.add
+      const statusIndicator = globalScene.add.sprite(0, 0, getLocalizedSpriteKey("statuses"));
-        .sprite(0, 0, getLocalizedSpriteKey("statuses"))
+      statusIndicator.setFrame(StatusEffect[this.pokemon.status?.effect].toLowerCase());
-        .setFrame(StatusEffect[this.pokemon.status?.effect].toLowerCase())
+      statusIndicator.setOrigin(0, 0);
-        .setOrigin(0)
+      statusIndicator.setPositionRelative(slotLevelLabel, this.slotIndex >= battlerCount ? 43 : 55, 0);
-        .setPositionRelative(slotLevelLabel, statusIconToLevelLabelOffset.x, statusIconToLevelLabelOffset.y);
+
       slotInfoContainer.add(statusIndicator);
     }
 
     if (this.pokemon.isShiny()) {
       const doubleShiny = this.pokemon.isDoubleShiny(false);
 
-      const shinyStar = globalScene.add
+      const shinyStar = globalScene.add.image(0, 0, `shiny_star_small${doubleShiny ? "_1" : ""}`);
-        .image(0, 0, `shiny_star_small${doubleShiny ? "_1" : ""}`)
+      shinyStar.setOrigin(0, 0);
-        .setOrigin(0)
+      shinyStar.setPositionRelative(this.slotName, -9, 3);
-        .setPositionRelative(this.slotName, shinyIconToNameOffset.x, shinyIconToNameOffset.y)
+      shinyStar.setTint(getVariantTint(this.pokemon.getBaseVariant()));
-        .setTint(getVariantTint(this.pokemon.getBaseVariant()));
+
       slotInfoContainer.add(shinyStar);
 
       if (doubleShiny) {
@@ -2020,38 +1971,50 @@ class PartySlot extends Phaser.GameObjects.Container {
           .setOrigin(0)
           .setPosition(shinyStar.x, shinyStar.y)
           .setTint(getVariantTint(this.pokemon.fusionVariant));
+
         slotInfoContainer.add(fusionShinyStar);
       }
     }
 
-    this.slotHpBar = globalScene.add
+    this.slotHpBar = globalScene.add.image(0, 0, "party_slot_hp_bar");
-      .image(0, 0, "party_slot_hp_bar")
+    this.slotHpBar.setPositionRelative(
-      .setOrigin(0)
+      slotBg,
-      .setVisible(false)
+      this.slotIndex >= battlerCount ? 72 : 8,
-      .setPositionRelative(this.slotBg, hpBarPosition.x, hpBarPosition.y);
+      this.slotIndex >= battlerCount ? 6 : 31,
+    );
+    this.slotHpBar.setOrigin(0, 0);
+    this.slotHpBar.setVisible(false);
 
     const hpRatio = this.pokemon.getHpRatio();
 
-    this.slotHpOverlay = globalScene.add
+    this.slotHpOverlay = globalScene.add.sprite(
-      .sprite(0, 0, "party_slot_hp_overlay", hpRatio > 0.5 ? "high" : hpRatio > 0.25 ? "medium" : "low")
+      0,
-      .setOrigin(0)
+      0,
-      .setPositionRelative(this.slotHpBar, hpOverlayToBarOffset.x, hpOverlayToBarOffset.y)
+      "party_slot_hp_overlay",
-      .setScale(hpRatio, 1)
+      hpRatio > 0.5 ? "high" : hpRatio > 0.25 ? "medium" : "low",
-      .setVisible(false);
+    );
+    this.slotHpOverlay.setPositionRelative(this.slotHpBar, 16, 2);
+    this.slotHpOverlay.setOrigin(0, 0);
+    this.slotHpOverlay.setScale(hpRatio, 1);
+    this.slotHpOverlay.setVisible(false);
 
-    this.slotHpText = addTextObject(0, 0, `${this.pokemon.hp}/${this.pokemon.getMaxHp()}`, TextStyle.PARTY)
+    this.slotHpText = addTextObject(0, 0, `${this.pokemon.hp}/${this.pokemon.getMaxHp()}`, TextStyle.PARTY);
-      .setOrigin(1, 0)
+    this.slotHpText.setPositionRelative(
-      .setPositionRelative(
       this.slotHpBar,
-        this.slotHpBar.width + hpTextToBarOffset.x,
+      this.slotHpBar.width - 3,
-        this.slotHpBar.height + hpTextToBarOffset.y,
+      this.slotHpBar.height - 2 + (offsetJa ? 2 : 0),
-      ) // TODO: annoying because it contains the width
+    );
-      .setVisible(false);
+    this.slotHpText.setOrigin(1, 0);
+    this.slotHpText.setVisible(false);
 
-    this.slotDescriptionLabel = addTextObject(0, 0, "", TextStyle.MESSAGE)
+    this.slotDescriptionLabel = addTextObject(0, 0, "", TextStyle.MESSAGE);
-      .setOrigin(0, 1)
+    this.slotDescriptionLabel.setPositionRelative(
-      .setVisible(false)
+      slotBg,
-      .setPositionRelative(this.slotBg, descriptionLabelPosition.x, descriptionLabelPosition.y);
+      this.slotIndex >= battlerCount ? 94 : 32,
+      this.slotIndex >= battlerCount ? 16 : 46,
+    );
+    this.slotDescriptionLabel.setOrigin(0, 1);
+    this.slotDescriptionLabel.setVisible(false);
 
     slotInfoContainer.add([this.slotHpBar, this.slotHpOverlay, this.slotHpText, this.slotDescriptionLabel]);
 
@@ -2113,9 +2076,10 @@ class PartySlot extends Phaser.GameObjects.Container {
   }
 
   private updateSlotTexture(): void {
+    const battlerCount = globalScene.currentBattle.getBattlerCount();
     this.slotBg.setTexture(
-      this.slotBgKey,
+      `party_slot${this.slotIndex >= battlerCount ? "" : "_main"}`,
-      `${this.slotBgKey}${this.transfer ? "_swap" : this.pokemon.hp ? "" : "_fnt"}${this.selected ? "_sel" : ""}`,
+      `party_slot${this.slotIndex >= battlerCount ? "" : "_main"}${this.transfer ? "_swap" : this.pokemon.hp ? "" : "_fnt"}${this.selected ? "_sel" : ""}`,
     );
   }
 }
@@ -2234,6 +2198,10 @@ class PartyDiscardModeButton extends Phaser.GameObjects.Container {
         this.discardIcon.setVisible(false);
         this.textBox.setVisible(true);
         this.textBox.setText(i18next.t("partyUiHandler:TRANSFER"));
+        this.setPosition(
+          globalScene.currentBattle.double ? 64 : 60,
+          globalScene.currentBattle.double ? -48 : -globalScene.game.canvas.height / 15 - 1,
+        );
         this.transferIcon.displayWidth = this.textBox.text.length * 9 + 3;
         break;
       case PartyUiMode.DISCARD:
@@ -2241,13 +2209,13 @@ class PartyDiscardModeButton extends Phaser.GameObjects.Container {
         this.discardIcon.setVisible(true);
         this.textBox.setVisible(true);
         this.textBox.setText(i18next.t("partyUiHandler:DISCARD"));
+        this.setPosition(
+          globalScene.currentBattle.double ? 64 : 60,
+          globalScene.currentBattle.double ? -48 : -globalScene.game.canvas.height / 15 - 1,
+        );
         this.discardIcon.displayWidth = this.textBox.text.length * 9 + 3;
         break;
     }
-    this.setPosition(
-      globalScene.currentBattle.double ? DISCARD_BUTTON_X_DOUBLES : DISCARD_BUTTON_X,
-      globalScene.currentBattle.double ? DISCARD_BUTTON_Y_DOUBLES : DISCARD_BUTTON_Y,
-    );
   }
 
   clear() {

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

@@ -26,7 +26,6 @@ import { addBBCodeTextObject, addTextObject, getTextColor } from "#ui/text";
 import { UiHandler } from "#ui/ui-handler";
 import { addWindow } from "#ui/ui-theme";
 import { formatFancyLargeNumber, formatLargeNumber, formatMoney, getPlayTimeString } from "#utils/common";
-import { toCamelCase } from "#utils/strings";
 import i18next from "i18next";
 import RoundRectangle from "phaser3-rex-plugins/plugins/roundrectangle";
 
@@ -707,7 +706,10 @@ export class RunInfoUiHandler extends UiHandler {
             rules.push(i18next.t("challenges:inverseBattle.shortName"));
             break;
           default: {
-            const localizationKey = toCamelCase(Challenges[this.runInfo.challenges[i].id]);
+            const localizationKey = Challenges[this.runInfo.challenges[i].id]
+              .split("_")
+              .map((f, i) => (i ? `${f[0]}${f.slice(1).toLowerCase()}` : f.toLowerCase()))
+              .join("");
             rules.push(i18next.t(`challenges:${localizationKey}.name`));
             break;
           }

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

@@ -45,7 +45,6 @@ import type { Variant } from "#sprites/variant";
 import { getVariantIcon, getVariantTint } from "#sprites/variant";
 import { achvs } from "#system/achv";
 import type { DexAttrProps, StarterAttributes, StarterMoveset } from "#system/game-data";
-import { RibbonData } from "#system/ribbons/ribbon-data";
 import { SettingKeyboard } from "#system/settings-keyboard";
 import type { DexEntry } from "#types/dex-data";
 import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler";
@@ -3227,8 +3226,6 @@ export class StarterSelectUiHandler extends MessageUiHandler {
       onScreenFirstIndex + maxRows * maxColumns - 1,
     );
 
-    const gameData = globalScene.gameData;
-
     this.starterSelectScrollBar.setScrollCursor(this.scrollCursor);
 
     let pokerusCursorIndex = 0;
@@ -3268,9 +3265,9 @@ export class StarterSelectUiHandler extends MessageUiHandler {
 
       container.label.setVisible(true);
       const speciesVariants =
-        speciesId && gameData.dexData[speciesId].caughtAttr & DexAttr.SHINY
+        speciesId && globalScene.gameData.dexData[speciesId].caughtAttr & DexAttr.SHINY
           ? [DexAttr.DEFAULT_VARIANT, DexAttr.VARIANT_2, DexAttr.VARIANT_3].filter(
-              v => !!(gameData.dexData[speciesId].caughtAttr & v),
+              v => !!(globalScene.gameData.dexData[speciesId].caughtAttr & v),
             )
           : [];
       for (let v = 0; v < 3; v++) {
@@ -3285,15 +3282,12 @@ export class StarterSelectUiHandler extends MessageUiHandler {
         }
       }
 
-      container.starterPassiveBgs.setVisible(!!gameData.starterData[speciesId].passiveAttr);
+      container.starterPassiveBgs.setVisible(!!globalScene.gameData.starterData[speciesId].passiveAttr);
       container.hiddenAbilityIcon.setVisible(
-        !!gameData.dexData[speciesId].caughtAttr && !!(gameData.starterData[speciesId].abilityAttr & 4),
+        !!globalScene.gameData.dexData[speciesId].caughtAttr &&
-      );
+          !!(globalScene.gameData.starterData[speciesId].abilityAttr & 4),
-      container.classicWinIcon
-        .setVisible(gameData.starterData[speciesId].classicWinCount > 0)
-        .setTexture(
-          gameData.dexData[speciesId].ribbons.has(RibbonData.NUZLOCKE) ? "champion_ribbon_emerald" : "champion_ribbon",
       );
+      container.classicWinIcon.setVisible(globalScene.gameData.starterData[speciesId].classicWinCount > 0);
       container.favoriteIcon.setVisible(this.starterPreferences[speciesId]?.favorite ?? false);
 
       // 'Candy Icon' mode

src/ui/test-dialogue-ui-handler.ts

@@ -31,7 +31,7 @@ export class TestDialogueUiHandler extends FormModalUiHandler {
             // we check for null or undefined here as per above - the typeof is still an object but the value is null so we need to exit out of this and pass the null key
 
             // Return in the format expected by i18next
-            return middleKey ? `${topKey}:${middleKey.join(".")}.${t}` : `${topKey}:${t}`;
+            return middleKey ? `${topKey}:${middleKey.map(m => m).join(".")}.${t}` : `${topKey}:${t}`;
           }
         })
         .filter(t => t);

src/utils/challenge-utils.ts

@@ -4,7 +4,6 @@ import { pokemonEvolutions } from "#balance/pokemon-evolutions";
 import { pokemonFormChanges } from "#data/pokemon-forms";
 import type { PokemonSpecies } from "#data/pokemon-species";
 import { ChallengeType } from "#enums/challenge-type";
-import { Challenges } from "#enums/challenges";
 import type { MoveId } from "#enums/move-id";
 import type { MoveSourceType } from "#enums/move-source-type";
 import type { SpeciesId } from "#enums/species-id";
@@ -379,7 +378,7 @@ export function checkStarterValidForChallenge(species: PokemonSpecies, props: De
  * @param soft - If `true`, allow it if it could become valid through a form change.
  * @returns `true` if the species is considered valid.
  */
-export function checkSpeciesValidForChallenge(species: PokemonSpecies, props: DexAttrProps, soft: boolean) {
+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)) {
@@ -408,28 +407,3 @@ export function checkSpeciesValidForChallenge(species: PokemonSpecies, props: De
   });
   return result;
 }
-
-/** @returns Whether the current game mode meets the criteria to be considered a Nuzlocke challenge */
-export function isNuzlockeChallenge(): boolean {
-  let isFreshStart = false;
-  let isLimitedCatch = false;
-  let isHardcore = false;
-  for (const challenge of globalScene.gameMode.challenges) {
-    // value is 0 if challenge is not active
-    if (!challenge.value) {
-      continue;
-    }
-    switch (challenge.id) {
-      case Challenges.FRESH_START:
-        isFreshStart = true;
-        break;
-      case Challenges.LIMITED_CATCH:
-        isLimitedCatch = true;
-        break;
-      case Challenges.HARDCORE:
-        isHardcore = true;
-        break;
-    }
-  }
-  return isFreshStart && isLimitedCatch && isHardcore;
-}

test/@types/vitest.d.ts

@@ -1,29 +1,29 @@
 import type { TerrainType } from "#app/data/terrain";
-import type Overrides from "#app/overrides";
 import type { ArenaTag } from "#data/arena-tag";
-import type { PositionalTag } from "#data/positional-tags/positional-tag";
 import type { AbilityId } from "#enums/ability-id";
-import type { ArenaTagSide } from "#enums/arena-tag-side";
 import type { ArenaTagType } from "#enums/arena-tag-type";
 import type { BattlerTagType } from "#enums/battler-tag-type";
 import type { MoveId } from "#enums/move-id";
 import type { PokemonType } from "#enums/pokemon-type";
-import type { PositionalTagType } from "#enums/positional-tag-type";
 import type { BattleStat, EffectiveStat, Stat } from "#enums/stat";
 import type { StatusEffect } from "#enums/status-effect";
 import type { WeatherType } from "#enums/weather-type";
 import type { Arena } from "#field/arena";
 import type { Pokemon } from "#field/pokemon";
-import type { PokemonMove } from "#moves/pokemon-move";
-import type { toHaveArenaTagOptions } from "#test/test-utils/matchers/to-have-arena-tag";
 import type { toHaveEffectiveStatOptions } from "#test/test-utils/matchers/to-have-effective-stat";
-import type { toHavePositionalTagOptions } from "#test/test-utils/matchers/to-have-positional-tag";
 import type { expectedStatusType } from "#test/test-utils/matchers/to-have-status-effect";
 import type { toHaveTypesOptions } from "#test/test-utils/matchers/to-have-types";
 import type { TurnMove } from "#types/turn-move";
 import type { AtLeastOne } from "#types/type-helpers";
 import type { toDmgValue } from "utils/common";
 import type { expect } from "vitest";
+import type { PositionalTag } from "#data/positional-tags/positional-tag";
+import { PositionalTagType } from "#enums/positional-tag-type";
+import type Overrides from "#app/overrides";
+import type { ArenaTagSide } from "#enums/arena-tag-side";
+import type { PokemonMove } from "#moves/pokemon-move";
+import { toHaveArenaTagOptions } from "#test/test-utils/matchers/to-have-arena-tag";
+import { toHavePositionalTagOptions } from "#test/test-utils/matchers/to-have-positional-tag";
 
 declare module "vitest" {
   interface Assertion<T> {
@@ -161,12 +161,12 @@ declare module "vitest" {
     toHaveFullHp(): void;
     /**
      * Check whether a {@linkcode Pokemon} has consumed the given amount of PP for one of its moves.
-     * @param moveId - The {@linkcode MoveId} corresponding to the {@linkcode PokemonMove} that should have consumed PP
+     * @param moveId - The `MoveId` corresponding to the {@linkcode PokemonMove} that should have consumed PP
      * @param ppUsed - The numerical amount of PP that should have been consumed,
      * or `all` to indicate the move should be _out_ of PP
      * @remarks
-     * If the Pokemon's moveset has been set via {@linkcode Overrides.MOVESET_OVERRIDE}/{@linkcode Overrides.ENEMY_MOVESET_OVERRIDE}
+     * If the Pokemon's moveset has been set via {@linkcode Overrides.MOVESET_OVERRIDE}/{@linkcode Overrides.OPP_MOVESET_OVERRIDE}
-     * or does not contain exactly one copy of `moveId`, this will fail the test.
+     * or does not contain exactly one copy of {@linkcode moveId}, this will fail the test.
      */
     toHaveUsedPP(moveId: MoveId, ppUsed: number | "all"): void;
 

test/mystery-encounter/encounters/weird-dream-encounter.test.ts

@@ -112,7 +112,7 @@ describe("Weird Dream - Mystery Encounter", () => {
     it("should transform the new party into new species, 2 at +90/+110, the rest at +40/50 BST", async () => {
       await game.runToMysteryEncounter(MysteryEncounterType.WEIRD_DREAM, defaultParty);
 
-      const pokemonPrior = scene.getPlayerParty().slice();
+      const pokemonPrior = scene.getPlayerParty().map(pokemon => pokemon);
       const bstsPrior = pokemonPrior.map(species => species.getSpeciesForm().getBaseStatTotal());
 
       await runMysteryEncounterToEnd(game, 1);

test/test-utils/game-manager.ts

@@ -224,7 +224,7 @@ export class GameManager {
     // This will consider all battle entry dialog as seens and skip them
     vi.spyOn(this.scene.ui, "shouldSkipDialogue").mockReturnValue(true);
 
-    if (overrides.ENEMY_HELD_ITEMS_OVERRIDE.length === 0) {
+    if (overrides.OPP_HELD_ITEMS_OVERRIDE.length === 0) {
       this.removeEnemyHeldItems();
     }
 

test/test-utils/helpers/challenge-mode-helper.ts

@@ -50,7 +50,7 @@ export class ChallengeModeHelper extends GameManagerHelper {
     });
 
     await this.game.phaseInterceptor.run(EncounterPhase);
-    if (overrides.ENEMY_HELD_ITEMS_OVERRIDE.length === 0 && this.game.override.removeEnemyStartingItems) {
+    if (overrides.OPP_HELD_ITEMS_OVERRIDE.length === 0 && this.game.override.removeEnemyStartingItems) {
       this.game.removeEnemyHeldItems();
     }
   }

test/test-utils/helpers/classic-mode-helper.ts

@@ -53,7 +53,7 @@ export class ClassicModeHelper extends GameManagerHelper {
     });
 
     await this.game.phaseInterceptor.to(EncounterPhase);
-    if (overrides.ENEMY_HELD_ITEMS_OVERRIDE.length === 0 && this.game.override.removeEnemyStartingItems) {
+    if (overrides.OPP_HELD_ITEMS_OVERRIDE.length === 0 && this.game.override.removeEnemyStartingItems) {
       this.game.removeEnemyHeldItems();
     }
   }

test/test-utils/helpers/daily-mode-helper.ts

@@ -37,7 +37,7 @@ export class DailyModeHelper extends GameManagerHelper {
 
     await this.game.phaseInterceptor.to(EncounterPhase);
 
-    if (overrides.ENEMY_HELD_ITEMS_OVERRIDE.length === 0 && this.game.override.removeEnemyStartingItems) {
+    if (overrides.OPP_HELD_ITEMS_OVERRIDE.length === 0 && this.game.override.removeEnemyStartingItems) {
       this.game.removeEnemyHeldItems();
     }
   }

test/test-utils/helpers/move-helper.ts

@@ -228,8 +228,8 @@ export class MoveHelper extends GameManagerHelper {
         console.warn("Player moveset override disabled due to use of `game.move.changeMoveset`!");
       }
     } else {
-      if (coerceArray(Overrides.ENEMY_MOVESET_OVERRIDE).length > 0) {
+      if (coerceArray(Overrides.OPP_MOVESET_OVERRIDE).length > 0) {
-        vi.spyOn(Overrides, "ENEMY_MOVESET_OVERRIDE", "get").mockReturnValue([]);
+        vi.spyOn(Overrides, "OPP_MOVESET_OVERRIDE", "get").mockReturnValue([]);
         console.warn("Enemy moveset override disabled due to use of `game.move.changeMoveset`!");
       }
     }
@@ -302,8 +302,8 @@ export class MoveHelper extends GameManagerHelper {
         (this.game.scene.phaseManager.getCurrentPhase() as EnemyCommandPhase).getFieldIndex()
       ];
 
-    if ([Overrides.ENEMY_MOVESET_OVERRIDE].flat().length > 0) {
+    if ([Overrides.OPP_MOVESET_OVERRIDE].flat().length > 0) {
-      vi.spyOn(Overrides, "ENEMY_MOVESET_OVERRIDE", "get").mockReturnValue([]);
+      vi.spyOn(Overrides, "OPP_MOVESET_OVERRIDE", "get").mockReturnValue([]);
       console.warn(
         "Warning: `forceEnemyMove` overwrites the Pokemon's moveset and disables the enemy moveset override!",
       );

test/test-utils/helpers/overrides-helper.ts

@@ -406,7 +406,7 @@ export class OverridesHelper extends GameManagerHelper {
    * @returns `this`
    */
   public enemySpecies(species: SpeciesId | number): this {
-    vi.spyOn(Overrides, "ENEMY_SPECIES_OVERRIDE", "get").mockReturnValue(species);
+    vi.spyOn(Overrides, "OPP_SPECIES_OVERRIDE", "get").mockReturnValue(species);
     this.log(`Enemy Pokemon species set to ${SpeciesId[species]} (=${species})!`);
     return this;
   }
@@ -416,7 +416,7 @@ export class OverridesHelper extends GameManagerHelper {
    * @returns `this`
    */
   public enableEnemyFusion(): this {
-    vi.spyOn(Overrides, "ENEMY_FUSION_OVERRIDE", "get").mockReturnValue(true);
+    vi.spyOn(Overrides, "OPP_FUSION_OVERRIDE", "get").mockReturnValue(true);
     this.log("Enemy Pokemon is a random fusion!");
     return this;
   }
@@ -427,7 +427,7 @@ export class OverridesHelper extends GameManagerHelper {
    * @returns `this`
    */
   public enemyFusionSpecies(species: SpeciesId | number): this {
-    vi.spyOn(Overrides, "ENEMY_FUSION_SPECIES_OVERRIDE", "get").mockReturnValue(species);
+    vi.spyOn(Overrides, "OPP_FUSION_SPECIES_OVERRIDE", "get").mockReturnValue(species);
     this.log(`Enemy Pokemon fusion species set to ${SpeciesId[species]} (=${species})!`);
     return this;
   }
@@ -438,7 +438,7 @@ export class OverridesHelper extends GameManagerHelper {
    * @returns `this`
    */
   public enemyAbility(ability: AbilityId): this {
-    vi.spyOn(Overrides, "ENEMY_ABILITY_OVERRIDE", "get").mockReturnValue(ability);
+    vi.spyOn(Overrides, "OPP_ABILITY_OVERRIDE", "get").mockReturnValue(ability);
     this.log(`Enemy Pokemon ability set to ${AbilityId[ability]} (=${ability})!`);
     return this;
   }
@@ -449,7 +449,7 @@ export class OverridesHelper extends GameManagerHelper {
    * @returns `this`
    */
   public enemyPassiveAbility(passiveAbility: AbilityId): this {
-    vi.spyOn(Overrides, "ENEMY_PASSIVE_ABILITY_OVERRIDE", "get").mockReturnValue(passiveAbility);
+    vi.spyOn(Overrides, "OPP_PASSIVE_ABILITY_OVERRIDE", "get").mockReturnValue(passiveAbility);
     this.log(`Enemy Pokemon PASSIVE ability set to ${AbilityId[passiveAbility]} (=${passiveAbility})!`);
     return this;
   }
@@ -460,7 +460,7 @@ export class OverridesHelper extends GameManagerHelper {
    * @returns `this`
    */
   public enemyHasPassiveAbility(hasPassiveAbility: boolean | null): this {
-    vi.spyOn(Overrides, "ENEMY_HAS_PASSIVE_ABILITY_OVERRIDE", "get").mockReturnValue(hasPassiveAbility);
+    vi.spyOn(Overrides, "OPP_HAS_PASSIVE_ABILITY_OVERRIDE", "get").mockReturnValue(hasPassiveAbility);
     if (hasPassiveAbility === null) {
       this.log("Enemy Pokemon PASSIVE ability no longer force enabled or disabled!");
     } else {
@@ -475,7 +475,7 @@ export class OverridesHelper extends GameManagerHelper {
    * @returns `this`
    */
   public enemyMoveset(moveset: MoveId | MoveId[]): this {
-    vi.spyOn(Overrides, "ENEMY_MOVESET_OVERRIDE", "get").mockReturnValue(moveset);
+    vi.spyOn(Overrides, "OPP_MOVESET_OVERRIDE", "get").mockReturnValue(moveset);
     moveset = coerceArray(moveset);
     const movesetStr = moveset.map(moveId => MoveId[moveId]).join(", ");
     this.log(`Enemy Pokemon moveset set to ${movesetStr} (=[${moveset.join(", ")}])!`);
@@ -488,7 +488,7 @@ export class OverridesHelper extends GameManagerHelper {
    * @returns `this`
    */
   public enemyLevel(level: number): this {
-    vi.spyOn(Overrides, "ENEMY_LEVEL_OVERRIDE", "get").mockReturnValue(level);
+    vi.spyOn(Overrides, "OPP_LEVEL_OVERRIDE", "get").mockReturnValue(level);
     this.log(`Enemy Pokemon level set to ${level}!`);
     return this;
   }
@@ -499,7 +499,7 @@ export class OverridesHelper extends GameManagerHelper {
    * @returns `this`
    */
   public enemyStatusEffect(statusEffect: StatusEffect): this {
-    vi.spyOn(Overrides, "ENEMY_STATUS_OVERRIDE", "get").mockReturnValue(statusEffect);
+    vi.spyOn(Overrides, "OPP_STATUS_OVERRIDE", "get").mockReturnValue(statusEffect);
     this.log(`Enemy Pokemon status-effect set to ${StatusEffect[statusEffect]} (=${statusEffect})!`);
     return this;
   }
@@ -510,7 +510,7 @@ export class OverridesHelper extends GameManagerHelper {
    * @returns `this`
    */
   public enemyHeldItems(items: ModifierOverride[]): this {
-    vi.spyOn(Overrides, "ENEMY_HELD_ITEMS_OVERRIDE", "get").mockReturnValue(items);
+    vi.spyOn(Overrides, "OPP_HELD_ITEMS_OVERRIDE", "get").mockReturnValue(items);
     this.log("Enemy Pokemon held items set to:", items);
     return this;
   }
@@ -571,7 +571,7 @@ export class OverridesHelper extends GameManagerHelper {
    * @param variant - (Optional) The enemy's shiny {@linkcode Variant}.
    */
   enemyShiny(shininess: boolean | null, variant?: Variant): this {
-    vi.spyOn(Overrides, "ENEMY_SHINY_OVERRIDE", "get").mockReturnValue(shininess);
+    vi.spyOn(Overrides, "OPP_SHINY_OVERRIDE", "get").mockReturnValue(shininess);
     if (shininess === null) {
       this.log("Disabled enemy Pokemon shiny override!");
     } else {
@@ -579,7 +579,7 @@ export class OverridesHelper extends GameManagerHelper {
     }
 
     if (variant !== undefined) {
-      vi.spyOn(Overrides, "ENEMY_VARIANT_OVERRIDE", "get").mockReturnValue(variant);
+      vi.spyOn(Overrides, "OPP_VARIANT_OVERRIDE", "get").mockReturnValue(variant);
       this.log(`Set enemy shiny variant to be ${variant}!`);
     }
     return this;
@@ -594,7 +594,7 @@ export class OverridesHelper extends GameManagerHelper {
    * @returns `this`
    */
   public enemyHealthSegments(healthSegments: number): this {
-    vi.spyOn(Overrides, "ENEMY_HEALTH_SEGMENTS_OVERRIDE", "get").mockReturnValue(healthSegments);
+    vi.spyOn(Overrides, "OPP_HEALTH_SEGMENTS_OVERRIDE", "get").mockReturnValue(healthSegments);
     this.log("Enemy Pokemon health segments set to:", healthSegments);
     return this;
   }

test/test-utils/matchers/to-have-used-pp.ts

@@ -33,7 +33,7 @@ export function toHaveUsedPP(
     };
   }
 
-  const override = received.isPlayer() ? Overrides.MOVESET_OVERRIDE : Overrides.ENEMY_MOVESET_OVERRIDE;
+  const override = received.isPlayer() ? Overrides.MOVESET_OVERRIDE : Overrides.OPP_MOVESET_OVERRIDE;
   if (coerceArray(override).length > 0) {
     return {
       pass: this.isNot,