Fix Merge Conflicts

create-test-boilerplate.js

@@ -0,0 +1,101 @@
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+/**
+ * This script creates a test boilerplate file for a move or ability.
+ * @param {string} type - The type of test to create. Either "move" or "ability".
+ * @param {string} fileName - The name of the file to create.
+ * @example npm run create-test move tackle
+ */
+
+// Get the directory name of the current module file
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+// Get the arguments from the command line
+const args = process.argv.slice(2);
+const type = args[0]; // "move" or "ability"
+let fileName = args[1]; // The file name
+
+if (!type || !fileName) {
+    console.error('Please provide both a type ("move" or "ability") and a file name.');
+    process.exit(1);
+}
+
+// Convert fileName from to snake_case if camelCase is given
+fileName = fileName.replace(/([a-z])([A-Z])/g, '$1_$2').toLowerCase();
+
+// Format the description for the test case
+const formattedName = fileName
+    .replace(/_/g, ' ')
+    .replace(/\b\w/g, char => char.toUpperCase());
+
+// Determine the directory based on the type
+let dir;
+let description;
+if (type === 'move') {
+    dir = path.join(__dirname, 'src', 'test', 'moves');
+    description = `Moves - ${formattedName}`;
+} else if (type === 'ability') {
+    dir = path.join(__dirname, 'src', 'test', 'abilities');
+    description = `Abilities - ${formattedName}`;
+} else {
+    console.error('Invalid type. Please use "move" or "ability".');
+    process.exit(1);
+}
+
+// Ensure the directory exists
+if (!fs.existsSync(dir)) {
+    fs.mkdirSync(dir, { recursive: true });
+}
+
+// Create the file with the given name
+const filePath = path.join(dir, `${fileName}.test.ts`);
+
+if (fs.existsSync(filePath)) {
+    console.error(`File "${fileName}.test.ts" already exists.`);
+    process.exit(1);
+}
+
+// Define the content template
+const content = `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, it } from "vitest";
+
+describe("${description}", () => {
+  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("single")
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(SPLASH_ONLY);
+  });
+
+  it("test case", async () => {
+    // await game.classicMode.startBattle();
+    // game.move.select();
+  }, TIMEOUT);
+});
+`;
+
+// Write the template content to the file
+fs.writeFileSync(filePath, content, 'utf8');
+
+console.log(`File created at: ${filePath}`);

package.json

@@ -18,7 +18,8 @@
 		"eslint-ci": "eslint .",
 		"docs": "typedoc",
 		"depcruise": "depcruise src",
