Apply Kev's suggestions from code review

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

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>>;
 ```
 

docs/localization.md

@@ -90,13 +90,9 @@ If this feature requires new text, the text should be integrated into the code w
   - For any feature pulled from the mainline Pokémon games (e.g. a Move or Ability implementation), it's best practice to include a source link for any added text.  
   [Poké Corpus](https://abcboy101.github.io/poke-corpus/) is a great resource for finding text from the mainline games; otherwise, a video/picture showing the text being displayed should suffice.
   - You should also [notify the current Head of Translation](#notifying-translation) to ensure a fast response.
-3. Your locales should use the following format:
+3. At this point, you may begin [testing locales integration in your main PR](#documenting-locales-changes).
-  - File names should be in `kebab-case`. Example: `trainer-names.json`
+4. The Translation Team will approve the locale PR (after corrections, if necessary), then merge it into `pokerogue-locales`.
-  - Key names should be in `camelCase`. Example: `aceTrainer`
+5. The Dev Team will approve your main PR for your feature, then merge it into PokéRogue's beta environment.
-    - If you make use of i18next's inbuilt [context support](https://www.i18next.com/translation-function/context), you need to use `snake_case` for the context key. Example: `aceTrainer_male`
-4. At this point, you may begin [testing locales integration in your main PR](#documenting-locales-changes).
-5. The Translation Team will approve the locale PR (after corrections, if necessary), then merge it into `pokerogue-locales`.
-6. The Dev Team will approve your main PR for your feature, then merge it into PokéRogue's beta environment.
 
 [^2]: For those wondering, the reason for choosing English specifically is due to it being the master language set in Pontoon (the program used by the Translation Team to perform locale updates).
 If a key is present in any language _except_ the master language, it won't appear anywhere else in the translation tool, rendering missing English keys quite a hassle.

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/move-types.ts

@@ -1,24 +1,13 @@
-import type { Pokemon } from "#field/pokemon";
 import type {
   AttackMove,
   ChargingAttackMove,
   ChargingSelfStatusMove,
-  Move,
   MoveAttr,
   MoveAttrConstructorMap,
   SelfStatusMove,
   StatusMove,
 } from "#moves/move";
 
-/**
- * A generic function producing a message during a Move's execution.
- * @param user - The {@linkcode Pokemon} using the move
- * @param target - The {@linkcode Pokemon} targeted by the move
- * @param move - The {@linkcode Move} being used
- * @returns a string
- */
-export type MoveMessageFunc = (user: Pokemon, target: Pokemon, move: Move) => string;
-
 export type MoveAttrFilter = (attr: MoveAttr) => boolean;
 
 export type * from "#moves/move";

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/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) : "";
   }
 
@@ -1667,7 +1670,6 @@ export class MoveTypeChangeAbAttr extends PreAttackAbAttr {
   constructor(
     private newType: PokemonType,
     private powerMultiplier: number,
-    // TODO: all moves with this attr solely check the move being used...
     private condition?: PokemonAttackCondition,
   ) {
     super(false);

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/moves/move.ts

@@ -86,11 +86,11 @@ import { PokemonHealPhase } from "#phases/pokemon-heal-phase";
 import { SwitchSummonPhase } from "#phases/switch-summon-phase";
 import type { AttackMoveResult } from "#types/attack-move-result";
 import type { Localizable } from "#types/locales";
-import type { ChargingMove, MoveAttrMap, MoveAttrString, MoveClassMap, MoveKindString, MoveMessageFunc } from "#types/move-types";
+import type { ChargingMove, MoveAttrMap, MoveAttrString, MoveClassMap, MoveKindString } from "#types/move-types";
 import type { TurnMove } from "#types/turn-move";
 import { BooleanHolder, type Constructor, isNullOrUndefined, NumberHolder, randSeedFloat, randSeedInt, randSeedItem, toDmgValue } 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}`;
   }
 
   /**
@@ -1363,20 +1357,20 @@ export class MoveHeaderAttr extends MoveAttr {
 
 /**
  * Header attribute to queue a message at the beginning of a turn.
+ * @see {@link MoveHeaderAttr}
  */
 export class MessageHeaderAttr extends MoveHeaderAttr {
-  /** The message to display, or a function producing one. */
+  private message: string | ((user: Pokemon, move: Move) => string);
-  private message: string | MoveMessageFunc;
 
-  constructor(message: string | MoveMessageFunc) {
+  constructor(message: string | ((user: Pokemon, move: Move) => string)) {
     super();
     this.message = message;
   }
 
-  apply(user: Pokemon, target: Pokemon, move: Move): boolean {
+  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     const message = typeof this.message === "string"
       ? this.message
-      : this.message(user, target, move);
+      : this.message(user, move);
 
     if (message) {
       globalScene.phaseManager.queueMessage(message);
@@ -1424,21 +1418,21 @@ export class BeakBlastHeaderAttr extends AddBattlerTagHeaderAttr {
  */
 export class PreMoveMessageAttr extends MoveAttr {
   /** The message to display or a function returning one */
-  private message: string | MoveMessageFunc;
+  private message: string | ((user: Pokemon, target: Pokemon, move: Move) => string | undefined);
 
   /**
    * Create a new {@linkcode PreMoveMessageAttr} to display a message before move execution.
-   * @param message - The message to display before move use, either` a literal string or a function producing one.
+   * @param message - The message to display before move use, either as a string or a function producing one.
    * @remarks
-   * If {@linkcode message} evaluates to an empty string (`""`), no message will be displayed
+   * If {@linkcode message} evaluates to an empty string (`''`), no message will be displayed
    * (though the move will still succeed).
    */
-  constructor(message: string | MoveMessageFunc) {
+  constructor(message: string | ((user: Pokemon, target: Pokemon, move: Move) => string)) {
     super();
     this.message = message;
   }
 
-  apply(user: Pokemon, target: Pokemon, move: Move): boolean {
+  apply(user: Pokemon, target: Pokemon, move: Move, _args: any[]): boolean {
     const message = typeof this.message === "function"
       ? this.message(user, target, move)
       : this.message;
@@ -1459,17 +1453,18 @@ export class PreMoveMessageAttr extends MoveAttr {
  * @extends MoveAttr
  */
 export class PreUseInterruptAttr extends MoveAttr {
-  protected message: string | MoveMessageFunc;
+  protected message?: string | ((user: Pokemon, target: Pokemon, move: Move) => string);
+  protected overridesFailedMessage: boolean;
   protected conditionFunc: MoveConditionFunc;
 
   /**
    * Create a new MoveInterruptedMessageAttr.
    * @param message The message to display when the move is interrupted, or a function that formats the message based on the user, target, and move.
    */
-  constructor(message: string | MoveMessageFunc, conditionFunc: MoveConditionFunc) {
+  constructor(message?: string | ((user: Pokemon, target: Pokemon, move: Move) => string), conditionFunc?: MoveConditionFunc) {
     super();
     this.message = message;
-    this.conditionFunc = conditionFunc;
+    this.conditionFunc = conditionFunc ?? (() => true);
   }
 
   /**
@@ -1490,9 +1485,11 @@ export class PreUseInterruptAttr extends MoveAttr {
    */
   override getFailedText(user: Pokemon, target: Pokemon, move: Move): string | undefined {
     if (this.message && this.conditionFunc(user, target, move)) {
-      return typeof this.message === "string"
+      const message =
-          ? this.message
+        typeof this.message === "string"
+          ? (this.message as string)
           : this.message(user, target, move);
+      return message;
     }
   }
 }
@@ -1697,30 +1694,17 @@ export class SurviveDamageAttr extends ModifiedDamageAttr {
   }
 }
 
-/**
+export class SplashAttr extends MoveEffectAttr {
- * Move attribute to display arbitrary text during a move's execution.
+  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- */
+    globalScene.phaseManager.queueMessage(i18next.t("moveTriggers:splash"));
-export class MessageAttr extends MoveEffectAttr {
+    return true;
-  /** The message to display, either as a string or a function returning one. */
-  private message: string | MoveMessageFunc;
-
-  constructor(message: string | MoveMessageFunc, options?: MoveEffectAttrOptions) {
-    // TODO: Do we need to respect `selfTarget` if we're just displaying text?
-    super(false, options)
-    this.message = message;
   }
+}
 
-  override apply(user: Pokemon, target: Pokemon, move: Move): boolean {
+export class CelebrateAttr extends MoveEffectAttr {
-    const message = typeof this.message === "function"
+  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-      ? this.message(user, target, move)
+    globalScene.phaseManager.queueMessage(i18next.t("moveTriggers:celebrate", { playerName: loggedInUser?.username }));
-      : this.message;
+    return true;
-
-    // TODO: Consider changing if/when MoveAttr `apply` return values become significant
-    if (message) {
-      globalScene.phaseManager.queueMessage(message, 500);
-      return true;
-    }
-    return false;
   }
 }
 
@@ -5932,8 +5916,8 @@ export class ProtectAttr extends AddBattlerTagAttr {
       for (const turnMove of user.getLastXMoves(-1).slice()) {
         if (
           // Quick & Wide guard increment the Protect counter without using it for fail chance
-          !(allMoves[turnMove.move].hasAttr("ProtectAttr") ||
+          !(allMoves[turnMove.move].hasAttr("ProtectAttr") || 
-          [MoveId.QUICK_GUARD, MoveId.WIDE_GUARD].includes(turnMove.move)) ||
+          [MoveId.QUICK_GUARD, MoveId.WIDE_GUARD].includes(turnMove.move)) || 
           turnMove.result !== MoveResult.SUCCESS
         ) {
           break;
@@ -5947,6 +5931,38 @@ export class ProtectAttr extends AddBattlerTagAttr {
   }
 }
 
+export class IgnoreAccuracyAttr extends AddBattlerTagAttr {
+  constructor() {
+    super(BattlerTagType.IGNORE_ACCURACY, true, false, 2);
+  }
+
+  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    if (!super.apply(user, target, move, args)) {
+      return false;
+    }
+
+    globalScene.phaseManager.queueMessage(i18next.t("moveTriggers:tookAimAtTarget", { pokemonName: getPokemonNameWithAffix(user), targetName: getPokemonNameWithAffix(target) }));
+
+    return true;
+  }
+}
+
+export class FaintCountdownAttr extends AddBattlerTagAttr {
+  constructor() {
+    super(BattlerTagType.PERISH_SONG, false, true, 4);
+  }
+
+  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    if (!super.apply(user, target, move, args)) {
+      return false;
+    }
+
+    globalScene.phaseManager.queueMessage(i18next.t("moveTriggers:faintCountdown", { pokemonName: getPokemonNameWithAffix(target), turnCount: this.turnCountMin - 1 }));
+
+    return true;
+  }
+}
+
 /**
  * Attribute to remove all Substitutes from the field.
  * @extends MoveEffectAttr
@@ -6587,10 +6603,8 @@ export class ChillyReceptionAttr extends ForceSwitchOutAttr {
     return (user, target, move) => globalScene.arena.weather?.weatherType !== WeatherType.SNOW || super.getSwitchOutCondition()(user, target, move);
   }
 }
-
 export class RemoveTypeAttr extends MoveEffectAttr {
 
-  // TODO: Remove the message callback
   private removedType: PokemonType;
   private messageCallback: ((user: Pokemon) => void) | undefined;
 
@@ -8285,6 +8299,8 @@ const MoveAttrs = Object.freeze({
   RandomLevelDamageAttr,
   ModifiedDamageAttr,
   SurviveDamageAttr,
+  SplashAttr,
+  CelebrateAttr,
   RecoilAttr,
   SacrificialAttr,
   SacrificialAttrOnHit,
@@ -8427,7 +8443,8 @@ const MoveAttrs = Object.freeze({
   RechargeAttr,
   TrapAttr,
   ProtectAttr,
-  MessageAttr,
+  IgnoreAccuracyAttr,
+  FaintCountdownAttr,
   RemoveAllSubstitutesAttr,
   HitsTagAttr,
   HitsTagForDoubleDamageAttr,
@@ -8921,7 +8938,7 @@ export function initMoves() {
     new AttackMove(MoveId.PSYWAVE, PokemonType.PSYCHIC, MoveCategory.SPECIAL, -1, 100, 15, -1, 0, 1)
       .attr(RandomLevelDamageAttr),
     new SelfStatusMove(MoveId.SPLASH, PokemonType.NORMAL, -1, 40, -1, 0, 1)
-      .attr(MessageAttr, i18next.t("moveTriggers:splash"))
+      .attr(SplashAttr)
       .condition(failOnGravityCondition),
     new SelfStatusMove(MoveId.ACID_ARMOR, PokemonType.POISON, -1, 20, -1, 0, 1)
       .attr(StatStageChangeAttr, [ Stat.DEF ], 2, true),
@@ -8983,10 +9000,7 @@ export function initMoves() {
       .attr(AddBattlerTagAttr, BattlerTagType.TRAPPED, false, true, 1)
       .reflectable(),
     new StatusMove(MoveId.MIND_READER, PokemonType.NORMAL, -1, 5, -1, 0, 2)
-      .attr(AddBattlerTagAttr, BattlerTagType.IGNORE_ACCURACY, true, false, 2)
+      .attr(IgnoreAccuracyAttr),
-      .attr(MessageAttr, (user, target) =>
-        i18next.t("moveTriggers:tookAimAtTarget", { pokemonName: getPokemonNameWithAffix(user), targetName: getPokemonNameWithAffix(target) })
-      ),
     new StatusMove(MoveId.NIGHTMARE, PokemonType.GHOST, 100, 15, -1, 0, 2)
       .attr(AddBattlerTagAttr, BattlerTagType.NIGHTMARE)
       .condition(targetSleptOrComatoseCondition),
@@ -9074,9 +9088,7 @@ export function initMoves() {
         return lastTurnMove.length === 0 || lastTurnMove[0].move !== move.id || lastTurnMove[0].result !== MoveResult.SUCCESS;
       }),
     new StatusMove(MoveId.PERISH_SONG, PokemonType.NORMAL, -1, 5, -1, 0, 2)
-      .attr(AddBattlerTagAttr, BattlerTagType.PERISH_SONG, false, true, 4)
+      .attr(FaintCountdownAttr)
-      .attr(MessageAttr, (_user, target) =>
-         i18next.t("moveTriggers:faintCountdown", { pokemonName: getPokemonNameWithAffix(target), turnCount: 3 }))
       .ignoresProtect()
       .soundBased()
       .condition(failOnBossCondition)
@@ -9092,10 +9104,7 @@ export function initMoves() {
       .attr(MultiHitAttr)
       .makesContact(false),
     new StatusMove(MoveId.LOCK_ON, PokemonType.NORMAL, -1, 5, -1, 0, 2)
-      .attr(AddBattlerTagAttr, BattlerTagType.IGNORE_ACCURACY, true, false, 2)
+      .attr(IgnoreAccuracyAttr),
-      .attr(MessageAttr, (user, target) =>
-        i18next.t("moveTriggers:tookAimAtTarget", { pokemonName: getPokemonNameWithAffix(user), targetName: getPokemonNameWithAffix(target) })
-      ),
     new AttackMove(MoveId.OUTRAGE, PokemonType.DRAGON, MoveCategory.PHYSICAL, 120, 100, 10, -1, 0, 2)
       .attr(FrenzyAttr)
       .attr(MissEffectAttr, frenzyMissFunc)
@@ -9322,8 +9331,8 @@ export function initMoves() {
         && (user.status.effect === StatusEffect.BURN || user.status.effect === StatusEffect.POISON || user.status.effect === StatusEffect.TOXIC || user.status.effect === StatusEffect.PARALYSIS) ? 2 : 1)
       .attr(BypassBurnDamageReductionAttr),
     new AttackMove(MoveId.FOCUS_PUNCH, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 150, 100, 20, -1, -3, 3)
-      .attr(MessageHeaderAttr, (user) => i18next.t("moveTriggers:isTighteningFocus", { pokemonName: getPokemonNameWithAffix(user) }))
+      .attr(MessageHeaderAttr, (user, move) => i18next.t("moveTriggers:isTighteningFocus", { pokemonName: getPokemonNameWithAffix(user) }))
-      .attr(PreUseInterruptAttr, (user) => i18next.t("moveTriggers:lostFocus", { pokemonName: getPokemonNameWithAffix(user) }), user => user.turnData.attacksReceived.some(r => r.damage > 0))
+      .attr(PreUseInterruptAttr, (user, target, move) => i18next.t("moveTriggers:lostFocus", { pokemonName: getPokemonNameWithAffix(user) }), user => !!user.turnData.attacksReceived.find(r => r.damage))
       .punchingMove(),
     new AttackMove(MoveId.SMELLING_SALTS, PokemonType.NORMAL, MoveCategory.PHYSICAL, 70, 100, 10, -1, 0, 3)
       .attr(MovePowerMultiplierAttr, (user, target, move) => target.status?.effect === StatusEffect.PARALYSIS ? 2 : 1)
@@ -10424,8 +10433,7 @@ export function initMoves() {
     new AttackMove(MoveId.DAZZLING_GLEAM, PokemonType.FAIRY, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 6)
       .target(MoveTarget.ALL_NEAR_ENEMIES),
     new SelfStatusMove(MoveId.CELEBRATE, PokemonType.NORMAL, -1, 40, -1, 0, 6)
-      // NB: This needs a lambda function as the user will not be logged in by the time the moves are initialized
+      .attr(CelebrateAttr),
-      .attr(MessageAttr, () => i18next.t("moveTriggers:celebrate", { playerName: loggedInUser?.username })),
     new StatusMove(MoveId.HOLD_HANDS, PokemonType.NORMAL, -1, 40, -1, 0, 6)
       .ignoresSubstitute()
       .target(MoveTarget.NEAR_ALLY),
@@ -10600,12 +10608,7 @@ export function initMoves() {
       .attr(StatStageChangeAttr, [ Stat.SPD ], -1)
       .reflectable(),
     new SelfStatusMove(MoveId.LASER_FOCUS, PokemonType.NORMAL, -1, 30, -1, 0, 7)
-      .attr(AddBattlerTagAttr, BattlerTagType.ALWAYS_CRIT, true, false)
+      .attr(AddBattlerTagAttr, BattlerTagType.ALWAYS_CRIT, true, false),
-      .attr(MessageAttr, (user) =>
-        i18next.t("battlerTags:laserFocusOnAdd", {
-          pokemonNameWithAffix: getPokemonNameWithAffix(user),
-        }),
-      ),
     new StatusMove(MoveId.GEAR_UP, PokemonType.STEEL, -1, 20, -1, 0, 7)
       .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], 1, false, { condition: (user, target, move) => !![ AbilityId.PLUS, AbilityId.MINUS ].find(a => target.hasAbility(a, false)) })
       .ignoresSubstitute()

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/enums/ui-mode.ts

@@ -38,7 +38,6 @@ export enum UiMode {
   UNAVAILABLE,
   CHALLENGE_SELECT,
   RENAME_POKEMON,
-  RENAME_RUN,
   RUN_HISTORY,
   RUN_INFO,
   TEST_DIALOGUE,

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

@@ -1827,7 +1827,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 +2032,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 +2062,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 +2130,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 +3003,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 =
@@ -6257,22 +6257,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 +6282,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

@@ -123,7 +123,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 +448,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);
     }
   }
@@ -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/system/game-data.ts

@@ -128,7 +128,6 @@ export interface SessionSaveData {
   battleType: BattleType;
   trainer: TrainerData;
   gameVersion: string;
-  runNameText: string;
   timestamp: number;
   challenges: ChallengeData[];
   mysteryEncounterType: MysteryEncounterType | -1; // Only defined when current wave is ME,
@@ -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;
 }
@@ -829,51 +826,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
-    for (const key of Object.values(Tutorial)) {
-      if (key === tutorial) {
-        tutorials[key] = status;
-      } else {
-        tutorials[key] ??= false;
-      }
     }
 
-    localStorage.setItem(saveDataKey, JSON.stringify(tutorials));
+    Object.keys(Tutorial)
+      .map(t => t as Tutorial)
+      .forEach(t => {
+        const key = Tutorial[t];
+        if (key === tutorial) {
+          tutorials[key] = flag;
+        } else {
+          tutorials[key] ??= false;
+        }
+      });
+
+    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;
@@ -985,54 +983,6 @@ export class GameData {
     });
   }
 
-  async renameSession(slotId: number, newName: string): Promise<boolean> {
-    return new Promise(async resolve => {
-      if (slotId < 0) {
-        return resolve(false);
-      }
-      const sessionData: SessionSaveData | null = await this.getSession(slotId);
-
-      if (!sessionData) {
-        return resolve(false);
-      }
-
-      if (newName === "") {
-        return resolve(true);
-      }
-
-      sessionData.runNameText = newName;
-      const updatedDataStr = JSON.stringify(sessionData);
-      const encrypted = encrypt(updatedDataStr, bypassLogin);
-      const secretId = this.secretId;
-      const trainerId = this.trainerId;
-
-      if (bypassLogin) {
-        localStorage.setItem(
-          `sessionData${slotId ? slotId : ""}_${loggedInUser?.username}`,
-          encrypt(updatedDataStr, bypassLogin),
-        );
-        resolve(true);
-        return;
-      }
-      pokerogueApi.savedata.session
-        .update({ slot: slotId, trainerId, secretId, clientSessionId }, encrypted)
-        .then(error => {
-          if (error) {
-            console.error("Failed to update session name:", error);
-            resolve(false);
-          } else {
-            localStorage.setItem(`sessionData${slotId ? slotId : ""}_${loggedInUser?.username}`, encrypted);
-            updateUserInfo().then(success => {
-              if (success !== null && !success) {
-                return resolve(false);
-              }
-            });
-            resolve(true);
-          }
-        });
-    });
-  }
-
   loadSession(slotId: number, sessionData?: SessionSaveData): Promise<boolean> {
     // biome-ignore lint/suspicious/noAsyncPromiseExecutor: TODO: fix this
     return new Promise(async (resolve, reject) => {

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,
+      this.slotHpBar.width - 3,
-        this.slotHpBar.width + hpTextToBarOffset.x,
+      this.slotHpBar.height - 2 + (offsetJa ? 2 : 0),
-        this.slotHpBar.height + hpTextToBarOffset.y,
+    );
-      ) // TODO: annoying because it contains the width
+    this.slotHpText.setOrigin(1, 0);
-      .setVisible(false);
+    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/rename-run-ui-handler.ts

@@ -1,54 +0,0 @@
-import i18next from "i18next";
-import type { InputFieldConfig } from "./form-modal-ui-handler";
-import { FormModalUiHandler } from "./form-modal-ui-handler";
-import type { ModalConfig } from "./modal-ui-handler";
-
-export class RenameRunFormUiHandler extends FormModalUiHandler {
-  getModalTitle(_config?: ModalConfig): string {
-    return i18next.t("menu:renamerun");
-  }
-
-  getWidth(_config?: ModalConfig): number {
-    return 160;
-  }
-
-  getMargin(_config?: ModalConfig): [number, number, number, number] {
-    return [0, 0, 48, 0];
-  }
-
-  getButtonLabels(_config?: ModalConfig): string[] {
-    return [i18next.t("menu:rename"), i18next.t("menu:cancel")];
-  }
-
-  getReadableErrorMessage(error: string): string {
-    const colonIndex = error?.indexOf(":");
-    if (colonIndex > 0) {
-      error = error.slice(0, colonIndex);
-    }
-
-    return super.getReadableErrorMessage(error);
-  }
-
-  override getInputFieldConfigs(): InputFieldConfig[] {
-    return [{ label: i18next.t("menu:runName") }];
-  }
-
-  show(args: any[]): boolean {
-    if (!super.show(args)) {
-      return false;
-    }
-    if (this.inputs?.length) {
-      this.inputs.forEach(input => {
-        input.text = "";
-      });
-    }
-    const config = args[0] as ModalConfig;
-    this.submitAction = _ => {
-      this.sanitizeInputs();
-      const sanitizedName = btoa(encodeURIComponent(this.inputs[0].text));
-      config.buttonActions[0](sanitizedName);
-      return true;
-    };
-    return true;
-  }
-}

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";
 
@@ -208,10 +207,6 @@ export class RunInfoUiHandler extends UiHandler {
     headerText.setOrigin(0, 0);
     headerText.setPositionRelative(headerBg, 8, 4);
     this.runContainer.add(headerText);
-    const runName = addTextObject(0, 0, this.runInfo.runNameText, TextStyle.WINDOW);
-    runName.setOrigin(0, 0);
-    runName.setPositionRelative(headerBg, 60, 4);
-    this.runContainer.add(runName);
   }
 
   /**
@@ -707,7 +702,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/save-slot-select-ui-handler.ts

@@ -1,14 +1,12 @@
 import { GameMode } from "#app/game-mode";
 import { globalScene } from "#app/global-scene";
 import { Button } from "#enums/buttons";
-import { GameModes } from "#enums/game-modes";
 import { TextStyle } from "#enums/text-style";
 import { UiMode } from "#enums/ui-mode";
 // biome-ignore lint/performance/noNamespaceImport: See `src/system/game-data.ts`
 import * as Modifier from "#modifiers/modifier";
 import type { SessionSaveData } from "#system/game-data";
 import type { PokemonData } from "#system/pokemon-data";
-import type { OptionSelectConfig } from "#ui/abstract-option-select-ui-handler";
 import { MessageUiHandler } from "#ui/message-ui-handler";
 import { RunDisplayMode } from "#ui/run-info-ui-handler";
 import { addTextObject } from "#ui/text";
@@ -17,7 +15,7 @@ import { fixedInt, formatLargeNumber, getPlayTimeString, isNullOrUndefined } fro
 import i18next from "i18next";
 
 const SESSION_SLOTS_COUNT = 5;
-const SLOTS_ON_SCREEN = 2;
+const SLOTS_ON_SCREEN = 3;
 
 export enum SaveSlotUiMode {
   LOAD,
@@ -35,7 +33,6 @@ export class SaveSlotSelectUiHandler extends MessageUiHandler {
 
   private uiMode: SaveSlotUiMode;
   private saveSlotSelectCallback: SaveSlotSelectCallback | null;
-  protected manageDataConfig: OptionSelectConfig;
 
   private scrollCursor = 0;
 
@@ -104,7 +101,6 @@ export class SaveSlotSelectUiHandler extends MessageUiHandler {
 
   processInput(button: Button): boolean {
     const ui = this.getUi();
-    const manageDataOptions: any[] = [];
 
     let success = false;
     let error = false;
@@ -113,115 +109,14 @@ export class SaveSlotSelectUiHandler extends MessageUiHandler {
       const originalCallback = this.saveSlotSelectCallback;
       if (button === Button.ACTION) {
         const cursor = this.cursor + this.scrollCursor;
-        const sessionSlot = this.sessionSlots[cursor];
+        if (this.uiMode === SaveSlotUiMode.LOAD && !this.sessionSlots[cursor].hasData) {
-        if (this.uiMode === SaveSlotUiMode.LOAD && !sessionSlot.hasData) {
           error = true;
         } else {
           switch (this.uiMode) {
             case SaveSlotUiMode.LOAD:
-              if (!sessionSlot.malformed) {
+              this.saveSlotSelectCallback = null;
-                manageDataOptions.push({
+              originalCallback?.(cursor);
-                  label: i18next.t("menu:loadGame"),
-                  handler: () => {
-                    globalScene.ui.revertMode();
-                    originalCallback?.(cursor);
-                    return true;
-                  },
-                  keepOpen: false,
-                });
-
-                manageDataOptions.push({
-                  label: i18next.t("saveSlotSelectUiHandler:renameRun"),
-                  handler: () => {
-                    globalScene.ui.revertMode();
-                    ui.setOverlayMode(
-                      UiMode.RENAME_RUN,
-                      {
-                        buttonActions: [
-                          (sanitizedName: string) => {
-                            const name = decodeURIComponent(atob(sanitizedName));
-                            globalScene.gameData.renameSession(cursor, name).then(response => {
-                              if (response[0] === false) {
-                                globalScene.reset(true);
-                              } else {
-                                this.clearSessionSlots();
-                                this.cursorObj = null;
-                                this.populateSessionSlots();
-                                this.setScrollCursor(0);
-                                this.setCursor(0);
-                                ui.revertMode();
-                                ui.showText("", 0);
-                              }
-                            });
-                          },
-                          () => {
-                            ui.revertMode();
-                          },
-                        ],
-                      },
-                      "",
-                    );
-                    return true;
-                  },
-                });
-              }
-
-              this.manageDataConfig = {
-                xOffset: 0,
-                yOffset: 48,
-                options: manageDataOptions,
-                maxOptions: 4,
-              };
-
-              manageDataOptions.push({
-                label: i18next.t("saveSlotSelectUiHandler:deleteRun"),
-                handler: () => {
-                  globalScene.ui.revertMode();
-                  ui.showText(i18next.t("saveSlotSelectUiHandler:deleteData"), null, () => {
-                    ui.setOverlayMode(
-                      UiMode.CONFIRM,
-                      () => {
-                        globalScene.gameData.tryClearSession(cursor).then(response => {
-                          if (response[0] === false) {
-                            globalScene.reset(true);
-                          } else {
-                            this.clearSessionSlots();
-                            this.cursorObj = null;
-                            this.populateSessionSlots();
-                            this.setScrollCursor(0);
-                            this.setCursor(0);
-                            ui.revertMode();
-                            ui.showText("", 0);
-                          }
-                        });
-                      },
-                      () => {
-                        ui.revertMode();
-                        ui.showText("", 0);
-                      },
-                      false,
-                      0,
-                      19,
-                      import.meta.env.DEV ? 300 : 2000,
-                    );
-                  });
-                  return true;
-                },
-                keepOpen: false,
-              });
-
-              manageDataOptions.push({
-                label: i18next.t("menuUiHandler:cancel"),
-                handler: () => {
-                  globalScene.ui.revertMode();
-                  return true;
-                },
-                keepOpen: true,
-              });
-
-              ui.setOverlayMode(UiMode.MENU_OPTION_SELECT, this.manageDataConfig);
               break;
-
             case SaveSlotUiMode.SAVE: {
               const saveAndCallback = () => {
                 const originalCallback = this.saveSlotSelectCallback;
@@ -266,7 +161,6 @@ export class SaveSlotSelectUiHandler extends MessageUiHandler {
         }
       } else {
         this.saveSlotSelectCallback = null;
-        ui.showText("", 0);
         originalCallback?.(-1);
         success = true;
       }
@@ -373,34 +267,33 @@ export class SaveSlotSelectUiHandler extends MessageUiHandler {
       this.cursorObj = globalScene.add.container(0, 0);
       const cursorBox = globalScene.add.nineslice(
         0,
-        15,
+        0,
         "select_cursor_highlight_thick",
         undefined,
-        294,
+        296,
-        this.sessionSlots[prevSlotIndex ?? 0]?.saveData?.runNameText ? 50 : 60,
+        44,
         6,
         6,
         6,
         6,
       );
       const rightArrow = globalScene.add.image(0, 0, "cursor");
-      rightArrow.setPosition(160, 15);
+      rightArrow.setPosition(160, 0);
       rightArrow.setName("rightArrow");
       this.cursorObj.add([cursorBox, rightArrow]);
       this.sessionSlotsContainer.add(this.cursorObj);
     }
     const cursorPosition = cursor + this.scrollCursor;
-    const cursorIncrement = cursorPosition * 76;
+    const cursorIncrement = cursorPosition * 56;
     if (this.sessionSlots[cursorPosition] && this.cursorObj) {
-      const session = this.sessionSlots[cursorPosition];
+      const hasData = this.sessionSlots[cursorPosition].hasData;
-      const hasData = session.hasData && !session.malformed;
       // If the session slot lacks session data, it does not move from its default, central position.
       // Only session slots with session data will move leftwards and have a visible arrow.
       if (!hasData) {
-        this.cursorObj.setPosition(151, 20 + cursorIncrement);
+        this.cursorObj.setPosition(151, 26 + cursorIncrement);
         this.sessionSlots[cursorPosition].setPosition(0, cursorIncrement);
       } else {
-        this.cursorObj.setPosition(145, 20 + cursorIncrement);
+        this.cursorObj.setPosition(145, 26 + cursorIncrement);
         this.sessionSlots[cursorPosition].setPosition(-6, cursorIncrement);
       }
       this.setArrowVisibility(hasData);
@@ -418,8 +311,7 @@ export class SaveSlotSelectUiHandler extends MessageUiHandler {
   revertSessionSlot(slotIndex: number): void {
     const sessionSlot = this.sessionSlots[slotIndex];
     if (sessionSlot) {
-      const valueHeight = 76;
+      sessionSlot.setPosition(0, slotIndex * 56);
-      sessionSlot.setPosition(0, slotIndex * valueHeight);
     }
   }
 
@@ -448,7 +340,7 @@ export class SaveSlotSelectUiHandler extends MessageUiHandler {
       this.setCursor(this.cursor, prevSlotIndex);
       globalScene.tweens.add({
         targets: this.sessionSlotsContainer,
-        y: this.sessionSlotsContainerInitialY - 76 * scrollCursor,
+        y: this.sessionSlotsContainerInitialY - 56 * scrollCursor,
         duration: fixedInt(325),
         ease: "Sine.easeInOut",
       });
@@ -482,14 +374,12 @@ export class SaveSlotSelectUiHandler extends MessageUiHandler {
 class SessionSlot extends Phaser.GameObjects.Container {
   public slotId: number;
   public hasData: boolean;
-  /** Indicates the save slot ran into an error while being loaded */
-  public malformed: boolean;
-  private slotWindow: Phaser.GameObjects.NineSlice;
   private loadingLabel: Phaser.GameObjects.Text;
+
   public saveData: SessionSaveData;
 
   constructor(slotId: number) {
-    super(globalScene, 0, slotId * 76);
+    super(globalScene, 0, slotId * 56);
 
     this.slotId = slotId;
 
@@ -497,89 +387,32 @@ class SessionSlot extends Phaser.GameObjects.Container {
   }
 
   setup() {
-    this.slotWindow = addWindow(0, 0, 304, 70);
+    const slotWindow = addWindow(0, 0, 304, 52);
-    this.add(this.slotWindow);
+    this.add(slotWindow);
 
-    this.loadingLabel = addTextObject(152, 33, i18next.t("saveSlotSelectUiHandler:loading"), TextStyle.WINDOW);
+    this.loadingLabel = addTextObject(152, 26, i18next.t("saveSlotSelectUiHandler:loading"), TextStyle.WINDOW);
     this.loadingLabel.setOrigin(0.5, 0.5);
     this.add(this.loadingLabel);
   }
 
-  /**
-   * Generates a name for sessions that don't have a name yet.
-   * @param data - The {@linkcode SessionSaveData} being checked
-   * @returns The default name for the given data.
-   */
-  decideFallback(data: SessionSaveData): string {
-    let fallbackName = `${GameMode.getModeName(data.gameMode)}`;
-    switch (data.gameMode) {
-      case GameModes.CLASSIC:
-        fallbackName += ` (${globalScene.gameData.gameStats.classicSessionsPlayed + 1})`;
-        break;
-      case GameModes.ENDLESS:
-      case GameModes.SPLICED_ENDLESS:
-        fallbackName += ` (${globalScene.gameData.gameStats.endlessSessionsPlayed + 1})`;
-        break;
-      case GameModes.DAILY: {
-        const runDay = new Date(data.timestamp).toLocaleDateString();
-        fallbackName += ` (${runDay})`;
-        break;
-      }
-      case GameModes.CHALLENGE: {
-        const activeChallenges = data.challenges.filter(c => c.value !== 0);
-        if (activeChallenges.length === 0) {
-          break;
-        }
-
-        fallbackName = "";
-        for (const challenge of activeChallenges.slice(0, 3)) {
-          if (fallbackName !== "") {
-            fallbackName += ", ";
-          }
-          fallbackName += challenge.toChallenge().getName();
-        }
-
-        if (activeChallenges.length > 3) {
-          fallbackName += ", ...";
-        } else if (fallbackName === "") {
-          // Something went wrong when retrieving the names of the active challenges,
-          // so fall back to just naming the run "Challenge"
-          fallbackName = `${GameMode.getModeName(data.gameMode)}`;
-        }
-        break;
-      }
-    }
-    return fallbackName;
-  }
-
   async setupWithData(data: SessionSaveData) {
-    const hasName = data?.runNameText;
     this.remove(this.loadingLabel, true);
-    if (hasName) {
-      const nameLabel = addTextObject(8, 5, data.runNameText, TextStyle.WINDOW);
-      this.add(nameLabel);
-    } else {
-      const fallbackName = this.decideFallback(data);
-      await globalScene.gameData.renameSession(this.slotId, fallbackName);
-      const nameLabel = addTextObject(8, 5, fallbackName, TextStyle.WINDOW);
-      this.add(nameLabel);
-    }
 
     const gameModeLabel = addTextObject(
       8,
-      19,
+      5,
       `${GameMode.getModeName(data.gameMode) || i18next.t("gameMode:unknown")} - ${i18next.t("saveSlotSelectUiHandler:wave")} ${data.waveIndex}`,
       TextStyle.WINDOW,
     );
     this.add(gameModeLabel);
 
-    const timestampLabel = addTextObject(8, 33, new Date(data.timestamp).toLocaleString(), TextStyle.WINDOW);
+    const timestampLabel = addTextObject(8, 19, new Date(data.timestamp).toLocaleString(), TextStyle.WINDOW);
     this.add(timestampLabel);
 
-    const playTimeLabel = addTextObject(8, 47, getPlayTimeString(data.playTime), TextStyle.WINDOW);
+    const playTimeLabel = addTextObject(8, 33, getPlayTimeString(data.playTime), TextStyle.WINDOW);
     this.add(playTimeLabel);
 
-    const pokemonIconsContainer = globalScene.add.container(144, 16);
+    const pokemonIconsContainer = globalScene.add.container(144, 4);
     data.party.forEach((p: PokemonData, i: number) => {
       const iconContainer = globalScene.add.container(26 * i, 0);
       iconContainer.setScale(0.75);
@@ -594,9 +427,13 @@ class SessionSlot extends Phaser.GameObjects.Container {
         TextStyle.PARTY,
         { fontSize: "54px", color: "#f8f8f8" },
       );
-      text.setShadow(0, 0, undefined).setStroke("#424242", 14).setOrigin(1, 0);
+      text.setShadow(0, 0, undefined);
+      text.setStroke("#424242", 14);
+      text.setOrigin(1, 0);
+
+      iconContainer.add(icon);
+      iconContainer.add(text);
 
-      iconContainer.add([icon, text]);
       pokemonIconsContainer.add(iconContainer);
 
       pokemon.destroy();
@@ -604,7 +441,7 @@ class SessionSlot extends Phaser.GameObjects.Container {
 
     this.add(pokemonIconsContainer);
 
-    const modifierIconsContainer = globalScene.add.container(148, 38);
+    const modifierIconsContainer = globalScene.add.container(148, 30);
     modifierIconsContainer.setScale(0.5);
     let visibleModifierIndex = 0;
     for (const m of data.modifiers) {
@@ -627,33 +464,22 @@ class SessionSlot extends Phaser.GameObjects.Container {
 
   load(): Promise<boolean> {
     return new Promise<boolean>(resolve => {
-      globalScene.gameData
+      globalScene.gameData.getSession(this.slotId).then(async sessionData => {
-        .getSession(this.slotId)
+        // Ignore the results if the view was exited
-        .then(async sessionData => {
+        if (!this.active) {
-          // Ignore the results if the view was exited
+          return;
-          if (!this.active) {
+        }
-            return;
+        if (!sessionData) {
-          }
+          this.hasData = false;
-          this.hasData = !!sessionData;
+          this.loadingLabel.setText(i18next.t("saveSlotSelectUiHandler:empty"));
-          if (!sessionData) {
+          resolve(false);
-            this.loadingLabel.setText(i18next.t("saveSlotSelectUiHandler:empty"));
+          return;
-            resolve(false);
+        }
-            return;
+        this.hasData = true;
-          }
+        this.saveData = sessionData;
-          this.saveData = sessionData;
+        await this.setupWithData(sessionData);
-          this.setupWithData(sessionData);
+        resolve(true);
-          resolve(true);
+      });
-        })
-        .catch(e => {
-          if (!this.active) {
-            return;
-          }
-          console.warn(`Failed to load session slot #${this.slotId}:`, e);
-          this.loadingLabel.setText(i18next.t("menu:failedToLoadSession"));
-          this.hasData = true;
-          this.malformed = true;
-          resolve(true);
-        });
     });
   }
 }

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/ui/ui.ts

@@ -60,7 +60,6 @@ import { addWindow } from "#ui/ui-theme";
 import { UnavailableModalUiHandler } from "#ui/unavailable-modal-ui-handler";
 import { executeIf } from "#utils/common";
 import i18next from "i18next";
-import { RenameRunFormUiHandler } from "./rename-run-ui-handler";
 
 const transitionModes = [
   UiMode.SAVE_SLOT,
@@ -99,7 +98,6 @@ const noTransitionModes = [
   UiMode.SESSION_RELOAD,
   UiMode.UNAVAILABLE,
   UiMode.RENAME_POKEMON,
-  UiMode.RENAME_RUN,
   UiMode.TEST_DIALOGUE,
   UiMode.AUTO_COMPLETE,
   UiMode.ADMIN,
@@ -170,7 +168,6 @@ export class UI extends Phaser.GameObjects.Container {
       new UnavailableModalUiHandler(),
       new GameChallengesUiHandler(),
       new RenameFormUiHandler(),
-      new RenameRunFormUiHandler(),
       new RunHistoryUiHandler(),
       new RunInfoUiHandler(),
       new TestDialogueUiHandler(UiMode.TEST_DIALOGUE),

test/@types/vitest.d.ts

@@ -130,7 +130,7 @@ declare module "vitest" {
      * @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},
      * does not contain {@linkcode expectedMove}
      * or contains the desired move more than once, this will fail the test.
      */

test/moves/whirlwind.test.ts

@@ -1,3 +1,4 @@
+import { globalScene } from "#app/global-scene";
 import { Status } from "#data/status-effect";
 import { AbilityId } from "#enums/ability-id";
 import { BattleType } from "#enums/battle-type";
@@ -178,13 +179,18 @@ describe("Moves - Whirlwind", () => {
     const eligibleEnemy = enemyParty.filter(p => p.hp > 0 && p.isAllowedInBattle());
     expect(eligibleEnemy.length).toBe(1);
 
+    // Spy on the queueMessage function
+    const queueSpy = vi.spyOn(globalScene.phaseManager, "queueMessage");
+
     // Player uses Whirlwind; opponent uses Splash
     game.move.select(MoveId.WHIRLWIND);
     await game.move.selectEnemyMove(MoveId.SPLASH);
     await game.toNextTurn();
 
-    const player = game.field.getPlayerPokemon();
+    // Verify that the failure message is displayed for Whirlwind
-    expect(player).toHaveUsedMove({ move: MoveId.WHIRLWIND, result: MoveResult.FAIL });
+    expect(queueSpy).toHaveBeenCalledWith(expect.stringContaining("But it failed"));
+    // Verify the opponent's Splash message
+    expect(queueSpy).toHaveBeenCalledWith(expect.stringContaining("But nothing happened!"));
   });
 
   it("should not pull in the other trainer's pokemon in a partner trainer battle", async () => {

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/system/rename-run.test.ts

@@ -1,82 +0,0 @@
-import * as account from "#app/account";
-import * as bypassLoginModule from "#app/global-vars/bypass-login";
-import { pokerogueApi } from "#app/plugins/api/pokerogue-api";
-import type { SessionSaveData } from "#app/system/game-data";
-import { AbilityId } from "#enums/ability-id";
-import { MoveId } from "#enums/move-id";
-import { GameManager } from "#test/test-utils/game-manager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-
-describe("System - Rename Run", () => {
-  let phaserGame: Phaser.Game;
-  let game: GameManager;
-
-  beforeAll(() => {
-    phaserGame = new Phaser.Game({
-      type: Phaser.HEADLESS,
-    });
-  });
-
-  beforeEach(() => {
-    game = new GameManager(phaserGame);
-    game.override
-      .moveset([MoveId.SPLASH])
-      .battleStyle("single")
-      .enemyAbility(AbilityId.BALL_FETCH)
-      .enemyMoveset(MoveId.SPLASH);
-  });
-
-  afterEach(() => {
-    game.phaseInterceptor.restoreOg();
-  });
-
-  describe("renameSession", () => {
-    beforeEach(() => {
-      vi.spyOn(bypassLoginModule, "bypassLogin", "get").mockReturnValue(false);
-      vi.spyOn(account, "updateUserInfo").mockImplementation(async () => [true, 1]);
-    });
-
-    it("should return false if slotId < 0", async () => {
-      const result = await game.scene.gameData.renameSession(-1, "Named Run");
-
-      expect(result).toEqual(false);
-    });
-
-    it("should return false if getSession returns null", async () => {
-      vi.spyOn(game.scene.gameData, "getSession").mockResolvedValue(null as unknown as SessionSaveData);
-
-      const result = await game.scene.gameData.renameSession(-1, "Named Run");
-
-      expect(result).toEqual(false);
-    });
-
-    it("should return true if bypassLogin is true", async () => {
-      vi.spyOn(bypassLoginModule, "bypassLogin", "get").mockReturnValue(true);
-      vi.spyOn(game.scene.gameData, "getSession").mockResolvedValue({} as SessionSaveData);
-
-      const result = await game.scene.gameData.renameSession(0, "Named Run");
-
-      expect(result).toEqual(true);
-    });
-
-    it("should return false if api returns error", async () => {
-      vi.spyOn(game.scene.gameData, "getSession").mockResolvedValue({} as SessionSaveData);
-      vi.spyOn(pokerogueApi.savedata.session, "update").mockResolvedValue("Unknown Error!");
-
-      const result = await game.scene.gameData.renameSession(0, "Named Run");
-
-      expect(result).toEqual(false);
-    });
-
-    it("should return true if api is succesfull", async () => {
-      vi.spyOn(game.scene.gameData, "getSession").mockResolvedValue({} as SessionSaveData);
-      vi.spyOn(pokerogueApi.savedata.session, "update").mockResolvedValue("");
-
-      const result = await game.scene.gameData.renameSession(0, "Named Run");
-
-      expect(result).toEqual(true);
-      expect(account.updateUserInfo).toHaveBeenCalled();
-    });
-  });
-});

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: false,