Merge branch 'beta' into bug/issue_4029

2025-07-13 11:52:18 +02:00 · 2024-09-05 23:59:15 -07:00 · 2024-09-05 23:59:15 -07:00 · 238ce52572
commit 238ce52572
parent 262e5a9321 f1650d2515
54 changed files with 3853 additions and 12583 deletions
--- a/public/images/pokemon/variant/465.json
+++ b/public/images/pokemon/variant/465.json
@ -0,0 +1,22 @@
+{
+	"1": {
+		"529cc5": "8153c7",
+		"d65a94": "5ad662",
+		"3a73ad": "6b3aad",
+		"bd216b": "21bd69",
+		"5a193a": "195a2a",
+		"193a63": "391963",
+		"295a84": "472984"
+	},
+	"2": {
+		"529cc5": "ffedb6",
+		"d65a94": "e67d2f",
+		"3a73ad": "ebc582",
+		"bd216b": "b35131",
+		"31313a": "3d1519",
+		"5a193a": "752e2e",
+		"193a63": "705040",
+		"295a84": "ad875a",
+		"4a4a52": "57211a"
+	}
+}
--- a/public/images/pokemon/variant/465_2.json
+++ b/public/images/pokemon/variant/465_2.json
--- a/public/images/pokemon/variant/465_2.png
+++ b/public/images/pokemon/variant/465_2.png
--- a/public/images/pokemon/variant/465_3.json
+++ b/public/images/pokemon/variant/465_3.json
--- a/public/images/pokemon/variant/465_3.png
+++ b/public/images/pokemon/variant/465_3.png
--- a/public/images/pokemon/variant/_masterlist.json
+++ b/public/images/pokemon/variant/_masterlist.json
@ -1691,8 +1691,8 @@
 	],
 	"465": [
 		0,
-		2,
-		2
+		1,
+		1
 	],
 	"466": [
 		1,
@ -3980,6 +3980,11 @@
 			1,
 			1
 		],
+		"465": [
+			0,
+			1,
+			1
+		],
 		"592": [
 			1,
 			1,
@ -5690,7 +5695,7 @@
 		"465": [
 			0,
 			1,
-			2
+			1
 		],
 		"466": [
 			2,
@ -8008,6 +8013,11 @@
 				1,
 				1
 			],
+			"465": [
+				0,
+				1,
+				1
+			],
 			"592": [
 				1,
 				1,
--- a/public/images/pokemon/variant/back/465.json
+++ b/public/images/pokemon/variant/back/465.json
@ -8,5 +8,14 @@
 		"bd216b": "21bd69",
 		"31313a": "31313a",
 		"d65a94": "5ad662"
+	},
+	"2": {
+		"5a193a": "752e2e",
+		"31313a": "3d1519",
+		"d65a94": "e67d2f",
+		"3a73ad": "ebc582",
+		"295a84": "ad875a",
+		"bd216b": "b35131",
+		"193a63": "705040"
 	}
 }
--- a/public/images/pokemon/variant/back/465_3.json
+++ b/public/images/pokemon/variant/back/465_3.json
--- a/public/images/pokemon/variant/back/465_3.png
+++ b/public/images/pokemon/variant/back/465_3.png
--- a/public/images/pokemon/variant/back/female/465.json
+++ b/public/images/pokemon/variant/back/female/465.json
@ -0,0 +1,21 @@
+{
+	"1": {
+		"193a63": "391963",
+		"295a84": "472984",
+		"3a73ad": "6b3aad",
+		"000000": "000000",
+		"5a193a": "195a2a",
+		"bd216b": "21bd69",
+		"31313a": "31313a",
+		"d65a94": "5ad662"
+	},
+	"2": {
+		"5a193a": "752e2e",
+		"31313a": "3d1519",
+		"d65a94": "e67d2f",
+		"3a73ad": "ebc582",
+		"295a84": "ad875a",
+		"bd216b": "b35131",
+		"193a63": "705040"
+	}
+}
--- a/public/images/pokemon/variant/female/465.json
+++ b/public/images/pokemon/variant/female/465.json
@ -0,0 +1,22 @@
+{
+	"1": {
+		"529cc5": "8153c7",
+		"d65a94": "5ad662",
+		"3a73ad": "6b3aad",
+		"bd216b": "21bd69",
+		"5a193a": "195a2a",
+		"193a63": "391963",
+		"295a84": "472984"
+	},
+	"2": {
+		"529cc5": "ffedb6",
+		"d65a94": "e67d2f",
+		"3a73ad": "ebc582",
+		"bd216b": "b35131",
+		"31313a": "3d1519",
+		"5a193a": "752e2e",
+		"193a63": "705040",
+		"295a84": "ad875a",
+		"4a4a52": "57211a"
+	}
+}
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@ -855,7 +855,7 @@ export default class BattleScene extends SceneBase {
    overrideModifiers(this, false);
    overrideHeldItems(this, pokemon, false);
    if (boss && !dataSource) {
-      const secondaryIvs = Utils.getIvsFromId(Utils.randSeedInt(4294967295));
+      const secondaryIvs = Utils.getIvsFromId(Utils.randSeedInt(4294967296));

      for (let s = 0; s < pokemon.ivs.length; s++) {
        pokemon.ivs[s] = Math.round(Phaser.Math.Linear(Math.min(pokemon.ivs[s], secondaryIvs[s]), Math.max(pokemon.ivs[s], secondaryIvs[s]), 0.75));
@ -961,6 +961,16 @@ export default class BattleScene extends SceneBase {
    this.offsetGym = this.gameMode.isClassic && this.getGeneratedOffsetGym();
  }

+  /**
+   * Generates a random number using the current battle's seed
+   *
+   * This calls {@linkcode Battle.randSeedInt}(`scene`, {@linkcode range}, {@linkcode min}) in `src/battle.ts`
+   * which calls {@linkcode Utils.randSeedInt randSeedInt}({@linkcode range}, {@linkcode min}) in `src/utils.ts`
+   *
+   * @param range How large of a range of random numbers to choose from. If {@linkcode range} <= 1, returns {@linkcode min}
+   * @param min The minimum integer to pick, default `0`
+   * @returns A random integer between {@linkcode min} and ({@linkcode min} + {@linkcode range} - 1)
+   */
  randBattleSeedInt(range: integer, min: integer = 0): integer {
    return this.currentBattle?.randSeedInt(this, range, min);
  }
@ -1112,7 +1122,8 @@ export default class BattleScene extends SceneBase {
            doubleTrainer = false;
          }
        }
-        newTrainer = trainerData !== undefined ? trainerData.toTrainer(this) : new Trainer(this, trainerType, doubleTrainer ? TrainerVariant.DOUBLE : Utils.randSeedInt(2) ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT);
+        const variant = doubleTrainer ? TrainerVariant.DOUBLE : (Utils.randSeedInt(2) ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT);
+        newTrainer = trainerData !== undefined ? trainerData.toTrainer(this) : new Trainer(this, trainerType, variant);
        this.field.add(newTrainer);
      }
    }
@ -2620,7 +2631,7 @@ export default class BattleScene extends SceneBase {
        if (mods.length < 1) {
          return mods;
        }
-        const rand = Math.floor(Utils.randSeedInt(mods.length));
+        const rand = Utils.randSeedInt(mods.length);
        return [mods[rand], ...shuffleModifiers(mods.filter((_, i) => i !== rand))];
      };
      modifiers = shuffleModifiers(modifiers);
--- a/src/battle.ts
+++ b/src/battle.ts
@ -354,6 +354,12 @@ export default class Battle {
    return null;
  }