-		"depcruise:graph": "depcruise src --output-type dot | node dependency-graph.js > dependency-graph.svg"
+		"depcruise:graph": "depcruise src --output-type dot | node dependency-graph.js > dependency-graph.svg",
+		"create-test": "node ./create-test-boilerplate.js"
 	},
 	"devDependencies": {
 		"@eslint/js": "^9.3.0",

public/images/pokemon/variant/279.json

@@ -1,38 +1,49 @@
 {
 	"0": {
+		"bc4524": "af5457",
 		"31638c": "324a26",
-		"101010": "101010",
 		"5aa5ce": "40683c",
-		"a5e6ff": "b6d9ac",
+		"ce4252": "af2c4f",
-		"7bceef": "789c6e",
-		"ced6ef": "c09e99",
-		"737384": "774644",
 		"ffffff": "f1dcd8",
 		"8c4231": "420b0c",
-		"ffde4a": "c66f68",
-		"c57b31": "551917",
 		"ffffad": "f4bfb6",
+		"ffde4a": "c66f68",
+		"7bceef": "789c6e",
+		"a5e6ff": "b6d9ac",
+		"737384": "774644",
 		"f7b531": "af5457",
-		"ce4252": "af2c4f",
+		"c57b31": "551917",
-		"bc4524": "af5457",
+		"ced6ef": "c09e99"
-		"00e5e7": "00e5e7"
 	},
 	"1": {
+		"bc4524": "3d325e",
 		"31638c": "143a72",
-		"101010": "101010",
 		"5aa5ce": "4060bc",
-		"a5e6ff": "b4b3ff",
+		"ce4252": "b75558",
-		"7bceef": "657ddf",
-		"ced6ef": "a8b5dd",
-		"737384": "737384",
 		"ffffff": "e5ecff",
 		"8c4231": "17103f",
-		"ffde4a": "534e72",
-		"c57b31": "2a1f50",
 		"ffffad": "87879b",
+		"ffde4a": "534e72",
+		"7bceef": "657ddf",
+		"a5e6ff": "b4b3ff",
 		"f7b531": "3d325e",
-		"ce4252": "b75558",
+		"c57b31": "2a1f50",
-		"bc4524": "3d325e",
+		"ced6ef": "a8b5dd"
-		"00e5e7": "00e5e7"
+	},
+	"2": {
+		"ce4252": "215991",
+		"ffde4a": "f16f40",
+		"ffffad": "ffb274",
+		"737384": "884c43",
+		"c57b31": "761c03",
+		"7bceef": "be3d2f",
+		"8c4231": "5a0700",
+		"5aa5ce": "892722",
+		"8c4232": "761c03",
+		"ffffff": "f5e1d1",
+		"a5e6ff": "dd533a",
+		"f7b531": "bc4524",
+		"ced6ef": "d19e92",
+		"31638c": "610f0e"
 	}
 }

public/images/pokemon/variant/_masterlist.json

@@ -1017,7 +1017,7 @@
 	"279": [
 		1,
 		1,
-		2
+		1
 	],
 	"280": [
 		0,

src/battle-scene.ts

@@ -1791,6 +1791,7 @@ export default class BattleScene extends SceneBase {
     config = config ?? {};
     try {
       const keyDetails = key.split("/");
+      config["volume"] = config["volume"] ?? 1;
       switch (keyDetails[0]) {
       case "level_up_fanfare":
       case "item_fanfare":
@@ -1800,11 +1801,11 @@ export default class BattleScene extends SceneBase {
       case "evolution_fanfare":
         // These sounds are loaded in as BGM, but played as sound effects
         // When these sounds are updated in updateVolume(), they are treated as BGM however because they are placed in the BGM Cache through being called by playSoundWithoutBGM()
-        config["volume"] = this.masterVolume * this.bgmVolume;
+        config["volume"] *= (this.masterVolume * this.bgmVolume);
         break;
       case "battle_anims":
       case "cry":
-        config["volume"] = this.masterVolume * this.fieldVolume;
+        config["volume"] *= (this.masterVolume * this.fieldVolume);
         //PRSFX sound files are unusually loud
         if (keyDetails[1].startsWith("PRSFX- ")) {
           config["volume"] *= 0.5;
@@ -1812,10 +1813,10 @@ export default class BattleScene extends SceneBase {
         break;
       case "ui":
         //As of, right now this applies to the "select", "menu_open", "error" sound effects
-        config["volume"] = this.masterVolume * this.uiVolume;
+        config["volume"] *= (this.masterVolume * this.uiVolume);
         break;
       case "se":
-        config["volume"] = this.masterVolume * this.seVolume;
+        config["volume"] *= (this.masterVolume * this.seVolume);
         break;
       }
       this.sound.play(key, config);

src/data/ability.ts

@@ -847,7 +847,7 @@ export class PostDefendTerrainChangeAbAttr extends PostDefendAbAttr {
 }
 
 export class PostDefendContactApplyStatusEffectAbAttr extends PostDefendAbAttr {
-  private chance: integer;
+  public chance: integer;
   private effects: StatusEffect[];
 
   constructor(chance: integer, ...effects: StatusEffect[]) {
@@ -2417,7 +2417,7 @@ export class PostSummonWeatherSuppressedFormChangeAbAttr extends PostSummonAbAtt
 
 /**
  * Triggers weather-based form change when summoned into an active weather.
- * Used by Forecast.
+ * Used by Forecast and Flower Gift.
  * @extends PostSummonAbAttr
  */
 export class PostSummonFormChangeByWeatherAbAttr extends PostSummonAbAttr {
@@ -2440,7 +2440,10 @@ export class PostSummonFormChangeByWeatherAbAttr extends PostSummonAbAttr {
    * @returns whether the form change was triggered
    */
   applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
-    if (pokemon.species.speciesId === Species.CASTFORM && this.ability === Abilities.FORECAST) {
+    const isCastformWithForecast = (pokemon.species.speciesId === Species.CASTFORM && this.ability === Abilities.FORECAST);
+    const isCherrimWithFlowerGift = (pokemon.species.speciesId === Species.CHERRIM && this.ability === Abilities.FLOWER_GIFT);
+
+    if (isCastformWithForecast || isCherrimWithFlowerGift) {
       if (simulated) {
         return simulated;
       }
@@ -3113,37 +3116,41 @@ export class PostWeatherChangeAbAttr extends AbAttr {
 
 /**
  * Triggers weather-based form change when weather changes.
- * Used by Forecast.
+ * Used by Forecast and Flower Gift.
  * @extends PostWeatherChangeAbAttr
  */
 export class PostWeatherChangeFormChangeAbAttr extends PostWeatherChangeAbAttr {
   private ability: Abilities;
+  private formRevertingWeathers: WeatherType[];
 
-  constructor(ability: Abilities) {
+  constructor(ability: Abilities, formRevertingWeathers: WeatherType[]) {
     super(false);
 
     this.ability = ability;
+    this.formRevertingWeathers = formRevertingWeathers;
   }
 
   /**
    * Calls {@linkcode Arena.triggerWeatherBasedFormChangesToNormal | triggerWeatherBasedFormChangesToNormal} when the
    * weather changed to form-reverting weather, otherwise calls {@linkcode Arena.triggerWeatherBasedFormChanges | triggerWeatherBasedFormChanges}
-   * @param {Pokemon} pokemon the Pokemon that changed the weather
+   * @param {Pokemon} pokemon the Pokemon with this ability
    * @param passive n/a
    * @param weather n/a
    * @param args n/a
    * @returns whether the form change was triggered
    */
   applyPostWeatherChange(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: WeatherType, args: any[]): boolean {
-    if (pokemon.species.speciesId === Species.CASTFORM && this.ability === Abilities.FORECAST) {
+    const isCastformWithForecast = (pokemon.species.speciesId === Species.CASTFORM && this.ability === Abilities.FORECAST);
+    const isCherrimWithFlowerGift = (pokemon.species.speciesId === Species.CHERRIM && this.ability === Abilities.FLOWER_GIFT);
+
+    if (isCastformWithForecast || isCherrimWithFlowerGift) {
       if (simulated) {
         return simulated;
       }
 
-      const formRevertingWeathers: WeatherType[] = [ WeatherType.NONE, WeatherType.SANDSTORM, WeatherType.STRONG_WINDS, WeatherType.FOG ];
       const weatherType = pokemon.scene.arena.weather?.weatherType;
 
-      if (weatherType && formRevertingWeathers.includes(weatherType)) {
+      if (weatherType && this.formRevertingWeathers.includes(weatherType)) {
         pokemon.scene.arena.triggerWeatherBasedFormChangesToNormal();
       } else {
         pokemon.scene.arena.triggerWeatherBasedFormChanges();
@@ -3676,10 +3683,10 @@ export class PostDancingMoveAbAttr extends PostMoveUsedAbAttr {
         // If the move is an AttackMove or a StatusMove the Dancer must replicate the move on the source of the Dance
         if (move.getMove() instanceof AttackMove || move.getMove() instanceof StatusMove) {
           const target = this.getTarget(dancer, source, targets);
-          dancer.scene.unshiftPhase(new MovePhase(dancer.scene, dancer, target, move, true));
+          dancer.scene.unshiftPhase(new MovePhase(dancer.scene, dancer, target, move, true, true));
         } else if (move.getMove() instanceof SelfStatusMove) {
           // If the move is a SelfStatusMove (ie. Swords Dance) the Dancer should replicate it on itself
-          dancer.scene.unshiftPhase(new MovePhase(dancer.scene, dancer, [dancer.getBattlerIndex()], move, true));
+          dancer.scene.unshiftPhase(new MovePhase(dancer.scene, dancer, [dancer.getBattlerIndex()], move, true, true));
         }
       }
       return true;
@@ -4732,7 +4739,8 @@ function setAbilityRevealed(pokemon: Pokemon): void {
  */
 function getPokemonWithWeatherBasedForms(scene: BattleScene) {
   return scene.getField(true).filter(p =>
-    p.hasAbility(Abilities.FORECAST) && p.species.speciesId === Species.CASTFORM
+    (p.hasAbility(Abilities.FORECAST) && p.species.speciesId === Species.CASTFORM)
+    || (p.hasAbility(Abilities.FLOWER_GIFT) && p.species.speciesId === Species.CHERRIM)
   );
 }
 
@@ -4931,7 +4939,7 @@ export function initAbilities() {
       .attr(UncopiableAbilityAbAttr)
       .attr(NoFusionAbilityAbAttr)
       .attr(PostSummonFormChangeByWeatherAbAttr, Abilities.FORECAST)
-      .attr(PostWeatherChangeFormChangeAbAttr, Abilities.FORECAST),
+      .attr(PostWeatherChangeFormChangeAbAttr, Abilities.FORECAST, [ WeatherType.NONE, WeatherType.SANDSTORM, WeatherType.STRONG_WINDS, WeatherType.FOG ]),
     new Ability(Abilities.STICKY_HOLD, 3)
       .attr(BlockItemTheftAbAttr)
       .bypassFaint()
@@ -5124,8 +5132,10 @@ export function initAbilities() {
       .conditionalAttr(getWeatherCondition(WeatherType.SUNNY || WeatherType.HARSH_SUN), StatMultiplierAbAttr, Stat.SPDEF, 1.5)
       .attr(UncopiableAbilityAbAttr)
       .attr(NoFusionAbilityAbAttr)
-      .ignorable()
+      .attr(PostSummonFormChangeByWeatherAbAttr, Abilities.FLOWER_GIFT)
-      .partial(),
+      .attr(PostWeatherChangeFormChangeAbAttr, Abilities.FLOWER_GIFT, [ WeatherType.NONE, WeatherType.SANDSTORM, WeatherType.STRONG_WINDS, WeatherType.FOG, WeatherType.HAIL, WeatherType.HEAVY_RAIN, WeatherType.SNOW, WeatherType.RAIN ])
+      .partial() // Should also boosts stats of ally
+      .ignorable(),
     new Ability(Abilities.BAD_DREAMS, 4)
       .attr(PostTurnHurtIfSleepingAbAttr),
     new Ability(Abilities.PICKPOCKET, 5)

src/data/arena-tag.ts

@@ -905,6 +905,21 @@ class HappyHourTag extends ArenaTag {
   }
 }
 
+class SafeguardTag extends ArenaTag {
+  constructor(turnCount: integer, sourceId: integer, side: ArenaTagSide) {
+    super(ArenaTagType.SAFEGUARD, turnCount, Moves.SAFEGUARD, sourceId, side);
+  }
+
+  onAdd(arena: Arena): void {
+    arena.scene.queueMessage(i18next.t(`arenaTag:safeguardOnAdd${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`));
+  }
+
+  onRemove(arena: Arena): void {
+    arena.scene.queueMessage(i18next.t(`arenaTag:safeguardOnRemove${this.side === ArenaTagSide.PLAYER ? "Player" : this.side === ArenaTagSide.ENEMY ? "Enemy" : ""}`));
+  }
+}
+
+
 export function getArenaTag(tagType: ArenaTagType, turnCount: integer, sourceMove: Moves | undefined, sourceId: integer, targetIndex?: BattlerIndex, side: ArenaTagSide = ArenaTagSide.BOTH): ArenaTag | null {
   switch (tagType) {
   case ArenaTagType.MIST:
@@ -950,6 +965,8 @@ export function getArenaTag(tagType: ArenaTagType, turnCount: integer, sourceMov
     return new TailwindTag(turnCount, sourceId, side);
   case ArenaTagType.HAPPY_HOUR:
     return new HappyHourTag(turnCount, sourceId, side);
+  case ArenaTagType.SAFEGUARD:
+    return new SafeguardTag(turnCount, sourceId, side);
   default:
     return null;
   }

src/data/battle-anims.ts

@@ -788,10 +788,10 @@ export abstract class BattleAnim {
         targetSprite.pipelineData["tone"] = [ 0.0, 0.0, 0.0, 0.0 ];
         targetSprite.setAngle(0);
         if (!this.isHideUser() && userSprite) {
-          userSprite.setVisible(true);
+          this.user?.getSprite().setVisible(true); // using this.user to fix context loss due to isOppAnim swap (#481)
         }
         if (!this.isHideTarget() && (targetSprite !== userSprite || !this.isHideUser())) {
-          targetSprite.setVisible(true);
+          this.target?.getSprite().setVisible(true); // using this.target to fix context loss due to isOppAnim swap (#481)
         }
         for (const ms of Object.values(spriteCache).flat()) {
           if (ms) {

src/data/battler-tags.ts

@@ -211,7 +211,7 @@ export class TrappedTag extends BattlerTag {
 
   canAdd(pokemon: Pokemon): boolean {
     const isGhost = pokemon.isOfType(Type.GHOST);
-    const isTrapped = pokemon.getTag(BattlerTagType.TRAPPED);
+    const isTrapped = pokemon.getTag(TrappedTag);
 
     return !isTrapped && !isGhost;
   }
@@ -244,6 +244,23 @@ export class TrappedTag extends BattlerTag {
   }
 }
 
+/**
+ * BattlerTag implementing No Retreat's trapping effect.
+ * This is treated separately from other trapping effects to prevent
+ * Ghost-type Pokemon from being able to reuse the move.
+ * @extends TrappedTag
+ */
+class NoRetreatTag extends TrappedTag {
+  constructor(sourceId: number) {
+    super(BattlerTagType.NO_RETREAT, BattlerTagLapseType.CUSTOM, 0, Moves.NO_RETREAT, sourceId);
+  }
+
+  /** overrides {@linkcode TrappedTag.apply}, removing the Ghost-type condition */
+  canAdd(pokemon: Pokemon): boolean {
+    return !pokemon.getTag(TrappedTag);
+  }
+}
+
 /**
  * BattlerTag that represents the {@link https://bulbapedia.bulbagarden.net/wiki/Flinch Flinch} status condition
  */
@@ -749,7 +766,7 @@ export class OctolockTag extends TrappedTag {
     const shouldLapse = lapseType !== BattlerTagLapseType.CUSTOM || super.lapse(pokemon, lapseType);
 
     if (shouldLapse) {
-      pokemon.scene.unshiftPhase(new StatStageChangePhase(pokemon.scene, pokemon.getBattlerIndex(), true, [ Stat.DEF, Stat.SPDEF ], -1));
+      pokemon.scene.unshiftPhase(new StatStageChangePhase(pokemon.scene, pokemon.getBattlerIndex(), false, [ Stat.DEF, Stat.SPDEF ], -1));
       return true;
     }
 
@@ -863,7 +880,7 @@ export abstract class DamagingTrapTag extends TrappedTag {
   }
 
   canAdd(pokemon: Pokemon): boolean {
-    return !pokemon.isOfType(Type.GHOST) && !pokemon.findTag(t => t instanceof DamagingTrapTag);
+    return !pokemon.getTag(TrappedTag);
   }
 
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
@@ -1505,6 +1522,25 @@ export class CritBoostTag extends BattlerTag {
   }
 }
 
+/**
+ * Tag for the effects of Dragon Cheer, which boosts the critical hit ratio of the user's allies.
+ * @extends {CritBoostTag}
+ */
+export class DragonCheerTag extends CritBoostTag {
+  /** The types of the user's ally when the tag is added */
+  public typesOnAdd: Type[];
+
+  constructor() {
+    super(BattlerTagType.CRIT_BOOST, Moves.DRAGON_CHEER);
+  }
+
+  onAdd(pokemon: Pokemon): void {
+    super.onAdd(pokemon);
+
+    this.typesOnAdd = pokemon.getTypes(true);
+  }
+}
+
 export class SaltCuredTag extends BattlerTag {
   private sourceIndex: number;
 
@@ -1862,6 +1898,8 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: number, source
     return new DrowsyTag();
   case BattlerTagType.TRAPPED:
     return new TrappedTag(tagType, BattlerTagLapseType.CUSTOM, turnCount, sourceMove, sourceId);
+  case BattlerTagType.NO_RETREAT:
+    return new NoRetreatTag(sourceId);
   case BattlerTagType.BIND:
     return new BindTag(turnCount, sourceId);
   case BattlerTagType.WRAP:
@@ -1921,6 +1959,8 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: number, source
     return new TypeBoostTag(tagType, sourceMove, Type.FIRE, 1.5, false);
   case BattlerTagType.CRIT_BOOST:
     return new CritBoostTag(tagType, sourceMove);
+  case BattlerTagType.DRAGON_CHEER:
+    return new DragonCheerTag();
   case BattlerTagType.ALWAYS_CRIT:
   case BattlerTagType.IGNORE_ACCURACY:
     return new BattlerTag(tagType, BattlerTagLapseType.TURN_END, 2, sourceMove);

src/data/move.ts

@@ -1951,6 +1951,13 @@ export class StatusEffectAttr extends MoveEffectAttr {
           return false;
         }
       }
+
+      if (user !== target && target.scene.arena.getTagOnSide(ArenaTagType.SAFEGUARD, target.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY)) {
+        if (move.category === MoveCategory.STATUS) {
+          user.scene.queueMessage(i18next.t("moveTriggers:safeguard", { targetName: getPokemonNameWithAffix(target)}));
+        }
+        return false;
+      }
       if ((!pokemon.status || (pokemon.status.effect === this.effect && moveChance < 0))
         && pokemon.trySetStatus(this.effect, true, user, this.cureTurn)) {
         applyPostAttackAbAttrs(ConfusionOnStatusEffectAbAttr, user, target, move, null, false, this.effect);
@@ -4678,6 +4685,17 @@ export class ConfuseAttr extends AddBattlerTagAttr {
   constructor(selfTarget?: boolean) {
     super(BattlerTagType.CONFUSED, selfTarget, false, 2, 5);
   }
+
+  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    if (!this.selfTarget && target.scene.arena.getTagOnSide(ArenaTagType.SAFEGUARD, target.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY)) {
+      if (move.category === MoveCategory.STATUS) {
+        user.scene.queueMessage(i18next.t("moveTriggers:safeguard", { targetName: getPokemonNameWithAffix(target)}));
+      }
+      return false;
+    }
+
+    return super.apply(user, target, move, args);
+  }
 }
 
 export class RechargeAttr extends AddBattlerTagAttr {
@@ -5907,9 +5925,9 @@ export class SwitchAbilitiesAttr extends MoveEffectAttr {
     target.summonData.ability = tempAbilityId;
 
     user.scene.queueMessage(i18next.t("moveTriggers:swappedAbilitiesWithTarget", {pokemonName: getPokemonNameWithAffix(user)}));
-    // Swaps Forecast from Castform
+    // Swaps Forecast/Flower Gift from Castform/Cherrim
     user.scene.arena.triggerWeatherBasedFormChangesToNormal();
-    // Swaps Forecast to Castform (edge case)
+    // Swaps Forecast/Flower Gift to Castform/Cherrim (edge case)
     user.scene.arena.triggerWeatherBasedFormChanges();
 
     return true;
@@ -6154,6 +6172,57 @@ export class DestinyBondAttr extends MoveEffectAttr {
   }
 }
 
+/**
+ * Attribute to apply a battler tag to the target if they have had their stats boosted this turn.
+ * @extends AddBattlerTagAttr
+ */
+export class AddBattlerTagIfBoostedAttr extends AddBattlerTagAttr {
+  constructor(tag: BattlerTagType) {
+    super(tag, false, false, 2, 5);
+  }
+
+  /**
+   * @param user {@linkcode Pokemon} using this move
+   * @param target {@linkcode Pokemon} target of this move
+   * @param move {@linkcode Move} being used
+   * @param {any[]} args N/A
+   * @returns true
+   */
+  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    if (target.turnData.statStagesIncreased) {
+      super.apply(user, target, move, args);
+    }
+    return true;
+  }
+}
+
+/**
+ * Attribute to apply a status effect to the target if they have had their stats boosted this turn.
+ * @extends MoveEffectAttr
+ */
+export class StatusIfBoostedAttr extends MoveEffectAttr {
+  public effect: StatusEffect;
+
+  constructor(effect: StatusEffect) {
+    super(true, MoveEffectTrigger.HIT);
+    this.effect = effect;
+  }
+
+  /**
+   * @param user {@linkcode Pokemon} using this move
+   * @param target {@linkcode Pokemon} target of this move
+   * @param move {@linkcode Move} N/A
+   * @param {any[]} args N/A
+   * @returns true
+   */
+  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    if (target.turnData.statStagesIncreased) {
+      target.trySetStatus(this.effect, true, user);
+    }
+    return true;
+  }
+}
+
 export class LastResortAttr extends MoveAttr {
   getCondition(): MoveConditionFunc {
     return (user: Pokemon, target: Pokemon, move: Move) => {
@@ -7080,7 +7149,7 @@ export function initMoves() {
       .attr(FriendshipPowerAttr, true),
     new StatusMove(Moves.SAFEGUARD, Type.NORMAL, -1, 25, -1, 0, 2)
       .target(MoveTarget.USER_SIDE)
-      .unimplemented(),
+      .attr(AddArenaTagAttr, ArenaTagType.SAFEGUARD, 5, true, true),
     new StatusMove(Moves.PAIN_SPLIT, Type.NORMAL, -1, 20, -1, 0, 2)
       .attr(HpSplitAttr)
       .condition(failOnBossCondition),
@@ -7269,7 +7338,7 @@ export function initMoves() {
       .attr(RemoveScreensAttr),
     new StatusMove(Moves.YAWN, Type.NORMAL, -1, 10, -1, 0, 3)
       .attr(AddBattlerTagAttr, BattlerTagType.DROWSY, false, true)
-      .condition((user, target, move) => !target.status),
+      .condition((user, target, move) => !target.status && !target.scene.arena.getTagOnSide(ArenaTagType.SAFEGUARD, target.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY)),
     new AttackMove(Moves.KNOCK_OFF, Type.DARK, MoveCategory.PHYSICAL, 65, 100, 20, -1, 0, 3)
       .attr(MovePowerMultiplierAttr, (user, target, move) => target.getHeldItems().filter(i => i.isTransferrable).length > 0 ? 1.5 : 1)
       .attr(RemoveHeldItemAttr, false),
@@ -8619,7 +8688,7 @@ export function initMoves() {
       .partial(),
     new SelfStatusMove(Moves.NO_RETREAT, Type.FIGHTING, -1, 5, -1, 0, 8)
       .attr(StatStageChangeAttr, [ Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.SPD ], 1, true)
-      .attr(AddBattlerTagAttr, BattlerTagType.TRAPPED, true, true, 1)
+      .attr(AddBattlerTagAttr, BattlerTagType.NO_RETREAT, true, false)
       .condition((user, target, move) => user.getTag(TrappedTag)?.sourceMove !== Moves.NO_RETREAT), // fails if the user is currently trapped by No Retreat
     new StatusMove(Moves.TAR_SHOT, Type.ROCK, 100, 15, -1, 0, 8)
       .attr(StatStageChangeAttr, [ Stat.SPD ], -1)
@@ -8811,10 +8880,10 @@ export function initMoves() {
     new AttackMove(Moves.SKITTER_SMACK, Type.BUG, MoveCategory.PHYSICAL, 70, 90, 10, 100, 0, 8)
       .attr(StatStageChangeAttr, [ Stat.SPATK ], -1),
     new AttackMove(Moves.BURNING_JEALOUSY, Type.FIRE, MoveCategory.SPECIAL, 70, 100, 5, 100, 0, 8)
-      .target(MoveTarget.ALL_NEAR_ENEMIES)
+      .attr(StatusIfBoostedAttr, StatusEffect.BURN)
-      .partial(),
+      .target(MoveTarget.ALL_NEAR_ENEMIES),
     new AttackMove(Moves.LASH_OUT, Type.DARK, MoveCategory.PHYSICAL, 75, 100, 5, -1, 0, 8)
-      .partial(),
+      .attr(MovePowerMultiplierAttr, (user, _target, _move) => user.turnData.statStagesDecreased ? 2 : 1),
     new AttackMove(Moves.POLTERGEIST, Type.GHOST, MoveCategory.PHYSICAL, 110, 90, 5, -1, 0, 8)
       .attr(AttackedByItemAttr)
       .makesContact(false),
@@ -9260,12 +9329,11 @@ export function initMoves() {
     new AttackMove(Moves.HARD_PRESS, Type.STEEL, MoveCategory.PHYSICAL, -1, 100, 10, -1, 0, 9)
       .attr(OpponentHighHpPowerAttr, 100),
     new StatusMove(Moves.DRAGON_CHEER, Type.DRAGON, -1, 15, -1, 0, 9)
-      .attr(AddBattlerTagAttr, BattlerTagType.CRIT_BOOST, false, true)
+      .attr(AddBattlerTagAttr, BattlerTagType.DRAGON_CHEER, false, true)
-      .target(MoveTarget.NEAR_ALLY)
+      .target(MoveTarget.NEAR_ALLY),
-      .partial(),
     new AttackMove(Moves.ALLURING_VOICE, Type.FAIRY, MoveCategory.SPECIAL, 80, 100, 10, -1, 0, 9)
-      .soundBased()
+      .attr(AddBattlerTagIfBoostedAttr, BattlerTagType.CONFUSED)
-      .partial(),
+      .soundBased(),
     new AttackMove(Moves.TEMPER_FLARE, Type.FIRE, MoveCategory.PHYSICAL, 75, 100, 10, -1, 0, 9)
       .attr(MovePowerMultiplierAttr, (user, target, move) => user.getLastXMoves(2)[1]?.result === MoveResult.MISS || user.getLastXMoves(2)[1]?.result === MoveResult.FAIL ? 2 : 1),
     new AttackMove(Moves.SUPERCELL_SLAM, Type.ELECTRIC, MoveCategory.PHYSICAL, 100, 95, 15, -1, 0, 9)

src/data/pokemon-forms.ts

@@ -66,34 +66,34 @@ export enum FormChangeItem {
 
   BLUE_ORB = 50,
   RED_ORB,
-  SHARP_METEORITE,
-  HARD_METEORITE,
-  SMOOTH_METEORITE,
   ADAMANT_CRYSTAL,
   LUSTROUS_GLOBE,
   GRISEOUS_CORE,
   REVEAL_GLASS,
-  GRACIDEA,
   MAX_MUSHROOMS,
   DARK_STONE,
   LIGHT_STONE,
   PRISON_BOTTLE,
-  N_LUNARIZER,
-  N_SOLARIZER,
   RUSTED_SWORD,
   RUSTED_SHIELD,
   ICY_REINS_OF_UNITY,
   SHADOW_REINS_OF_UNITY,
-  WELLSPRING_MASK,
+  ULTRANECROZIUM_Z,
-  HEARTHFLAME_MASK,
+
-  CORNERSTONE_MASK,
+  SHARP_METEORITE = 100,
+  HARD_METEORITE,
+  SMOOTH_METEORITE,
+  GRACIDEA,
   SHOCK_DRIVE,
   BURN_DRIVE,
   CHILL_DRIVE,
   DOUSE_DRIVE,
-  ULTRANECROZIUM_Z,
+  N_SOLARIZER,
-
+  N_LUNARIZER,
-  FIST_PLATE = 100,
+  WELLSPRING_MASK,
+  HEARTHFLAME_MASK,
+  CORNERSTONE_MASK,
+  FIST_PLATE,
   SKY_PLATE,
   TOXIC_PLATE,
   EARTH_PLATE,
@@ -129,7 +129,7 @@ export enum FormChangeItem {
   DRAGON_MEMORY,
   DARK_MEMORY,
   FAIRY_MEMORY,
-  BLANK_MEMORY  // TODO: Find a potential use for this
+  NORMAL_MEMORY // TODO: Find a potential use for this
 }
 
 export type SpeciesFormChangeConditionPredicate = (p: Pokemon) => boolean;
@@ -359,7 +359,7 @@ export class SpeciesDefaultFormMatchTrigger extends SpeciesFormChangeTrigger {
 
 /**
  * Class used for triggering form changes based on weather.
- * Used by Castform.
+ * Used by Castform and Cherrim.
  * @extends SpeciesFormChangeTrigger
  */
 export class SpeciesFormChangeWeatherTrigger extends SpeciesFormChangeTrigger {
@@ -392,7 +392,7 @@ export class SpeciesFormChangeWeatherTrigger extends SpeciesFormChangeTrigger {
 /**
  * Class used for reverting to the original form when the weather runs out
  * or when the user loses the ability/is suppressed.
- * Used by Castform.
+ * Used by Castform and Cherrim.
  * @extends SpeciesFormChangeTrigger
  */
 export class SpeciesFormChangeRevertWeatherFormTrigger extends SpeciesFormChangeTrigger {
@@ -930,6 +930,11 @@ export const pokemonFormChanges: PokemonFormChanges = {
     new SpeciesFormChange(Species.CASTFORM, "rainy", "", new SpeciesFormChangeActiveTrigger(), true),
     new SpeciesFormChange(Species.CASTFORM, "snowy", "", new SpeciesFormChangeActiveTrigger(), true),
   ],
+  [Species.CHERRIM]: [
+    new SpeciesFormChange(Species.CHERRIM, "overcast", "sunshine", new SpeciesFormChangeWeatherTrigger(Abilities.FLOWER_GIFT, [ WeatherType.SUNNY, WeatherType.HARSH_SUN ]), true),
+    new SpeciesFormChange(Species.CHERRIM, "sunshine", "overcast", new SpeciesFormChangeRevertWeatherFormTrigger(Abilities.FLOWER_GIFT, [ WeatherType.NONE, WeatherType.SANDSTORM, WeatherType.STRONG_WINDS, WeatherType.FOG, WeatherType.HAIL, WeatherType.HEAVY_RAIN, WeatherType.SNOW, WeatherType.RAIN ]), true),
+    new SpeciesFormChange(Species.CHERRIM, "sunshine", "overcast", new SpeciesFormChangeActiveTrigger(), true),
+  ],
 };
 
 export function initPokemonForms() {

src/enums/arena-tag-type.ts

@@ -22,5 +22,6 @@ export enum ArenaTagType {
   CRAFTY_SHIELD = "CRAFTY_SHIELD",
   TAILWIND = "TAILWIND",
   HAPPY_HOUR = "HAPPY_HOUR",
+  SAFEGUARD = "SAFEGUARD",
   NO_CRIT = "NO_CRIT"
 }

src/enums/battler-tag-type.ts

@@ -69,5 +69,7 @@ export enum BattlerTagType {
   GULP_MISSILE_ARROKUDA = "GULP_MISSILE_ARROKUDA",
   GULP_MISSILE_PIKACHU = "GULP_MISSILE_PIKACHU",
   BEAK_BLAST_CHARGING = "BEAK_BLAST_CHARGING",
-  SHELL_TRAP = "SHELL_TRAP"
+  SHELL_TRAP = "SHELL_TRAP",
+  DRAGON_CHEER = "DRAGON_CHEER",
+  NO_RETREAT = "NO_RETREAT",
 }

src/field/arena.ts

@@ -339,7 +339,10 @@ export class Arena {
    */
   triggerWeatherBasedFormChanges(): void {
     this.scene.getField(true).forEach( p => {
-      if (p.hasAbility(Abilities.FORECAST) && p.species.speciesId === Species.CASTFORM) {
+      const isCastformWithForecast = (p.hasAbility(Abilities.FORECAST) && p.species.speciesId === Species.CASTFORM);
+      const isCherrimWithFlowerGift = (p.hasAbility(Abilities.FLOWER_GIFT) && p.species.speciesId === Species.CHERRIM);
+
+      if (isCastformWithForecast || isCherrimWithFlowerGift) {
         new ShowAbilityPhase(this.scene, p.getBattlerIndex());
         this.scene.triggerPokemonFormChange(p, SpeciesFormChangeWeatherTrigger);
       }
@@ -351,7 +354,10 @@ export class Arena {
    */
   triggerWeatherBasedFormChangesToNormal(): void {
     this.scene.getField(true).forEach( p => {
-      if (p.hasAbility(Abilities.FORECAST, false, true) && p.species.speciesId === Species.CASTFORM) {
+      const isCastformWithForecast = (p.hasAbility(Abilities.FORECAST, false, true) && p.species.speciesId === Species.CASTFORM);
+      const isCherrimWithFlowerGift = (p.hasAbility(Abilities.FLOWER_GIFT, false, true) && p.species.speciesId === Species.CHERRIM);
+
+      if (isCastformWithForecast || isCherrimWithFlowerGift) {
         new ShowAbilityPhase(this.scene, p.getBattlerIndex());
         return this.scene.triggerPokemonFormChange(p, SpeciesFormChangeRevertWeatherFormTrigger);
       }

src/field/pokemon.ts

@@ -17,10 +17,10 @@ import { initMoveAnim, loadMoveAnimAssets } from "../data/battle-anims";
 import { Status, StatusEffect, getRandomStatus } from "../data/status-effect";
 import { pokemonEvolutions, pokemonPrevolutions, SpeciesFormEvolution, SpeciesEvolutionCondition, FusionSpeciesFormEvolution } from "../data/pokemon-evolutions";
 import { reverseCompatibleTms, tmSpecies, tmPoolTiers } from "../data/tms";
-import { BattlerTag, BattlerTagLapseType, EncoreTag, GroundedTag, HighestStatBoostTag, TypeImmuneTag, getBattlerTag, SemiInvulnerableTag, TypeBoostTag, ExposedTag } from "../data/battler-tags";
+import { BattlerTag, BattlerTagLapseType, EncoreTag, GroundedTag, HighestStatBoostTag, TypeImmuneTag, getBattlerTag, SemiInvulnerableTag, TypeBoostTag, ExposedTag, DragonCheerTag, CritBoostTag, TrappedTag } from "../data/battler-tags";
 import { WeatherType } from "../data/weather";
 import { ArenaTagSide, NoCritTag, WeakenMoveScreenTag } from "../data/arena-tag";
-import { Ability, AbAttr, StatMultiplierAbAttr, BlockCritAbAttr, BonusCritAbAttr, BypassBurnDamageReductionAbAttr, FieldPriorityMoveImmunityAbAttr, IgnoreOpponentStatStagesAbAttr, MoveImmunityAbAttr, PreDefendFullHpEndureAbAttr, ReceivedMoveDamageMultiplierAbAttr, ReduceStatusEffectDurationAbAttr, StabBoostAbAttr, StatusEffectImmunityAbAttr, TypeImmunityAbAttr, WeightMultiplierAbAttr, allAbilities, applyAbAttrs, applyStatMultiplierAbAttrs, applyPreApplyBattlerTagAbAttrs, applyPreAttackAbAttrs, applyPreDefendAbAttrs, applyPreSetStatusAbAttrs, UnsuppressableAbilityAbAttr, SuppressFieldAbilitiesAbAttr, NoFusionAbilityAbAttr, MultCritAbAttr, IgnoreTypeImmunityAbAttr, DamageBoostAbAttr, IgnoreTypeStatusEffectImmunityAbAttr, ConditionalCritAbAttr, applyFieldStatMultiplierAbAttrs, FieldMultiplyStatAbAttr, AddSecondStrikeAbAttr, UserFieldStatusEffectImmunityAbAttr, UserFieldBattlerTagImmunityAbAttr, BattlerTagImmunityAbAttr, MoveTypeChangeAbAttr, FullHpResistTypeAbAttr } from "../data/ability";
+import { Ability, AbAttr, StatMultiplierAbAttr, BlockCritAbAttr, BonusCritAbAttr, BypassBurnDamageReductionAbAttr, FieldPriorityMoveImmunityAbAttr, IgnoreOpponentStatStagesAbAttr, MoveImmunityAbAttr, PreDefendFullHpEndureAbAttr, ReceivedMoveDamageMultiplierAbAttr, ReduceStatusEffectDurationAbAttr, StabBoostAbAttr, StatusEffectImmunityAbAttr, TypeImmunityAbAttr, WeightMultiplierAbAttr, allAbilities, applyAbAttrs, applyStatMultiplierAbAttrs, applyPreApplyBattlerTagAbAttrs, applyPreAttackAbAttrs, applyPreDefendAbAttrs, applyPreSetStatusAbAttrs, UnsuppressableAbilityAbAttr, SuppressFieldAbilitiesAbAttr, NoFusionAbilityAbAttr, MultCritAbAttr, IgnoreTypeImmunityAbAttr, DamageBoostAbAttr, IgnoreTypeStatusEffectImmunityAbAttr, ConditionalCritAbAttr, applyFieldStatMultiplierAbAttrs, FieldMultiplyStatAbAttr, AddSecondStrikeAbAttr, UserFieldStatusEffectImmunityAbAttr, UserFieldBattlerTagImmunityAbAttr, BattlerTagImmunityAbAttr, MoveTypeChangeAbAttr, FullHpResistTypeAbAttr, applyCheckTrappedAbAttrs, CheckTrappedAbAttr } from "../data/ability";
 import PokemonData from "../system/pokemon-data";
 import { BattlerIndex } from "../battle";
 import { Mode } from "../ui/ui";
@@ -131,9 +131,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       this.scene.applyModifiers(HiddenAbilityRateBoosterModifier, true, hiddenAbilityChance);
     }
 
-    const hasHiddenAbility = !Utils.randSeedInt(hiddenAbilityChance.value);
-    const randAbilityIndex = Utils.randSeedInt(2);
-
     this.species = species;
     this.pokeball = dataSource?.pokeball || PokeballType.POKEBALL;
     this.level = level;
@@ -144,6 +141,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       this.abilityIndex = abilityIndex; // Use the provided ability index if it is defined
     } else {
       // If abilityIndex is not provided, determine it based on species and hidden ability
+      const hasHiddenAbility = !Utils.randSeedInt(hiddenAbilityChance.value);
+      const randAbilityIndex = Utils.randSeedInt(2);
       if (species.abilityHidden && hasHiddenAbility) {
         // If the species has a hidden ability and the hidden ability is present
         this.abilityIndex = 2;
@@ -768,9 +767,15 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
         critStage.value += 1;
       }
     }
-    if (source.getTag(BattlerTagType.CRIT_BOOST)) {
+    const critBoostTag = source.getTag(CritBoostTag);
-      critStage.value += 2;
+    if (critBoostTag) {
+      if (critBoostTag instanceof DragonCheerTag) {
+        critStage.value += critBoostTag.typesOnAdd.includes(Type.DRAGON) ? 2 : 1;
+      } else {
+        critStage.value += 2;
+      }
     }
+
     console.log(`crit stage: +${critStage.value}`);
     return critStage.value;
   }
@@ -1294,6 +1299,28 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     return !!this.getTag(GroundedTag) || (!this.isOfType(Type.FLYING, true, true) && !this.hasAbility(Abilities.LEVITATE) && !this.getTag(BattlerTagType.MAGNET_RISEN) && !this.getTag(SemiInvulnerableTag));
   }
 
+  /**
+   * Determines whether this Pokemon is prevented from running or switching due
+   * to effects from moves and/or abilities.
+   * @param trappedAbMessages `string[]` If defined, ability trigger messages
+   * (e.g. from Shadow Tag) are forwarded through this array.
+   * @param simulated `boolean` if `true`, applies abilities via simulated calls.
+   * @returns
+   */
+  isTrapped(trappedAbMessages: string[] = [], simulated: boolean = true): boolean {
+    if (this.isOfType(Type.GHOST)) {
+      return false;
+    }
+
+    const trappedByAbility = new Utils.BooleanHolder(false);
+
+    this.scene.getEnemyField()!.forEach(enemyPokemon =>
+      applyCheckTrappedAbAttrs(CheckTrappedAbAttr, enemyPokemon, trappedByAbility, this, trappedAbMessages, simulated)
+    );
+
+    return (trappedByAbility.value || !!this.getTag(TrappedTag));
+  }
+
   /**
    * Calculates the type of a move when used by this Pokemon after
    * type-changing move and ability attributes have applied.
@@ -1590,13 +1617,14 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   }
 
   /**
-   * Function that tries to set a Pokemon shiny based on the trainer's trainer ID and secret ID
+   * Function that tries to set a Pokemon shiny based on the trainer's trainer ID and secret ID.
    * Endless Pokemon in the end biome are unable to be set to shiny
    *
-   * The exact mechanic is that it calculates E as the XOR of the player's trainer ID and secret ID
+   * The exact mechanic is that it calculates E as the XOR of the player's trainer ID and secret ID.
-   * F is calculated as the XOR of the first 16 bits of the Pokemon's ID with the last 16 bits
+   * F is calculated as the XOR of the first 16 bits of the Pokemon's ID with the last 16 bits.
-   * The XOR of E and F are then compared to the thresholdOverride (default case 32) to see whether or not to generate a shiny
+   * The XOR of E and F are then compared to the {@linkcode shinyThreshold} (or {@linkcode thresholdOverride} if set) to see whether or not to generate a shiny.
-   * @param thresholdOverride number that is divided by 2^16 (65536) to get the shiny chance
+   * The base shiny odds are {@linkcode baseShinyChance} / 65536
+   * @param thresholdOverride number that is divided by 2^16 (65536) to get the shiny chance, overrides {@linkcode shinyThreshold} if set (bypassing shiny rate modifiers such as Shiny Charm)
    * @returns true if the Pokemon has been set as a shiny, false otherwise
    */
   trySetShiny(thresholdOverride?: integer): boolean {
@@ -1611,7 +1639,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     const E = this.scene.gameData.trainerId ^ this.scene.gameData.secretId;
     const F = rand1 ^ rand2;
 
-    const shinyThreshold = new Utils.IntegerHolder(32);
+    /** `64/65536 -> 1/1024` */
+    const baseShinyChance = 64;
+    const shinyThreshold = new Utils.IntegerHolder(baseShinyChance);
     if (thresholdOverride === undefined) {
       if (this.scene.eventManager.isEventActive()) {
         shinyThreshold.value *= this.scene.eventManager.getShinyMultiplier();
@@ -1624,9 +1654,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     }
 
     this.shiny = (E ^ F) < shinyThreshold.value;
-    if ((E ^ F) < 32) {
-      console.log("REAL SHINY!!");
-    }
 
     if (this.shiny) {
       this.initShinySparkle();
@@ -2879,6 +2906,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
 
     const types = this.getTypes(true, true);
 
+    const defendingSide = this.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY;
+    if (sourcePokemon && sourcePokemon !== this && this.scene.arena.getTagOnSide(ArenaTagType.SAFEGUARD, defendingSide)) {
+      return false;
+    }
+
     switch (effect) {
     case StatusEffect.POISON:
     case StatusEffect.TOXIC:
@@ -4401,7 +4433,7 @@ export interface TurnMove {
   targets?: BattlerIndex[];
   result: MoveResult;
   virtual?: boolean;
-  turn?: integer;
+  turn?: number;
 }
 
 export interface QueuedMove {
@@ -4413,9 +4445,9 @@ export interface QueuedMove {
 export interface AttackMoveResult {
   move: Moves;
   result: DamageResult;
-  damage: integer;
+  damage: number;
   critical: boolean;
-  sourceId: integer;
+  sourceId: number;
   sourceBattlerIndex: BattlerIndex;
 }
 
@@ -4423,7 +4455,7 @@ export class PokemonSummonData {
   public statStages: number[] = [ 0, 0, 0, 0, 0, 0, 0 ];
   public moveQueue: QueuedMove[] = [];
   public disabledMove: Moves = Moves.NONE;
-  public disabledTurns: integer = 0;
+  public disabledTurns: number = 0;
   public tags: BattlerTag[] = [];
   public abilitySuppressed: boolean = false;
   public abilitiesApplied: Abilities[] = [];
@@ -4440,7 +4472,7 @@ export class PokemonSummonData {
 }
 
 export class PokemonBattleData {
-  public hitCount: integer = 0;
+  public hitCount: number = 0;
   public endured: boolean = false;
   public berriesEaten: BerryType[] = [];
   public abilitiesApplied: Abilities[] = [];
@@ -4449,21 +4481,23 @@ export class PokemonBattleData {
 
 export class PokemonBattleSummonData {
   /** The number of turns the pokemon has passed since entering the battle */
-  public turnCount: integer = 1;
+  public turnCount: number = 1;
   /** The list of moves the pokemon has used since entering the battle */
   public moveHistory: TurnMove[] = [];
 }
 
 export class PokemonTurnData {
-  public flinched: boolean;
+  public flinched: boolean = false;
-  public acted: boolean;
+  public acted: boolean = false;
-  public hitCount: integer;
+  public hitCount: number;
-  public hitsLeft: integer;
+  public hitsLeft: number;
-  public damageDealt: integer = 0;
+  public damageDealt: number = 0;
-  public currDamageDealt: integer = 0;
+  public currDamageDealt: number = 0;
-  public damageTaken: integer = 0;
+  public damageTaken: number = 0;
   public attacksReceived: AttackMoveResult[] = [];
   public order: number;
+  public statStagesIncreased: boolean = false;
+  public statStagesDecreased: boolean = false;
 }
 
 export enum AiType {

src/locales/de/arena-tag.json

@@ -47,5 +47,11 @@
   "tailwindOnRemovePlayer": "Der Rückenwind auf deiner Seite hat sich gelegt!",
   "tailwindOnRemoveEnemy": "Der Rückenwind auf gegnerischer Seite hat sich gelegt!",
   "happyHourOnAdd": "Goldene Zeiten sind angebrochen!",
-  "happyHourOnRemove": "Die goldenen Zeiten sind vorbei!"
+  "happyHourOnRemove": "Die goldenen Zeiten sind vorbei!",
+  "safeguardOnAdd": "Das ganze Feld wird von einem Schleier umhüllt!",
+  "safeguardOnAddPlayer": "Das Team des Anwenders wird von einem Schleier umhüllt!",
+  "safeguardOnAddEnemy": "Das gegnerische Team wird von einem Schleier umhüllt!",
+  "safeguardOnRemove": "Der mystische Schleier, der das ganze Feld umgab, hat sich gelüftet!",
+  "safeguardOnRemovePlayer": "Der mystische Schleier, der dein Team umgab, hat sich gelüftet!",
+  "safeguardOnRemoveEnemy": "Der mystische Schleier, der das gegnerische Team umgab, hat sich gelüftet!"
 }

src/locales/de/dialogue.json

@@ -1403,19 +1403,19 @@
       "1": "Ich muss dein Potenzial als Trainer und die Stärke der Pokémon sehen, die mit dir kämpfen!",
       "2": "Los geht's! Dies sind meine Gesteins-Pokémon, mein ganzer Stolz!",
       "3": "Gesteins-Pokémon sind einfach die besten!",
-      "4": "Ich muss dein Potenzial als Trainer und die Stärke der Pokémon sehen, die mit dir kämpfen!"
+      "4": "Tag für Tag grabe ich hier nach Fossilien.\n$Die viele Arbeit hat meine Pokémon felsenfest gemacht\nund das wirst du jetzt im Kampf zu spüren bekommen!"
     },
     "victory": {
       "1": "W-was? Das kann nicht sein! Meine total tranierten Pokémon!",
       "2": "…Wir haben die Kontrolle verloren. Beim nächsten Mal fordere ich dich\n$zu einem Fossilien-Ausgrabungswettbewerb heraus.",
       "3": "Mit deinem Können ist es nur natürlich, dass du gewinnst.",
-      "4": "W-was?! Das kann nicht sein! Selbst das war nicht genug?",
+      "4": "W-was?! Das kann nicht sein! Selbst das war nicht genug?"
-      "5": "Ich habe es vermasselt."
     },
     "defeat": {
       "1": "Siehst du? Ich bin stolz auf meinen steinigen Kampfstil!",
       "2": "Danke! Der Kampf hat mir Vertrauen gegeben, dass ich vielleicht meinen Vater besiegen kann!",
-      "3": "Ich fühle mich, als hätte ich gerade einen wirklich hartnäckigen Felsen durchbrochen!"
+      "3": "Na, was sagst du jetzt? Meine felsenfesten Pokémon waren hart genug für dich, was?",
+      "4": "Ich wusste, dass ich gewinnen würde!"
     }
   },
   "morty": {

src/locales/de/modifier-type.json

@@ -598,6 +598,6 @@
     "DRAGON_MEMORY": "Drachen-Disc",
     "DARK_MEMORY": "Unlicht-Disc",
     "FAIRY_MEMORY": "Feen-Disc",
-    "BLANK_MEMORY": "Leere-Disc"
+    "NORMAL_MEMORY": "Normal-Disc"
   }
 }

src/locales/de/move-trigger.json

@@ -65,5 +65,6 @@
   "suppressAbilities": "Die Fähigkeit von {{pokemonName}} wirkt nicht mehr!",
   "revivalBlessing": "{{pokemonName}} ist wieder fit und kampfbereit!",
   "swapArenaTags": "{{pokemonName}} hat die Effekte, die auf den beiden Seiten des Kampffeldes wirken, miteinander getauscht!",
-  "exposedMove": "{{pokemonName}} erkennt {{targetPokemonName}}!"
+  "exposedMove": "{{pokemonName}} erkennt {{targetPokemonName}}!",
+  "safeguard": "{{targetName}} wird durch Bodyguard geschützt!"
 }

src/locales/en/challenges.json

@@ -1,6 +1,7 @@
 {
   "title": "Challenge Modifiers",
   "illegalEvolution": "{{pokemon}} changed into an ineligble pokémon\nfor this challenge!",
+  "noneSelected": "None Selected",
   "singleGeneration": {
     "name": "Mono Gen",
     "desc": "You can only use Pokémon from Generation {{gen}}.",

src/locales/en/dialogue.json

@@ -742,7 +742,7 @@
   "plumeria": {
     "encounter": {
       "1": " ...Hmph. You don't look like anything special to me.",
-      "2": "It takes these dumb Grunts way too long to deal with you kids..",
+      "2": "It takes these dumb Grunts way too long to deal with you kids...",
       "3": "Mess with anyone in Team Skull, and I'll show you how serious I can get."
     },
     "victory": {
@@ -1479,21 +1479,21 @@
       "1_female": "I need to see your potential as a Trainer. And, I'll need to see the toughness of the Pokémon that battle with you!",
       "2": "Here goes! These are my rocking Pokémon, my pride and joy!",
       "3": "Rock-type Pokémon are simply the best!",
-      "4": "I need to see your potential as a Trainer. And, I'll need to see the toughness of the Pokémon that battle with you!",
+      "4": "Every day, I toughened up my Pokémon by digging up Fossils nonstop.\n$Could I show you how tough I made them in a battle?",
-      "4_female": "I need to see your potential as a Trainer. And, I'll need to see the toughness of the Pokémon that battle with you!"
+      "4_female": "Every day, I toughened up my Pokémon by digging up Fossils nonstop.\n$Could I show you how tough I made them in a battle?"
     },
     "victory": {
       "1": "W-what? That can't be! My buffed-up Pokémon!",
       "2": "…We lost control there. Next time I'd like to challenge you to a Fossil-digging race underground.",
       "2_female": "…We lost control there. Next time I'd like to challenge you to a Fossil-digging race underground.",
       "3": "With skill like yours, it's natural for you to win.",
-      "4": "Wh-what?! It can't be! Even that wasn't enough?",
+      "4": "Wh-what?! It can't be! Even that wasn't enough?"
-      "5": "I blew it."
     },
     "defeat": {
       "1": "See? I'm proud of my rocking battle style!",
       "2": "Thanks! The battle gave me confidence that I may be able to beat my dad!",
-      "3": "I feel like I just smashed through a really stubborn boulder!"
+      "3": "See? These are my rocking Pokémon, my pride and joy!",
+      "4": "I knew I would win!"
     }
   },
   "morty": {

src/locales/en/modifier-type.json

@@ -437,6 +437,6 @@
     "DRAGON_MEMORY": "Dragon Memory",
     "DARK_MEMORY": "Dark Memory",
     "FAIRY_MEMORY": "Fairy Memory",
-    "BLANK_MEMORY": "Blank Memory"
+    "NORMAL_MEMORY": "Normal Memory"
   }
 }

src/locales/es/arena-tag.json

@@ -1 +1,8 @@
-{}
+{
+  "safeguardOnAdd": "¡Todos los Pokémon están protegidos por Velo Sagrado!",
+  "safeguardOnAddPlayer": "¡Tu equipo se ha protegido con Velo Sagrado!",
+  "safeguardOnAddEnemy": "¡El equipo enemigo se ha protegido con Velo Sagrado!",
+  "safeguardOnRemove": "¡Velo Sagrado dejó de hacer efecto!",
+  "safeguardOnRemovePlayer": "El efecto de Velo Sagrado en tu equipo se ha disipado.",
+  "safeguardOnRemoveEnemy": "El efecto de Velo Sagrado en el equipo enemigo se ha disipado."
+}

src/locales/es/bgm-name.json

@@ -1,95 +1,99 @@
 {
   "music": "Música: ",
   "missing_entries": "{{name}}",
-  "battle_kanto_champion": "B2W2 - ¡Vs Campeón de Kanto!",
+  "battle_kanto_champion": "B2W2 - ¡Vs. Campeón de Kanto!",
-  "battle_johto_champion": "B2W2 - ¡Vs Campeón de Johto!",
+  "battle_johto_champion": "B2W2 - ¡Vs. Campeón de Johto!",
-  "battle_hoenn_champion_g5": "B2W2 - ¡Vs Campeón de Hoenn!",
+  "battle_hoenn_champion_g5": "B2W2 - ¡Vs. Campeón de Hoenn!",
-  "battle_hoenn_champion_g6": "ORAS - ¡Vs Campeón de Hoenn!",
+  "battle_hoenn_champion_g6": "ORAS - ¡Vs. Campeón de Hoenn!",
-  "battle_sinnoh_champion": "B2W2 - ¡Vs Campeón de Sinnoh!",
+  "battle_sinnoh_champion": "B2W2 - ¡Vs. Campeón de Sinnoh!",
-  "battle_champion_alder": "BW - ¡Vs Campeón de Teselia!",
+  "battle_champion_alder": "BW - ¡Vs. Campeón de Teselia!",
-  "battle_champion_iris": "B2W2 - ¡Vs Campeón de Teselia!",
+  "battle_champion_iris": "B2W2 - ¡Vs. Campeón de Teselia!",
-  "battle_kalos_champion": "XY - ¡Vs Campeón de Kalos!",
+  "battle_kalos_champion": "XY - ¡Vs. Campeón de Kalos!",
-  "battle_alola_champion": "USUM - ¡Vs Campeón de Alola!",
+  "battle_alola_champion": "USUM - ¡Vs. Campeón de Alola!",
-  "battle_galar_champion": "SWSH - ¡Vs Campeón de Galar!",
+  "battle_galar_champion": "SWSH - ¡Vs. Campeón de Galar!",
-  "battle_champion_geeta": "SV - ¡Vs Campeona Ságita!",
+  "battle_champion_geeta": "SV - ¡Vs. Campeona Ságita!",
-  "battle_champion_nemona": "SV - ¡Vs Campeona Mencía!",
+  "battle_champion_nemona": "SV - ¡Vs. Campeona Mencía!",
-  "battle_champion_kieran": "SV - ¡Vs Campeón Cass!",
+  "battle_champion_kieran": "SV - ¡Vs. Campeón Cass!",
-  "battle_hoenn_elite": "ORAS - ¡Vs Alto Mando!",
+  "battle_hoenn_elite": "ORAS - ¡Vs. Alto Mando!",
-  "battle_unova_elite": "BW - ¡Vs Alto Mando!",
+  "battle_unova_elite": "BW - ¡Vs. Alto Mando!",
-  "battle_kalos_elite": "XY - ¡Vs Alto Mando!",
+  "battle_kalos_elite": "XY - ¡Vs. Alto Mando!",
-  "battle_alola_elite": "SM - ¡Vs Alto Mando!",
+  "battle_alola_elite": "SM - ¡Vs. Alto Mando!",
-  "battle_galar_elite": "SWSH - Torneo de Finalistas",
+  "battle_galar_elite": "SWSH - Torneo de finalistas",
-  "battle_paldea_elite": "SV - ¡Vs Alto Mando!",
+  "battle_paldea_elite": "SV - ¡Vs. Alto Mando!",
-  "battle_bb_elite": "SV - ¡Vs Alto Mando de la Academia Arándano!",
+  "battle_bb_elite": "SV - ¡Vs. Alto Mando de la Academia Arándano!",
   "battle_final_encounter": "PMD RTDX - Dominio de Rayquaza",
-  "battle_final": "BW - ¡Vs Ghechis!",
+  "battle_final": "BW - ¡Vs. Ghechis!",
-  "battle_kanto_gym": "B2W2 - ¡Vs Líder de Kanto!",
+  "battle_kanto_gym": "B2W2 - ¡Vs. Líder de Kanto!",
-  "battle_johto_gym": "B2W2 - ¡Vs Líder de Johto!",
+  "battle_johto_gym": "B2W2 - ¡Vs. Líder de Johto!",
-  "battle_hoenn_gym": "B2W2 - ¡Vs Líder de Hoenn!",
+  "battle_hoenn_gym": "B2W2 - ¡Vs. Líder de Hoenn!",
-  "battle_sinnoh_gym": "B2W2 - ¡Vs Líder de Sinnoh!",
+  "battle_sinnoh_gym": "B2W2 - ¡Vs. Líder de Sinnoh!",
-  "battle_unova_gym": "BW - ¡Vs Líder de Teselia!",
+  "battle_unova_gym": "BW - ¡Vs. Líder de Teselia!",
-  "battle_kalos_gym": "XY - ¡Vs Líder de Kalos!",
+  "battle_kalos_gym": "XY - ¡Vs. Líder de Kalos!",
-  "battle_galar_gym": "SWSH - ¡Vs Líder de Galar!",
+  "battle_galar_gym": "SWSH - ¡Vs. Líder de Galar!",
-  "battle_paldea_gym": "SV - ¡Vs Líder de Paldea!",
+  "battle_paldea_gym": "SV - ¡Vs. Líder de Paldea!",
-  "battle_legendary_kanto": "XY - ¡Vs Legendarios de Kanto!",
+  "battle_legendary_kanto": "XY - ¡Vs. Legendarios de Kanto!",
-  "battle_legendary_raikou": "HGSS - ¡Vs Raikou!",
+  "battle_legendary_raikou": "HGSS - ¡Vs. Raikou!",
-  "battle_legendary_entei": "HGSS - ¡Vs Entei!",
+  "battle_legendary_entei": "HGSS - ¡Vs. Entei!",
-  "battle_legendary_suicune": "HGSS - ¡Vs Suicune!",
+  "battle_legendary_suicune": "HGSS - ¡Vs. Suicune!",
-  "battle_legendary_lugia": "HGSS - ¡Vs Lugia!",
+  "battle_legendary_lugia": "HGSS - ¡Vs. Lugia!",
-  "battle_legendary_ho_oh": "HGSS - ¡Vs Ho-oh!",
+  "battle_legendary_ho_oh": "HGSS - ¡Vs. Ho-oh!",
-  "battle_legendary_regis_g5": "B2W2 - ¡Vs Regis!",
+  "battle_legendary_regis_g5": "B2W2 - ¡Vs. Regis!",
-  "battle_legendary_regis_g6": "ORAS - ¡Vs Regis!",
+  "battle_legendary_regis_g6": "ORAS - ¡Vs. Regis!",
-  "battle_legendary_gro_kyo": "ORAS - ¡Vs Groudon/Kyogre!",
+  "battle_legendary_gro_kyo": "ORAS - ¡Vs. Groudon/Kyogre!",
-  "battle_legendary_rayquaza": "ORAS - ¡Vs Rayquaza!",
+  "battle_legendary_rayquaza": "ORAS - ¡Vs. Rayquaza!",
-  "battle_legendary_deoxys": "ORAS - ¡Vs Deoxys!",
+  "battle_legendary_deoxys": "ORAS - ¡Vs. Deoxys!",
-  "battle_legendary_lake_trio": "ORAS - ¡Vs Trío del Lago!",
+  "battle_legendary_lake_trio": "ORAS - ¡Vs. trío del Lago!",
-  "battle_legendary_sinnoh": "ORAS - ¡Vs Legendarios de Sinnoh!",
+  "battle_legendary_sinnoh": "ORAS - ¡Vs. legendarios de Sinnoh!",
-  "battle_legendary_dia_pal": "ORAS - ¡Vs Dialga/Palkia!",
+  "battle_legendary_dia_pal": "ORAS - ¡Vs. Dialga/Palkia!",
-  "battle_legendary_giratina": "ORAS - ¡Vs Giratina!",
+  "battle_legendary_origin_forme": "LA - ¡Vs. Dialga & Palkia, Forma Origen!",
-  "battle_legendary_arceus": "HGSS - ¡Vs Arceus!",
+  "battle_legendary_giratina": "ORAS - ¡Vs. Giratina!",
-  "battle_legendary_unova": "BW - ¡Vs Legendarios de Teselia!",
+  "battle_legendary_arceus": "HGSS - ¡Vs. Arceus!",
-  "battle_legendary_kyurem": "BW - ¡Vs Kyurem!",
+  "battle_legendary_unova": "BW - ¡Vs. legendarios de Teselia!",
-  "battle_legendary_res_zek": "BW - ¡Vs Reshiram/Zekrom!",
+  "battle_legendary_kyurem": "BW - ¡Vs. Kyurem!",
-  "battle_legendary_xern_yvel": "XY - ¡Vs Xerneas/Yveltal!",
+  "battle_legendary_res_zek": "BW - ¡Vs. Reshiram/Zekrom!",
-  "battle_legendary_tapu": "SM - ¡Vs Tapus!",
+  "battle_legendary_xern_yvel": "XY - ¡Vs. Xerneas/Yveltal!",
-  "battle_legendary_sol_lun": "SM - ¡Vs Solgaleo/Lunala!",
+  "battle_legendary_tapu": "SM - ¡Vs. Tapus!",
-  "battle_legendary_ub": "SM - ¡Vs Ultraentes!",
+  "battle_legendary_sol_lun": "SM - ¡Vs. Solgaleo/Lunala!",
-  "battle_legendary_dusk_dawn": "USUM - ¡Vs Necrozma Melena Crepuscular/Alas del Alba!",
+  "battle_legendary_ub": "SM - ¡Vs. Ultraentes!",
-  "battle_legendary_ultra_nec": "USUM - ¡Vs Ultra-Necrozma!",
+  "battle_legendary_dusk_dawn": "USUM - ¡Vs. Necrozma Melena Crepuscular/Alas del Alba!",
-  "battle_legendary_zac_zam": "SWSH - ¡Vs Zacian/Zamazenta!",
+  "battle_legendary_ultra_nec": "USUM - ¡Vs. Ultra-Necrozma!",
-  "battle_legendary_glas_spec": "SWSH - ¡Vs Glastrier/Spectrier!",
+  "battle_legendary_zac_zam": "SWSH - ¡Vs. Zacian/Zamazenta!",
-  "battle_legendary_calyrex": "SWSH - ¡Vs Calyrex!",
+  "battle_legendary_glas_spec": "SWSH - ¡Vs. Glastrier/Spectrier!",
-  "battle_legendary_birds_galar": "SWSH - ¡Vs Aves Legendarias de Galar!",
+  "battle_legendary_calyrex": "SWSH - ¡Vs. Calyrex!",
-  "battle_legendary_ruinous": "SV - ¡Vs Tesoros Funestos!",
+  "battle_legendary_riders": "SWSH - ¡Vs. Calyrex Jinete!",
-  "battle_legendary_kor_mir": "SV Depths of Area Zero Battle",
+  "battle_legendary_birds_galar": "SWSH - ¡Vs. Aves Legendarias de Galar!",
-  "battle_legendary_loyal_three": "SV - ¡Vs Compatrones!",
+  "battle_legendary_ruinous": "SV - ¡Vs. Tesoros Funestos!",
-  "battle_legendary_ogerpon": "SV - ¡Vs Ogerpon!",
+  "battle_legendary_kor_mir": "SV - ¡Batalla en el área Zero!",
-  "battle_legendary_terapagos": "SV - ¡Vs Terapagos!",
+  "battle_legendary_loyal_three": "SV - ¡Vs. Compatrones!",
-  "battle_legendary_pecharunt": "SV - ¡Vs Pecharunt!",
+  "battle_legendary_ogerpon": "SV - ¡Vs. Ogerpon!",
-  "battle_rival": "BW - ¡Vs Rival!",
+  "battle_legendary_terapagos": "SV - ¡Vs. Terapagos!",
+  "battle_legendary_pecharunt": "SV - ¡Vs. Pecharunt!",
+  "battle_rival": "BW - ¡Vs. Rival!",
   "battle_rival_2": "BW - ¡Vs N!",
-  "battle_rival_3": "BW - ¡Vs N (Liga Pokémon)!",
+  "battle_rival_3": "BW - ¡Vs. N (Liga Pokémon)!",
-  "battle_trainer": "BW - ¡Vs Entrenador!",
+  "battle_trainer": "BW - ¡Vs. entrenador!",
-  "battle_wild": "BW - ¡Vs Pokémon Salvaje!",
+  "battle_wild": "BW - ¡Vs. Pokémon salvaje!",
-  "battle_wild_strong": "BW - ¡Vs Pokémon Salvaje Raro!",
+  "battle_wild_strong": "BW - ¡Vs. Pokémon salvaje raro!",
-  "end_summit": "PMD RTDX - Techo del Cielo",
+  "end_summit": "PMD RTDX - Techo del cielo",
-  "battle_rocket_grunt": "HGSS Team Rocket Battle",
+  "battle_rocket_grunt": "HGSS - ¡Vs. Team Rocket!",
-  "battle_aqua_magma_grunt": "ORAS Team Aqua & Magma Battle",
+  "battle_aqua_magma_grunt": "ORAS - ¡Vs. Equipo Aqua & Magma!",
-  "battle_galactic_grunt": "BDSP Team Galactic Battle",
+  "battle_galactic_grunt": "BDSP - ¡Vs. Equipo Galaxia!",
   "battle_plasma_grunt": "BW - ¡Vs Equipo Plasma!",
-  "battle_flare_grunt": "XY Team Flare Battle",
+  "battle_flare_grunt": "XY - ¡Vs. Team Flare!",
-  "battle_aether_grunt": "SM Aether Foundation Battle",
+  "battle_aether_grunt": "SM - ¡Vs. Fundación Æther!",
-  "battle_skull_grunt": "SM Team Skull Battle",
+  "battle_skull_grunt": "SM - ¡Vs. Team Skull!",
-  "battle_macro_grunt": "SWSH Trainer Battle",
+  "battle_macro_grunt": "SWSH - ¡Vs. entrenador!",
-  "battle_galactic_admin": "BDSP Team Galactic Admin Battle",
+  "battle_galactic_admin": "BDSP - ¡Vs. Comandante del Equipo Galaxia!",
-  "battle_skull_admin": "SM Team Skull Admin Battle",
+  "battle_skull_admin": "SM - ¡Vs. Comandante del Team Skull!",
-  "battle_oleana": "SWSH Oleana Battle",
+  "battle_oleana": "SWSH - ¡Vs. Olivia!",
-  "battle_rocket_boss": "USUM Giovanni Battle",
+  "battle_rocket_boss": "USUM - ¡Vs. Giovanni!",
-  "battle_aqua_magma_boss": "ORAS Archie & Maxie Battle",
+  "battle_aqua_magma_boss": "ORAS - ¡Vs. Aquiles & Magno!",
-  "battle_galactic_boss": "BDSP Cyrus Battle",
+  "battle_galactic_boss": "BDSP - ¡Vs. Helio!",
-  "battle_plasma_boss": "B2W2 Ghetsis Battle",
+  "battle_plasma_boss": "B2W2 - ¡Vs.  Ghechis Armonia!",
-  "battle_flare_boss": "XY Lysandre Battle",
+  "battle_flare_boss": "XY - ¡Vs. Lysson!",
-
+  "battle_aether_boss": "SM - ¡Vs. Samina!",
+  "battle_skull_boss": "SM - ¡Vs. Guzmán!",
+  "battle_macro_boss": "SWSH - ¡Vs. Rose!",
   "abyss": "PMD EoS - Cráter Oscuro",
   "badlands": "PMD EoS - Valle Desolado",
   "beach": "PMD EoS - Risco Calado",
@@ -105,40 +109,40 @@
   "graveyard": "PMD EoS - Bosque Misterio",
   "ice_cave": "PMD EoS - Gran Iceberg",
   "island": "PMD EoS - Costa Escarpada",
-  "jungle": "Lmz - Jungle",
+  "jungle": "Lmz - Jungla",
-  "laboratory": "Firel - Laboratory",
+  "laboratory": "Firel - Laboratorio",
   "lake": "PMD EoS - Cueva Cristal",
   "meadow": "PMD EoS - Bosque de la Cumbre del Cielo",
-  "metropolis": "Firel - Metropolis",
+  "metropolis": "Firel - Metrópolis",
   "mountain": "PMD EoS - Monte Cuerno",
   "plains": "PMD EoS - Pradera de la Cumbre del Cielo",
   "power_plant": "PMD EoS - Pradera Destello",
   "ruins": "PMD EoS - Sima Hermética",
-  "sea": "Andr06 - Marine Mystique",
+  "sea": "Andr06 - Misticismo marino",
-  "seabed": "Firel - Seabed",
+  "seabed": "Firel - Lecho del mar",
-  "slum": "Andr06 - Sneaky Snom",
+  "slum": "Andr06 - Snom sigiloso",
   "snowy_forest": "PMD EoS - Campo nevado de la Cumbre del Cielo",
-  "space": "Firel - Aether",
+  "space": "Firel - Æther ",
   "swamp": "PMD EoS - Mar Circundante",
   "tall_grass": "PMD EoS - Bosque Niebla",
   "temple": "PMD EoS - Cueva Regia",
   "town": "PMD EoS - Tema del territorio aleatorio 3",
   "volcano": "PMD EoS - Cueva Vapor",
   "wasteland": "PMD EoS - Corazón Tierra Oculta",
-  "encounter_ace_trainer": "BW - Desafío Combate (Entrenador Guay)",
+  "encounter_ace_trainer": "BW - ¡Vs. entrenador guay!",
-  "encounter_backpacker": "BW - Desafío Combate (Mochilero)",
+  "encounter_backpacker": "BW - ¡Vs. mochilero!",
-  "encounter_clerk": "BW - Desafío Combate (Empresario)",
+  "encounter_clerk": "BW - ¡Vs. empresario!",
-  "encounter_cyclist": "BW - Desafío Combate (Ciclista)",
+  "encounter_cyclist": "BW - ¡Vs. ciclista!",
-  "encounter_lass": "BW - Desafío Combate (Chica)",
+  "encounter_lass": "BW - ¡Vs. chica joven!",
-  "encounter_parasol_lady": "BW - Desafío Combate (Dama parasol)",
+  "encounter_parasol_lady": "BW - ¡Vs. dama parasol!",
-  "encounter_pokefan": "BW - Desafío Combate (Pokéfan)",
+  "encounter_pokefan": "BW - ¡Vs. poké-fan!",
-  "encounter_psychic": "BW - Desafío Combate (Médium)",
+  "encounter_psychic": "BW -¡Vs. médium!",
-  "encounter_rich": "BW - Desafío Combate (Aristócrata)",
+  "encounter_rich": "BW - ¡Vs. aristócrata!",
-  "encounter_rival": "BW - Desafío Combate (Cheren)",
+  "encounter_rival": "BW - ¡Vs. Cheren!",
-  "encounter_roughneck": "BW - Desafío Combate (Calvo)",
+  "encounter_roughneck": "BW - ¡Vs. tío chungo!",
-  "encounter_scientist": "BW - Desafío Combate (Científico)",
+  "encounter_scientist": "BW - ¡Vs. científico!",
-  "encounter_twins": "BW - Desafío Combate (Gemelas)",
+  "encounter_twins": "BW - ¡Vs. gemelas!",
-  "encounter_youngster": "BW - Desafío Combate (Joven)",
+  "encounter_youngster": "BW - ¡Vs. chico joven!",
   "heal": "BW - Cura Pokémon",
   "menu": "PMD EoS - ¡Bienvenidos al mundo de los Pokémon!",
   "title": "PMD EoS - Tema del menú principal"

src/locales/es/modifier-type.json

@@ -598,6 +598,6 @@
     "DRAGON_MEMORY": "Disco dragón",
     "DARK_MEMORY": "Disco siniestro",
     "FAIRY_MEMORY": "Disco hada",
-    "BLANK_MEMORY": "Disco en blanco"
+    "NORMAL_MEMORY": "Disco normal"
   }
 }

src/locales/es/modifier.json

@@ -1,3 +1,12 @@
 {
-  "bypassSpeedChanceApply": "¡Gracias {{itemName}} {{pokemonName}} puede tener prioridad!"
+  "surviveDamageApply": "{{pokemonNameWithAffix}} ha usado {{typeName}} y ha logrado resistir!",
+  "turnHealApply": "{{pokemonNameWithAffix}} ha recuperado unos pocos PS gracias a {{typeName}}!",
+  "hitHealApply": "{{pokemonNameWithAffix}} ha recuperado unos pocos PS gracias a {{typeName}}!",
+  "pokemonInstantReviveApply": "{{pokemonNameWithAffix}} ha sido revivido gracias a su {{typeName}}!",
+  "pokemonResetNegativeStatStageApply": "Las estadísticas bajadas de {{pokemonNameWithAffix}} fueron restauradas gracias a {{typeName}}!",
+  "moneyInterestApply": "Recibiste intereses de ₽{{moneyAmount}}\ngracias a {{typeName}}!",
+  "turnHeldItemTransferApply": "{{pokemonNameWithAffix}}'s {{itemName}} fue absorbido\npor {{pokemonName}}'s {{typeName}}!",
+  "contactHeldItemTransferApply": "{{pokemonNameWithAffix}}'s {{itemName}} fue robado por {{pokemonName}}'s {{typeName}}!",
+  "enemyTurnHealApply": "¡{{pokemonNameWithAffix}}\nrecuperó algunos PS!",
+  "bypassSpeedChanceApply": "¡Gracias a su {{itemName}}, {{pokemonName}} puede tener prioridad!"
 }

src/locales/es/move-trigger.json

@@ -11,5 +11,6 @@
   "usedUpAllElectricity": "¡{{pokemonName}} ha descargado toda su electricidad!",
   "stoleItem": "¡{{pokemonName}} robó el objeto\n{{itemName}} de {{targetName}}!",
   "statEliminated": "¡Los cambios en estadísticas fueron eliminados!",
-  "revivalBlessing": "¡{{pokemonName}} ha revivido!"
+  "revivalBlessing": "¡{{pokemonName}} ha revivido!",
+  "safeguard": "¡{{targetName}} está protegido por Velo Sagrado!"
 }

src/locales/es/pokemon-form-battle.json

@@ -4,5 +4,11 @@
   "mega-y": "Mega {{pokemonName}} Y",
   "primal": "{{pokemonName}} Primigenio",
   "gigantamax": "G-Max {{pokemonName}}",
-  "eternamax": "E-Max {{pokemonName}}"
+  "eternamax": "E-Max {{pokemonName}}",
+  "megaChange": "¡{{preName}} ha mega-evolucionado a {{pokemonName}}!",
+  "gigantamaxChange": "¡{{preName}} ha gigamaxizado a {{pokemonName}}!",
+  "eternamaxChange": "¡{{preName}} ha eternamaxizado a {{pokemonName}}!",
+  "revertChange": "¡{{pokemonName}} ha revertido a su forma original!",
+  "formChange": "¡{{preName}} ha cambiado de forma!",
+  "disguiseChange": "¡El disfraz ha actuado como señuelo!\t"
 }

src/locales/es/pokemon-form.json

@@ -7,6 +7,7 @@
   "pikachuToughCosplay": "Enmascarada",
   "pikachuPartner": "Compañero",
   "eeveePartner": "Compañero",
+  "pichuSpiky": "Picoreja",
   "unownA": "A",
   "unownB": "B",
   "unownC": "C",
@@ -49,6 +50,8 @@
   "rotomFrost": "Frío",
   "rotomFan": "Ventilador",
   "rotomMow": "Corte",
+  "giratinaAltered": "Modificada",
+  "shayminLand": "Tierra",
   "basculinRedStriped": "Raya Roja",
   "basculinBlueStriped": "Raya Azul",
   "basculinWhiteStriped": "Raya Blanca",
@@ -56,6 +59,10 @@
   "deerlingSummer": "Verano",
   "deerlingAutumn": "Otoño",
   "deerlingWinter": "Invierno",
+  "tornadusIncarnate": "Avatar",
+  "thundurusIncarnate": "Avatar",
+  "landorusIncarnate": "Avatar",
+  "keldeoOrdinary": "Habitual",
   "meloettaAria": "Lírica",
   "meloettaPirouette": "Danza",
   "froakieBattleBond": "Fuerte Afecto",
@@ -87,12 +94,12 @@
   "furfrouHeart": "Corazón",
   "furfrouStar": "Estrella",
   "furfrouDiamond": "Diamante",
-  "furfrouDebutante": "Debutante",
+  "furfrouDebutante": "Señorita",
-  "furfrouMatron": "Matrón",
+  "furfrouMatron": "Dama",
-  "furfrouDandy": "Dandi",
+  "furfrouDandy": "Caballero",
-  "furfrouLaReine": "La Reine",
+  "furfrouLaReine": "Aristócrata",
   "furfrouKabuki": "Kabuki",
-  "furfrouPharaoh": "Faraón",
+  "furfrouPharaoh": "Faraónico",
   "pumpkabooSmall": "Pequeño",
   "pumpkabooLarge": "Grande",
   "pumpkabooSuper": "Enorme",
@@ -127,11 +134,15 @@
   "magearnaOriginal": "Vetusto",
   "marshadowZenith": "Cénit",
   "sinisteaPhony": "Falsificada",
-  "sinisteaAntique": "Auténtica",
+  "sinisteaAntique": "Genuina",
   "eiscueNoIce": "Cara Deshielo",
   "indeedeeMale": "Macho",
   "indeedeeFemale": "Hembra",
+  "morpekoFullBelly": "Saciada",
+  "zacianHeroOfManyBattles": "Guerrero avezado",
+  "zamazentaHeroOfManyBattles": "Guerrero avezado",
   "zarudeDada": "Papá",
+  "enamorusIncarnate": "Avatar",
   "squawkabillyGreenPlumage": "Plumaje Verde",
   "squawkabillyBluePlumage": "Plumaje Azul",
   "squawkabillyYellowPlumage": "Plumaje Amarillo",
@@ -141,8 +152,18 @@
   "tatsugiriStretchy": "Estirada",
   "gimmighoulChest": "Cofre",
   "gimmighoulRoaming": "Andante",
-  "poltchageistCounterfeit": "Imitación",
+  "koraidonApexBuild": "Forma Plena",
-  "poltchageistArtisan": "Original",
+  "koraidonLimitedBuild": "Forma Limitada",
+  "koraidonSprintingBuild": "Forma Carrera",
+  "koraidonSwimmingBuild": "Forma Nado",
+  "koraidonGlidingBuild": "Forma Planeo",
+  "miraidonUltimateMode": "Modo Pleno",
+  "miraidonLowPowerMode": "Modo Limitado",
+  "miraidonDriveMode": "Modo Conducción",
+  "miraidonAquaticMode": "Modo Flote",
+  "miraidonGlideMode": "Modo Planeo",
+  "poltchageistCounterfeit": "Fraudulenta",
+  "poltchageistArtisan": "Opulenta",
   "paldeaTaurosCombat": "Combatiente",
   "paldeaTaurosBlaze": "Ardiente",
   "paldeaTaurosAqua": "Acuático"

src/locales/es/splash-messages.json

@@ -3,12 +3,12 @@
   "joinTheDiscord": "¡Únete al Discord!",
   "infiniteLevels": "¡Niveles infinitos!",
   "everythingStacks": "¡Todo se acumula!",
-  "optionalSaveScumming": "¡Trampas guardando (¡opcionales!)!",
+  "optionalSaveScumming": "¡Trampas de guardado opcionales!",
   "biomes": "¡35 biomas!",
   "openSource": "¡Código abierto!",
   "playWithSpeed": "¡Juega a velocidad 5x!",
-  "liveBugTesting": "¡Arreglo de bugs sobre la marcha!",
+  "liveBugTesting": "¡Testeo de bugs en directo!",
-  "heavyInfluence": "¡Influencia Alta en RoR2!",
+  "heavyInfluence": "¡Mucha Influencia de RoR2!",
   "pokemonRiskAndPokemonRain": "¡Pokémon Risk y Pokémon Rain!",
   "nowWithMoreSalt": "¡Con un 33% más de polémica!",
   "infiniteFusionAtHome": "¡Infinite Fusion en casa!",
@@ -17,16 +17,16 @@
   "mubstitute": "¡Mubstituto!",
   "thatsCrazy": "¡De locos!",
   "oranceJuice": "¡Zumo de narancia!",
-  "questionableBalancing": "¡Balance cuestionable!",
+  "questionableBalancing": "¡Cambios en balance cuestionables!",
   "coolShaders": "¡Shaders impresionantes!",
   "aiFree": "¡Libre de IA!",
   "suddenDifficultySpikes": "¡Saltos de dificultad repentinos!",
   "basedOnAnUnfinishedFlashGame": "¡Basado en un juego Flash inacabado!",
-  "moreAddictiveThanIntended": "¡Más adictivo de la cuenta!",
+  "moreAddictiveThanIntended": "¡Más adictivo de lo previsto!",
   "mostlyConsistentSeeds": "¡Semillas CASI consistentes!",
   "achievementPointsDontDoAnything": "¡Los Puntos de Logro no hacen nada!",
   "youDoNotStartAtLevel": "¡No empiezas al nivel 2000!",
-  "dontTalkAboutTheManaphyEggIncident": "¡No hablen del incidente del Huevo Manaphy!",
+  "dontTalkAboutTheManaphyEggIncident": "¡No se habla del Incidente Manaphy!",
   "alsoTryPokengine": "¡Prueba también Pokéngine!",
   "alsoTryEmeraldRogue": "¡Prueba también Emerald Rogue!",
   "alsoTryRadicalRed": "¡Prueba también Radical Red!",

src/locales/es/terrain.json

@@ -1 +1,16 @@
-{}
+{
+  "misty": "Niebla",
+  "mistyStartMessage": "¡La niebla ha envuelto el terreno de combate!",
+  "mistyClearMessage": "La niebla se ha disipado.",
+  "mistyBlockMessage": "¡El campo de niebla ha protegido a {{pokemonNameWithAffix}} ",
+  "electric": "Eléctrico",
+  "electricStartMessage": "¡Se ha formado un campo de corriente eléctrica en el terreno\nde combate!",
+  "electricClearMessage": "El campo de corriente eléctrica ha desaparecido.\t",
+  "grassy": "Hierba",
+  "grassyStartMessage": "¡El terreno de combate se ha cubierto de hierba!",
+  "grassyClearMessage": "La hierba ha desaparecido.",
+  "psychic": "Psíquico",
+  "psychicStartMessage": "¡El terreno de combate se ha vuelto muy extraño!",
+  "psychicClearMessage": "Ha desaparecido la extraña sensación que se percibía en el terreno\nde combate.",
+  "defaultBlockMessage": "¡El campo {{terrainName}} ha protegido a {{pokemonNameWithAffix}} "
+}

src/locales/es/trainer-names.json

@@ -1,7 +1,7 @@
 {
   "brock": "Brock",
   "misty": "Misty",
-  "lt_surge": "Tt. Surge",
+  "lt_surge": "Teniente Surge",
   "erika": "Erika",
   "janine": "Sachiko",
   "sabrina": "Sabrina",
@@ -23,7 +23,7 @@
   "winona": "Alana",
   "tate": "Vito",
   "liza": "Leti",
-  "juan": "Galán",
+  "juan": "Galano",
   "roark": "Roco",
   "gardenia": "Gardenia",
   "maylene": "Brega",
@@ -34,7 +34,7 @@
   "volkner": "Lectro",
   "cilan": "Millo",
   "chili": "Zeo",
-  "cress": "Maiz",
+  "cress": "Maíz",
   "cheren": "Cheren",
   "lenora": "Aloe",
   "roxie": "Hiedra",
@@ -57,7 +57,7 @@
   "nessa": "Cathy",
   "kabu": "Naboru",
   "bea": "Judith",
-  "allister": "Allistair",
+  "allister": "Alistair",
   "opal": "Sally",
   "bede": "Berto",
   "gordie": "Morris",
@@ -123,30 +123,28 @@
   "leon": "Lionel",
   "rival": "Finn",
   "rival_female": "Ivy",
-  "archer": "Archer",
+  "archer": "Atlas",
-  "ariana": "Ariana",
+  "ariana": "Atenea",
-  "proton": "Proton",
+  "proton": "Protón",
   "petrel": "Petrel",
-  "tabitha": "Tabitha",
+  "tabitha": "Tatiano",
-  "courtney": "Courtney",
+  "courtney": "Carola",
-  "shelly": "Shelly",
+  "shelly": "Silvina",
-  "matt": "Matt",
+  "matt": "Matías",
-  "mars": "Mars",
+  "mars": "Venus",
-  "jupiter": "Jupiter",
+  "jupiter": "Ceres",
-  "saturn": "Saturn",
+  "saturn": "Saturno",
-  "zinzolin": "Zinzolin",
+  "zinzolin": "Menek",
-  "rood": "Rood",
+  "rood": "Ruga",
-  "xerosic": "Xerosic",
+  "xerosic": "Xero",
-  "bryony": "Bryony",
+  "bryony": "Begonia",
+  "maxie": "Magno",
+  "archie": "Aquiles",
+  "cyrus": "Helio",
+  "ghetsis": "Ghechis",
+  "lysandre": "Lysson",
   "faba": "Fabio",
-
-  "maxie": "Maxie",
-  "archie": "Archie",
-  "cyrus": "Cyrus",
-  "ghetsis": "Ghetsis",
-  "lysandre": "Lysandre",
   "lusamine": "Samina",
-
   "blue_red_double": "Azul y Rojo",
   "red_blue_double": "Rojo y Azul",
   "tate_liza_double": "Vito y Leti",

src/locales/fr/arena-tag.json

@@ -47,5 +47,11 @@
   "tailwindOnRemovePlayer": "Le vent arrière soufflant\nsur votre équipe s’arrête !",
   "tailwindOnRemoveEnemy": "Le vent arrière soufflant\nsur l’équipe ennemie s’arrête !",
   "happyHourOnAdd": "L’ambiance est euphorique !",
-  "happyHourOnRemove": "L’ambiance se calme !"
+  "happyHourOnRemove": "L’ambiance se calme !",
+  "safeguardOnAdd": "Un voile mystérieux recouvre\ntout le terrain !",
+  "safeguardOnAddPlayer": "Un voile mystérieux recouvre\nvotre équipe !",
+  "safeguardOnAddEnemy": "Un voile mystérieux recouvre\nl’équipe ennemie !",
+  "safeguardOnRemove": "Le terrain n’est plus protégé\npar le voile mystérieux !",
+  "safeguardOnRemovePlayer": "Votre équipe n’est plus protégée\npar le voile mystérieux !",
+  "safeguardOnRemoveEnemy": "L’équipe ennemie n’est plus protégée\npar le voile mystérieux !"
 }

src/locales/fr/dialogue-misc.json

@@ -1,4 +1,6 @@
 {
   "ending": "@c{smile}Oh ? T’as gagné ?@d{96} @c{smile_eclosed}J’aurais dû le savoir.\nMais de voilà de retour.\n$@c{smile}C’est terminé.@d{64} T’as brisé ce cycle infernal.\n$@c{serious_smile_fists}T’as aussi accompli ton rêve non ?\nTu n’as pas connu la moindre défaite.\n$@c{neutral}Je suis le seul à me souvenir de ce que t’as fait.@d{96}\nJe pense que ça ira, non ?\n$@c{serious_smile_fists}Ta légende vivra à jamais dans nos cœurs.\n$@c{smile_eclosed}Bref, j’en ai un peu marre de ce endroit, pas toi ? Rentrons à la maison.\n$@c{serious_smile_fists}On se fera un p’tit combat une fois rentrés ?\nSi t’es d’accord.",
-  "ending_female": "@c{shock}T’es revenu ?@d{32} Ça veut dire…@d{96} que t’as gagné ?!\n@c{smile_ehalf}J’aurais dû le savoir.\n$@c{smile_eclosed}Bien sûr… J’ai toujours eu ce sentiment.\n@c{smile}C’est fini maitenant hein ? T’as brisé ce cycle.\n$@c{smile_ehalf}T’as aussi accompli ton rêve non ?\nTu n’as pas connu la moindre défaite.\n$Je serai la seule à me souvenir de ce que t’as fait.\n@c{angry_mopen}Je tâcherai de ne pas oublier !\n$@c{smile_wave_wink}J’déconne !@d{64} @c{smile}Jamais j’oublierai.@d{32}\nTa légende vivra à jamais dans nos cœurs.\n$@c{smile_wave}Bon,@d{64} il se fait tard…@d{96} je crois ?\nDifficile à dire ici.\n$Rentrons, @c{smile_wave_wink}et demain on se fera un p’tit combat, comme au bon vieux temps ?"
+  "ending_female": "@c{shock}T’es revenu ?@d{32} Ça veut dire…@d{96} que t’as gagné ?!\n@c{smile_ehalf}J’aurais dû le savoir.\n$@c{smile_eclosed}Bien sûr… J’ai toujours eu ce sentiment.\n@c{smile}C’est fini maitenant hein ? T’as brisé ce cycle.\n$@c{smile_ehalf}T’as aussi accompli ton rêve non ?\nTu n’as pas connu la moindre défaite.\n$Je serai la seule à me souvenir de ce que t’as fait.\n@c{angry_mopen}Je tâcherai de ne pas oublier !\n$@c{smile_wave_wink}J’déconne !@d{64} @c{smile}Jamais j’oublierai.@d{32}\nTa légende vivra à jamais dans nos cœurs.\n$@c{smile_wave}Bon,@d{64} il se fait tard…@d{96} je crois ?\nDifficile à dire ici.\n$Rentrons, @c{smile_wave_wink}et demain on se fera un p’tit combat, comme au bon vieux temps ?",
+  "ending_endless": "Félicitations ! Vous avez atteint la fin actuelle.\nPlus de contenu à venir bientôt !",
+  "ending_name": "Les devs"
 }

src/locales/fr/modifier-type.json

@@ -437,6 +437,6 @@
     "DRAGON_MEMORY": "ROM Dragon",
     "DARK_MEMORY": "ROM Ténèbres",
     "FAIRY_MEMORY": "ROM Fée",
-    "BLANK_MEMORY": "ROM Vierge"
+    "NORMAL_MEMORY": "ROM Normal"
   }
 }

src/locales/fr/move-trigger.json

@@ -65,5 +65,6 @@
   "suppressAbilities": "Le talent de {{pokemonName}}\na été rendu inactif !",
   "revivalBlessing": "{{pokemonName}} a repris connaissance\net est prêt à se battre de nouveau !",
   "swapArenaTags": "Les effets affectant chaque côté du terrain\nont été échangés par {{pokemonName}} !",
-  "exposedMove": "{{targetPokemonName}} est identifié\npar {{pokemonName}} !"
+  "exposedMove": "{{targetPokemonName}} est identifié\npar {{pokemonName}} !",
+  "safeguard": "{{targetName}} est protégé\npar la capacité Rune Protect !"
 }

src/locales/fr/pokemon-info.json

@@ -13,7 +13,8 @@
     "SPD": "Vitesse",
     "SPDshortened": "Vit",
     "ACC": "Précison",
-    "EVA": "Esquive"
+    "EVA": "Esquive",
+    "HPStat": "PV"
   },
   "Type": {
     "UNKNOWN": "Inconnu",

src/locales/fr/pokemon-summary.json

@@ -13,5 +13,32 @@
   "metFragment": {
     "normal": "rencontré au N.{{level}},\n{{biome}}.",
     "apparently": "apparemment rencontré au N.{{level}},\n{{biome}}."
+  },
+  "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}}"
   }
 }

src/locales/fr/trainer-classes.json

@@ -101,8 +101,8 @@
   "workers": "Ouvriers",
   "youngster": "Gamin",
   "rocket_grunt": "Sbire de la Team Rocket",
-  "rocket_grunt_female": "Sbire de la Team Rocket",
   "rocket_grunts": "Sbires de la Team Rocket",
+  "rocket_grunt_female": "Sbire de la Team Rocket",
   "magma_grunt": "Sbire de la Team Magma",
   "magma_grunt_female": "Sbire de la Team Magma",
   "magma_grunts": "Sbires de la Team Magma",
@@ -123,6 +123,7 @@
   "aether_grunts": "Employés de la Fondation Æther",
   "skull_grunt": "Sbire de la Team Skull",
   "skull_grunt_female": "Sbire de la Team Skull",
+  "skull_grunts": "Sbires de la Team Skull",
   "macro_grunt": "Employé de Macro Cosmos",
   "macro_grunt_female": "Employée de Macro Cosmos",
   "macro_grunts": "Employés de Macro Cosmos"

src/locales/it/arena-tag.json

@@ -1 +1,8 @@
-{}
+{
+  "safeguardOnAdd": "Un velo mistico ricopre il campo!",
+  "safeguardOnAddPlayer": "Un velo mistico ricopre la tua squadra!",
+  "safeguardOnAddEnemy": "Un velo mistico ricopre la squadra avversaria!",
+  "safeguardOnRemove": "Il campo non è più protetto da Salvaguardia!",
+  "safeguardOnRemovePlayer": "La tua squadra non è più protetta da Salvaguardia!",
+  "safeguardOnRemoveEnemy": "La squadra avversaria non è più protetta da Salvaguardia!"
+}

src/locales/it/modifier-type.json

@@ -598,6 +598,6 @@
     "DRAGON_MEMORY": "ROM Drago",
     "DARK_MEMORY": "ROM Buio",
     "FAIRY_MEMORY": "ROM Folletto",
-    "BLANK_MEMORY": "ROM Vuota"
+    "NORMAL_MEMORY": "ROM Normale"
   }
 }

src/locales/it/move-trigger.json

@@ -65,5 +65,6 @@
   "suppressAbilities": "L’abilità di {{pokemonName}}\nperde ogni efficacia!",
   "revivalBlessing": "{{pokemonName}} torna in forze!",
   "swapArenaTags": "{{pokemonName}} ha invertito gli effetti attivi\nnelle due metà del campo!",
-  "exposedMove": "{{pokemonName}} ha identificato\n{{targetPokemonName}}!"
+  "exposedMove": "{{pokemonName}} ha identificato\n{{targetPokemonName}}!",
+  "safeguard": "Salvaguardia protegge {{targetName}}!"
 }

src/locales/it/party-ui-handler.json

@@ -1,42 +1,47 @@
 {
-    "SEND_OUT": "Manda in campo",
+  "SEND_OUT": "Manda in campo",
-    "SUMMARY": "Sommario",
+  "SUMMARY": "Sommario",
-    "CANCEL": "Annulla",
+  "CANCEL": "Annulla",
-    "RELEASE": "Rilascia",
+  "RELEASE": "Rilascia",
-    "APPLY": "Applica",
+  "APPLY": "Applica",
-    "TEACH": "Insegna",
+  "TEACH": "Insegna",
-    "SPLICE": "Unisci",
+  "SPLICE": "Unisci",
-    "UNSPLICE": "Dividi",
+  "UNSPLICE": "Dividi",
-    "ACTIVATE": "Attiva",
+  "ACTIVATE": "Attiva",
-    "DEACTIVATE": "Disattiva",
+  "DEACTIVATE": "Disattiva",
-    "TRANSFER": "Trasferisci",
+  "TRANSFER": "Trasferisci",
-    "ALL": "Tutto",
+  "ALL": "Tutto",
-    "PASS_BATON": "Staffetta",
+  "PASS_BATON": "Staffetta",
-    "UNPAUSE_EVOLUTION": "Consenti evoluzione",
+  "UNPAUSE_EVOLUTION": "Consenti evoluzione",
-    "REVIVE": "Revitalizza",
+  "REVIVE": "Revitalizza",
-    "RENAME": "Rinomina",
+  "RENAME": "Rinomina",
-    "choosePokemon": "Scegli un Pokémon.",
+  "choosePokemon": "Scegli un Pokémon.",
-    "doWhatWithThisPokemon": "Hai selezionato questo Pokémon.",
+  "doWhatWithThisPokemon": "Hai selezionato questo Pokémon.",
-    "noEnergy": "{{pokemonName}} non ha più energie\nper lottare!",
+  "noEnergy": "{{pokemonName}} non ha più energie\nper lottare!",
-    "hasEnergy": "{{pokemonName}} ha ancora energie\nper lottare!",
+  "hasEnergy": "{{pokemonName}} ha ancora energie\nper lottare!",
-    "cantBeUsed": "{{pokemonName}} non può essere usato\nin questa sfida!",
+  "cantBeUsed": "{{pokemonName}} non può essere usato\nin questa sfida!",
-    "tooManyItems": "{{pokemonName}} possiede già\nquest'oggetto in abbondanza!",
+  "tooManyItems": "{{pokemonName}} possiede già\nquest'oggetto in abbondanza!",
-    "anyEffect": "Non avrebbe alcun effetto.",
+  "anyEffect": "Non avrebbe alcun effetto.",
-    "unpausedEvolutions": "{{pokemonName}} può di nuovo evolversi.",
+  "unpausedEvolutions": "{{pokemonName}} può di nuovo evolversi.",
-    "unspliceConfirmation": "Vuoi davvero dividere {{fusionName}}\nda {{pokemonName}}? {{fusionName}} andrà perduto.",
+  "unspliceConfirmation": "Vuoi davvero dividere {{fusionName}}\nda {{pokemonName}}? {{fusionName}} andrà perduto.",
-    "wasReverted": "{{fusionName}} è tornato ad essere {{pokemonName}}.",
+  "wasReverted": "{{fusionName}} è tornato ad essere {{pokemonName}}.",
-    "releaseConfirmation": "Vuoi davvero liberare {{pokemonName}}?",
+  "releaseConfirmation": "Vuoi davvero liberare {{pokemonName}}?",
-    "releaseInBattle": "Non puoi liberare un Pokémon che sta combattendo!",
+  "releaseInBattle": "Non puoi liberare un Pokémon che sta combattendo!",
-    "selectAMove": "Scegli una mossa.",
+  "selectAMove": "Scegli una mossa.",
-    "changeQuantity": "Scegli un oggetto da trasferire.\nUsa < e > per cambiarne la quantità.",
+  "changeQuantity": "Scegli un oggetto da trasferire.\nUsa < e > per cambiarne la quantità.",
-    "selectAnotherPokemonToSplice": "Scegli un altro Pokémon da unire.",
+  "selectAnotherPokemonToSplice": "Scegli un altro Pokémon da unire.",
-    "cancel": "Annulla",
+  "cancel": "Annulla",
-    "goodbye": "Addio, {{pokemonName}}!",
+  "able": "Sì!",
-    "byebye": "Ciao ciao, {{pokemonName}}!",
+  "notAble": "No!",
-    "farewell": "Arrivederci, {{pokemonName}}!",
+  "learned": "La conosce!",
-    "soLong": "È stato bello, {{pokemonName}}!",
+  "goodbye": "Addio, {{pokemonName}}!",
-    "thisIsWhereWePart": "Le nostre strade si dividono, {{pokemonName}}!",
+  "byebye": "Ciao ciao, {{pokemonName}}!",
-    "illMissYou": "Mi mancherai, {{pokemonName}}!",
+  "farewell": "Arrivederci, {{pokemonName}}!",
-    "illNeverForgetYou": "Non ti dimenticherò, {{pokemonName}}!",
+  "soLong": "È stato bello, {{pokemonName}}!",
-    "untilWeMeetAgain": "Alla prossima, {{pokemonName}}!"
+  "thisIsWhereWePart": "Le nostre strade si dividono, {{pokemonName}}!",
-  }
+  "illMissYou": "Mi mancherai, {{pokemonName}}!",
+  "illNeverForgetYou": "Non ti dimenticherò, {{pokemonName}}!",
+  "untilWeMeetAgain": "Alla prossima, {{pokemonName}}!",
+  "sayonara": "Sayonara, {{pokemonName}}!",
+  "smellYaLater": "Ci becchiamo, {{pokemonName}}!"
+}

src/locales/it/pokemon-info-container.json

@@ -2,5 +2,6 @@
   "moveset": "Set di mosse",
   "gender": "Genere:",
   "ability": "Abilità:",
-  "nature": "Natura:"
+  "nature": "Natura:",
+  "form": "Forma:"
 }

src/locales/it/pokemon.json

@@ -1 +1,23 @@
-{}
+{
+  "type_null": "Tipo Zero",
+  "great_tusk": "Grandizanne",
+  "scream_tail": "Codaurlante",
+  "brute_bonnet": "Fungofurioso",
+  "flutter_mane": "Crinealato",
+  "slither_wing": "Alirasenti",
+  "sandy_shocks": "Peldisabbia",
+  "iron_treads": "Solcoferreo",
+  "iron_bundle": "Saccoferreo",
+  "iron_hands": "Manoferrea",
+  "iron_jugulis": "Colloferreo",
+  "iron_moth": "Falenaferrea",
+  "iron_thorns": "Spineferree",
+  "roaring_moon": "Lunaruggente",
+  "iron_valiant": "Eroeferreo",
+  "walking_wake": "Acquecrespe",
+  "iron_leaves": "Fogliaferrea",
+  "gouging_fire": "Vampeaguzze",
+  "raging_bolt": "Furiatonante",
+  "iron_boulder": "Massoferreo",
+  "iron_crown": "Capoferreo"
+}

src/locales/ja/ability-trigger.json

@@ -12,7 +12,6 @@
   "blockItemTheft": "{{pokemonNameWithAffix}}の　{{abilityName}}で\n道具を　うばわれない！",
   "typeImmunityHeal": "{{pokemonNameWithAffix}}は　{{abilityName}}で\n体力を　回復した！",
   "nonSuperEffectiveImmunity": "{{pokemonNameWithAffix}}は　{{abilityName}}で\nダメージを　受けない。",
-  "postDefendDisguise": "{{pokemonNameWithAffix}}の\nばけのかわが　はがれた！",
   "moveImmunity": "{{pokemonNameWithAffix}}には\n効果が　ないようだ…",
   "reverseDrain": "{{pokemonNameWithAffix}}は\nヘドロえきを　吸い取った！",
   "postDefendTypeChange": "{{pokemonNameWithAffix}}は　{{abilityName}}で\n{{typeName}}タイプに　なった！",

src/locales/ja/achv.json

@@ -6,7 +6,7 @@
     "name": "なし"
   },
   "MoneyAchv": {
-    "description": "一回の　ランで　₽{{moneyAmount}}を　稼ぐ"
+    "description": "一回の　ランで　{{moneyAmount}}円を　稼ぐ"
   },
   "10K_MONEY": {
     "name": "お金を持つ人"
@@ -21,7 +21,7 @@
     "name": "超富裕層"
   },
   "DamageAchv": {
-    "description": "一撃で　{{damageAmount}}ダメージを　与える"
+    "description": "一撃で　HP{{damageAmount}}の　ダメージを　与える"
   },
   "250_DMG": {
     "name": "力持ち"
@@ -33,10 +33,11 @@
     "name": "カカロット"
   },
   "10000_DMG": {
-    "name": "ワンパンマン"
+    "name": "ワンパンマン",
+    "name_female": "ワンパンウーマン"
   },
   "HealAchv": {
-    "description": "一つの　技や　特性や　持っているアイテムで　{{healAmount}}{{HP}}を　一気に　回復する"
+    "description": "一つの　技や　特性や　持っているアイテムで\n{{healAmount}}{{HP}}を　一気に　回復する"
   },
   "250_HEAL": {
     "name": "回復発見者"
@@ -82,7 +83,7 @@
   },
   "TRANSFER_MAX_STAT_STAGE": {
     "name": "同力",
-    "description": "少なくとも　一つの　能力を　最大まで　あげて　他の　手持ちポケモンに　バトンタッチする"
+    "description": "少なくとも　一つの　能力を　最大まで　あげて\n他の　手持ちポケモンに　バトンタッチする"
   },
   "MAX_FRIENDSHIP": {
     "name": "マブ達",
@@ -106,7 +107,7 @@
   },
   "SPLICE": {
     "name": "インフィニット・フュジョン",
-    "description": "いでんしのくさびで　二つの　ポケモンを　吸収合体させる"
+    "description": "遺伝子のくさびで　二つの　ポケモンを　吸収合体させる"
   },
   "MINI_BLACK_HOLE": {
     "name": "アイテムホーリック",
@@ -161,8 +162,8 @@
     "description": "クラシックモードを　クリアする"
   },
   "UNEVOLVED_CLASSIC_VICTORY": {
-    "name": "Bring Your Child To Work Day",
+    "name": "はじめてのおつかい",
-    "description": "Beat the game in Classic Mode with at least one unevolved party member."
+    "description": "少なくとも　一つの　進化していない　手持ちポケモンで\nクラシックモードを　クリアする"
   },
   "MONO_GEN_ONE": {
     "name": "原始",
@@ -260,5 +261,9 @@
   "FRESH_START": {
     "name": "一発で！",
     "description": "出直しチャレンジを　クリアする"
+  },
+  "INVERSE_BATTLE": {
+    "name": "カガミよミガカ",
+    "description": "反転バトルチャレンジを　クリアする\nるすアリク　をジンレャチルトバ転反"
   }
 }

src/locales/ja/battler-tags.json

@@ -1,4 +1,12 @@
 {
+  "trappedDesc": "捕らわれること",
+  "flinchedDesc": "ひるむこと",
+  "confusedDesc": "混乱",
+  "infatuatedDesc": "メロメロ",
+  "seedDesc": "種を植えつくこと",
+  "nightmareDesc": "あくむ",
+  "ingrainDesc": "根",
+  "drowsyDesc": "ねむけ",
   "rechargingLapse": "{{pokemonNameWithAffix}}は　攻撃の　反動で　動けない！",
   "trappedOnAdd": "{{pokemonNameWithAffix}}は　もう　逃げられない！",
   "trappedOnRemove": "{{pokemonNameWithAffix}}は\n{{moveName}}の　効果が　解けた!",
@@ -13,9 +21,9 @@
   "infatuatedOnAdd": "{{pokemonNameWithAffix}}は　{{sourcePokemonName}}に　メロメロに　なった!",
   "infatuatedOnOverlap": "{{pokemonNameWithAffix}}は　すでに　メロメロだ!",
   "infatuatedLapse": "{{pokemonNameWithAffix}}は　{{sourcePokemonName}}に　メロメロだ!",
-  "infatuatedLapseImmobilize": "{{pokemonNameWithAffix}}は\nメロメロで　わざが　出せなかった！",
+  "infatuatedLapseImmobilize": "{{pokemonNameWithAffix}}は　メロメロで　技が出せなかった！",
   "infatuatedOnRemove": "{{pokemonNameWithAffix}}は　メロメロ状態が　治った！",
-  "seededOnAdd": "{{pokemonNameWithAffix}}に　種を　植（う）えつけた！",
+  "seededOnAdd": "{{pokemonNameWithAffix}}に　種を　植えつけた！",
   "seededLapse": "やどりぎが　{{pokemonNameWithAffix}}の　体力を　うばう！",
   "seededLapseShed": "{{pokemonNameWithAffix}}は　ヘドロえきを　吸い取った！",
   "nightmareOnAdd": "{{pokemonNameWithAffix}}は　あくむを　見始めた！",

src/locales/ja/berry.json

@@ -1,46 +1,46 @@
 {
   "SITRUS": {
     "name": "オボンのみ",
-    "effect": "HP 50%いかのとき HPを 25パーセント かいふくする"
+    "effect": "持たせると HPが 50％以下になるとき　HPを 25％ 回復する"
   },
   "LUM": {
     "name": "ラムのみ",
-    "effect": "すべての じょうたい いじょうと こんらんを かいふくする"
+    "effect": "持たせると 状態異常や 混乱になるとき 回復する\n"
   },
   "ENIGMA": {
     "name": "ナゾのみ",
-    "effect": "こうかばつぐんの わざを うけたとき HPを 25パーセント かいふくする"
+    "effect": "持たせると 効果バツグンの 技を 受けたとき HPを ２５％回復する"
   },
   "LIECHI": {
     "name": "チイラのみ",
-    "effect": "HP 25%いかのとき こうげきが あがる"
+    "effect": "持たせると HPが 25%以下に なるとき 攻撃が あがる"
   },
   "GANLON": {
     "name": "リュガのみ",
-    "effect": "HP 25%いかのとき ぼうぎょが あがる"
+    "effect": "持たせると HPが 25%以下に なるとき 防御が あがる\n"
   },
   "PETAYA": {
     "name": "ヤタピのみ",
-    "effect": "HP 25%いかのとき とくこうが あがる"
+    "effect": "持たせると HPが 25%以下に なるとき 特攻が あがる\n"
   },
   "APICOT": {
     "name": "ズアのみ",
-    "effect": "HP 25%いかのとき とくぼうが あがる"
+    "effect": "持たせると HPが 25%以下に なるとき 特防が あがる\n"
   },
   "SALAC": {
     "name": "カムラのみ",
-    "effect": "HP 25%いかのとき すばやさが あがる"
+    "effect": "持たせると HPが 25%以下に なるとき 素早さが あがる"
   },
   "LANSAT": {
     "name": "サンのみ",
-    "effect": "HP 25%いかのとき こうげきが きゅうしょに あたりやすくなる"
+    "effect": "持たせると HPが 25%以下に なるとき 攻撃が 急所に 当たりやすくなる"
   },
   "STARF": {
     "name": "スターのみ",
-    "effect": "HP 25%いかのとき のうりょくの どれか 1つが ぐーんと あがる"
+    "effect": "持たせると HPが 25%以下に なるとき どれか 1つの 能力が ぐーんと あがる"
   },
   "LEPPA": {
     "name": "ヒメリのみ",
-    "effect": "PPが 0に なった わざの PPを 10だけ かいふくする"
+    "effect": "持たせると PPが 0になる 技のPPを 10回復する"
   }
 }

src/locales/ja/challenges.json

@@ -1,10 +1,10 @@
 {
-  "title": "チャレンジを　設定",
+  "title": "チャレンジを 設定",
   "illegalEvolution": "{{pokemon}}は　このチャレンジで\n対象外の　ポケモンに　なってしまった！",
   "singleGeneration": {
     "name": "単一世代",
-    "desc": "{{gen}}世代からの　ポケモンしか　使えません",
+    "desc": "{{gen}}世代からの ポケモンしか 使えません",
-    "desc_default": "選んだ　世代からの　ポケモンしか　使えません",
+    "desc_default": "選んだ 世代からの ポケモンしか 使えません",
     "gen_1": "1",
     "gen_2": "2",
     "gen_3": "3",
@@ -17,13 +17,19 @@
   },
   "singleType": {
     "name": "単一タイプ",
-    "desc": "{{type}}タイプの　ポケモンしか　使えません",
+    "desc": "{{type}}タイプの ポケモンしか 使えません",
-    "desc_default": "選んだ　タイプの　ポケモンしか　使えません"
+    "desc_default": "選んだ タイプの ポケモンしか 使えません"
   },
   "freshStart": {
     "name": "出直し",
-    "shortName": "出直し",
+    "desc": "ポケローグを 始めた ばかりの ような ままで ゲーム開始の スターターしか 使えません",
-    "desc": "ポケローグを　始めた　ばかりの　ような　ままで　ゲーム開始の　最初のパートナーしか　使えません",
+    "value.0": "オフ",
+    "value.1": "オン"
+  },
+  "inverseBattle": {
+    "name": "反転バトル",
+    "shortName": "反バ",
+    "desc": "タイプ相性が 反転で、なんの タイプも 「効果はなし」が ありません\n他の チャレンジの 実績が 無効に されます",
     "value.0": "オフ",
     "value.1": "オン"
   }

src/locales/ja/command-ui-handler.json

@@ -3,5 +3,5 @@
   "ball": "ボール",
   "pokemon": "ポケモン",
   "run": "にげる",
-  "actionMessage": "{{pokemonName}}は どうする？"
+  "actionMessage": "{{pokemonName}}は　どうする？"
 }

src/locales/ja/egg.json

@@ -4,23 +4,23 @@
   "ultraTier": "超レア",
   "masterTier": "伝説",
   "defaultTier": "ふつう",
-  "hatchWavesMessageSoon": "なかから おとが きこえてくる! もうすぐ うまれそう！",
+  "hatchWavesMessageSoon": "中から 音が 聞こえてくる！ もうすぐ 生まれそう！",
-  "hatchWavesMessageClose": "ときどき うごいている みたい。 うまれるまで もう ちょっとかな？",
+  "hatchWavesMessageClose": "時々 動いている みたい。生まれるまで もう ちょっとかな？",
-  "hatchWavesMessageNotClose": "なにが うまれてくるのかな? うまれるまで まだまだ じかんが かかりそう。",
+  "hatchWavesMessageNotClose": "なにが 生まれてくるのかな？ 生まれるまで まだまだ 時間が かかりそう。",
-  "hatchWavesMessageLongTime": "この タマゴは うまれるまで かなり じかんが かかりそう。",
+  "hatchWavesMessageLongTime": "この タマゴは 生まれるまで かなり 時間が かかりそう。",
   "gachaTypeLegendary": "伝説確率アップ",
-  "gachaTypeMove": "レアなタマゴわざ確率アップ",
+  "gachaTypeMove": "レアなタマゴ技確率アップ",
   "gachaTypeShiny": "色違い確率アップ",
   "selectMachine": "ガチャマシンを選択",
   "notEnoughVouchers": "タマゴクーポンが足りません！",
   "tooManyEggs": "タマゴが一杯です!",
   "pull": "回引く",
   "pulls": "回引く",
-  "sameSpeciesEgg": "{{species}}は　このタマゴから　うまれる！",
+  "sameSpeciesEgg": "{{species}}は　このタマゴから　生まれる！",
-  "hatchFromTheEgg": "{{pokemonName}}は　タマゴから　うまれた！",
+  "hatchFromTheEgg": "{{pokemonName}}は　タマゴから　生まれた！",
-  "eggMoveUnlock": "タマゴわざ　{{moveName}}を　おぼえた！",
+  "eggMoveUnlock": "タマゴ技：　{{moveName}}を　覚えた！",
-  "rareEggMoveUnlock": "レアなタマゴわざ　{{moveName}}を　おぼえた！！",
+  "rareEggMoveUnlock": "レアなタマゴ技：　{{moveName}}を　覚えた！！",
-  "moveUPGacha": "わざ UP!",
+  "moveUPGacha": "技 UP!",
   "shinyUPGacha": "色違い UP!",
   "legendaryUPGacha": "UP!"
 }

src/locales/ja/game-mode.json

@@ -1,8 +1,8 @@
 {
   "classic": "クラシック",
   "endless": "エンドレス",
-  "endlessSpliced": "エンドレス (Spliced)",
+  "endlessSpliced": "エンドレス（吸収合体）",
   "dailyRun": "デイリーラン",
-  "unknown": "Unknown",
+  "unknown": "？？？",
   "challenge": "チャレンジ"
 }

src/locales/ja/game-stats-ui-handler.json

@@ -1,6 +1,6 @@
 {
   "stats": "統計",
-  "playTime": "プレー時間",
+  "playTime": "プレイ時間",
   "totalBattles": "合計バトル数",
   "starters": "スターター数",
   "shinyStarters": "色違いスターター数",
@@ -12,27 +12,27 @@
   "dailyRunAttempts": "デイリーラン",
   "dailyRunWins": "デイリーラン勝利",
   "endlessRuns": "エンドレスラン",
-  "highestWaveEndless": "エンドレス最高ウェーブ",
+  "highestWaveEndless": "エンドレス最高波",
   "highestMoney": "最大貯金",
   "highestDamage": "最大ダメージ",
   "highestHPHealed": "最大HP回復",
   "pokemonEncountered": "遭遇したポケモン",
   "pokemonDefeated": "倒したポケモン",
   "pokemonCaught": "捕まえたポケモン",
-  "eggsHatched": "ふかしたタマゴ",
+  "eggsHatched": "孵化したタマゴ",
-  "subLegendsSeen": "見つけた順伝説",
+  "subLegendsSeen": "見つけた順伝説ポケモン",
-  "subLegendsCaught": "捕まえた順伝説",
+  "subLegendsCaught": "捕まえた準伝説ポケモン",
-  "subLegendsHatched": "ふかした順伝説",
+  "subLegendsHatched": "孵化した準伝説ポケモン",
-  "legendsSeen": "見つけた伝説",
+  "legendsSeen": "見つけた伝説ポケモン",
-  "legendsCaught": "捕まえた伝説",
+  "legendsCaught": "捕まえた伝説ポケモン",
-  "legendsHatched": "ふかした伝説",
+  "legendsHatched": "孵化した伝説ポケモン",
   "mythicalsSeen": "見つけた幻ポケモン",
   "mythicalsCaught": "捕まえた幻ポケモン",
-  "mythicalsHatched": "ふかした幻ポケモン",
+  "mythicalsHatched": "孵化した幻ポケモン",
-  "shiniesSeen": "見つけた色違い",
+  "shiniesSeen": "見つけた色違いポケモン",
-  "shiniesCaught": "捕まえた色違い",
+  "shiniesCaught": "捕まえた色違いポケモン",
-  "shiniesHatched": "ふかした色違い",
+  "shiniesHatched": "孵化した色違いポケモン",
-  "pokemonFused": "合体したポケモン",
+  "pokemonFused": "吸収合体したポケモン",
   "trainersDefeated": "倒したトレーナー",
   "eggsPulled": "引いたタマゴ",
   "rareEggsPulled": "引いたレアタマゴ",

src/locales/ja/menu-ui-handler.json

@@ -2,19 +2,22 @@
   "GAME_SETTINGS": "設定",
   "ACHIEVEMENTS": "実績",
   "STATS": "統計",
+  "RUN_HISTORY": "ラン歴",
   "EGG_LIST": "タマゴリスト",
   "EGG_GACHA": "タマゴガチャ",
   "MANAGE_DATA": "データ管理",
   "COMMUNITY": "コミュニティ",
-  "SAVE_AND_QUIT": "保存して終了",
+  "SAVE_AND_QUIT": "セーブして終了",
   "LOG_OUT": "ログアウト",
   "slot": "スロット {{slotNumber}}",
-  "importSession": "セッションのインポート",
+  "importSession": "セッションをインポート",
   "importSlotSelect": "インポート先の　スロットを　選んでください",
-  "exportSession": "セッションのエクスポート",
+  "exportSession": "セッションをエクスポート",
   "exportSlotSelect": "エクスポート元の　スロットを　選んでください",
-  "importData": "データのインポート",
+  "importRunHistory": "ラン歴をインポート",
-  "exportData": "データのエクスポート",
+  "exportRunHistory": "ラン歴をエクスポート",
+  "importData": "データをインポート",
+  "exportData": "データをエクスポート",
   "consentPreferences": "同意設定",
   "linkDiscord": "Discord連携",
   "unlinkDiscord": "Discord連携解除",
@@ -22,5 +25,5 @@
   "unlinkGoogle": "Google連携解除",
   "cancel": "キャンセル",
   "losingProgressionWarning": "戦闘開始からの　データが　保存されません。\nよろしいですか？",
-  "noEggs": "現在　タマゴを　ふかしていません！"
+  "noEggs": "現在は　タマゴを　孵化していません！"
 }

src/locales/ja/menu.json

@@ -1,38 +1,55 @@
 {
   "cancel": "キャンセル",
   "continue": "つづきから",
-  "loadGame": "ロードセーブ",
+  "dailyRun": "日替わりラン（ベータ版）",
+  "loadGame": "セーブを読み込む",
   "newGame": "はじめから",
-  "username": "ユーザーめい",
+  "settings": "設定",
+  "selectGameMode": "ゲームモードを　選んでください。",
+  "logInOrCreateAccount": "始めるには、ログイン、または　登録して　ください。\nメールアドレスは　必要が　ありません！",
+  "username": "ユーザー名",
   "password": "パスワード",
   "login": "ログイン",
-  "orUse": "Or use",
+  "orUse": "他の\nログイン方法",
-  "register": "かいいん とうろく",
+  "register": "登録",
-  "emptyUsername": "ユーザー名は空にできません",
+  "emptyUsername": "ユーザー名を 空にする ことは できません",
-  "invalidLoginUsername": "入力したユーザー名は無効です",
+  "invalidLoginUsername": "入力されたユーザー名は無効です",
-  "invalidRegisterUsername": "ユーザー名には英文字、数字、アンダースコアのみを含める必要があります",
+  "invalidRegisterUsername": "ユーザー名には 英文字、 数字、 アンダースコアのみを 含くむ必要が あります",
   "invalidLoginPassword": "入力したパスワードは無効です",
-  "invalidRegisterPassword": "パスワードは6文字以上でなければなりません",
+  "invalidRegisterPassword": "パスワードは 6文字以上 でなければなりません",
-  "usernameAlreadyUsed": "ユーザー名は既に使用されています",
+  "usernameAlreadyUsed": "入力したユーザー名は すでに 使用されています",
-  "accountNonExistent": "ユーザーは存在しません",
+  "accountNonExistent": "入力したユーザーは 存在しません",
-  "unmatchingPassword": "パスワードが一致しません",
+  "unmatchingPassword": "入力したパスワードが 一致しません",
-  "passwordNotMatchingConfirmPassword": "パスワードは確認パスワードと一致する必要があります",
+  "passwordNotMatchingConfirmPassword": "パスワードは パスワード確認と 一致する 必要があります",
   "confirmPassword": "パスワード確認",
-  "registrationAgeWarning": "登録することで、あなたが13歳以上であることを確認します。",
+  "registrationAgeWarning": "登録では １３歳以上 であることを 確認します。",
   "backToLogin": "ログインへ",
-  "failedToLoadSaveData": "保存データの読み込みに失敗しました。ページを再読み込みしてください。\nこれが続く場合は、管理者に連絡してください。",
+  "failedToLoadSaveData": "セーブデータの　読み込みは　不可能でした。ページを　再読み込み　してください。\n長い間に続く　場合は　管理者に　連絡してください。",
-  "sessionSuccess": "セッションが正常に読み込まれました。",
+  "sessionSuccess": "セッションが　正常に　読み込まれました。",
-  "failedToLoadSession": "セッションデータを読み込むことができませんでした。\nデータが破損している可能性があります。",
+  "failedToLoadSession": "セッションデータを　読み込むことが　できませんでした。\nデータが　破損している　可能性が　あります。",
-  "boyOrGirl": "おとこのこ？\nそれとも おんなのこ？",
+  "boyOrGirl": "男の子？\nそれとも　女の子？",
-  "evolving": "…おや！？\n{{pokemonName}}のようすが…！",
+  "evolving": "…おや！？\n{{pokemonName}}の　様子が…！",
-  "stoppedEvolving": "{{pokemonName}}のへんかがとまった",
+  "stoppedEvolving": "あれ…？　{{pokemonName}}の　変化が　止まった！",
-  "evolutionDone": "おめでとう！\n{{pokemonName}}は{{evolvedPokemonName}}にしんかした！",
+  "pauseEvolutionsQuestion": "{{pokemonName}}の　進化を　休止しますか?\n後で　手持ち画面から　進化を　また　可能にできます。",
-  "dailyRankings": "ほんじつのランキング",
+  "evolutionsPaused": "{{pokemonName}}の　進化を　休止しました。",
-  "weeklyRankings": "しゅうのランキング",
+  "evolutionDone": "おめでとう！\n{{pokemonName}}は　{{evolvedPokemonName}}に　進化した！",
+  "dailyRankings": "今日のランキング",
+  "weeklyRankings": "今週のランキング",
   "noRankings": "ランキングなし",
   "positionIcon": "#",
-  "loading": "よみこみちゅう…",
+  "usernameScoreboard": "ユーザー名",
+  "score": "スコア",
+  "wave": "波",
+  "loading": "読み込み中…",
+  "loadingAsset": "読み込み中:{{assetName}}",
   "playersOnline": "オンラインのプレイヤー",
   "yes": "はい",
-  "no": "いいえ"
+  "no": "いいえ",
+  "disclaimer": "免責",
+  "disclaimerDescription": "このゲームは 未完成作品です。\nセーブデータの 損失を含める ゲーム性に関する 問題が 起きる可能性が あります。\nなお、ゲームは 予告なく変更される 可能性もあり、さらに更新され、完成されるとも 限りません。",
+  "choosePokemon": "ポケモンを選ぶ",
+  "renamePokemon": "ニックネームを変える",
+  "rename": "変える",
+  "nickname": "ニックネーム",
+  "errorServerDown": "おや！\nサーバーとの 接続中に 問題が 発生しました。\nゲームは 自動的に 再接続されます から\nウィンドウは 開いたままに しておいても よろしいです。"
 }

src/locales/ja/modifier-select-ui-handler.json

@@ -1,12 +1,12 @@
 {
   "transfer": "アイテム移行",
   "reroll": "選択肢変更",
-  "lockRarities": "レア度の固定",
+  "lockRarities": "レア度を固定",
-  "checkTeam": "チームを確認",
+  "checkTeam": "手持ちを確認",
-  "transferDesc": "ポケモンの　手持ちアイテムを　移行する",
+  "transferDesc": "手持ちポケモンの　持たせるアイテムを　移行する",
   "rerollDesc": "お金を　使って　アイテムの　選択肢を　変更する",
-  "lockRaritiesDesc": "選択肢を　変更するときの　レア度を　固定する\n（選択肢変更金額を影響する）",
+  "lockRaritiesDesc": "選択肢を　変更するときの　レア度を　固定する\n（選択肢変更の価格は変わる）",
-  "checkTeamDesc": "チームの　状態を　確認する\nフォルムチェンジアイテムを　有効・無効にする",
+  "checkTeamDesc": "手持ちポケモンの　状態を　確認する\nフォルムチェンジアイテムを　有効・無効にする",
   "rerollCost": "{{formattedMoney}}円",
   "itemCost": "{{formattedMoney}}円"
 }

src/locales/ja/pokemon-info.json

@@ -2,21 +2,22 @@
   "Stat": {
     "HP": "HP",
     "HPshortened": "HP",
-    "ATK": "こうげき",
+    "ATK": "攻撃",
-    "ATKshortened": "こうげき",
+    "ATKshortened": "攻撃",
-    "DEF": "ぼうぎょ",
+    "DEF": "防御",
-    "DEFshortened": "ぼうぎょ",
+    "DEFshortened": "防御",
-    "SPATK": "とくこう",
+    "SPATK": "特攻",
-    "SPATKshortened": "とくこう",
+    "SPATKshortened": "特攻",
-    "SPDEF": "とくぼう",
+    "SPDEF": "特防",
-    "SPDEFshortened": "とくぼう",
+    "SPDEFshortened": "特防",
-    "SPD": "すばやさ",
+    "SPD": "素早さ",
-    "SPDshortened": "すばやさ",
+    "SPDshortened": "素早さ",
-    "ACC": "めいちゅう",
+    "ACC": "命中",
-    "EVA": "かいひ"
+    "EVA": "回避",
+    "HPStat": "HP"
   },
   "Type": {
-    "UNKNOWN": "Unknown",
+    "UNKNOWN": "？？？",
     "NORMAL": "ノーマル",
     "FIGHTING": "かくとう",
     "FLYING": "ひこう",

src/locales/ja/pokemon.json

@@ -437,7 +437,7 @@
   "bronzor": "ドーミラー",
   "bronzong": "ドータクン",
   "bonsly": "ウソハチ",
-  "mime_jr.": "マネネ",
+  "mime_jr": "マネネ",
   "happiny": "ピンプク",
   "chatot": "ペラップ",
   "spiritomb": "ミカルゲ",
@@ -770,7 +770,7 @@
   "sandygast": "スナバァ",
   "palossand": "シロデスナ",
   "pyukumuku": "ナマコブシ",
-  "type:_null": "タイプ：ヌル",
+  "type_null": "タイプ：ヌル",
   "silvally": "シルヴァディ",
   "minior": "メテノ",
   "komala": "ネッコアラ",
@@ -863,7 +863,7 @@
   "obstagoon": "タチフサグマ",
   "perrserker": "ニャイキング",
   "cursola": "サニゴーン",
-  "sirfetch_d": "ネギガナイト",
+  "sirfetchd": "ネギガナイト",
   "mr_rime": "バリコオル",
   "runerigus": "デスバーン",
   "milcery": "マホミル",

src/locales/ja/settings.json

@@ -6,12 +6,14 @@
   "audio": "音声",
   "gamepad": "コントローラー",
   "keyboard": "キーボード",
-  "gameSpeed": "ゲームスピード",
+  "gameSpeed": "ゲームの速さ",
-  "hpBarSpeed": "HPバーの増減スピード",
+  "hpBarSpeed": "HPバー増減の速さ",
-  "expGainsSpeed": "EXPバーの増加スピード",
+  "expGainsSpeed": "経験値バー増加の速さ",
-  "expPartyDisplay": "パーティの経験値取得表示",
+  "expPartyDisplay": "手持ちの経験値取得表示",
+  "skipSeenDialogues": "もう見た話をスキップ",
   "battleStyle": "試合のルール",
-  "enableRetries": "リトライを有効にする",
+  "enableRetries": "再挑戦を有効にする",
+  "hideIvs": "個体値スキャナーを隠す",
   "tutorials": "チュートリアル",
   "touchControls": "タッチ操作",
   "vibrations": "振動",
@@ -35,33 +37,71 @@
   "moneyFormat": "お金の表示形式",
   "damageNumbers": "ダメージ表示",
   "simple": "シンプル",
-  "fancy": "Fancy",
+  "fancy": "オシャレ",
   "abbreviated": "省略",
-  "moveAnimations": "戦闘アニメ",
+  "moveAnimations": "戦闘アニメーション",
   "showStatsOnLevelUp": "レベルアップ時のステータス表示",
+  "candyUpgradeNotification": "飴アプグレ通知",
   "passivesOnly": "パッシブのみ",
+  "candyUpgradeDisplay": "飴アプグレ表示",
   "icon": "アイコン",
   "animation": "アニメーション",
-  "moveInfo": "技の情報表示",
+  "moveInfo": "技情報",
+  "showMovesetFlyout": "技情報表示",
+  "showArenaFlyout": "戦場情報表示",
+  "showTimeOfDayWidget": "時刻指標",
+  "timeOfDayAnimation": "時刻指標アニメーション",
+  "bounce": "跳ねる",
+  "timeOfDay_back": "跳ね返る",
+  "spriteSet": "スプライト設定",
+  "consistent": "一貫",
+  "mixedAnimated": "アニメーションミックス",
+  "fusionPaletteSwaps": "吸収合体ポケモンの色違い",
   "playerGender": "プレイヤーの性別",
-  "typeHints": "相性のヒント",
+  "typeHints": "タイプ相性ヒント",
   "masterVolume": "マスターボリューム",
-  "bgmVolume": "BGMのボリューム",
+  "bgmVolume": "BGMボリューム",
-  "seVolume": "SEのボリューム",
+  "fieldVolume": "フィールドボリューム",
+  "seVolume": "SEボリューム",
+  "uiVolume": "UIボリューム",
+  "musicPreference": "BGM設定",
+  "mixed": "ミックス",
+  "gamepadPleasePlug": "コントローラーを　接続してください\nまたは、ボタンを　押してください",
+  "delete": "削除",
+  "keyboardPleasePress": "キーを押してください",
   "reset": "リセット",
   "requireReload": "再読み込みが必要",
   "action": "決定",
   "back": "戻る",
+  "pressToBind": "押下でキーバインド",
+  "pressButton": "ボタンを押してください",
   "buttonUp": "上",
   "buttonDown": "下",
   "buttonLeft": "左",
   "buttonRight": "右",
   "buttonAction": "決定",
   "buttonMenu": "メニュー",
-  "buttonSubmit": "Submit",
+  "buttonSubmit": "提出",
   "buttonCancel": "キャンセル",
-  "alt": " (代替)",
+  "buttonStats": "能力変化表示",
+  "buttonCycleForm": "フォルム変更",
+  "buttonCycleShiny": "色違い変更",
+  "buttonCycleGender": "性別変更",
+  "buttonCycleAbility": "特性変更",
+  "buttonCycleNature": "性格変更",
+  "buttonCycleVariant": "色変更",
+  "buttonSpeedUp": "速さを上げる",
+  "buttonSlowDown": "速さを下げる",
+  "alt": "（代替）",
   "mute": "ミュート",
   "controller": "コントローラー",
-  "gamepadSupport": "コントローラーサポート"
+  "gamepadSupport": "コントローラーサポート",
+  "showBgmBar": "BGMの名前を表示",
+  "moveTouchControls": "タッチ移動操作",
+  "shopOverlayOpacity": "ショップオーバレイ不透明度",
+  "shopCursorTarget": "ショップカーソル初位置",
+  "items": "アイテム",
+  "reroll": "選択肢変更",
+  "shop": "ショップ",
+  "checkTeam": "手持ちを確認"
 }

src/locales/ja/starter-select-ui-handler.json

@@ -1,5 +1,5 @@
 {
-  "confirmStartTeam": "この条件で　チャレンジを　始めますか？",
+  "confirmStartTeam": "この手持ちで　始めますか？",
   "confirmExit": "終了しますか？",
   "invalidParty": "手持ちは　チャレンジの　条件で　認められない！",
   "gen1": "1世代",
@@ -16,8 +16,8 @@
   "passive": "パッシブ:",
   "nature": "性格:",
   "eggMoves": "タマゴ技",
-  "start": "始める",
   "addToParty": "手持ちに入れる",
+  "removeFromParty": "手持ちから除く",
   "toggleIVs": "個体値を表示",
   "manageMoves": "技を並び替える",
   "manageNature": "性格を変える",
@@ -36,9 +36,10 @@
   "cycleAbility": ": 特性変更",
   "cycleNature": ": 性格変更",
   "cycleVariant": ": 色変更",
+  "goFilter": ": フィルタ へ ",
   "enablePassive": "パッシブ - オン",
   "disablePassive": "パッシブ - オフ",
-  "locked": "開放されていない",
+  "locked": "非開放",
   "disabled": "無効",
   "uncaught": "捕まっていない"
 }

src/locales/ko/achv.json

@@ -225,7 +225,7 @@
     "name": "독침붕처럼 쏴라"
   },
   "MONO_GHOST": {
-    "name": "누굴 부를 거야?"
+    "name": "무서운 게 딱 좋아!"
   },
   "MONO_STEEL": {
     "name": "강철 심장"

src/locales/ko/arena-tag.json

@@ -47,5 +47,11 @@
   "tailwindOnRemovePlayer": "우리 편의\n순풍이 멈췄다!",
   "tailwindOnRemoveEnemy": "상대의\n순풍이 멈췄다!",
   "happyHourOnAdd": "모두 행복한 기분에\n휩싸였다!",
-  "happyHourOnRemove": "기분이 원래대로 돌아왔다."
+  "happyHourOnRemove": "기분이 원래대로 돌아왔다.",
+  "safeguardOnAdd": "필드 전체가 신비의 베일에 둘러싸였다!",
+  "safeguardOnAddPlayer": "우리 편은 신비의 베일에 둘러싸였다!",
+  "safeguardOnAddEnemy": "상대 편은 신비의 베일에 둘러싸였다!",
+  "safeguardOnRemove": "필드를 감싸던 신비의 베일이 없어졌다!",
+  "safeguardOnRemovePlayer": "우리 편을 감싸던 신비의 베일이 없어졌다!",
+  "safeguardOnRemoveEnemy": "상대 편을 감싸던 신비의 베일이 없어졌다!"
 }

src/locales/ko/modifier-type.json

@@ -598,6 +598,6 @@
     "DRAGON_MEMORY": "드래곤메모리",
     "DARK_MEMORY": "다크메모리",
     "FAIRY_MEMORY": "페어리메모리",
-    "BLANK_MEMORY": "빈메모리"
+    "NORMAL_MEMORY": "일반메모리"
   }
 }

src/locales/ko/move-trigger.json

@@ -65,5 +65,6 @@
   "suppressAbilities": "{{pokemonName}}의\n특성이 효과를 발휘하지 못하게 되었다!",
   "revivalBlessing": "{{pokemonName}}[[는]]\n정신을 차려 싸울 수 있게 되었다!",
   "swapArenaTags": "{{pokemonName}}[[는]]\n서로의 필드 효과를 교체했다!",
-  "exposedMove": "{{pokemonName}}[[는]]\n{{targetPokemonName}}의 정체를 꿰뚫어 보았다!"
+  "exposedMove": "{{pokemonName}}[[는]]\n{{targetPokemonName}}의 정체를 꿰뚫어 보았다!",
+  "safeguard": "{{targetName}}[[는]] 신비의 베일이 지켜 주고 있다!"
 }

src/locales/pt_BR/arena-tag.json

@@ -47,5 +47,11 @@
   "tailwindOnRemovePlayer": "O Tailwind de sua equipe acabou!",
   "tailwindOnRemoveEnemy": "O Tailwind da equipe adversária acabou!",
   "happyHourOnAdd": "Todos foram envolvidos por uma atmosfera alegre!",
-  "happyHourOnRemove": "A atmosfera retornou ao normal."
+  "happyHourOnRemove": "A atmosfera retornou ao normal.",
+  "safeguardOnAdd": "O campo de batalha está envolto num véu místico!",
+  "safeguardOnAddPlayer": "Sua equipe se envolveu num véu místico!",
+  "safeguardOnAddEnemy": "A equipe adversária se envolveu num véu místico!",
+  "safeguardOnRemove": "O campo não está mais protegido por Safeguard!",
+  "safeguardOnRemovePlayer": "Sua equipe não está mais protegido por Safeguard!",
+  "safeguardOnRemoveEnemy": "A equipe adversária não está mais protegido por Safeguard!"
 }

src/locales/pt_BR/menu-ui-handler.json

@@ -14,8 +14,8 @@
   "importSlotSelect": "Selecione um slot para importar.",
   "exportSession": "Exportar sessão",
   "exportSlotSelect": "Selecione um slot para exportar.",
-  "importRunHistory":"Importar Histórico de Jogos",
+  "importRunHistory": "Importar Histórico de Jogos",
-  "exportRunHistory":"Exportar Histórico de Jogos",
+  "exportRunHistory": "Exportar Histórico de Jogos",
   "importData": "Importar dados",
   "exportData": "Exportar dados",
   "consentPreferences": "Opções de Privacidade",
@@ -25,5 +25,5 @@
   "unlinkGoogle": "Desconectar Google",
   "cancel": "Cancelar",
   "losingProgressionWarning": "Você vai perder todo o progresso desde o início da batalha. Confirmar?",
-  "noEggs": "Você não está chocando\nnenhum ovo no momento!"
+  "noEggs": "Você não está chocando nenhum ovo\nno momento!"
 }

src/locales/pt_BR/modifier-type.json

@@ -598,6 +598,6 @@
     "DRAGON_MEMORY": "Memória do Dragão",
     "DARK_MEMORY": "Memória Sombria",
     "FAIRY_MEMORY": "Memória de Fada",
-    "BLANK_MEMORY": "Memória Vazia"
+    "NORMAL_MEMORY": "Memória Normal"
   }
 }

src/locales/pt_BR/move-trigger.json

@@ -61,5 +61,6 @@
   "suppressAbilities": "A habilidade de {{pokemonName}}\nfoi suprimida!",
   "revivalBlessing": "{{pokemonName}} foi reanimado!",
   "swapArenaTags": "{{pokemonName}} trocou os efeitos de batalha que afetam cada lado do campo!",
-  "exposedMove": "{{pokemonName}} identificou\n{{targetPokemonName}}!"
+  "exposedMove": "{{pokemonName}} identificou\n{{targetPokemonName}}!",
+  "safeguard": "{{targetName}} está protegido por Safeguard!"
 }

src/locales/pt_BR/pokemon-summary.json

@@ -13,5 +13,32 @@
   "metFragment": {
     "normal": "encontrado no Nv.{{level}},\n{{biome}}.",
     "apparently": "aparentemente encontrado no Nv.{{level}},\n{{biome}}."
+  },
+  "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}}"
   }
 }

src/locales/pt_BR/tutorial.json

@@ -1,10 +1,10 @@
 {
-  "intro": "Bem-vindo ao PokéRogue! Este é um jogo Pokémon feito por fãs focado em batalhas com elementos roguelite.\n$Este jogo não é monetizado e não reivindicamos propriedade de Pokémon nem dos ativos protegidos\n$por direitos autorais usados.\n$O jogo é um trabalho em andamento, mas é totalmente jogável.\n$Para relatórios de bugs, use a comunidade no Discord.\n$Se o jogo estiver rodando lentamente, certifique-se de que a 'Aceleração de hardware' esteja ativada \n$nas configurações do seu navegador.",
+  "intro": "Bem-vindo ao PokéRogue!\n$Este é um fangame Pokémon focado em batalhas com elementos roguelite.\n$Este jogo não é monetizado e não reivindicamos propriedade do Pokémon nem dos ativos protegidos$por direitos autorais usados.\n$O jogo é um trabalho em andamento,\nmas totalmente jogável.\n$Para relatórios de bugs, use a comunidade do Discord.\n$Se o jogo rodar lentamente, certifique-se de que\na 'Aceleração de Hardware' esteja ativada$nas configurações do seu navegador.",
   "accessMenu": "Para acessar o menu, pressione M ou Esc.\n$O menu contém configurações e diversas funções.",
-  "menu": "A partir deste menu, você pode acessar as configurações. \n$Nas configurações, você pode alterar a velocidade do jogo,\n$o estilo da janela, entre outras opções. \n$Existem também vários outros recursos disponíveis aqui.\n$Não deixe de conferir todos eles!",
+  "menu": "A partir deste menu, você pode\\nacessar as configurações.\n$A partir das configurações, você\npode alterar a velocidade do jogo,\n$o estilo da janela e outras opções.\n$Há também vários outros recursos aqui.\nCertifique-se de verificar todos eles!",
-  "starterSelect": "Aqui você pode escolher seus iniciais apertando a tecla Z ou\na Barra de Espaço.\n$Esses serão os primeiro Pokémon da sua equipe.\n$Cada inicial tem seu custo. Sua equipe pode ter até 6\nmembros, desde que a soma dos custos não ultrapasse 10. \n$Você pode escolher o gênero, a habilidade\ne até a forma do seu inicial.\n$Essas opções dependem das variantes dessa\nespécie que você já capturou ou chocou. \n$Os IVs de cada inicial são os melhores de todos os Pokémon\ndaquela espécie que você já capturou ou chocou.\n$Sempre capture vários Pokémon de várias espécies!",
+  "starterSelect": "Nesta tela, você pode selecionar seus iniciais\npressionando Z ou a barra de espaço.\n$Esses serão os primeiros membros da sua equipe.\n$Cada inicial tem um custo. Sua equipe pode ter até 6 membros,\ndesde que desde que o custo total não exceda 10.\n$Você pode escolher o gênero, a habilidade\ne até a forma do seu inicial.\n$Essas opções dependem das variantes dessa\nespécie que você já capturou ou chocou.\n$Os IVs de cada inicial são os melhores de todos os Pokémon\ndaquela espécie que você já capturou ou chocou.\n$Sempre capture vários Pokémon de todas as espécies!",
   "pokerus": "Todo dia, 3 Pokémon iniciais ficam com uma borda roxa.\n$Caso veja um inicial que você possui com uma dessa, tente\nadicioná-lo a sua equipe. Lembre-se de olhar seu sumário!",
   "statChange": "As mudanças de atributos se mantém após a batalha desde que o Pokémon não seja trocado.\n$Seus Pokémon voltam a suas Poké Bolas antes de batalhas contra treinadores e de entrar em um novo bioma.\n$Para ver as mudanças de atributos dos Pokémon em campo, mantena C ou Shift pressionado durante a batalha.",
   "selectItem": "Após cada batalha, você pode escolher entre 3 itens aleatórios.\n$Você pode escolher apenas um deles.\n$Esses itens variam entre consumíveis, itens de segurar e itens passivos permanentes.\n$A maioria dos efeitos de itens não consumíveis podem ser acumulados.\n$Alguns itens só aparecerão se puderem ser usados, como os itens de evolução.\n$Você também pode transferir itens de segurar entre os Pokémon utilizando a opção \"Alterar\".\n$A opção de transferir irá aparecer no canto inferior direito assim que você obter um item de segurar.\n$Você pode comprar itens consumíveis com dinheiro, e sua variedade aumentará conforme você for mais longe.\n$Certifique-se de comprá-los antes de escolher seu item aleatório. Ao escolhê-lo, a próxima batalha começará.",
-  "eggGacha": "Aqui você pode trocar seus vouchers\npor ovos de Pokémon.\n$Ovos ficam mais próximos de chocar após cada batalha.\nOvos mais raros demoram mais para chocar.\n$Pokémon chocados não serão adicionados a sua equipe,\nmas sim aos seus iniciais.\n$Pokémon chocados geralmente possuem IVs melhores\nque Pokémon selvagens.\n$Alguns Pokémon só podem ser obtidos através de seus ovos.\n$Temos 3 máquinas, cada uma com seu bônus específico,\nentão escolha a que mais lhe convém!"
+  "eggGacha": "Nesta tela, você pode trocar seus vouchers por ovos\nde Pokémon.\n$Ovos ficam mais próximos de chocar após cada batalha.\nOvos mais raros demoram mais tempo para chocar.\n$Pokémon chocados não serão adicionados a sua equipe,\nmas sim aos seus iniciais.\n$Pokémon chocados de ovos geralmente têm IVs melhores\ndo que Pokémon selvagens.\n$Alguns Pokémon só podem ser obtidos através de ovos.\n$Existem 3 máquinas para usar com diferentes bônus, então\nescolha a que mais lhe convém!"
 }

src/locales/zh_CN/arena-tag.json

@@ -47,5 +47,11 @@
   "tailwindOnRemovePlayer": "我方的顺风停止了！",
   "tailwindOnRemoveEnemy": "敌方的顺风停止了！",
   "happyHourOnAdd": "大家被欢乐的\n气氛包围了！",
-  "happyHourOnRemove": "气氛回复到平常了。"
+  "happyHourOnRemove": "气氛回复到平常了。",
+  "safeguardOnAdd": "整个场地被\n神秘之幕包围了！",
+  "safeguardOnAddPlayer": "我方被\n神秘之幕包围了！",
+  "safeguardOnAddEnemy": "对手被\n神秘之幕包围了！",
+  "safeguardOnRemove": "包围整个场地的\n神秘之幕消失了！",
+  "safeguardOnRemovePlayer": "包围我方的\n神秘之幕消失了！",
+  "safeguardOnRemoveEnemy": "包围对手的\n神秘之幕消失了！"
 }

src/locales/zh_CN/modifier-type.json

@@ -598,6 +598,6 @@
     "DRAGON_MEMORY": "龙存储碟",
     "DARK_MEMORY": "黑暗存储碟",
     "FAIRY_MEMORY": "妖精存储碟",
-    "BLANK_MEMORY": "空白存储碟"
+    "NORMAL_MEMORY": "一般存储碟"
   }
 }

src/locales/zh_CN/move-trigger.json

@@ -65,5 +65,6 @@
   "suppressAbilities": "{{pokemonName}}的特性\n变得无效了！",
   "revivalBlessing": "{{pokemonName}}复活了！",
   "swapArenaTags": "{{pokemonName}}\n交换了双方的场地效果！",
-  "exposedMove": "{{pokemonName}}识破了\n{{targetPokemonName}}的原型！"
+  "exposedMove": "{{pokemonName}}识破了\n{{targetPokemonName}}的原型！",
+  "safeguard": "{{targetName}}\n正受到神秘之幕的保护！"
 }

src/locales/zh_TW/arena-tag.json

@@ -1,5 +1,11 @@
 {
   "noCritOnAddPlayer": "{{moveName}}保護了你的\n隊伍不被擊中要害！",
   "noCritOnAddEnemy": "{{moveName}}保護了對方的\n隊伍不被擊中要害！",
-  "noCritOnRemove": "{{pokemonNameWithAffix}}的{{moveName}}\n效果消失了！"
+  "noCritOnRemove": "{{pokemonNameWithAffix}}的{{moveName}}\n效果消失了！",
+  "safeguardOnAdd": "整個場地被\n神秘之幕包圍了！",
+  "safeguardOnAddPlayer": "我方被\n神秘之幕包圍了！",
+  "safeguardOnAddEnemy": "對手被\n神秘之幕包圍了！",
+  "safeguardOnRemove": "包圍整個場地的\n神秘之幕消失了！",
+  "safeguardOnRemovePlayer": "包圍我方的\n神秘之幕消失了！",
+  "safeguardOnRemoveEnemy": "包圍對手的\n神秘之幕消失了！"
 }

src/locales/zh_TW/modifier-type.json

@@ -594,6 +594,6 @@
     "DRAGON_MEMORY": "龍記憶碟",
     "DARK_MEMORY": "黑暗記憶碟",
     "FAIRY_MEMORY": "妖精記憶碟",
-    "BLANK_MEMORY": "空白記憶碟"
+    "NORMAL_MEMORY": "一般記憶碟"
   }
 }

src/locales/zh_TW/move-trigger.json

@@ -65,5 +65,6 @@
   "suppressAbilities": "{{pokemonName}}的特性\n變得無效了！",
   "revivalBlessing": "{{pokemonName}}復活了！",
   "swapArenaTags": "{{pokemonName}}\n交換了雙方的場地效果！",
-  "exposedMove": "{{pokemonName}}識破了\n{{targetPokemonName}}的原形！"
+  "exposedMove": "{{pokemonName}}識破了\n{{targetPokemonName}}的原形！",
+  "safeguard": "{{targetName}}\n正受到神秘之幕的保護！"
 }

src/modifier/modifier-type.ts

@@ -1070,7 +1070,7 @@ class EvolutionItemModifierTypeGenerator extends ModifierTypeGenerator {
 }
 
 class FormChangeItemModifierTypeGenerator extends ModifierTypeGenerator {
-  constructor() {
+  constructor(rare: boolean) {
     super((party: Pokemon[], pregenArgs?: any[]) => {
       if (pregenArgs && (pregenArgs.length === 1) && (pregenArgs[0] in FormChangeItem)) {
         return new FormChangeItemModifierType(pregenArgs[0] as FormChangeItem);
@@ -1110,7 +1110,8 @@ class FormChangeItemModifierTypeGenerator extends ModifierTypeGenerator {
           }
         }
         return formChangeItemTriggers;
-      }).flat().flatMap(fc => fc.item))];
+      }).flat())
+      ].flat().flatMap(fc => fc.item).filter(i => (i && i < 100) === rare);
       // convert it into a set to remove duplicate values, which can appear when the same species with a potential form change is in the party.
 
       if (!formChangeItemPool.length) {
@@ -1309,7 +1310,8 @@ export const modifierTypes = {
 
   EVOLUTION_ITEM: () => new EvolutionItemModifierTypeGenerator(false),
   RARE_EVOLUTION_ITEM: () => new EvolutionItemModifierTypeGenerator(true),
-  FORM_CHANGE_ITEM: () => new FormChangeItemModifierTypeGenerator(),
+  FORM_CHANGE_ITEM: () => new FormChangeItemModifierTypeGenerator(false),
+  RARE_FORM_CHANGE_ITEM: () => new FormChangeItemModifierTypeGenerator(true),
 
   MEGA_BRACELET: () => new ModifierType("modifierType:ModifierType.MEGA_BRACELET", "mega_bracelet", (type, _args) => new Modifiers.MegaEvolutionAccessModifier(type)),
   DYNAMAX_BAND: () => new ModifierType("modifierType:ModifierType.DYNAMAX_BAND", "dynamax_band", (type, _args) => new Modifiers.GigantamaxAccessModifier(type)),
@@ -1614,6 +1616,7 @@ const modifierPool: ModifierPool = {
     new WeightedModifierType(modifierTypes.PP_MAX, 3),
     new WeightedModifierType(modifierTypes.MINT, 4),
     new WeightedModifierType(modifierTypes.RARE_EVOLUTION_ITEM, (party: Pokemon[]) => Math.min(Math.ceil(party[0].scene.currentBattle.waveIndex / 15) * 4, 32), 32),
+    new WeightedModifierType(modifierTypes.FORM_CHANGE_ITEM, (party: Pokemon[]) => Math.min(Math.ceil(party[0].scene.currentBattle.waveIndex / 50), 4) * 6, 24),
     new WeightedModifierType(modifierTypes.AMULET_COIN, skipInLastClassicWaveOrDefault(3)),
     new WeightedModifierType(modifierTypes.EVIOLITE, (party: Pokemon[]) => {
       if (!party[0].scene.gameMode.isFreshStartChallenge() && party[0].scene.gameData.unlocks[Unlockables.EVIOLITE]) {
@@ -1680,7 +1683,7 @@ const modifierPool: ModifierPool = {
     new WeightedModifierType(modifierTypes.KINGS_ROCK, 3),
     new WeightedModifierType(modifierTypes.LOCK_CAPSULE, skipInLastClassicWaveOrDefault(3)),
     new WeightedModifierType(modifierTypes.SUPER_EXP_CHARM, skipInLastClassicWaveOrDefault(8)),
-    new WeightedModifierType(modifierTypes.FORM_CHANGE_ITEM, (party: Pokemon[]) => Math.min(Math.ceil(party[0].scene.currentBattle.waveIndex / 50), 4) * 6, 24),
+    new WeightedModifierType(modifierTypes.RARE_FORM_CHANGE_ITEM, (party: Pokemon[]) => Math.min(Math.ceil(party[0].scene.currentBattle.waveIndex / 50), 4) * 6, 24),
     new WeightedModifierType(modifierTypes.MEGA_BRACELET, (party: Pokemon[]) => Math.min(Math.ceil(party[0].scene.currentBattle.waveIndex / 50), 4) * 9, 36),
     new WeightedModifierType(modifierTypes.DYNAMAX_BAND, (party: Pokemon[]) => Math.min(Math.ceil(party[0].scene.currentBattle.waveIndex / 50), 4) * 9, 36),
     new WeightedModifierType(modifierTypes.VOUCHER_PLUS, (party: Pokemon[], rerollCount: integer) => !party[0].scene.gameMode.isDaily ? Math.max(3 - rerollCount * 1, 0) : 0, 3),

src/modifier/modifier.ts

@@ -10,7 +10,7 @@ import { FusionSpeciesFormEvolution, pokemonEvolutions, pokemonPrevolutions } fr
 import { getPokemonNameWithAffix } from "../messages";
 import * as Utils from "../utils";
 import { getBerryEffectFunc, getBerryPredicate } from "../data/berry";
-import { BattlerTagType} from "#enums/battler-tag-type";
+import { BattlerTagType } from "#enums/battler-tag-type";
 import { BerryType } from "#enums/berry-type";
 import { StatusEffect, getStatusEffectHealText } from "../data/status-effect";
 import { achvs } from "../system/achv";
@@ -2323,7 +2323,7 @@ export class ShinyRateBoosterModifier extends PersistentModifier {
   }
 
   apply(args: any[]): boolean {
-    (args[0] as Utils.IntegerHolder).value *= Math.pow(2, 2 + this.getStackCount());
+    (args[0] as Utils.IntegerHolder).value *= Math.pow(2, 1 + this.getStackCount());
 
     return true;
   }

src/phases/battle-end-phase.ts

@@ -23,12 +23,6 @@ export class BattleEndPhase extends BattlePhase {
       this.scene.unshiftPhase(new GameOverPhase(this.scene, true));
     }
 
-    for (const pokemon of this.scene.getField()) {
-      if (pokemon) {
-        pokemon.resetBattleSummonData();
-      }
-    }
-
     for (const pokemon of this.scene.getParty().filter(p => p.isAllowedInBattle())) {
       applyPostBattleAbAttrs(PostBattleAbAttr, pokemon);
     }

src/phases/command-phase.ts

@@ -1,21 +1,18 @@
-import BattleScene from "#app/battle-scene.js";
+import BattleScene from "#app/battle-scene";
-import { TurnCommand, BattleType } from "#app/battle.js";
+import { TurnCommand, BattleType } from "#app/battle";
-import { applyCheckTrappedAbAttrs, CheckTrappedAbAttr } from "#app/data/ability.js";
+import { TrappedTag, EncoreTag } from "#app/data/battler-tags";
-import { TrappedTag, EncoreTag } from "#app/data/battler-tags.js";
+import { MoveTargetSet, getMoveTargets } from "#app/data/move";
-import { MoveTargetSet, getMoveTargets } from "#app/data/move.js";
+import { speciesStarters } from "#app/data/pokemon-species";
-import { speciesStarters } from "#app/data/pokemon-species.js";
+import { Abilities } from "#app/enums/abilities";
-import { Type } from "#app/data/type.js";
+import { BattlerTagType } from "#app/enums/battler-tag-type";
-import { Abilities } from "#app/enums/abilities.js";
+import { Biome } from "#app/enums/biome";
-import { BattlerTagType } from "#app/enums/battler-tag-type.js";
+import { Moves } from "#app/enums/moves";
-import { Biome } from "#app/enums/biome.js";
+import { PokeballType } from "#app/enums/pokeball";
-import { Moves } from "#app/enums/moves.js";
+import { FieldPosition, PlayerPokemon } from "#app/field/pokemon";
-import { PokeballType } from "#app/enums/pokeball.js";
+import { getPokemonNameWithAffix } from "#app/messages";
-import { FieldPosition, PlayerPokemon } from "#app/field/pokemon.js";
+import { Command } from "#app/ui/command-ui-handler";
-import { getPokemonNameWithAffix } from "#app/messages.js";
+import { Mode } from "#app/ui/ui";
-import { Command } from "#app/ui/command-ui-handler.js";
-import { Mode } from "#app/ui/ui.js";
 import i18next from "i18next";
-import * as Utils from "#app/utils.js";
 import { FieldPhase } from "./field-phase";
 import { SelectTargetPhase } from "./select-target-phase";
 
@@ -77,7 +74,6 @@ export class CommandPhase extends FieldPhase {
 
   handleCommand(command: Command, cursor: integer, ...args: any[]): boolean {
     const playerPokemon = this.scene.getPlayerField()[this.fieldIndex];
-    const enemyField = this.scene.getEnemyField();
     let success: boolean;
 
     switch (command) {
@@ -184,14 +180,9 @@ export class CommandPhase extends FieldPhase {
           this.scene.ui.setMode(Mode.COMMAND, this.fieldIndex);
         }, null, true);
       } else {
-        const trapTag = playerPokemon.findTag(t => t instanceof TrappedTag) as TrappedTag;
-        const trapped = new Utils.BooleanHolder(false);
         const batonPass = isSwitch && args[0] as boolean;
         const trappedAbMessages: string[] = [];
-        if (!batonPass) {
+        if (batonPass || !playerPokemon.isTrapped(trappedAbMessages)) {
-          enemyField.forEach(enemyPokemon => applyCheckTrappedAbAttrs(CheckTrappedAbAttr, enemyPokemon, trapped, playerPokemon, trappedAbMessages, true));
-        }
-        if (batonPass || (!trapTag && !trapped.value)) {
           this.scene.currentBattle.turnCommands[this.fieldIndex] = isSwitch
             ? { command: Command.POKEMON, cursor: cursor, args: args }
             : { command: Command.RUN };
@@ -199,14 +190,27 @@ export class CommandPhase extends FieldPhase {
           if (!isSwitch && this.fieldIndex) {
               this.scene.currentBattle.turnCommands[this.fieldIndex - 1]!.skip = true;
           }
-        } else if (trapTag) {
+        } else if (trappedAbMessages.length > 0) {
-          if (trapTag.sourceMove === Moves.INGRAIN && trapTag.sourceId && this.scene.getPokemonById(trapTag.sourceId)?.isOfType(Type.GHOST)) {
+          if (!isSwitch) {
-            success = true;
+            this.scene.ui.setMode(Mode.MESSAGE);
+          }
+          this.scene.ui.showText(trappedAbMessages[0], null, () => {
+            this.scene.ui.showText("", 0);
+            if (!isSwitch) {
+              this.scene.ui.setMode(Mode.COMMAND, this.fieldIndex);
+            }
+          }, null, true);
+        } else {
+          const trapTag = playerPokemon.getTag(TrappedTag);
+
+          // trapTag should be defined at this point, but just in case...
+          if (!trapTag) {
             this.scene.currentBattle.turnCommands[this.fieldIndex] = isSwitch
               ? { command: Command.POKEMON, cursor: cursor, args: args }
               : { command: Command.RUN };
             break;
           }
+
           if (!isSwitch) {
             this.scene.ui.setMode(Mode.COMMAND, this.fieldIndex);
             this.scene.ui.setMode(Mode.MESSAGE);
@@ -224,16 +228,6 @@ export class CommandPhase extends FieldPhase {
                 this.scene.ui.setMode(Mode.COMMAND, this.fieldIndex);
               }
             }, null, true);
-        } else if (trapped.value && trappedAbMessages.length > 0) {
-          if (!isSwitch) {
-            this.scene.ui.setMode(Mode.MESSAGE);
-          }
-          this.scene.ui.showText(trappedAbMessages[0], null, () => {
-            this.scene.ui.showText("", 0);
-            if (!isSwitch) {
-              this.scene.ui.setMode(Mode.COMMAND, this.fieldIndex);
-            }
-          }, null, true);
         }
       }
       break;

src/phases/enemy-command-phase.ts

@@ -1,9 +1,6 @@
-import BattleScene from "#app/battle-scene.js";
+import BattleScene from "#app/battle-scene";
-import { BattlerIndex } from "#app/battle.js";
+import { BattlerIndex } from "#app/battle";
-import { applyCheckTrappedAbAttrs, CheckTrappedAbAttr } from "#app/data/ability.js";
+import { Command } from "#app/ui/command-ui-handler";
-import { TrappedTag } from "#app/data/battler-tags.js";
-import { Command } from "#app/ui/command-ui-handler.js";
-import * as Utils from "#app/utils.js";
 import { FieldPhase } from "./field-phase";
 
 /**
@@ -45,10 +42,7 @@ export class EnemyCommandPhase extends FieldPhase {
     if (trainer && !enemyPokemon.getMoveQueue().length) {
       const opponents = enemyPokemon.getOpponents();
 
-      const trapTag = enemyPokemon.findTag(t => t instanceof TrappedTag) as TrappedTag;
+      if (!enemyPokemon.isTrapped()) {
-      const trapped = new Utils.BooleanHolder(false);
-      opponents.forEach(playerPokemon => applyCheckTrappedAbAttrs(CheckTrappedAbAttr, playerPokemon, trapped, enemyPokemon, [""], true));
-      if (!trapTag && !trapped.value) {
         const partyMemberScores = trainer.getPartyMemberMatchupScores(enemyPokemon.trainerSlot, true);
 
         if (partyMemberScores.length) {

src/phases/move-phase.ts

@@ -1,9 +1,9 @@
 import BattleScene from "#app/battle-scene.js";
 import { BattlerIndex } from "#app/battle.js";
-import { applyAbAttrs, RedirectMoveAbAttr, BlockRedirectAbAttr, IncreasePpAbAttr, applyPreAttackAbAttrs, PokemonTypeChangeAbAttr, applyPostMoveUsedAbAttrs, PostMoveUsedAbAttr } from "#app/data/ability.js";
+import { applyAbAttrs, applyPostMoveUsedAbAttrs, applyPreAttackAbAttrs, BlockRedirectAbAttr, IncreasePpAbAttr, PokemonTypeChangeAbAttr, PostMoveUsedAbAttr, RedirectMoveAbAttr } from "#app/data/ability.js";
 import { CommonAnim } from "#app/data/battle-anims.js";
-import { CenterOfAttentionTag, BattlerTagLapseType } from "#app/data/battler-tags.js";
+import { BattlerTagLapseType, CenterOfAttentionTag } from "#app/data/battler-tags.js";
-import { MoveFlags, BypassRedirectAttr, allMoves, CopyMoveAttr, applyMoveAttrs, BypassSleepAttr, HealStatusEffectAttr, ChargeAttr, PreMoveMessageAttr } from "#app/data/move.js";
+import { allMoves, applyMoveAttrs, BypassRedirectAttr, BypassSleepAttr, ChargeAttr, CopyMoveAttr, HealStatusEffectAttr, MoveFlags, PreMoveMessageAttr } from "#app/data/move.js";
 import { SpeciesFormChangePreMoveTrigger } from "#app/data/pokemon-forms.js";
 import { getStatusEffectActivationText, getStatusEffectHealText } from "#app/data/status-effect.js";
 import { Type } from "#app/data/type.js";
@@ -13,10 +13,10 @@ import { BattlerTagType } from "#app/enums/battler-tag-type.js";
 import { Moves } from "#app/enums/moves.js";
 import { StatusEffect } from "#app/enums/status-effect.js";
 import { MoveUsedEvent } from "#app/events/battle-scene.js";
-import Pokemon, { PokemonMove, MoveResult, TurnMove } from "#app/field/pokemon.js";
+import Pokemon, { MoveResult, PokemonMove, TurnMove } from "#app/field/pokemon.js";
 import { getPokemonNameWithAffix } from "#app/messages.js";
-import i18next from "i18next";
 import * as Utils from "#app/utils.js";
+import i18next from "i18next";
 import { BattlePhase } from "./battle-phase";
 import { CommonAnimPhase } from "./common-anim-phase";
 import { MoveEffectPhase } from "./move-effect-phase";
@@ -38,8 +38,8 @@ export class MovePhase extends BattlePhase {
     this.pokemon = pokemon;
     this.targets = targets;
     this.move = move;
-    this.followUp = !!followUp;
+    this.followUp = followUp ?? false;
-    this.ignorePp = !!ignorePp;
+    this.ignorePp = ignorePp ?? false;
     this.failed = false;
     this.cancelled = false;
   }
@@ -194,7 +194,7 @@ export class MovePhase extends BattlePhase {
         return this.end();
       }
 
-      if (!moveQueue.length || !moveQueue.shift()?.ignorePP) { // using .shift here clears out two turn moves once they've been used
+      if ((!moveQueue.length || !moveQueue.shift()?.ignorePP) && !this.ignorePp) { // using .shift here clears out two turn moves once they've been used
         this.move.usePp(ppUsed);
         this.scene.eventTarget.dispatchEvent(new MoveUsedEvent(this.pokemon?.id, this.move.getMove(), this.move.ppUsed));
       }

src/phases/stat-stage-change-phase.ts

@@ -1,13 +1,13 @@
-import BattleScene from "#app/battle-scene";
 import { BattlerIndex } from "#app/battle";
-import { applyPreStatStageChangeAbAttrs, ProtectStatAbAttr, applyAbAttrs, StatStageChangeMultiplierAbAttr, StatStageChangeCopyAbAttr, applyPostStatStageChangeAbAttrs, PostStatStageChangeAbAttr } from "#app/data/ability";
+import BattleScene from "#app/battle-scene";
-import { MistTag, ArenaTagSide } from "#app/data/arena-tag";
+import { applyAbAttrs, applyPostStatStageChangeAbAttrs, applyPreStatStageChangeAbAttrs, PostStatStageChangeAbAttr, ProtectStatAbAttr, StatStageChangeCopyAbAttr, StatStageChangeMultiplierAbAttr } from "#app/data/ability";
+import { ArenaTagSide, MistTag } from "#app/data/arena-tag";
 import Pokemon from "#app/field/pokemon";
 import { getPokemonNameWithAffix } from "#app/messages";
 import { ResetNegativeStatStageModifier } from "#app/modifier/modifier";
 import { handleTutorial, Tutorial } from "#app/tutorial";
-import i18next from "i18next";
 import * as Utils from "#app/utils";
+import i18next from "i18next";
 import { PokemonPhase } from "./pokemon-phase";
 import { Stat, type BattleStat, getStatKey, getStatStageChangeDescriptionKey } from "#enums/stat";
 
@@ -83,6 +83,20 @@ export class StatStageChangePhase extends PokemonPhase {
       }
 
       for (const s of filteredStats) {
+        if (stages.value > 0 && pokemon.getStatStage(s) < 6) {
+          if (!pokemon.turnData) {
+            // Temporary fix for missing turn data struct on turn 1
+            pokemon.resetTurnData();
+          }
+          pokemon.turnData.statStagesIncreased = true;
+        } else if (stages.value < 0 && pokemon.getStatStage(s) > -6) {
+          if (!pokemon.turnData) {
+            // Temporary fix for missing turn data struct on turn 1
+            pokemon.resetTurnData();
+          }
+          pokemon.turnData.statStagesDecreased = true;
+        }
+
         pokemon.setStatStage(s, pokemon.getStatStage(s) + stages.value);
       }
 

src/phases/switch-summon-phase.ts

@@ -71,7 +71,7 @@ export class SwitchSummonPhase extends SummonPhase {
       i18next.t("battle:playerComeBack", { pokemonName: getPokemonNameWithAffix(pokemon) }) :
       i18next.t("battle:trainerComeBack", {
         trainerName: this.scene.currentBattle.trainer?.getName(!(this.fieldIndex % 2) ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER),
-        pokemonName: getPokemonNameWithAffix(pokemon)
+        pokemonName: pokemon.getNameToRender()
       })
     );
     this.scene.playSound("se/pb_rel");