+  /**
+   * Generates a random number using the current battle's seed. Calls {@linkcode Utils.randSeedInt}
+   * @param range How large of a range of random numbers to choose from. If {@linkcode range} <= 1, returns {@linkcode min}
+   * @param min The minimum integer to pick, default `0`
+   * @returns A random integer between {@linkcode min} and ({@linkcode min} + {@linkcode range} - 1)
+   */
  randSeedInt(scene: BattleScene, range: number, min: number = 0): number {
    if (range <= 1) {
      return min;
--- a/src/data/ability.ts
+++ b/src/data/ability.ts
@ -2642,7 +2642,7 @@ export class ConfusionOnStatusEffectAbAttr extends PostAttackAbAttr {
      if (simulated) {
        return defender.canAddTag(BattlerTagType.CONFUSED);
      } else {
-        return defender.addTag(BattlerTagType.CONFUSED, pokemon.randSeedInt(3, 2), move.id, defender.id);
+        return defender.addTag(BattlerTagType.CONFUSED, pokemon.randSeedIntRange(2, 5), move.id, defender.id);
      }
    }
    return false;
--- a/src/data/battler-tags.ts
+++ b/src/data/battler-tags.ts
@ -486,7 +486,7 @@ export class ConfusedTag extends BattlerTag {
      if (pokemon.randSeedInt(3) === 0) {
        const atk = pokemon.getEffectiveStat(Stat.ATK);
        const def = pokemon.getEffectiveStat(Stat.DEF);
-        const damage = Utils.toDmgValue(((((2 * pokemon.level / 5 + 2) * 40 * atk / def) / 50) + 2) * (pokemon.randSeedInt(15, 85) / 100));
+        const damage = Utils.toDmgValue(((((2 * pokemon.level / 5 + 2) * 40 * atk / def) / 50) + 2) * (pokemon.randSeedIntRange(85, 100) / 100));
        pokemon.scene.queueMessage(i18next.t("battlerTags:confusedLapseHurtItself"));
        pokemon.damageAndUpdate(damage);
        pokemon.battleData.hitCount++;
--- a/src/data/egg.ts
+++ b/src/data/egg.ts
@ -15,7 +15,7 @@ export const EGG_SEED = 1073741824;
 // Rates for specific random properties in 1/x
 const DEFAULT_SHINY_RATE = 128;
 const GACHA_SHINY_UP_SHINY_RATE = 64;
-const SAME_SPECIES_EGG_SHINY_RATE = 24;
+const SAME_SPECIES_EGG_SHINY_RATE = 12;
 const SAME_SPECIES_EGG_HA_RATE = 8;
 const MANAPHY_EGG_MANAPHY_RATE = 8;
 const GACHA_EGG_HA_RATE = 192;
--- a/src/data/move.ts
+++ b/src/data/move.ts
@ -4400,7 +4400,7 @@ export class AddBattlerTagAttr extends MoveEffectAttr {

    const moveChance = this.getMoveChance(user, target, move, this.selfTarget, true);
    if (moveChance < 0 || moveChance === 100 || user.randSeedInt(100) < moveChance) {
-      return (this.selfTarget ? user : target).addTag(this.tagType,  user.randSeedInt(this.turnCountMax - this.turnCountMin, this.turnCountMin), move.id, user.id);
+      return (this.selfTarget ? user : target).addTag(this.tagType,  user.randSeedIntRange(this.turnCountMin, this.turnCountMax), move.id, user.id);
    }

    return false;
@ -6234,6 +6234,8 @@ const userSleptOrComatoseCondition: MoveConditionFunc = (user: Pokemon, target:

 const targetSleptOrComatoseCondition: MoveConditionFunc = (user: Pokemon, target: Pokemon, move: Move) =>  target.status?.effect === StatusEffect.SLEEP || target.hasAbility(Abilities.COMATOSE);

+const failIfLastCondition: MoveConditionFunc = (user: Pokemon, target: Pokemon, move: Move) => user.scene.phaseQueue.find(phase => phase instanceof MovePhase) !== undefined;
+
 export type MoveAttrFilter = (attr: MoveAttr) => boolean;

 function applyMoveAttrsInternal(attrFilter: MoveAttrFilter, user: Pokemon | null, target: Pokemon | null, move: Move, args: any[]): Promise<void> {
@ -6972,7 +6974,8 @@ export function initMoves() {
      .attr(StatusEffectAttr, StatusEffect.FREEZE)
      .target(MoveTarget.ALL_NEAR_ENEMIES),
    new SelfStatusMove(Moves.PROTECT, Type.NORMAL, -1, 10, -1, 4, 2)
-      .attr(ProtectAttr),
+      .attr(ProtectAttr)
+      .condition(failIfLastCondition),
    new AttackMove(Moves.MACH_PUNCH, Type.FIGHTING, MoveCategory.PHYSICAL, 40, 100, 30, -1, 1, 2)
      .punchingMove(),
    new StatusMove(Moves.SCARY_FACE, Type.NORMAL, 100, 10, -1, 0, 2)
@ -7023,7 +7026,8 @@ export function initMoves() {
      .windMove()
      .target(MoveTarget.ALL_NEAR_ENEMIES),
    new SelfStatusMove(Moves.DETECT, Type.FIGHTING, -1, 5, -1, 4, 2)
-      .attr(ProtectAttr),
+      .attr(ProtectAttr)
+      .condition(failIfLastCondition),
    new AttackMove(Moves.BONE_RUSH, Type.GROUND, MoveCategory.PHYSICAL, 25, 90, 10, -1, 0, 2)
      .attr(MultiHitAttr)
      .makesContact(false),
@ -7041,7 +7045,8 @@ export function initMoves() {
      .attr(HitHealAttr)
      .triageMove(),
    new SelfStatusMove(Moves.ENDURE, Type.NORMAL, -1, 10, -1, 4, 2)
-      .attr(ProtectAttr, BattlerTagType.ENDURING),
+      .attr(ProtectAttr, BattlerTagType.ENDURING)
+      .condition(failIfLastCondition),
    new StatusMove(Moves.CHARM, Type.FAIRY, 100, 20, -1, 0, 2)
      .attr(StatStageChangeAttr, [ Stat.ATK ], -2),
    new AttackMove(Moves.ROLLOUT, Type.ROCK, MoveCategory.PHYSICAL, 30, 90, 20, -1, 0, 2)
@ -7788,7 +7793,8 @@ export function initMoves() {
      .attr(StatStageChangeAttr, [ Stat.ATK, Stat.ACC ], 1, true),
    new StatusMove(Moves.WIDE_GUARD, Type.ROCK, -1, 10, -1, 3, 5)
      .target(MoveTarget.USER_SIDE)
-      .attr(AddArenaTagAttr, ArenaTagType.WIDE_GUARD, 1, true, true),
+      .attr(AddArenaTagAttr, ArenaTagType.WIDE_GUARD, 1, true, true)
+      .condition(failIfLastCondition),
    new StatusMove(Moves.GUARD_SPLIT, Type.PSYCHIC, -1, 10, -1, 0, 5)
      .attr(AverageStatsAttr, [ Stat.DEF, Stat.SPDEF ], "moveTriggers:sharedGuard"),
    new StatusMove(Moves.POWER_SPLIT, Type.PSYCHIC, -1, 10, -1, 0, 5)
@ -7876,7 +7882,8 @@ export function initMoves() {
      .attr(PositiveStatStagePowerAttr),
    new StatusMove(Moves.QUICK_GUARD, Type.FIGHTING, -1, 15, -1, 3, 5)
      .target(MoveTarget.USER_SIDE)
-      .attr(AddArenaTagAttr, ArenaTagType.QUICK_GUARD, 1, true, true),
+      .attr(AddArenaTagAttr, ArenaTagType.QUICK_GUARD, 1, true, true)
+      .condition(failIfLastCondition),
    new SelfStatusMove(Moves.ALLY_SWITCH, Type.PSYCHIC, -1, 15, -1, 2, 5)
      .ignoresProtect()
      .unimplemented(),
@ -8047,7 +8054,8 @@ export function initMoves() {
    new StatusMove(Moves.MAT_BLOCK, Type.FIGHTING, -1, 10, -1, 0, 6)
      .target(MoveTarget.USER_SIDE)
      .attr(AddArenaTagAttr, ArenaTagType.MAT_BLOCK, 1, true, true)
-      .condition(new FirstMoveCondition()),
+      .condition(new FirstMoveCondition())
+      .condition(failIfLastCondition),
    new AttackMove(Moves.BELCH, Type.POISON, MoveCategory.SPECIAL, 120, 90, 10, -1, 0, 6)
      .condition((user, target, move) => user.battleData.berriesEaten.length > 0),
    new StatusMove(Moves.ROTOTILLER, Type.GROUND, -1, 10, -1, 0, 6)
@ -8105,7 +8113,8 @@ export function initMoves() {
      .triageMove(),
    new StatusMove(Moves.CRAFTY_SHIELD, Type.FAIRY, -1, 10, -1, 3, 6)
      .target(MoveTarget.USER_SIDE)
-      .attr(AddArenaTagAttr, ArenaTagType.CRAFTY_SHIELD, 1, true, true),
+      .attr(AddArenaTagAttr, ArenaTagType.CRAFTY_SHIELD, 1, true, true)
+      .condition(failIfLastCondition),
    new StatusMove(Moves.FLOWER_SHIELD, Type.FAIRY, -1, 10, -1, 0, 6)
      .target(MoveTarget.ALL)
      .attr(StatStageChangeAttr, [ Stat.DEF ], 1, false, (user, target, move) => target.getTypes().includes(Type.GRASS) && !target.getTag(SemiInvulnerableTag)),
@ -8130,7 +8139,8 @@ export function initMoves() {
      .target(MoveTarget.BOTH_SIDES)
      .unimplemented(),
    new SelfStatusMove(Moves.KINGS_SHIELD, Type.STEEL, -1, 10, -1, 4, 6)
-      .attr(ProtectAttr, BattlerTagType.KINGS_SHIELD),
+      .attr(ProtectAttr, BattlerTagType.KINGS_SHIELD)
+      .condition(failIfLastCondition),
    new StatusMove(Moves.PLAY_NICE, Type.NORMAL, -1, 20, -1, 0, 6)
      .attr(StatStageChangeAttr, [ Stat.ATK ], -1),
    new StatusMove(Moves.CONFIDE, Type.NORMAL, -1, 20, -1, 0, 6)
@ -8153,7 +8163,8 @@ export function initMoves() {
    new AttackMove(Moves.MYSTICAL_FIRE, Type.FIRE, MoveCategory.SPECIAL, 75, 100, 10, 100, 0, 6)
      .attr(StatStageChangeAttr, [ Stat.SPATK ], -1),
    new SelfStatusMove(Moves.SPIKY_SHIELD, Type.GRASS, -1, 10, -1, 4, 6)
-      .attr(ProtectAttr, BattlerTagType.SPIKY_SHIELD),
+      .attr(ProtectAttr, BattlerTagType.SPIKY_SHIELD)
+      .condition(failIfLastCondition),
    new StatusMove(Moves.AROMATIC_MIST, Type.FAIRY, -1, 20, -1, 0, 6)
      .attr(StatStageChangeAttr, [ Stat.SPDEF ], 1)
      .target(MoveTarget.NEAR_ALLY),
@ -8349,7 +8360,8 @@ export function initMoves() {
    new AttackMove(Moves.FIRST_IMPRESSION, Type.BUG, MoveCategory.PHYSICAL, 90, 100, 10, -1, 2, 7)
      .condition(new FirstMoveCondition()),
    new SelfStatusMove(Moves.BANEFUL_BUNKER, Type.POISON, -1, 10, -1, 4, 7)
-      .attr(ProtectAttr, BattlerTagType.BANEFUL_BUNKER),
+      .attr(ProtectAttr, BattlerTagType.BANEFUL_BUNKER)
+      .condition(failIfLastCondition),
    new AttackMove(Moves.SPIRIT_SHACKLE, Type.GHOST, MoveCategory.PHYSICAL, 80, 100, 10, 100, 0, 7)
      .attr(AddBattlerTagAttr, BattlerTagType.TRAPPED, false, false, 1, 1, true)
      .makesContact(false),
@ -8592,6 +8604,7 @@ export function initMoves() {
    /* Unused */
    new SelfStatusMove(Moves.MAX_GUARD, Type.NORMAL, -1, 10, -1, 4, 8)
      .attr(ProtectAttr)
+      .condition(failIfLastCondition)
      .ignoresVirtual(),
    /* End Unused */
    new AttackMove(Moves.DYNAMAX_CANNON, Type.DRAGON, MoveCategory.SPECIAL, 100, 100, 5, -1, 0, 8)
@ -8770,7 +8783,8 @@ export function initMoves() {
      .target(MoveTarget.USER_AND_ALLIES)
      .ignoresProtect(),
    new SelfStatusMove(Moves.OBSTRUCT, Type.DARK, 100, 10, -1, 4, 8)
-      .attr(ProtectAttr, BattlerTagType.OBSTRUCT),
+      .attr(ProtectAttr, BattlerTagType.OBSTRUCT)
+      .condition(failIfLastCondition),
    new AttackMove(Moves.FALSE_SURRENDER, Type.DARK, MoveCategory.PHYSICAL, 80, -1, 10, -1, 0, 8),
    new AttackMove(Moves.METEOR_ASSAULT, Type.FIGHTING, MoveCategory.PHYSICAL, 150, 100, 5, -1, 0, 8)
      .attr(RechargeAttr)
@ -9058,10 +9072,10 @@ export function initMoves() {
      .attr(TeraBlastCategoryAttr)
      .attr(TeraBlastTypeAttr)
      .attr(TeraBlastPowerAttr)
-      .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], -1, true, (user, target, move) => user.isTerastallized() && user.isOfType(Type.STELLAR))
-      .partial(),
+      .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], -1, true, (user, target, move) => user.isTerastallized() && user.isOfType(Type.STELLAR)),
    new SelfStatusMove(Moves.SILK_TRAP, Type.BUG, -1, 10, -1, 4, 9)
-      .attr(ProtectAttr, BattlerTagType.SILK_TRAP),
+      .attr(ProtectAttr, BattlerTagType.SILK_TRAP)
+      .condition(failIfLastCondition),
    new AttackMove(Moves.AXE_KICK, Type.FIGHTING, MoveCategory.PHYSICAL, 120, 90, 10, 30, 0, 9)
      .attr(MissEffectAttr, crashDamageFunc)
      .attr(NoEffectAttr, crashDamageFunc)
@ -9253,7 +9267,8 @@ export function initMoves() {
      .attr(PreMoveMessageAttr, doublePowerChanceMessageFunc)
      .attr(DoublePowerChanceAttr),
    new SelfStatusMove(Moves.BURNING_BULWARK, Type.FIRE, -1, 10, -1, 4, 9)
-      .attr(ProtectAttr, BattlerTagType.BURNING_BULWARK),
+      .attr(ProtectAttr, BattlerTagType.BURNING_BULWARK)
+      .condition(failIfLastCondition),
    new AttackMove(Moves.THUNDERCLAP, Type.ELECTRIC, MoveCategory.SPECIAL, 70, 100, 5, -1, 1, 9)
      .condition((user, target, move) => user.scene.currentBattle.turnCommands[target.getBattlerIndex()]?.command === Command.FIGHT && !target.turnData.acted && allMoves[user.scene.currentBattle.turnCommands[target.getBattlerIndex()]?.move?.move!].category !== MoveCategory.STATUS), // TODO: is this bang correct?
    new AttackMove(Moves.MIGHTY_CLEAVE, Type.ROCK, MoveCategory.PHYSICAL, 95, 100, 5, -1, 0, 9)
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@ -1720,7 +1720,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
      };

    this.fusionSpecies = this.scene.randomSpecies(this.scene.currentBattle?.waveIndex || 0, this.level, false, filter, true);
-    this.fusionAbilityIndex = (this.fusionSpecies.abilityHidden && hasHiddenAbility ? this.fusionSpecies.ability2 ? 2 : 1 : this.fusionSpecies.ability2 ? randAbilityIndex : 0);
+    this.fusionAbilityIndex = (this.fusionSpecies.abilityHidden && hasHiddenAbility ? 2 : this.fusionSpecies.ability2 !== this.fusionSpecies.ability1 ? randAbilityIndex : 0);
    this.fusionShiny = this.shiny;
    this.fusionVariant = this.variant;

@ -2278,7 +2278,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {

        if (!isTypeImmune) {
          const levelMultiplier = (2 * source.level / 5 + 2);
-          const randomMultiplier = ((this.scene.randBattleSeedInt(16) + 85) / 100);
+          const randomMultiplier = (this.randSeedIntRange(85, 100) / 100);
          damage.value = Utils.toDmgValue((((levelMultiplier * power * sourceAtk.value / targetDef.value) / 50) + 2)
                                   * stabMultiplier.value
                                   * typeMultiplier
@ -3448,12 +3448,30 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    fusionCanvas.remove();
  }

+  /**
+   * Generates a random number using the current battle's seed, or the global seed if `this.scene.currentBattle` is falsy
+   * <!-- @import "../battle".Battle -->
+   * This calls either {@linkcode BattleScene.randBattleSeedInt}({@linkcode range}, {@linkcode min}) in `src/battle-scene.ts`
+   * which calls {@linkcode Battle.randSeedInt}(`scene`, {@linkcode range}, {@linkcode min}) in `src/battle.ts`
+   * which calls {@linkcode Utils.randSeedInt randSeedInt}({@linkcode range}, {@linkcode min}) in `src/utils.ts`,
+   * or it directly calls {@linkcode Utils.randSeedInt randSeedInt}({@linkcode range}, {@linkcode min}) in `src/utils.ts` if there is no current battle
+   *
+   * @param range How large of a range of random numbers to choose from. If {@linkcode range} <= 1, returns {@linkcode min}
+   * @param min The minimum integer to pick, default `0`
+   * @returns A random integer between {@linkcode min} and ({@linkcode min} + {@linkcode range} - 1)
+   */
  randSeedInt(range: integer, min: integer = 0): integer {
    return this.scene.currentBattle
      ? this.scene.randBattleSeedInt(range, min)
      : Utils.randSeedInt(range, min);
  }

+  /**
+   * Generates a random number using the current battle's seed, or the global seed if `this.scene.currentBattle` is falsy
+   * @param min The minimum integer to generate
+   * @param max The maximum integer to generate
+   * @returns a random integer between {@linkcode min} and {@linkcode max} inclusive
+   */
  randSeedIntRange(min: integer, max: integer): integer {
    return this.randSeedInt((max - min) + 1, min);
  }
--- a/src/locales/en/menu.json
+++ b/src/locales/en/menu.json
@ -51,5 +51,7 @@
  "renamePokemon": "Rename Pokémon",
  "rename": "Rename",
  "nickname": "Nickname",
-  "errorServerDown": "Oops! There was an issue contacting the server.\n\nYou may leave this window open,\nthe game will automatically reconnect."
+  "errorServerDown": "Oops! There was an issue contacting the server.\n\nYou may leave this window open,\nthe game will automatically reconnect.",
+  "noSaves": "You don't have any save files on record!",
+  "tooManySaves": "You have too many save files on record!"
 }
--- a/src/locales/ja/achv.json
+++ b/src/locales/ja/achv.json
@ -37,7 +37,7 @@
    "name_female": "ワンパンウーマン"
  },
  "HealAchv": {
-    "description": "一つの　技や　特性や　持っているアイテムで\n{{healAmount}}{{HP}}を　一気に　回復する"
+    "description": "一つの　技や　特性や　持たせたアイテムで\n{{HP}}{{healAmount}}を　一気に　回復する"
  },
  "250_HEAL": {
    "name": "回復発見者"
@ -52,7 +52,7 @@
    "name": "ジョーイさん"
  },
  "LevelAchv": {
-    "description": "一つの　ポケモンを　Lv{{level}}まで　レベルアップする"
+    "description": "一つの　ポケモンを　Lv.{{level}}まで　上げる"
  },
  "LV_100": {
    "name": "まだまだだよ"
@ -82,7 +82,7 @@
    "name": "マスターリーグチャンピオン"
  },
  "TRANSFER_MAX_STAT_STAGE": {
-    "name": "同力",
+    "name": "連係プレー",
    "description": "少なくとも　一つの　能力を　最大まで　あげて\n他の　手持ちポケモンに　バトンタッチする"
  },
  "MAX_FRIENDSHIP": {
@ -94,7 +94,7 @@
    "description": "一つの　手持ちポケモンを　メガシンカさせる"
  },
  "GIGANTAMAX": {
-    "name": "太―くて　堪らない",
+    "name": "太ーくて堪らない",
    "description": "一つの　手持ちポケモンを　キョダイマックスさせる"
  },
  "TERASTALLIZE": {
@ -106,7 +106,7 @@
    "description": "一つの　手持ちポケモンを　ステラ・テラスタルさせる"
  },
  "SPLICE": {
-    "name": "インフィニット・フュジョン",
+    "name": "インフィニット・フュージョン",
    "description": "遺伝子のくさびで　二つの　ポケモンを　吸収合体させる"
  },
  "MINI_BLACK_HOLE": {
@ -205,7 +205,7 @@
    "description": "{{type}}タイプの　単一タイプチャレンジを　クリアする"
  },
  "MONO_NORMAL": {
-    "name": "凡人"
+    "name": "超凡人"
  },
  "MONO_FIGHTING": {
    "name": "八千以上だ!!"
@ -223,7 +223,7 @@
    "name": "タケシの挑戦状"
  },
  "MONO_BUG": {
-    "name": "チョウチョウせん者"
+    "name": "チョウチョウ戦者"
  },
  "MONO_GHOST": {
    "name": "貞子ちゃん"
--- a/src/locales/ja/arena-flyout.json
+++ b/src/locales/ja/arena-flyout.json
@ -1 +1,43 @@
-{}
+{
+  "activeBattleEffects": "場の効果",
+  "player": "味方",
+  "neutral": "場の全員",
+  "enemy": "相手",
+
+  "sunny": "晴れ",
+  "rain": "雨",
+  "sandstorm": "砂あらし",
+  "hail": "あられ",
+  "snow": "雪",
+  "fog": "きり",
+  "heavyRain": "強い雨",
+  "harshSun": "大日照り",
+  "strongWinds": "乱気流",
+
+  "misty": "ミストフィールド",
+  "electric": "エレキフィールド",
+  "grassy": "グラスフィールド",
+  "psychic": "サイコフィールド",
+
+  "mudSport": "どろあそび",
+  "waterSport": "みずあそび",
+  "spikes": "まきびし",
+  "toxicSpikes": "どくびし",
+  "mist": "しろいきり",
+  "futureSight": "みらいよち",
+  "doomDesire": "はめつのねがい",
+  "wish": "ねがいごと",
+  "stealthRock": "ステルスロック",
+  "stickyWeb": "ねばねばネット",
+  "trickRoom": "トリックルーム",
+  "gravity": "じゅうりょく",
+  "reflect": "リフレクター",
+  "lightScreen": "ひかりのかべ",
+  "auroraVeil": "オーロラベール",
+  "quickGuard": "ファストガード",
+  "wideGuard": "ワイドガード",
+  "matBlock": "たたみがえし",
+  "craftyShield": "トリックガード",
+  "tailwind": "おいかぜ",
+  "happyHour": "ハッピータイム"
+}
--- a/src/locales/ja/bgm-name.json
+++ b/src/locales/ja/bgm-name.json
@ -1 +1,150 @@
-{}
+{
+  "music": "Music: ",
+  "missing_entries": "{{name}}",
+  "battle_kanto_champion": "B2W2 Kanto Champion Battle",
+  "battle_johto_champion": "B2W2 Johto Champion Battle",
+  "battle_hoenn_champion_g5": "B2W2 Hoenn Champion Battle",
+  "battle_hoenn_champion_g6": "ORAS Hoenn Champion Battle",
+  "battle_sinnoh_champion": "B2W2 Sinnoh Champion Battle",
+  "battle_champion_alder": "BW Unova Champion Battle",
+  "battle_champion_iris": "B2W2 Unova Champion Battle",
+  "battle_kalos_champion": "XY Kalos Champion Battle",
+  "battle_alola_champion": "USUM Alola Champion Battle",
+  "battle_galar_champion": "SWSH Galar Champion Battle",
+  "battle_champion_geeta": "SV Champion Geeta Battle",
+  "battle_champion_nemona": "SV Champion Nemona Battle",
+  "battle_champion_kieran": "SV Champion Kieran Battle",
+  "battle_hoenn_elite": "ORAS Elite Four Battle",
+  "battle_unova_elite": "BW Elite Four Battle",
+  "battle_kalos_elite": "XY Elite Four Battle",
+  "battle_alola_elite": "SM Elite Four Battle",
+  "battle_galar_elite": "SWSH League Tournament Battle",
+  "battle_paldea_elite": "SV Elite Four Battle",
+  "battle_bb_elite": "SV BB League Elite Four Battle",
+  "battle_final_encounter": "PMD RTDX Rayquaza's Domain",
+  "battle_final": "BW Ghetsis Battle",
+  "battle_kanto_gym": "B2W2 Kanto Gym Battle",
+  "battle_johto_gym": "B2W2 Johto Gym Battle",
+  "battle_hoenn_gym": "B2W2 Hoenn Gym Battle",
+  "battle_sinnoh_gym": "B2W2 Sinnoh Gym Battle",
+  "battle_unova_gym": "BW Unova Gym Battle",
+  "battle_kalos_gym": "XY Kalos Gym Battle",
+  "battle_galar_gym": "SWSH Galar Gym Battle",
+  "battle_paldea_gym": "SV Paldea Gym Battle",
+  "battle_legendary_kanto": "XY Kanto Legendary Battle",
+  "battle_legendary_raikou": "HGSS Raikou Battle",
+  "battle_legendary_entei": "HGSS Entei Battle",
+  "battle_legendary_suicune": "HGSS Suicune Battle",
+  "battle_legendary_lugia": "HGSS Lugia Battle",
+  "battle_legendary_ho_oh": "HGSS Ho-oh Battle",
+  "battle_legendary_regis_g5": "B2W2 Legendary Titan Battle",
+  "battle_legendary_regis_g6": "ORAS Legendary Titan Battle",
+  "battle_legendary_gro_kyo": "ORAS Groudon & Kyogre Battle",
+  "battle_legendary_rayquaza": "ORAS Rayquaza Battle",
+  "battle_legendary_deoxys": "ORAS Deoxys Battle",
+  "battle_legendary_lake_trio": "ORAS Lake Guardians Battle",
+  "battle_legendary_sinnoh": "ORAS Sinnoh Legendary Battle",
+  "battle_legendary_dia_pal": "ORAS Dialga & Palkia Battle",
+  "battle_legendary_origin_forme": "LA Origin Dialga & Palkia Battle",
+  "battle_legendary_giratina": "ORAS Giratina Battle",
+  "battle_legendary_arceus": "HGSS Arceus Battle",
+  "battle_legendary_unova": "BW Unova Legendary Battle",
+  "battle_legendary_kyurem": "BW Kyurem Battle",
+  "battle_legendary_res_zek": "BW Reshiram & Zekrom Battle",
+  "battle_legendary_xern_yvel": "XY Xerneas & Yveltal Battle",
+  "battle_legendary_tapu": "SM Tapu Battle",
+  "battle_legendary_sol_lun": "SM Solgaleo & Lunala Battle",
+  "battle_legendary_ub": "SM Ultra Beast Battle",
+  "battle_legendary_dusk_dawn": "USUM Dusk Mane & Dawn Wings Necrozma Battle",
+  "battle_legendary_ultra_nec": "USUM Ultra Necrozma Battle",
+  "battle_legendary_zac_zam": "SWSH Zacian & Zamazenta Battle",
+  "battle_legendary_glas_spec": "SWSH Glastrier & Spectrier Battle",
+  "battle_legendary_calyrex": "SWSH Calyrex Battle",
+  "battle_legendary_riders": "SWSH Ice & Shadow Rider Calyrex Battle",
+  "battle_legendary_birds_galar": "SWSH Galarian Legendary Birds Battle",
+  "battle_legendary_ruinous": "SV Treasures of Ruin Battle",
+  "battle_legendary_kor_mir": "SV Depths of Area Zero Battle",
+  "battle_legendary_loyal_three": "SV Loyal Three Battle",
+  "battle_legendary_ogerpon": "SV Ogerpon Battle",
+  "battle_legendary_terapagos": "SV Terapagos Battle",
+  "battle_legendary_pecharunt": "SV Pecharunt Battle",
+  "battle_rival": "BW Rival Battle",
+  "battle_rival_2": "BW N Battle",
+  "battle_rival_3": "BW Final N Battle",
+  "battle_trainer": "BW Trainer Battle",
+  "battle_wild": "BW Wild Battle",
+  "battle_wild_strong": "BW Strong Wild Battle",
+  "end_summit": "PMD RTDX Sky Tower Summit",
+  "battle_rocket_grunt": "HGSS Team Rocket Battle",
+  "battle_aqua_magma_grunt": "ORAS Team Aqua & Magma Battle",
+  "battle_galactic_grunt": "BDSP Team Galactic Battle",
+  "battle_plasma_grunt": "BW Team Plasma Battle",
+  "battle_flare_grunt": "XY Team Flare Battle",
+  "battle_aether_grunt": "SM Aether Foundation Battle",
+  "battle_skull_grunt": "SM Team Skull Battle",
+  "battle_macro_grunt": "SWSH Trainer Battle",
+  "battle_galactic_admin": "BDSP Team Galactic Admin Battle",
+  "battle_skull_admin": "SM Team Skull Admin Battle",
+  "battle_oleana": "SWSH Oleana Battle",
+  "battle_rocket_boss": "USUM Giovanni Battle",
+  "battle_aqua_magma_boss": "ORAS Archie & Maxie Battle",
+  "battle_galactic_boss": "BDSP Cyrus Battle",
+  "battle_plasma_boss": "B2W2 Ghetsis Battle",
+  "battle_flare_boss": "XY Lysandre Battle",
+  "battle_aether_boss": "SM Lusamine Battle",
+  "battle_skull_boss": "SM Guzma Battle",
+  "battle_macro_boss": "SWSH Rose Battle",
+
+  "abyss": "PMD EoS Dark Crater",
+  "badlands": "PMD EoS Barren Valley",
+  "beach": "PMD EoS Drenched Bluff",
+  "cave": "PMD EoS Sky Peak Cave",
+  "construction_site": "PMD EoS Boulder Quarry",
+  "desert": "PMD EoS Northern Desert",
+  "dojo": "PMD EoS Marowak Dojo",
+  "end": "PMD RTDX Sky Tower",
+  "factory": "PMD EoS Concealed Ruins",
+  "fairy_cave": "PMD EoS Star Cave",
+  "forest": "PMD EoS Dusk Forest",
+  "grass": "PMD EoS Apple Woods",
+  "graveyard": "PMD EoS Mystifying Forest",
+  "ice_cave": "PMD EoS Vast Ice Mountain",
+  "island": "PMD EoS Craggy Coast",
+  "jungle": "Lmz - Jungle",
+  "laboratory": "Firel - Laboratory",
+  "lake": "PMD EoS Crystal Cave",
+  "meadow": "PMD EoS Sky Peak Forest",
+  "metropolis": "Firel - Metropolis",
+  "mountain": "PMD EoS Mt. Horn",
+  "plains": "PMD EoS Sky Peak Prairie",
+  "power_plant": "PMD EoS Far Amp Plains",
+  "ruins": "PMD EoS Deep Sealed Ruin",
+  "sea": "Andr06 - Marine Mystique",
+  "seabed": "Firel - Seabed",
+  "slum": "Andr06 - Sneaky Snom",
+  "snowy_forest": "PMD EoS Sky Peak Snowfield",
+  "space": "Firel - Aether",
+  "swamp": "PMD EoS Surrounded Sea",
+  "tall_grass": "PMD EoS Foggy Forest",
+  "temple": "PMD EoS Aegis Cave",
+  "town": "PMD EoS Random Dungeon Theme 3",
+  "volcano": "PMD EoS Steam Cave",
+  "wasteland": "PMD EoS Hidden Highland",
+  "encounter_ace_trainer": "BW Trainers' Eyes Meet (Ace Trainer)",
+  "encounter_backpacker": "BW Trainers' Eyes Meet (Backpacker)",
+  "encounter_clerk": "BW Trainers' Eyes Meet (Clerk)",
+  "encounter_cyclist": "BW Trainers' Eyes Meet (Cyclist)",
+  "encounter_lass": "BW Trainers' Eyes Meet (Lass)",
+  "encounter_parasol_lady": "BW Trainers' Eyes Meet (Parasol Lady)",
+  "encounter_pokefan": "BW Trainers' Eyes Meet (Poke Fan)",
+  "encounter_psychic": "BW Trainers' Eyes Meet (Psychic)",
+  "encounter_rich": "BW Trainers' Eyes Meet (Gentleman)",
+  "encounter_rival": "BW Cheren",
+  "encounter_roughneck": "BW Trainers' Eyes Meet (Roughneck)",
+  "encounter_scientist": "BW Trainers' Eyes Meet (Scientist)",
+  "encounter_twins": "BW Trainers' Eyes Meet (Twins)",
+  "encounter_youngster": "BW Trainers' Eyes Meet (Youngster)",
+  "heal": "BW Pokémon Heal",
+  "menu": "PMD EoS Welcome to the World of Pokémon!",
+  "title": "PMD EoS Top Menu Theme"
+}
--- a/src/locales/ja/challenges.json
+++ b/src/locales/ja/challenges.json
@ -1,5 +1,5 @@
 {
-  "title": "チャレンジを 設定",
+  "title": "チャレンジの設定",
  "illegalEvolution": "{{pokemon}}は　このチャレンジで\n対象外の　ポケモンに　なってしまった！",
  "singleGeneration": {
    "name": "単一世代",
--- a/src/locales/ja/common.json
+++ b/src/locales/ja/common.json
@ -1 +1,8 @@
-{}
+{
+  "start": "スタート",
+  "luckIndicator": "運：",
+  "shinyOnHover": "色違い",
+  "commonShiny": "ふつう",
+  "rareShiny": "レア",
+  "epicShiny": "超レア"
+}
--- a/src/locales/ja/dialogue-double-battle.json
+++ b/src/locales/ja/dialogue-double-battle.json
@ -1 +1,84 @@
-{}
+{
+  "blue_red_double": {
+    "encounter": {
+      "1": "Blue: Hey Red, let's show them what we're made of!\n$Red: ...\n$Blue: This is Pallet Town Power!"
+    },
+    "victory": {
+      "1": "Blue: That was a great battle!\n$Red: ..."
+    }
+  },
+  "red_blue_double": {
+    "encounter": {
+      "1": "Red: ...!\n$Blue: He never talks much.\n$Blue: But dont let that fool you! He is a champ after all!"
+    },
+    "victory": {
+      "1": "Red: ...!\n$Blue: Next time we will beat you!"
+    }
+  },
+  "tate_liza_double": {
+    "encounter": {
+      "1": "Tate: Are you surprised?\n$Liza: We are two gym leaders at once!\n$Tate: We are twins!\n$Liza: We dont need to talk to understand each other!\n$Tate: Twice the power...\n$Liza: Can you handle it?"
+    },
+    "victory": {
+      "1": "Tate: What? Our combination was perfect!\n$Liza: Looks like we need to train more..."
+    }
+  },
+  "liza_tate_double": {
+    "encounter": {
+      "1": "Liza: Hihihi... Are you surprised?\n$Tate: Yes, we are really two gym leaders at once!\n$Liza: This is my twin brother Tate!\n$Tate: And this is my twin sister Liza!\n$Liza: Don't you think we are a perfect combination?"
+    },
+    "victory": {
+      "1": "Liza: Are we...\n$Tate: ...not as strong as we thought?"
+    }
+  },
+  "wallace_steven_double": {
+    "encounter": {
+      "1": "Steven: Wallace, let's show them the power of the champions!\n$Wallace: We will show you the power of Hoenn!\n$Steven: Let's go!"
+    },
+    "victory": {
+      "1": "Steven: That was a great battle!\n$Wallace: We will win next time!"
+    }
+  },
+  "steven_wallace_double": {
+    "encounter": {
+      "1": "Steven: Do you have any rare Pokémon?\n$Wallace: Steven... We are here for a battle, not to show off our Pokémon.\n$Steven: Oh... I see... Let's go then!"
+    },
+    "victory": {
+      "1": "Steven: Now that we are done with the battle, let's show off our Pokémon!\n$Wallace: Steven..."
+    }
+  },
+  "alder_iris_double": {
+    "encounter": {
+      "1": "Alder: We are the strongest trainers in Unova!\n$Iris: Fights against strong trainers are the best!"
+    },
+    "victory": {
+      "1": "Alder: Wow! You are super strong!\n$Iris: We will win next time!"
+    }
+  },
+  "iris_alder_double": {
+    "encounter": {
+      "1": "Iris: Welcome Challenger! I am THE Unova Champion!\n$Alder: Iris, aren't you a bit too excited?",
+      "1_female": "Iris: Welcome Challenger! I am THE Unova Champion!\n$Alder: Iris, aren't you a bit too excited?"
+    },
+    "victory": {
+      "1": "Iris: A loss like this is not easy to take...\n$Alder: But we will only get stronger with every loss!"
+    }
+  },
+  "piers_marnie_double": {
+    "encounter": {
+      "1": "Marnie: Brother, let's show them the power of Spikemuth!\n$Piers: We bring darkness!"
+    },
+    "victory": {
+      "1": "Marnie: You brought light to our darkness!\n$Piers: Its too bright..."
+    }
+  },
+  "marnie_piers_double": {
+    "encounter": {
+      "1": "Piers: Ready for a concert?\n$Marnie: Brother... They are here to fight, not to sing...",
+      "1_female": "Piers: Ready for a concert?\n$Marnie: Brother... They are here to fight, not to sing..."
+    },
+    "victory": {
+      "1": "Piers: Now that was a great concert!\n$Marnie: Brother..."
+    }
+  }
+}
--- a/src/locales/ja/dialogue-final-boss.json
+++ b/src/locales/ja/dialogue-final-boss.json
@ -1 +1,10 @@
-{}
+{
+  "encounter": "It appears the time has finally come once again.\nYou know why you have come here, do you not?\n$You were drawn here, because you have been here before.\nCountless times.\n$Though, perhaps it can be counted.\nTo be precise, this is in fact your {{cycleCount}} cycle.\n$Each cycle your mind reverts to its former state.\nEven so, somehow, remnants of your former selves remain.\n$Until now you have yet to succeed, but I sense a different presence in you this time.\n\n$You are the only one here, though it is as if there is… another.\n$Will you finally prove a formidable challenge to me?\nThe challenge I have longed after for millennia?\n$We begin.",
+  "encounter_female": "It appears the time has finally come once again.\nYou know why you have come here, do you not?\n$You were drawn here, because you have been here before.\nCountless times.\n$Though, perhaps it can be counted.\nTo be precise, this is in fact your {{cycleCount}} cycle.\n$Each cycle your mind reverts to its former state.\nEven so, somehow, remnants of your former selves remain.\n$Until now you have yet to succeed, but I sense a different presence in you this time.\n\n$You are the only one here, though it is as if there is… another.\n$Will you finally prove a formidable challenge to me?\nThe challenge I have longed after for millennia?\n$We begin.",
+  "firstStageWin": "I see. The presence I felt was indeed real.\nIt appears I no longer need to hold back.\n$Do not disappoint me.",
+  "secondStageWin": "…Magnificent.",
+  "key_ordinal_one": "st",
+  "key_ordinal_two": "nd",
+  "key_ordinal_few": "rd",
+  "key_ordinal_other": "th"
+}
--- a/src/locales/ja/dialogue-misc.json
+++ b/src/locales/ja/dialogue-misc.json
@ -1 +1,6 @@
-{}
+{
+  "ending": "@c{shock}You're back?@d{32} Does that mean…@d{96} you won?!\n@c{smile_ehalf}I should have known you had it in you.\n$@c{smile_eclosed}Of course… I always had that feeling.\n@c{smile}It's over now, right? You ended the loop.\n$@c{smile_ehalf}You fulfilled your dream too, didn't you?\nYou didn't lose even once.\n$I'll be the only one to remember what you did.\n@c{angry_mopen}I'll try not to forget!\n$@c{smile_wave_wink}Just kidding!@d{64} @c{smile}I'd never forget.@d{32}\nYour legend will live on in our hearts.\n$@c{smile_wave}Anyway,@d{64} it's getting late…@d{96} I think?\nIt's hard to tell in this place.\n$Let's go home. @c{smile_wave_wink}Maybe tomorrow, we can have another battle, for old time's sake?",
+  "ending_female": "@c{smile}Oh? You won?@d{96} @c{smile_eclosed}I guess I should've known.\nBut, you're back now.\n$@c{smile}It's over.@d{64} You ended the loop.\n$@c{serious_smile_fists}You fulfilled your dream too, didn't you?\nYou didn't lose even once.\n$@c{neutral}I'm the only one who'll remember what you did.@d{96}\nI guess that's okay, isn't it?\n$@c{serious_smile_fists}Your legend will always live on in our hearts.\n$@c{smile_eclosed}Anyway, I've had about enough of this place, haven't you? Let's head home.\n$@c{serious_smile_fists}Maybe when we get back, we can have another battle?\nIf you're up to it.",
+  "ending_endless": "Congratulations on reaching the current end!\nMore content is coming soon.",
+  "ending_name": "Devs"
+}
--- a/src/locales/ja/dialogue.json
+++ b/src/locales/ja/dialogue.json
--- a/src/locales/ja/fight-ui-handler.json
+++ b/src/locales/ja/fight-ui-handler.json
@ -1,7 +1,7 @@
 {
  "pp": "PP",
-  "power": "いりょく",
-  "accuracy": "めいちゅう",
-  "abilityFlyInText": " {{pokemonName}}の {{passive}}{{abilityName}}",
-  "passive": "Passive "
+  "power": "威力",
+  "accuracy": "命中",
+  "abilityFlyInText": " {{pokemonName}}の\n{{passive}}：{{abilityName}}",
+  "passive": "パッシブ "
 }
--- a/src/locales/ja/filter-bar.json
+++ b/src/locales/ja/filter-bar.json
@ -32,7 +32,7 @@
  "noPokerus": "ポケルス - なし",
  "sortByNumber": "No.",
  "sortByCost": "ポイント",
-  "sortByCandies": "飴の数",
+  "sortByCandies": "アメの数",
  "sortByIVs": "個体値",
  "sortByName": "名前"
 }
--- a/src/locales/ja/game-stats-ui-handler.json
+++ b/src/locales/ja/game-stats-ui-handler.json
@ -12,26 +12,26 @@
  "dailyRunAttempts": "デイリーラン",
  "dailyRunWins": "デイリーラン勝利",
  "endlessRuns": "エンドレスラン",
-  "highestWaveEndless": "エンドレス最高波",
+  "highestWaveEndless": "エンドレス最高ラウンド",
  "highestMoney": "最大貯金",
  "highestDamage": "最大ダメージ",
  "highestHPHealed": "最大HP回復",
  "pokemonEncountered": "遭遇したポケモン",
  "pokemonDefeated": "倒したポケモン",
  "pokemonCaught": "捕まえたポケモン",
-  "eggsHatched": "孵化したタマゴ",
+  "eggsHatched": "ふかしたタマゴ",
  "subLegendsSeen": "見つけた順伝説ポケモン",
  "subLegendsCaught": "捕まえた準伝説ポケモン",
-  "subLegendsHatched": "孵化した準伝説ポケモン",
+  "subLegendsHatched": "ふかした準伝説ポケモン",
  "legendsSeen": "見つけた伝説ポケモン",
  "legendsCaught": "捕まえた伝説ポケモン",
-  "legendsHatched": "孵化した伝説ポケモン",
+  "legendsHatched": "ふかした伝説ポケモン",
  "mythicalsSeen": "見つけた幻ポケモン",
  "mythicalsCaught": "捕まえた幻ポケモン",
-  "mythicalsHatched": "孵化した幻ポケモン",
+  "mythicalsHatched": "ふかした幻ポケモン",
  "shiniesSeen": "見つけた色違いポケモン",
  "shiniesCaught": "捕まえた色違いポケモン",
-  "shiniesHatched": "孵化した色違いポケモン",
+  "shiniesHatched": "ふかした色違いポケモン",
  "pokemonFused": "吸収合体したポケモン",
  "trainersDefeated": "倒したトレーナー",
  "eggsPulled": "引いたタマゴ",
--- a/src/locales/ja/growth.json
+++ b/src/locales/ja/growth.json
@ -1,8 +1,8 @@
 {
-  "Erratic": "60まんタイプ",
-  "Fast": "80まんタイプ",
-  "Medium_Fast": "100まんタイプ",
-  "Medium_Slow": "105まんタイプ",
-  "Slow": "125まんタイプ",
-  "Fluctuating": "164まんタイプ"
+  "Erratic": "60万タイプ",
+  "Fast": "80万タイプ",
+  "Medium_Fast": "100万タイプ",
+  "Medium_Slow": "105万タイプ",
+  "Slow": "125万タイプ",
+  "Fluctuating": "164万タイプ"
 }
--- a/src/locales/ja/menu-ui-handler.json
+++ b/src/locales/ja/menu-ui-handler.json
@ -24,6 +24,6 @@
  "linkGoogle": "Google連携",
  "unlinkGoogle": "Google連携解除",
  "cancel": "キャンセル",
-  "losingProgressionWarning": "戦闘開始からの　データが　保存されません。\nよろしいですか？",
-  "noEggs": "現在は　タマゴを　孵化していません！"
+  "losingProgressionWarning": "戦闘開始からの　データが　セーブされません。\nよろしいですか？",
+  "noEggs": "現在は　タマゴを　ふかしていません！"
 }
--- a/src/locales/ja/modifier-type.json
+++ b/src/locales/ja/modifier-type.json
@ -353,7 +353,7 @@
      "description": "やせいのポケモンがかくれとくせいをもつかくりつをおおきくふやす"
    },
    "IV_SCANNER": {
-      "name": "こたいち たんちき",
+      "name": "こたいちスキャナー",
      "description": "やせいのポケモンのこたいちをスキャンできる。スタックごとに2つのこたいちがあきらかになる。もっともたかいこたいちがさいしょにひょうじされる"
    },
    "DNA_SPLICERS": {
--- a/src/locales/ja/modifier.json
+++ b/src/locales/ja/modifier.json
@ -1,12 +1,12 @@
 {
  "surviveDamageApply": "{{pokemonNameWithAffix}}は\n{{typeName}}で　もちこたえた！",
-  "turnHealApply": "{{pokemonNameWithAffix}}は\n{{typeName}}で　少し　回復！",
-  "hitHealApply": "{{pokemonNameWithAffix}}は\n{{typeName}}で　少し　回復！",
+  "turnHealApply": "{{pokemonNameWithAffix}}は\n{{typeName}}で　少し　体力を　回復した！",
+  "hitHealApply": "{{pokemonNameWithAffix}}は\n{{typeName}}で　少し　体力を　回復した！",
  "pokemonInstantReviveApply": "{{pokemonNameWithAffix}}は\n{{typeName}}で　復活した！",
  "resetNegativeStatStageApply": "{{pokemonNameWithAffix}}は　{{typeName}}で\n下がった能力が　元に戻った！",
  "moneyInterestApply": "{{typeName}}から　{{moneyAmount}}円　取得した！",
-  "turnHeldItemTransferApply": "{{pokemonName}}の {{typeName}}が\n{{pokemonNameWithAffix}}の {{itemName}}を 吸い取った！",
-  "contactHeldItemTransferApply": "{{pokemonName}}の {{typeName}}が\n{{pokemonNameWithAffix}}の {{itemName}}を うばい取った！",
+  "turnHeldItemTransferApply": "{{pokemonName}}の {{typeName}}が\n{{pokemonNameWithAffix}}の {{itemName}}を　吸い取った！",
+  "contactHeldItemTransferApply": "{{pokemonName}}の {{typeName}}が\n{{pokemonNameWithAffix}}の {{itemName}}を　奪い取った！",
  "enemyTurnHealApply": "{{pokemonNameWithAffix}}は\n体力を　回復！",
  "bypassSpeedChanceApply": "{{pokemonName}}は　{{itemName}}で\n行動が　はやくなった！"
 }
--- a/src/locales/ja/move-trigger.json
+++ b/src/locales/ja/move-trigger.json
@ -1,64 +1,69 @@
 {
-  "hitWithRecoil": "{{pokemonName}}は\nはんどうによる　ダメージを　うけた！",
-  "cutHpPowerUpMove": "{{pokemonName}}は\nたいりょくを　けずって　パワーぜんかい！",
-  "absorbedElectricity": "{{pokemonName}}は\n　でんきを　きゅうしゅうした！",
-  "switchedStatChanges": "{{pokemonName}}は　あいてと　じぶんの\nのうりょくへんかを　いれかえた！",
-  "sharedGuard": "{{pokemonName}}は\nおたがいのガードを　シェアした！",
-  "sharedPower": "{{pokemonName}}は\nおたがいのパワーを　シェアした！",
-  "goingAllOutForAttack": "{{pokemonName}}は\nほんきを　だした！",
-  "regainedHealth": "{{pokemonName}}は\nたいりょくを　かいふくした！",
-  "keptGoingAndCrashed": "いきおいあまって　{{pokemonName}}は\nじめんに　ぶつかった！",
-  "fled": "{{pokemonName}}は　にげだした!",
-  "cannotBeSwitchedOut": "{{pokemonName}}を\nもどすことが　できない！",
-  "swappedAbilitiesWithTarget": "{{pokemonName}}は\nおたがいの　とくせいを　いれかえた！",
-  "coinsScatteredEverywhere": "こばんが　あたりに　ちらばった！",
+  "hitWithRecoil": "{{pokemonName}}は\n反動による　ダメージを　受けた！",
+  "cutHpPowerUpMove": "{{pokemonName}}は\n体力を　削って　技の　威力を　上がった！",
+  "absorbedElectricity": "{{pokemonName}}は\n　電気を　吸収した！",
+  "switchedStatChanges": "{{pokemonName}}は　相手と　自分の\n能力変化を　入れ替えた！",
+  "switchedTwoStatChanges": "{{pokemonName}}は　相手と　自分の {{firstStat}}と\n{{secondStat}}の　能力変化を　入れ替えた！",
+  "switchedStat": "{{pokemonName}}は　相手と　{{stat}}を　入れ替えた！",
+  "sharedGuard": "{{pokemonName}}は\nお互いのガードを　シェアした！",
+  "sharedPower": "{{pokemonName}}は\nお互いのパワーを　シェアした！",
+  "goingAllOutForAttack": "{{pokemonName}}は\n本気を　出した！",
+  "regainedHealth": "{{pokemonName}}は\n体力を　回復した！",
+  "keptGoingAndCrashed": "勢い余って　{{pokemonName}}は\n地面に　ぶつかった！",
+  "fled": "{{pokemonName}}は　逃げ出した!",
+  "cannotBeSwitchedOut": "{{pokemonName}}を\n戻すことが　できない！",
+  "swappedAbilitiesWithTarget": "{{pokemonName}}は\nお互いの　特性を　入れ替えた！",
+  "coinsScatteredEverywhere": "小判が　辺りに　散らばった！",
  "attackedByItem": "{{pokemonName}}に\n{{itemName}}が　おそいかかる！",
-  "whippedUpAWhirlwind": "{{pokemonName}}の　まわりで\nくうきが　うずをまく！",
-  "flewUpHigh": "{{pokemonName}}は\nそらたかく　とびあがった！",
-  "tookInSunlight": "{{pokemonName}}は\nひかりを きゅうしゅうした！",
-  "dugAHole": "{{pokemonName}}は\nじめんに　もぐった！",
-  "loweredItsHead": "{{pokemonName}}は\nくびを　ひっこめた！",
-  "isGlowing": "{{pokemonName}}を\nはげしいひかりが　つつむ！",
-  "bellChimed": "すずのおとが　ひびきわたった！",
-  "foresawAnAttack": "{{pokemonName}}は\nみらいに　こうげきを　よちした！",
-  "hidUnderwater": "{{pokemonName}}は\nすいちゅうに　みをひそめた！",
-  "soothingAromaWaftedThroughArea": "ここちよい　かおりが　ひろがった！",
-  "sprangUp": "{{pokemonName}}は\nたかく　とびはねた！",
-  "choseDoomDesireAsDestiny": "{{pokemonName}}は\nはめつのねがいを　みらいに　たくした！",
-  "vanishedInstantly": "{{pokemonName}}の　すがたが\nいっしゅんにして　きえた！",
-  "tookTargetIntoSky": "{{pokemonName}}は {{targetName}}を\nじょうくうに　つれさった！",
-  "becameCloakedInFreezingLight": "{{pokemonName}}は\nつめたいひかりに　つつまれた！",
-  "becameCloakedInFreezingAir": "{{pokemonName}}は\nこごえるくうきに　つつまれた！",
-  "isChargingPower": "{{pokemonName}}は\nパワーを　ためこんでいる！",
-  "burnedItselfOut": "{{pokemonName}}の　ほのうは\nもえつきた！",
-  "startedHeatingUpBeak": "{{pokemonName}}は\nクチバシを　かねつしはじめた！",
+  "whippedUpAWhirlwind": "{{pokemonName}}の　周りで\n空気が　渦を巻く！",
+  "flewUpHigh": "{{pokemonName}}は\n空高く　飛び上がった！",
+  "tookInSunlight": "{{pokemonName}}は\n光を 吸収した！",
+  "dugAHole": "{{pokemonName}}は\n地面に　潜った！",
+  "loweredItsHead": "{{pokemonName}}は\n首を　引っ込めた！",
+  "isGlowing": "{{pokemonName}}を\n激しい光が　包む！",
+  "bellChimed": "鈴の音が　響き渡った！",
+  "foresawAnAttack": "{{pokemonName}}は\n未来に　攻撃を　予知した！",
+  "isTighteningFocus": "{{pokemonName}}は\n集中力を　高めている！",
+  "hidUnderwater": "{{pokemonName}}は\n水中に　身を潜めた！",
+  "soothingAromaWaftedThroughArea": "心地よい　香りが　広がった！",
+  "sprangUp": "{{pokemonName}}は\n高く　飛び跳ねた！",
+  "choseDoomDesireAsDestiny": "{{pokemonName}}は\nはめつのねがいを　未来に　託した！",
+  "vanishedInstantly": "{{pokemonName}}の　姿が\n一瞬にして　消えた！",
+  "tookTargetIntoSky": "{{pokemonName}}は {{targetName}}を\n上空に　連れ去った！",
+  "becameCloakedInFreezingLight": "{{pokemonName}}は\n冷たい光に　包まれた！",
+  "becameCloakedInFreezingAir": "{{pokemonName}}は\n凍える空気に　包まれた！",
+  "isChargingPower": "{{pokemonName}}は\nパワーを　溜め込んでいる！",
+  "burnedItselfOut": "{{pokemonName}}の　炎は　燃え尽きた！",
+  "startedHeatingUpBeak": "{{pokemonName}}は\nクチバシを　加熱し始めた！",
  "setUpShellTrap": "{{pokemonName}}は\nトラップシェルを　仕掛けた！",
-  "isOverflowingWithSpacePower": "{{pokemonName}}に\nうちゅうの　ちからが　あふれだす！",
-  "usedUpAllElectricity": "{{pokemonName}}は\nでんきを　つかいきった！",
-  "stoleItem": "{{pokemonName}}は\n{{targetName}}の {{itemName}}を　ぬすんだ！",
-  "incineratedItem": "{{pokemonName}}は\n{{targetName}}の {{itemName}}を　もやした！",
-  "knockedOffItem": "{{pokemonName}}は\n{{targetName}}の {{itemName}}を　はたきおとした！",
-  "tookMoveAttack": "{{pokemonName}}は\n{{moveName}}の　こうげきを　うけた！",
-  "cutOwnHpAndMaximizedStat": "{{pokemonName}}は\nたいりょくを　けずって　{{statName}}ぜんかい！",
-  "copiedStatChanges": "{{pokemonName}}は　{{targetName}}の\nのうりょくへんかを　コピーした！",
+  "isOverflowingWithSpacePower": "{{pokemonName}}に\n宇宙の　力が　溢れ出す！",
+  "usedUpAllElectricity": "{{pokemonName}}は\n電気を　使い切った！",
+  "stoleItem": "{{pokemonName}}は\n{{targetName}}の {{itemName}}を　盗んだ！",
+  "incineratedItem": "{{pokemonName}}は\n{{targetName}}の {{itemName}}を　燃やした！",
+  "knockedOffItem": "{{pokemonName}}は\n{{targetName}}の {{itemName}}を　はたき落とした！",
+  "tookMoveAttack": "{{pokemonName}}は\n{{moveName}}の　攻撃を　受けた！",
+  "cutOwnHpAndMaximizedStat": "{{pokemonName}}は\n体力を　削って　{{statName}}全開！",
+  "copiedStatChanges": "{{pokemonName}}は　{{targetName}}の\n能力変化を　コピーした！",
  "magnitudeMessage": "マグニチュード{{magnitude}}！",
-  "tookAimAtTarget": "{{pokemonName}}は {{targetName}}に\nねらいを　さだめた！",
+  "tookAimAtTarget": "{{pokemonName}}は {{targetName}}に\n狙いを　定めた！",
  "transformedIntoType": "{{pokemonName}}は\n{{typeName}}タイプに　なった！",
  "copiedMove": "{{pokemonName}}は\n{{moveName}}を　コピーした！",
  "sketchedMove": "{{pokemonName}}は\n{{moveName}}を　スケッチした！",
-  "acquiredAbility": "{{pokemonName}}の　とくせいが\n{{abilityName}}に　なった！",
+  "acquiredAbility": "{{pokemonName}}の　特性が\n{{abilityName}}に　なった！",
  "copiedTargetAbility": "{{pokemonName}}は\n{{targetName}}の　{{abilityName}}を　コピーした！",
-  "transformedIntoTarget": "{{pokemonName}}は\n{{targetName}}に　へんしんした！",
-  "tryingToTakeFoeDown": "{{pokemonName}}は　あいてを\nみちづれに　しようとしている！",
-  "addType": "{{pokemonName}}に\n{{typeName}}タイプが　ついかされた！",
-  "cannotUseMove": "{{pokemonName}}は\n{{moveName}}を　つかえなかった！",
-  "healHp": "{{pokemonName}}の\nたいりょくが　かいふくした！",
-  "sacrificialFullRestore": "{{pokemonName}}の\nねがいごとが　かなった！",
-  "invertStats": "{{pokemonName}}の\nのうりょくへんかが　ぎゃくてんした！",
-  "resetStats": "{{pokemonName}}の\nのうりょくへんかが　もとにもどった！",
-  "faintCountdown": "{{pokemonName}}は\n{{turnCount}}ターンごに　ほろびてしまう！",
+  "transformedIntoTarget": "{{pokemonName}}は\n{{targetName}}に　変身した！",
+  "tryingToTakeFoeDown": "{{pokemonName}}は　相手を\nみちづれに　しようとしている！",
+  "addType": "{{pokemonName}}に\n{{typeName}}タイプが　追加された！",
+  "cannotUseMove": "{{pokemonName}}は\n{{moveName}}を　使えなかった！",
+  "healHp": "{{pokemonName}}の\n体力が　回復した！",
+  "sacrificialFullRestore": "{{pokemonName}}の\nいやしのねがいが　叶った！",
+  "invertStats": "{{pokemonName}}は\n能力変化が　ひっくり返った！",
+  "resetStats": "{{pokemonName}}の\n能力変化が　元に戻った！",
+  "statEliminated": "全ての　能力変化が　元に戻った！",
+  "faintCountdown": "{{pokemonName}}は\n{{turnCount}}ターン後に　滅びてしまう！",
  "copyType": "{{pokemonName}}は　{{targetPokemonName}}と\n同じタイプに　なった！",
-  "suppressAbilities": "{{pokemonName}}の　とくせいが　きかなくなった！",
+  "suppressAbilities": "{{pokemonName}}の　特性が　効かなくなった！",
  "revivalBlessing": "{{pokemonName}}は\n復活して　戦えるようになった！",
-  "swapArenaTags": "{{pokemonName}}は\nおたがいの　ばのこうかを　いれかえた！"
+  "swapArenaTags": "{{pokemonName}}は\nお互いの　場の　効果を　入れ替えた！",
+  "exposedMove": "{{pokemonName}}は {{targetPokemonName}}の\n正体を　見破った！"
 }
--- a/src/locales/ja/party-ui-handler.json
+++ b/src/locales/ja/party-ui-handler.json
@ -1,8 +1,8 @@
 {
-  "SEND_OUT": "いれかえる",
-  "SUMMARY": "つよさをみる",
+  "SEND_OUT": "入れ替える",
+  "SUMMARY": "強さを見る",
  "CANCEL": "やめる",
-  "RELEASE": "にがす",
-  "APPLY": "つかう",
-  "TEACH": "おしえる"
+  "RELEASE": "逃がす",
+  "APPLY": "使う",
+  "TEACH": "教える"
 }
--- a/src/locales/ja/pokemon-info-container.json
+++ b/src/locales/ja/pokemon-info-container.json
@ -1,7 +1,7 @@
 {
-  "moveset": "わざ",
-  "gender": "せいべつ:",
-  "ability": "とくせい:",
-  "nature": "せいかく:",
-  "form": "すがた:"
+  "moveset": "技",
+  "gender": "性別:",
+  "ability": "特性:",
+  "nature": "性格:",
+  "form": "姿:"
 }
--- a/src/locales/ja/pokemon-summary.json
+++ b/src/locales/ja/pokemon-summary.json
@ -1 +1,44 @@
-{}
+{
+  "pokemonInfo": "ポケモン情報",
+  "status": "ステータス",
+  "powerAccuracyCategory": "威力\n命中\n分類",
+  "type": "タイプ",
+  "unknownTrainer": "？？？",
+  "ot": "親",
+  "nature": "性格",
+  "expPoints": "経験値",
+  "nextLv": "次のレベルまで",
+  "cancel": "キャンセル",
+  "memoString": "{{natureFragment}}な性格。\n{{metFragment}}",
+  "metFragment": {
+    "normal": "{{biome}}で\nLv.{{level}}の時に出会った。",
+    "apparently": "{{biome}}で\nLv.{{level}}の時に出会ったようだ。"
+  },
+  "natureFragment": {
+    "Hardy": "{{nature}}",
+    "Lonely": "{{nature}}",
+    "Brave": "{{nature}}",
+    "Adamant": "{{nature}}",
+    "Naughty": "{{nature}}",
+    "Bold": "{{nature}}",
+    "Docile": "{{nature}}",
+    "Relaxed": "{{nature}}",
+    "Impish": "{{nature}}",
+    "Lax": "{{nature}}",
+    "Timid": "{{nature}}",
+    "Hasty": "{{nature}}",
+    "Serious": "{{nature}}",
+    "Jolly": "{{nature}}",
+    "Naive": "{{nature}}",
+    "Modest": "{{nature}}",
+    "Mild": "{{nature}}",
+    "Quiet": "{{nature}}",
+    "Bashful": "{{nature}}",
+    "Rash": "{{nature}}",
+    "Calm": "{{nature}}",
+    "Gentle": "{{nature}}",
+    "Sassy": "{{nature}}",
+    "Careful": "{{nature}}",
+    "Quirky": "{{nature}}"
+  }
+}
--- a/src/locales/ja/run-history.json
+++ b/src/locales/ja/run-history.json
@ -28,10 +28,10 @@
  "SPDshortened": "速さ",
  "runInfo": "ラン情報",
  "money": "お金",
-  "runLength": "ラン最高ウェーブ",
-  "viewHeldItems": "手持ちアイテム",
-  "hallofFameText": "殿堂へようこそ！",
-  "hallofFameText_female": "殿堂へようこそ！",
+  "runLength": "時間",
+  "viewHeldItems": "持たせたアイテム",
+  "hallofFameText": "殿堂入り　おめでとう！",
+  "hallofFameText_female": "殿堂入り　おめでとう！",
  "viewHallOfFame": "殿堂登録を見る！",
  "viewEndingSplash": "クリア後のアートを見る！"
 }
--- a/src/locales/ja/save-slot-select-ui-handler.json
+++ b/src/locales/ja/save-slot-select-ui-handler.json
@ -1,7 +1,7 @@
 {
  "overwriteData": "選択した　スロットに　データを　上書きします？",
  "loading": "読込中…",
-  "wave": "波",
+  "wave": "ラウンド",
  "lv": "Lv",
  "empty": "なし"
 }
--- a/src/locales/ja/splash-messages.json
+++ b/src/locales/ja/splash-messages.json
@ -1 +1,36 @@
-{}
+{
+  "battlesWon": "Battles Won!",
+  "joinTheDiscord": "Join the Discord!",
+  "infiniteLevels": "Infinite Levels!",
+  "everythingStacks": "Everything Stacks!",
+  "optionalSaveScumming": "Optional Save Scumming!",
+  "biomes": "35 Biomes!",
+  "openSource": "Open Source!",
+  "playWithSpeed": "Play with 5x Speed!",
+  "liveBugTesting": "Live Bug Testing!",
+  "heavyInfluence": "Heavy RoR2 Influence!",
+  "pokemonRiskAndPokemonRain": "Pokémon Risk and Pokémon Rain!",
+  "nowWithMoreSalt": "Now with 33% More Salt!",
+  "infiniteFusionAtHome": "Infinite Fusion at Home!",
+  "brokenEggMoves": "Broken Egg Moves!",
+  "magnificent": "Magnificent!",
+  "mubstitute": "Mubstitute!",
+  "thatsCrazy": "That's Crazy!",
+  "oranceJuice": "Orance Juice!",
+  "questionableBalancing": "Questionable Balancing!",
+  "coolShaders": "Cool Shaders!",
+  "aiFree": "AI-Free!",
+  "suddenDifficultySpikes": "Sudden Difficulty Spikes!",
+  "basedOnAnUnfinishedFlashGame": "Based on an Unfinished Flash Game!",
+  "moreAddictiveThanIntended": "More Addictive than Intended!",
+  "mostlyConsistentSeeds": "Mostly Consistent Seeds!",
+  "achievementPointsDontDoAnything": "Achievement Points Don't Do Anything!",
+  "youDoNotStartAtLevel": "You Do Not Start at Level 2000!",
+  "dontTalkAboutTheManaphyEggIncident": "Don't Talk About the Manaphy Egg Incident!",
+  "alsoTryPokengine": "Also Try Pokéngine!",
+  "alsoTryEmeraldRogue": "Also Try Emerald Rogue!",
+  "alsoTryRadicalRed": "Also Try Radical Red!",
+  "eeveeExpo": "Eevee Expo!",
+  "ynoproject": "YNOproject!",
+  "breedersInSpace": "Breeders in space!"
+}
--- a/src/locales/ja/weather.json
+++ b/src/locales/ja/weather.json
@ -16,17 +16,17 @@
  "snowStartMessage": "雪が　降り始めた！",
  "snowLapseMessage": "雪が　降っている！",
  "snowClearMessage": "雪が　止んだ！",
-  "fogStartMessage": "足下に　霧(きり)が立ち込めた！",
-  "fogLapseMessage": "足下に　霧(きり)が　立ち込めている！",
-  "fogClearMessage": "足下の　霧(きり)が消え去った！",
+  "fogStartMessage": "足下に　霧が　立ち込めた！",
+  "fogLapseMessage": "足下に　霧が　立ち込めている！",
+  "fogClearMessage": "足下の　霧が　消え去った！",
  "heavyRainStartMessage": "強い雨が　降り始めた！",
  "heavyRainLapseMessage": "強い雨が　降っている！",
  "heavyRainClearMessage": "強い雨が　あがった！",
  "harshSunStartMessage": "日差しが　とても強くなった！",
  "harshSunLapseMessage": "日差しが　とても強い！",
  "harshSunClearMessage": "日差しが　元に戻った！",
-  "strongWindsStartMessage": "謎(なぞ)の　乱気流(らんきりゅう)が\nひこうポケモンを　護(まも)る！",
-  "strongWindsLapseMessage": "謎(なぞ)の　乱気流(らんきりゅう)の　勢(いきお)いは　止まらない！",
-  "strongWindsEffectMessage": "謎(なぞ)の　乱気流(らんきりゅう)が　攻撃(こうげき)を　弱(よわ)めた！",
-  "strongWindsClearMessage": "謎(なぞ)の　乱気流(らんきりゅう)が　おさまった！"
+  "strongWindsStartMessage": "謎の　乱気流が\nひこうポケモンを　護る！",
+  "strongWindsLapseMessage": "謎の　乱気流の　勢いは　止まらない！",
+  "strongWindsEffectMessage": "謎の　乱気流が　攻撃を　弱めた！",
+  "strongWindsClearMessage": "謎の　乱気流が　おさまった！"
 }
--- a/src/phases/move-effect-phase.ts
+++ b/src/phases/move-effect-phase.ts
@ -377,16 +377,16 @@ export class MoveEffectPhase extends PokemonPhase {
      return false;
    }

-    const moveAccuracy = this.move.getMove().calculateBattleAccuracy(user!, target); // TODO: is the bang correct here?
+    const moveAccuracy = this.move.getMove().calculateBattleAccuracy(user, target);

    if (moveAccuracy === -1) {
      return true;
    }

    const accuracyMultiplier = user.getAccuracyMultiplier(target, this.move.getMove());
-    const rand = user.randSeedInt(100, 1);
+    const rand = user.randSeedInt(100);

-    return rand <= moveAccuracy * (accuracyMultiplier!); // TODO: is this bang correct?
+    return rand < (moveAccuracy * accuracyMultiplier);
  }

  /** Returns the {@linkcode Pokemon} using this phase's invoked move */
--- a/src/test/moves/dragon_cheer.test.ts
+++ b/src/test/moves/dragon_cheer.test.ts
@ -0,0 +1,101 @@
+import { BattlerIndex } from "#app/battle";
+import { Type } from "#app/data/type";
+import { Moves } from "#app/enums/moves";
+import { Species } from "#app/enums/species";
+import { Abilities } from "#enums/abilities";
+import GameManager from "#test/utils/gameManager";
+import { SPLASH_ONLY } from "#test/utils/testUtils";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+describe("Moves - Dragon Cheer", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+  const TIMEOUT = 20 * 1000;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .battleType("double")
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(SPLASH_ONLY)
+      .enemyLevel(20)
+      .moveset([Moves.DRAGON_CHEER, Moves.TACKLE, Moves.SPLASH]);
+  });
+
+  it("increases the user's allies' critical hit ratio by one stage", async () => {
+    await game.classicMode.startBattle([Species.DRAGONAIR, Species.MAGIKARP]);
+
+    const enemy = game.scene.getEnemyField()[0];
+
+    vi.spyOn(enemy, "getCritStage");
+
+    game.move.select(Moves.DRAGON_CHEER, 0);
+    game.move.select(Moves.TACKLE, 1, BattlerIndex.ENEMY);
+
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
+
+    // After Tackle
+    await game.phaseInterceptor.to("TurnEndPhase");
+    expect(enemy.getCritStage).toHaveReturnedWith(1); // getCritStage is called on defender
+  }, TIMEOUT);
+
+  it("increases the user's Dragon-type allies' critical hit ratio by two stages", async () => {
+    await game.classicMode.startBattle([Species.MAGIKARP, Species.DRAGONAIR]);
+
+    const enemy = game.scene.getEnemyField()[0];
+
+    vi.spyOn(enemy, "getCritStage");
+
+    game.move.select(Moves.DRAGON_CHEER, 0);
+    game.move.select(Moves.TACKLE, 1, BattlerIndex.ENEMY);
+
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
+
+    // After Tackle
+    await game.phaseInterceptor.to("TurnEndPhase");
+    expect(enemy.getCritStage).toHaveReturnedWith(2); // getCritStage is called on defender
+  }, TIMEOUT);
+
+  it("applies the effect based on the allies' type upon use of the move, and do not change if the allies' type changes later in battle", async () => {
+    await game.classicMode.startBattle([Species.DRAGONAIR, Species.MAGIKARP]);
+
+    const magikarp = game.scene.getPlayerField()[1];
+    const enemy = game.scene.getEnemyField()[0];
+
+    vi.spyOn(enemy, "getCritStage");
+
+    game.move.select(Moves.DRAGON_CHEER, 0);
+    game.move.select(Moves.TACKLE, 1, BattlerIndex.ENEMY);
+
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
+
+    // After Tackle
+    await game.phaseInterceptor.to("TurnEndPhase");
+    expect(enemy.getCritStage).toHaveReturnedWith(1); // getCritStage is called on defender
+
+    await game.toNextTurn();
+
+    // Change Magikarp's type to Dragon
+    vi.spyOn(magikarp, "getTypes").mockReturnValue([Type.DRAGON]);
+    expect(magikarp.getTypes()).toEqual([Type.DRAGON]);
+
+    game.move.select(Moves.SPLASH, 0);
+    game.move.select(Moves.TACKLE, 1, BattlerIndex.ENEMY);
+
+    await game.setTurnOrder([BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
+
+    await game.phaseInterceptor.to("MoveEndPhase");
+    expect(enemy.getCritStage).toHaveReturnedWith(1); // getCritStage is called on defender
+  }, TIMEOUT);
+});
--- a/src/test/moves/glaive_rush.test.ts
+++ b/src/test/moves/glaive_rush.test.ts
@ -1,13 +1,12 @@
 import { allMoves } from "#app/data/move";
 import { Abilities } from "#app/enums/abilities";
-import { DamagePhase } from "#app/phases/damage-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
+import { Moves } from "#app/enums/moves";
+import { Species } from "#app/enums/species";
 import GameManager from "#test/utils/gameManager";
 import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";

+const TIMEOUT = 20 * 1000;

 describe("Moves - Glaive Rush", () => {
  let phaserGame: Phaser.Game;
@ -25,131 +24,142 @@ describe("Moves - Glaive Rush", () => {

  beforeEach(() => {
    game = new GameManager(phaserGame);
-    game.override.battleType("single");
-    game.override.disableCrits();
-    game.override.enemySpecies(Species.MAGIKARP);
-    game.override.enemyAbility(Abilities.BALL_FETCH);
-    game.override.enemyMoveset(Array(4).fill(Moves.GLAIVE_RUSH));
-    game.override.starterSpecies(Species.KLINK);
-    game.override.ability(Abilities.UNNERVE);
-    game.override.passiveAbility(Abilities.FUR_COAT);
-    game.override.moveset([Moves.SHADOW_SNEAK, Moves.AVALANCHE, Moves.SPLASH, Moves.GLAIVE_RUSH]);
+    game.override
+      .battleType("single")
+      .disableCrits()
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Array(4).fill(Moves.GLAIVE_RUSH))
+      .starterSpecies(Species.KLINK)
+      .ability(Abilities.BALL_FETCH)
+      .moveset([Moves.SHADOW_SNEAK, Moves.AVALANCHE, Moves.SPLASH, Moves.GLAIVE_RUSH]);
  });

  it("takes double damage from attacks", async () => {
-    await game.startBattle();
+    await game.classicMode.startBattle();
+
    const enemy = game.scene.getEnemyPokemon()!;
    enemy.hp = 1000;

-    vi.spyOn(game.scene, "randBattleSeedInt").mockReturnValue(0);
    game.move.select(Moves.SHADOW_SNEAK);
-    await game.phaseInterceptor.to(DamagePhase);
+    await game.phaseInterceptor.to("DamagePhase");
    const damageDealt = 1000 - enemy.hp;
-    await game.phaseInterceptor.to(TurnEndPhase);
+    await game.phaseInterceptor.to("TurnEndPhase");
    game.move.select(Moves.SHADOW_SNEAK);
-    await game.phaseInterceptor.to(DamagePhase);
+    await game.phaseInterceptor.to("DamagePhase");
    expect(enemy.hp).toBeLessThanOrEqual(1001 - (damageDealt * 3));

-  }, 5000); // TODO: revert back to 20s
+  }, TIMEOUT);

  it("always gets hit by attacks", async () => {
-    await game.startBattle();
+    await game.classicMode.startBattle();
+
    const enemy = game.scene.getEnemyPokemon()!;
    enemy.hp = 1000;

    allMoves[Moves.AVALANCHE].accuracy = 0;
    game.move.select(Moves.AVALANCHE);
-    await game.phaseInterceptor.to(TurnEndPhase);
+    await game.phaseInterceptor.to("TurnEndPhase");
    expect(enemy.hp).toBeLessThan(1000);

-  }, 20000);
+  }, TIMEOUT);

  it("interacts properly with multi-lens", async () => {
-    game.override.startingHeldItems([{ name: "MULTI_LENS", count: 2 }]);
-    game.override.enemyMoveset(Array(4).fill(Moves.AVALANCHE));
-    await game.startBattle();
+    game.override
+      .startingHeldItems([{ name: "MULTI_LENS", count: 2 }])
+      .enemyMoveset(Array(4).fill(Moves.AVALANCHE));
+    await game.classicMode.startBattle();
+
    const player = game.scene.getPlayerPokemon()!;
    const enemy = game.scene.getEnemyPokemon()!;
+
    enemy.hp = 1000;
    player.hp = 1000;

    allMoves[Moves.AVALANCHE].accuracy = 0;
    game.move.select(Moves.GLAIVE_RUSH);
-    await game.phaseInterceptor.to(TurnEndPhase);
+    await game.phaseInterceptor.to("TurnEndPhase");
    expect(player.hp).toBeLessThan(1000);
    player.hp = 1000;
    game.move.select(Moves.SPLASH);
-    await game.phaseInterceptor.to(TurnEndPhase);
+    await game.phaseInterceptor.to("TurnEndPhase");
    expect(player.hp).toBe(1000);

-  }, 20000);
+  }, TIMEOUT);

  it("secondary effects only last until next move", async () => {
    game.override.enemyMoveset(Array(4).fill(Moves.SHADOW_SNEAK));
-    await game.startBattle();
+    await game.classicMode.startBattle();
+
    const player = game.scene.getPlayerPokemon()!;
    const enemy = game.scene.getEnemyPokemon()!;
+
    enemy.hp = 1000;
    player.hp = 1000;
    allMoves[Moves.SHADOW_SNEAK].accuracy = 0;

    game.move.select(Moves.GLAIVE_RUSH);
-    await game.phaseInterceptor.to(TurnEndPhase);
+    await game.phaseInterceptor.to("TurnEndPhase");
    expect(player.hp).toBe(1000);

    game.move.select(Moves.SPLASH);
-    await game.phaseInterceptor.to(TurnEndPhase);
+    await game.phaseInterceptor.to("TurnEndPhase");
    const damagedHp = player.hp;
    expect(player.hp).toBeLessThan(1000);

    game.move.select(Moves.SPLASH);
-    await game.phaseInterceptor.to(TurnEndPhase);
+    await game.phaseInterceptor.to("TurnEndPhase");
    expect(player.hp).toBe(damagedHp);

-  }, 20000);
+  }, TIMEOUT);

  it("secondary effects are removed upon switching", async () => {
-    game.override.enemyMoveset(Array(4).fill(Moves.SHADOW_SNEAK));
-    game.override.starterSpecies(0);
-    await game.startBattle([Species.KLINK, Species.FEEBAS]);
+    game.override
+      .enemyMoveset(Array(4).fill(Moves.SHADOW_SNEAK))
+      .starterSpecies(0);
+    await game.classicMode.startBattle([Species.KLINK, Species.FEEBAS]);
+
    const player = game.scene.getPlayerPokemon()!;
    const enemy = game.scene.getEnemyPokemon()!;
+
    enemy.hp = 1000;
    allMoves[Moves.SHADOW_SNEAK].accuracy = 0;

    game.move.select(Moves.GLAIVE_RUSH);
-    await game.phaseInterceptor.to(TurnEndPhase);
+    await game.phaseInterceptor.to("TurnEndPhase");
    expect(player.hp).toBe(player.getMaxHp());

    game.doSwitchPokemon(1);
-    await game.phaseInterceptor.to(TurnEndPhase);
+    await game.phaseInterceptor.to("TurnEndPhase");
    game.doSwitchPokemon(1);
-    await game.phaseInterceptor.to(TurnEndPhase);
+    await game.phaseInterceptor.to("TurnEndPhase");
    expect(player.hp).toBe(player.getMaxHp());

-  }, 20000);
+  }, TIMEOUT);

  it("secondary effects don't activate if move fails", async () => {
    game.override.moveset([Moves.SHADOW_SNEAK, Moves.PROTECT, Moves.SPLASH, Moves.GLAIVE_RUSH]);
-    await game.startBattle();
+    await game.classicMode.startBattle();
+
    const player = game.scene.getPlayerPokemon()!;
    const enemy = game.scene.getEnemyPokemon()!;
+
    enemy.hp = 1000;
    player.hp = 1000;

    game.move.select(Moves.PROTECT);
-    await game.phaseInterceptor.to(TurnEndPhase);
+    await game.phaseInterceptor.to("TurnEndPhase");

    game.move.select(Moves.SHADOW_SNEAK);
-    await game.phaseInterceptor.to(TurnEndPhase);
+    await game.phaseInterceptor.to("TurnEndPhase");
    game.override.enemyMoveset(Array(4).fill(Moves.SPLASH));
    const damagedHP1 = 1000 - enemy.hp;
    enemy.hp = 1000;

    game.move.select(Moves.SHADOW_SNEAK);
-    await game.phaseInterceptor.to(TurnEndPhase);
+    await game.phaseInterceptor.to("TurnEndPhase");
    const damagedHP2 = 1000 - enemy.hp;

    expect(damagedHP2).toBeGreaterThanOrEqual((damagedHP1 * 2) - 1);
-  }, 20000);
+  }, TIMEOUT);
 });
--- a/src/test/moves/protect.test.ts
+++ b/src/test/moves/protect.test.ts
@ -7,7 +7,8 @@ import { Moves } from "#enums/moves";
 import { Stat } from "#enums/stat";
 import { allMoves } from "#app/data/move";
 import { ArenaTagSide, ArenaTrapTag } from "#app/data/arena-tag";
-import { BerryPhase } from "#app/phases/berry-phase";
+import { BattlerIndex } from "#app/battle";
+import { MoveResult } from "#app/field/pokemon";

 const TIMEOUT = 20 * 1000;

@ -43,13 +44,13 @@ describe("Moves - Protect", () => {
  test(
    "should protect the user from attacks",
    async () => {
-      await game.startBattle([Species.CHARIZARD]);
+      await game.classicMode.startBattle([Species.CHARIZARD]);

      const leadPokemon = game.scene.getPlayerPokemon()!;

      game.move.select(Moves.PROTECT);

-      await game.phaseInterceptor.to(BerryPhase, false);
+      await game.phaseInterceptor.to("BerryPhase", false);

      expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
    }, TIMEOUT
@ -61,13 +62,13 @@ describe("Moves - Protect", () => {
      game.override.enemyMoveset(Array(4).fill(Moves.CEASELESS_EDGE));
      vi.spyOn(allMoves[Moves.CEASELESS_EDGE], "accuracy", "get").mockReturnValue(100);

-      await game.startBattle([Species.CHARIZARD]);
+      await game.classicMode.startBattle([Species.CHARIZARD]);

      const leadPokemon = game.scene.getPlayerPokemon()!;

      game.move.select(Moves.PROTECT);

-      await game.phaseInterceptor.to(BerryPhase, false);
+      await game.phaseInterceptor.to("BerryPhase", false);

      expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
      expect(game.scene.arena.getTagOnSide(ArenaTrapTag, ArenaTagSide.ENEMY)).toBeUndefined();
@ -79,13 +80,13 @@ describe("Moves - Protect", () => {
    async () => {
      game.override.enemyMoveset(Array(4).fill(Moves.CHARM));

-      await game.startBattle([Species.CHARIZARD]);
+      await game.classicMode.startBattle([Species.CHARIZARD]);

      const leadPokemon = game.scene.getPlayerPokemon()!;

      game.move.select(Moves.PROTECT);

-      await game.phaseInterceptor.to(BerryPhase, false);
+      await game.phaseInterceptor.to("BerryPhase", false);

      expect(leadPokemon.getStatStage(Stat.ATK)).toBe(0);
    }, TIMEOUT
@ -96,18 +97,38 @@ describe("Moves - Protect", () => {
    async () => {
      game.override.enemyMoveset(Array(4).fill(Moves.TACHYON_CUTTER));

-      await game.startBattle([Species.CHARIZARD]);
+      await game.classicMode.startBattle([Species.CHARIZARD]);

      const leadPokemon = game.scene.getPlayerPokemon()!;
-
      const enemyPokemon = game.scene.getEnemyPokemon()!;

      game.move.select(Moves.PROTECT);

-      await game.phaseInterceptor.to(BerryPhase, false);
+      await game.phaseInterceptor.to("BerryPhase", false);

      expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
      expect(enemyPokemon.turnData.hitCount).toBe(1);
    }, TIMEOUT
  );
+
+  test(
+    "should fail if the user is the last to move in the turn",
+    async () => {
+      game.override.enemyMoveset(Array(4).fill(Moves.PROTECT));
+
+      await game.classicMode.startBattle([Species.CHARIZARD]);
+
+      const leadPokemon = game.scene.getPlayerPokemon()!;
+      const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+      game.move.select(Moves.PROTECT);
+
+      await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+
+      await game.phaseInterceptor.to("BerryPhase", false);
+
+      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
+      expect(leadPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+    }, TIMEOUT
+  );
 });
--- a/src/test/moves/quick_guard.test.ts
+++ b/src/test/moves/quick_guard.test.ts
@ -5,8 +5,8 @@ import { Species } from "#enums/species";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Stat } from "#enums/stat";
-import { BerryPhase } from "#app/phases/berry-phase";
-import { CommandPhase } from "#app/phases/command-phase";
+import { BattlerIndex } from "#app/battle";
+import { MoveResult } from "#app/field/pokemon";

 const TIMEOUT = 20 * 1000;

@ -42,19 +42,16 @@ describe("Moves - Quick Guard", () => {
  test(
    "should protect the user and allies from priority moves",
    async () => {
-      await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]);
+      await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]);

-      const leadPokemon = game.scene.getPlayerField();
+      const playerPokemon = game.scene.getPlayerField();

      game.move.select(Moves.QUICK_GUARD);
-
-      await game.phaseInterceptor.to(CommandPhase);
-
      game.move.select(Moves.SPLASH, 1);

-      await game.phaseInterceptor.to(BerryPhase, false);
+      await game.phaseInterceptor.to("BerryPhase", false);

-      leadPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp()));
+      playerPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp()));
    }, TIMEOUT
  );

@ -64,19 +61,16 @@ describe("Moves - Quick Guard", () => {
      game.override.enemyAbility(Abilities.PRANKSTER);
      game.override.enemyMoveset(Array(4).fill(Moves.GROWL));

-      await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]);
+      await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]);

-      const leadPokemon = game.scene.getPlayerField();
+      const playerPokemon = game.scene.getPlayerField();

      game.move.select(Moves.QUICK_GUARD);
-
-      await game.phaseInterceptor.to(CommandPhase);
-
      game.move.select(Moves.SPLASH, 1);

-      await game.phaseInterceptor.to(BerryPhase, false);
+      await game.phaseInterceptor.to("BerryPhase", false);

-      leadPokemon.forEach(p => expect(p.getStatStage(Stat.ATK)).toBe(0));
+      playerPokemon.forEach(p => expect(p.getStatStage(Stat.ATK)).toBe(0));
    }, TIMEOUT
  );

@ -85,21 +79,40 @@ describe("Moves - Quick Guard", () => {
    async () => {
      game.override.enemyMoveset(Array(4).fill(Moves.WATER_SHURIKEN));

-      await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]);
+      await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]);

-      const leadPokemon = game.scene.getPlayerField();
+      const playerPokemon = game.scene.getPlayerField();
      const enemyPokemon = game.scene.getEnemyField();

      game.move.select(Moves.QUICK_GUARD);
-
-      await game.phaseInterceptor.to(CommandPhase);
-
      game.move.select(Moves.FOLLOW_ME, 1);

-      await game.phaseInterceptor.to(BerryPhase, false);
+      await game.phaseInterceptor.to("BerryPhase", false);

-      leadPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp()));
+      playerPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp()));
      enemyPokemon.forEach(p => expect(p.turnData.hitCount).toBe(1));
    }
  );
+
+  test(
+    "should fail if the user is the last to move in the turn",
+    async () => {
+      game.override.battleType("single");
+      game.override.enemyMoveset(Array(4).fill(Moves.QUICK_GUARD));
+
+      await game.classicMode.startBattle([Species.CHARIZARD]);
+
+      const playerPokemon = game.scene.getPlayerPokemon()!;
+      const enemyPokemon = game.scene.getEnemyPokemon()!;
+
+      game.move.select(Moves.QUICK_GUARD);
+
+      await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+
+      await game.phaseInterceptor.to("BerryPhase", false);
+
+      expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
+      expect(playerPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+    }, TIMEOUT
+  );
 });
--- a/src/test/utils/gameManager.ts
+++ b/src/test/utils/gameManager.ts
@ -76,7 +76,7 @@ export default class GameManager {
  constructor(phaserGame: Phaser.Game, bypassLogin: boolean = true) {
    localStorage.clear();
    ErrorInterceptor.getInstance().clear();
-    BattleScene.prototype.randBattleSeedInt = (arg) => arg-1;
+    BattleScene.prototype.randBattleSeedInt = (range, min: number = 0) => min + range - 1; // This simulates a max roll
    this.gameWrapper = new GameWrapper(phaserGame, bypassLogin);
    this.scene = new BattleScene();
    this.phaseInterceptor = new PhaseInterceptor(this.scene);
--- a/src/test/utils/mocks/mocksContainer/mockContainer.ts
+++ b/src/test/utils/mocks/mocksContainer/mockContainer.ts
@ -208,4 +208,5 @@ export default class MockContainer implements MockGameObject {
    return this.list;
  }

+  disableInteractive = vi.fn();
 }
--- a/src/ui/login-form-ui-handler.ts
+++ b/src/ui/login-form-ui-handler.ts
@ -8,7 +8,21 @@ import { addTextObject, TextStyle } from "./text";
 import { addWindow } from "./ui-theme";
 import { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler";

+interface BuildInteractableImageOpts {
+  scale?: number;
+  x?: number;
+  y?: number;
+  origin?: { x: number; y: number };
+}
+
 export default class LoginFormUiHandler extends FormModalUiHandler {
+  private readonly ERR_USERNAME: string = "invalid username";
+  private readonly ERR_PASSWORD: string =  "invalid password";
+  private readonly ERR_ACCOUNT_EXIST: string =  "account doesn't exist";
+  private readonly ERR_PASSWORD_MATCH: string =  "password doesn't match";
+  private readonly ERR_NO_SAVES: string = "No save files found";
+  private readonly ERR_TOO_MANY_SAVES: string = "Too many save files found";
+
  private googleImage: Phaser.GameObjects.Image;
  private discordImage: Phaser.GameObjects.Image;
  private usernameInfoImage: Phaser.GameObjects.Image;
@ -21,8 +35,23 @@ export default class LoginFormUiHandler extends FormModalUiHandler {
  }

  setup(): void {
-
    super.setup();
+    this.buildExternalPartyContainer();
+
+    this.infoContainer = this.scene.add.container(0, 0);
+
+    this.usernameInfoImage = this.buildInteractableImage("settings_icon", "username-info-icon", {
+      x: 20,
+      scale: 0.5
+    });
+
+    this.infoContainer.add(this.usernameInfoImage);
+    this.getUi().add(this.infoContainer);
+    this.infoContainer.setVisible(false);
+    this.infoContainer.disableInteractive();
+  }
+
+  private buildExternalPartyContainer() {
    this.externalPartyContainer = this.scene.add.container(0, 0);
    this.externalPartyContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, this.scene.game.canvas.width / 12, this.scene.game.canvas.height / 12), Phaser.Geom.Rectangle.Contains);
    this.externalPartyTitle = addTextObject(this.scene, 0, 4, "", TextStyle.SETTINGS_LABEL);
@ -31,23 +60,8 @@ export default class LoginFormUiHandler extends FormModalUiHandler {
    this.externalPartyContainer.add(this.externalPartyBg);
    this.externalPartyContainer.add(this.externalPartyTitle);

-    this.infoContainer = this.scene.add.container(0, 0);
-    this.infoContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, this.scene.game.canvas.width / 12, this.scene.game.canvas.height / 12), Phaser.Geom.Rectangle.Contains);
-
-    const googleImage = this.scene.add.image(0, 0, "google");
-    googleImage.setOrigin(0, 0);
-    googleImage.setScale(0.07);
-    googleImage.setInteractive();
-    googleImage.setName("google-icon");
-    this.googleImage = googleImage;
-
-    const discordImage = this.scene.add.image(20, 0, "discord");
-    discordImage.setOrigin(0, 0);
-    discordImage.setScale(0.07);
-    discordImage.setInteractive();
-    discordImage.setName("discord-icon");
-
-    this.discordImage = discordImage;
+    this.googleImage = this.buildInteractableImage("google", "google-icon");
+    this.discordImage = this.buildInteractableImage("discord", "discord-icon");

    this.externalPartyContainer.add(this.googleImage);
    this.externalPartyContainer.add(this.discordImage);
@ -55,59 +69,52 @@ export default class LoginFormUiHandler extends FormModalUiHandler {
    this.externalPartyContainer.add(this.googleImage);
    this.externalPartyContainer.add(this.discordImage);
    this.externalPartyContainer.setVisible(false);
-
-    const usernameInfoImage = this.scene.add.image(20, 0, "settings_icon");
-    usernameInfoImage.setOrigin(0, 0);
-    usernameInfoImage.setScale(0.5);
-    usernameInfoImage.setInteractive();
-    usernameInfoImage.setName("username-info-icon");
-    this.usernameInfoImage = usernameInfoImage;
-
-    this.infoContainer.add(this.usernameInfoImage);
-    this.getUi().add(this.infoContainer);
-    this.infoContainer.setVisible(false);
  }

-  getModalTitle(config?: ModalConfig): string {
+  override getModalTitle(_config?: ModalConfig): string {
    return i18next.t("menu:login");
  }

-  getFields(config?: ModalConfig): string[] {
+  override getFields(_config?: ModalConfig): string[] {
    return [ i18next.t("menu:username"), i18next.t("menu:password") ];
  }

-  getWidth(config?: ModalConfig): number {
+  override getWidth(_config?: ModalConfig): number {
    return 160;
  }

-  getMargin(config?: ModalConfig): [number, number, number, number] {
+  override getMargin(_config?: ModalConfig): [number, number, number, number] {
    return [ 0, 0, 48, 0 ];
  }

-  getButtonLabels(config?: ModalConfig): string[] {
+  override getButtonLabels(_config?: ModalConfig): string[] {
    return [ i18next.t("menu:login"), i18next.t("menu:register")];
  }

-  getReadableErrorMessage(error: string): string {
+  override getReadableErrorMessage(error: string): string {
    const colonIndex = error?.indexOf(":");
    if (colonIndex > 0) {
      error = error.slice(0, colonIndex);
    }
    switch (error) {
-    case "invalid username":
+    case this.ERR_USERNAME:
      return i18next.t("menu:invalidLoginUsername");
-    case "invalid password":
+    case this.ERR_PASSWORD:
      return i18next.t("menu:invalidLoginPassword");
-    case "account doesn't exist":
+    case this.ERR_ACCOUNT_EXIST:
      return i18next.t("menu:accountNonExistent");
-    case "password doesn't match":
+    case this.ERR_PASSWORD_MATCH:
      return i18next.t("menu:unmatchingPassword");
+    case this.ERR_NO_SAVES:
+      return i18next.t("menu:noSaves");
+    case this.ERR_TOO_MANY_SAVES:
+      return i18next.t("menu:tooManySaves");
    }

    return super.getReadableErrorMessage(error);
  }

-  show(args: any[]): boolean {
+  override show(args: any[]): boolean {
    if (super.show(args)) {

      const config = args[0] as ModalConfig;
@ -148,17 +155,16 @@ export default class LoginFormUiHandler extends FormModalUiHandler {
    return false;
  }

-  clear() {
+  override clear() {
    super.clear();
    this.externalPartyContainer.setVisible(false);
    this.infoContainer.setVisible(false);
+    this.setMouseCursorStyle("default"); //reset cursor

-    this.discordImage.off("pointerdown");
-    this.googleImage.off("pointerdown");
-    this.usernameInfoImage.off("pointerdown");
+    [this.discordImage, this.googleImage, this.usernameInfoImage].forEach((img) => img.off("pointerdown"));
  }

-  processExternalProvider(config: ModalConfig) : void {
+  private processExternalProvider(config: ModalConfig) : void {
    this.externalPartyTitle.setText(i18next.t("menu:orUse") ?? "");
    this.externalPartyTitle.setX(20+this.externalPartyTitle.text.length);
    this.externalPartyTitle.setVisible(true);
@ -205,6 +211,7 @@ export default class LoginFormUiHandler extends FormModalUiHandler {
            label: dataKeys[i].replace(keyToFind, ""),
            handler: () => {
              this.scene.ui.revertMode();
+              this.infoContainer.disableInteractive();
              return true;
            }
          });
@ -213,8 +220,13 @@ export default class LoginFormUiHandler extends FormModalUiHandler {
          options: options,
          delay: 1000
        });
+        this.infoContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, this.scene.game.canvas.width, this.scene.game.canvas.height), Phaser.Geom.Rectangle.Contains);
      } else {
-        return onFail("You have too many save files to use this");
+        if (dataKeys.length > 2) {
+          return onFail(this.ERR_TOO_MANY_SAVES);
+        } else {
+          return onFail(this.ERR_NO_SAVES);
+        }
      }
    });

@ -236,4 +248,21 @@ export default class LoginFormUiHandler extends FormModalUiHandler {
      alpha: 1
    });
  }
+
+  private buildInteractableImage(texture: string, name: string, opts: BuildInteractableImageOpts = {}) {
+    const {
+      scale = 0.07,
+      x = 0,
+      y = 0,
+      origin = { x: 0, y: 0 }
+    } = opts;
+    const img = this.scene.add.image(x, y, texture);
+    img.setName(name);
+    img.setOrigin(origin.x, origin.y);
+    img.setScale(scale);
+    img.setInteractive();
+    this.addInteractionHoverEffect(img);
+
+    return img;
+  }
 }
--- a/src/ui/modal-ui-handler.ts
+++ b/src/ui/modal-ui-handler.ts
@ -57,29 +57,35 @@ export abstract class ModalUiHandler extends UiHandler {

    const buttonLabels = this.getButtonLabels();

-    const buttonTopMargin = this.getButtonTopMargin();
-
    for (const label of buttonLabels) {
-      const buttonLabel = addTextObject(this.scene, 0, 8, label, TextStyle.TOOLTIP_CONTENT);
-      buttonLabel.setOrigin(0.5, 0.5);
-
-      const buttonBg = addWindow(this.scene, 0, 0, buttonLabel.getBounds().width + 8, 16, false, false, 0, 0, WindowVariant.THIN);
-      buttonBg.setOrigin(0.5, 0);
-      buttonBg.setInteractive(new Phaser.Geom.Rectangle(0, 0, buttonBg.width, buttonBg.height), Phaser.Geom.Rectangle.Contains);
-
-      const buttonContainer = this.scene.add.container(0, buttonTopMargin);
-
-      this.buttonBgs.push(buttonBg);
-      this.buttonContainers.push(buttonContainer);
-
-      buttonContainer.add(buttonBg);
-      buttonContainer.add(buttonLabel);
-      this.modalContainer.add(buttonContainer);
+      this.addButton(label);
    }

    this.modalContainer.setVisible(false);
  }

+  private addButton(label: string) {
+    const buttonTopMargin = this.getButtonTopMargin();
+    const buttonLabel = addTextObject(this.scene, 0, 8, label, TextStyle.TOOLTIP_CONTENT);
+    buttonLabel.setOrigin(0.5, 0.5);
+
+    const buttonBg = addWindow(this.scene, 0, 0, buttonLabel.getBounds().width + 8, 16, false, false, 0, 0, WindowVariant.THIN);
+    buttonBg.setOrigin(0.5, 0);
+    buttonBg.setInteractive(new Phaser.Geom.Rectangle(0, 0, buttonBg.width, buttonBg.height), Phaser.Geom.Rectangle.Contains);
+
+    const buttonContainer = this.scene.add.container(0, buttonTopMargin);
+
+    this.buttonBgs.push(buttonBg);
+    this.buttonContainers.push(buttonContainer);
+
+    buttonContainer.add(buttonBg);
+    buttonContainer.add(buttonLabel);
+
+    this.addInteractionHoverEffect(buttonBg);
+
+    this.modalContainer.add(buttonContainer);
+  }
+
  show(args: any[]): boolean {
    if (args.length >= 1 && "buttonActions" in args[0]) {
      super.show(args);
@ -135,4 +141,20 @@ export abstract class ModalUiHandler extends UiHandler {

    this.buttonBgs.map(bg => bg.off("pointerdown"));
  }
+
+  /**
+   * Adds a hover effect to a game object which changes the cursor to a `pointer` and tints it slighly
+   * @param gameObject the game object to add hover events/effects to
+   */
+  protected addInteractionHoverEffect(gameObject: Phaser.GameObjects.Image | Phaser.GameObjects.NineSlice | Phaser.GameObjects.Sprite) {
+    gameObject.on("pointerover", () => {
+      this.setMouseCursorStyle("pointer");
+      gameObject.setTint(0xbbbbbb);
+    });
+
+    gameObject.on("pointerout", () => {
+      this.setMouseCursorStyle("default");
+      gameObject.clearTint();
+    });
+  }
 }
--- a/src/ui/ui-handler.ts
+++ b/src/ui/ui-handler.ts
@ -52,6 +52,15 @@ export default abstract class UiHandler {
    return changed;
  }

+  /**
+   * Changes the style of the mouse cursor.
+   * @see {@link https://developer.mozilla.org/en-US/docs/Web/CSS/cursor}
+   * @param cursorStyle cursor style to apply
+   */
+  protected setMouseCursorStyle(cursorStyle: "pointer" | "default") {
+    this.scene.input.manager.canvas.style.cursor = cursorStyle;
+  }
+
  clear() {
    this.active = false;
  }
--- a/src/utils.ts
+++ b/src/utils.ts
@ -1,5 +1,5 @@
-import i18next from "i18next";
 import { MoneyFormat } from "#enums/money-format";
+import i18next from "i18next";

 export const MissingTextureKey = "__MISSING";

@ -82,6 +82,12 @@ export function randInt(range: integer, min: integer = 0): integer {
  return Math.floor(Math.random() * range) + min;
 }

+/**
+ * Generates a random number using the global seed, or the current battle's seed if called via `Battle.randSeedInt`
+ * @param range How large of a range of random numbers to choose from. If {@linkcode range} <= 1, returns {@linkcode min}
+ * @param min The minimum integer to pick, default `0`
+ * @returns A random integer between {@linkcode min} and ({@linkcode min} + {@linkcode range} - 1)
+ */
 export function randSeedInt(range: integer, min: integer = 0): integer {
  if (range <= 1) {
    return min;