Merge branch 'beta' into feature/multilanguage-support

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -35,5 +35,3 @@ body:
     attributes:
       label: Additional context
       description: Add any other context or screenshots about the feature request here.
-    validations:
-      required: true

public/images/pokemon/exp/670-red.json

@@ -2513,7 +2513,6 @@
 	],
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:edb2df3a947401efb05329a2c96d5d73:f256d83ef4df17c17958acc6e0432ab0:bad05b37c157676604256a043511a6a2$"
+		"version": "3.0"
 	}
 }

public/images/pokemon/variant/_masterlist.json

@@ -3815,6 +3815,11 @@
 			1,
 			1
 		],
+		"178": [
+			0,
+			2,
+			2
+		],
 		"185": [
 			0,
 			1,
@@ -7833,6 +7838,11 @@
 				1,
 				1
 			],
+			"178": [
+				0,
+				2,
+				2
+			],
 			"185": [
 				0,
 				1,

public/images/pokemon/variant/exp/800-ultra.json

@@ -1,21 +1,5 @@
 {
 	"1": {
-		"b0a080": "e552ec",
-		"f8f8e8": "ffe2ed",
-		"9b8259": "b021c5",
-		"e5e4c2": "ffb9f9",
-		"000000": "000000",
-		"bc9b4e": "900090",
-		"f8f8d0": "ff8ae9",
-		"e8e088": "ff49e7",
-		"d0b868": "d10cc7",
-		"7d673b": "510059",
-		"282828": "282828",
-		"f84040": "f84040",
-		"f88888": "1ae2e6",
-		"c81010": "00c2d2"
-	},
-	"2": {
 		"b0a080": "d96b23",
 		"f8f8e8": "ffe1b8",
 		"9b8259": "b43c06",
@@ -30,5 +14,21 @@
 		"f84040": "f84040",
 		"f88888": "f88888",
 		"c81010": "c81010"
+	},
+	"2": {
+		"b0a080": "e552ec",
+		"f8f8e8": "ffe2ed",
+		"9b8259": "b021c5",
+		"e5e4c2": "ffb9f9",
+		"000000": "000000",
+		"bc9b4e": "900090",
+		"f8f8d0": "ff8ae9",
+		"e8e088": "ff49e7",
+		"d0b868": "d10cc7",
+		"7d673b": "510059",
+		"282828": "282828",
+		"f84040": "f84040",
+		"f88888": "1ae2e6",
+		"c81010": "00c2d2"
 	}
 }

src/battle-scene.ts

@@ -1,11 +1,10 @@
 import Phaser from "phaser";
 import UI from "./ui/ui";
-import { NextEncounterPhase, NewBiomeEncounterPhase, SelectBiomePhase, MessagePhase, TurnInitPhase, ReturnPhase, LevelCapPhase, ShowTrainerPhase, LoginPhase, MovePhase, TitlePhase, SwitchPhase, SummonPhase, ToggleDoublePositionPhase } from "./phases";
 import Pokemon, { PlayerPokemon, EnemyPokemon } from "./field/pokemon";
 import PokemonSpecies, { PokemonSpeciesFilter, allSpecies, getPokemonSpecies } from "./data/pokemon-species";
 import { Constructor } from "#app/utils";
 import * as Utils from "./utils";
-import { Modifier, ModifierBar, ConsumablePokemonModifier, ConsumableModifier, PokemonHpRestoreModifier, HealingBoosterModifier, PersistentModifier, PokemonHeldItemModifier, ModifierPredicate, DoubleBattleChanceBoosterModifier, FusePokemonModifier, PokemonFormChangeItemModifier, TerastallizeModifier, overrideModifiers, overrideHeldItems } from "./modifier/modifier";
+import { Modifier, ModifierBar, ConsumablePokemonModifier, ConsumableModifier, PokemonHpRestoreModifier, TurnHeldItemTransferModifier, HealingBoosterModifier, PersistentModifier, PokemonHeldItemModifier, ModifierPredicate, DoubleBattleChanceBoosterModifier, FusePokemonModifier, PokemonFormChangeItemModifier, TerastallizeModifier, overrideModifiers, overrideHeldItems } from "./modifier/modifier";
 import { PokeballType } from "./data/pokeball";
 import { initCommonAnims, initMoveAnim, loadCommonAnimAssets, loadMoveAnimAssets, populateAnims } from "./data/battle-anims";
 import { Phase } from "./phase";
@@ -37,8 +36,8 @@ import UIPlugin from "phaser3-rex-plugins/templates/ui/ui-plugin";
 import { addUiThemeOverrides } from "./ui/ui-theme";
 import PokemonData from "./system/pokemon-data";
 import { Nature } from "./data/nature";
-import { SpeciesFormChangeManualTrigger, SpeciesFormChangeTimeOfDayTrigger, SpeciesFormChangeTrigger, pokemonFormChanges, FormChangeItem } from "./data/pokemon-forms";
-import { FormChangePhase, QuietFormChangePhase } from "./form-change-phase";
+import { SpeciesFormChangeManualTrigger, SpeciesFormChangeTimeOfDayTrigger, SpeciesFormChangeTrigger, pokemonFormChanges, FormChangeItem, SpeciesFormChange } from "./data/pokemon-forms";
+import { FormChangePhase } from "./phases/form-change-phase";
 import { getTypeRgb } from "./data/type";
 import PokemonSpriteSparkleHandler from "./field/pokemon-sprite-sparkle-handler";
 import CharSprite from "./ui/char-sprite";
@@ -69,6 +68,21 @@ import i18next from "i18next";
 import {TrainerType} from "#enums/trainer-type";
 import { battleSpecDialogue } from "./data/dialogue";
 import { LoadingScene } from "./loading-scene";
+import { LevelCapPhase } from "./phases/level-cap-phase";
+import { LoginPhase } from "./phases/login-phase";
+import { MessagePhase } from "./phases/message-phase";
+import { MovePhase } from "./phases/move-phase";
+import { NewBiomeEncounterPhase } from "./phases/new-biome-encounter-phase";
+import { NextEncounterPhase } from "./phases/next-encounter-phase";
+import { QuietFormChangePhase } from "./phases/quiet-form-change-phase";
+import { ReturnPhase } from "./phases/return-phase";
+import { SelectBiomePhase } from "./phases/select-biome-phase";
+import { ShowTrainerPhase } from "./phases/show-trainer-phase";
+import { SummonPhase } from "./phases/summon-phase";
+import { SwitchPhase } from "./phases/switch-phase";
+import { TitlePhase } from "./phases/title-phase";
+import { ToggleDoublePositionPhase } from "./phases/toggle-double-position-phase";
+import { TurnInitPhase } from "./phases/turn-init-phase";
 
 export const bypassLogin = import.meta.env.VITE_BYPASS_LOGIN === "1";
 
@@ -2421,7 +2435,6 @@ export default class BattleScene extends SceneBase {
         getEnemyModifierTypesForWave(difficultyWaveIndex, count, [ enemyPokemon ], this.currentBattle.battleType === BattleType.TRAINER ? ModifierPoolType.TRAINER : ModifierPoolType.WILD, upgradeChance)
           .map(mt => mt.newModifier(enemyPokemon).add(this.enemyModifiers, false, this));
       });
-
       this.updateModifiers(false).then(() => resolve());
     });
   }
@@ -2579,7 +2592,7 @@ export default class BattleScene extends SceneBase {
 
       // in case this is NECROZMA, determine which forms this
       const matchingFormChangeOpts = pokemonFormChanges[pokemon.species.speciesId].filter(fc => fc.findTrigger(formChangeTriggerType) && fc.canChange(pokemon));
-      let matchingFormChange;
+      let matchingFormChange: SpeciesFormChange | null;
       if (pokemon.species.speciesId === Species.NECROZMA && matchingFormChangeOpts.length > 1) {
         // Ultra Necrozma is changing its form back, so we need to figure out into which form it devolves.
         const formChangeItemModifiers = (this.findModifiers(m => m instanceof PokemonFormChangeItemModifier && m.pokemonId === pokemon.id) as PokemonFormChangeItemModifier[]).filter(m => m.active).map(m => m.formChangeItem);
@@ -2666,7 +2679,9 @@ export default class BattleScene extends SceneBase {
     if (pokemon instanceof EnemyPokemon && pokemon.isBoss() && !pokemon.formIndex && pokemon.bossSegmentIndex < 1) {
       this.fadeOutBgm(Utils.fixedInt(2000), false);
       this.ui.showDialogue(battleSpecDialogue[BattleSpec.FINAL_BOSS].firstStageWin, pokemon.species.name, undefined, () => {
-        this.addEnemyModifier(getModifierType(modifierTypes.MINI_BLACK_HOLE).newModifier(pokemon) as PersistentModifier, false, true);
+        const finalBossMBH = getModifierType(modifierTypes.MINI_BLACK_HOLE).newModifier(pokemon) as TurnHeldItemTransferModifier;
+        finalBossMBH.setTransferrableFalse();
+        this.addEnemyModifier(finalBossMBH, false, true);
         pokemon.generateAndPopulateMoveset(1);
         this.setFieldScale(0.75);
         this.triggerPokemonFormChange(pokemon, SpeciesFormChangeManualTrigger, false);

src/data/ability.ts

@@ -3,7 +3,6 @@ import { Type } from "./type";
 import { Constructor } from "#app/utils";
 import * as Utils from "../utils";
 import { BattleStat, getBattleStatName } from "./battle-stat";
-import { MovePhase, PokemonHealPhase, ShowAbilityPhase, StatChangePhase } from "../phases";
 import { getPokemonNameWithAffix } from "../messages";
 import { Weather, WeatherType } from "./weather";
 import { BattlerTag, GroundedTag, GulpMissileTag, SemiInvulnerableTag } from "./battler-tags";
@@ -26,6 +25,10 @@ import { ArenaTagType } from "#enums/arena-tag-type";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
+import { MovePhase } from "#app/phases/move-phase.js";
+import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase.js";
+import { ShowAbilityPhase } from "#app/phases/show-ability-phase.js";
+import { StatChangePhase } from "#app/phases/stat-change-phase.js";
 
 export class Ability implements Localizable {
   public id: Abilities;
@@ -2395,16 +2398,16 @@ export class PreStatChangeAbAttr extends AbAttr {
 }
 
 export class ProtectStatAbAttr extends PreStatChangeAbAttr {
-  private protectedStat: BattleStat | null;
+  private protectedStat?: BattleStat;
 
   constructor(protectedStat?: BattleStat) {
     super();
 
-    this.protectedStat = protectedStat ?? null;
+    this.protectedStat = protectedStat;
   }
 
   applyPreStatChange(pokemon: Pokemon, passive: boolean, stat: BattleStat, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    if (!this.protectedStat || stat === this.protectedStat) {
+    if (Utils.isNullOrUndefined(this.protectedStat) || stat === this.protectedStat) {
       cancelled.value = true;
       return true;
     }
@@ -5039,6 +5042,7 @@ export function initAbilities() {
         (pokemon, abilityName) => i18next.t("abilityTriggers:disguiseAvoidedDamage", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName: abilityName }),
         (pokemon) => Math.floor(pokemon.getMaxHp() / 8))
       .attr(PostBattleInitFormChangeAbAttr, () => 0)
+      .bypassFaint()
       .ignorable(),
     new Ability(Abilities.BATTLE_BOND, 7)
       .attr(PostVictoryFormChangeAbAttr, () => 2)
@@ -5191,6 +5195,7 @@ export function initAbilities() {
       .attr(FormBlockDamageAbAttr, (target, user, move) => move.category === MoveCategory.PHYSICAL && !!target.getTag(BattlerTagType.ICE_FACE), 0, BattlerTagType.ICE_FACE,
         (pokemon, abilityName) => i18next.t("abilityTriggers:iceFaceAvoidedDamage", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName: abilityName }))
       .attr(PostBattleInitFormChangeAbAttr, () => 0)
+      .bypassFaint()
       .ignorable(),
     new Ability(Abilities.POWER_SPOT, 8)
       .attr(AllyMoveCategoryPowerBoostAbAttr, [MoveCategory.SPECIAL, MoveCategory.PHYSICAL], 1.3),

src/data/arena-tag.ts

@@ -4,7 +4,6 @@ import * as Utils from "../utils";
 import { MoveCategory, allMoves, MoveTarget, IncrementMovePriorityAttr, applyMoveAttrs } from "./move";
 import { getPokemonNameWithAffix } from "../messages";
 import Pokemon, { HitResult, PokemonMove } from "../field/pokemon";
-import { MoveEffectPhase, PokemonHealPhase, ShowAbilityPhase, StatChangePhase } from "../phases";
 import { StatusEffect } from "./status-effect";
 import { BattlerIndex } from "../battle";
 import { BlockNonDirectDamageAbAttr, ChangeMovePriorityAbAttr, ProtectStatAbAttr, applyAbAttrs } from "./ability";
@@ -15,6 +14,10 @@ import { Abilities } from "#enums/abilities";
 import { ArenaTagType } from "#enums/arena-tag-type";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { Moves } from "#enums/moves";
+import { MoveEffectPhase } from "#app/phases/move-effect-phase.js";
+import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase.js";
+import { ShowAbilityPhase } from "#app/phases/show-ability-phase.js";
+import { StatChangePhase } from "#app/phases/stat-change-phase.js";
 
 export enum ArenaTagSide {
   BOTH,

src/data/battler-tags.ts

@@ -1,5 +1,4 @@
 import { ChargeAnim, CommonAnim, CommonBattleAnim, MoveChargeAnim } from "./battle-anims";
-import { CommonAnimPhase, MoveEffectPhase, MovePhase, PokemonHealPhase, ShowAbilityPhase, StatChangeCallback, StatChangePhase } from "../phases";
 import { getPokemonNameWithAffix } from "../messages";
 import Pokemon, { MoveResult, HitResult } from "../field/pokemon";
 import { Stat, getStatName } from "./pokemon-stat";
@@ -18,6 +17,12 @@ import { BattlerTagType } from "#enums/battler-tag-type";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import i18next from "#app/plugins/i18n.js";
+import { CommonAnimPhase } from "#app/phases/common-anim-phase.js";
+import { MoveEffectPhase } from "#app/phases/move-effect-phase.js";
+import { MovePhase } from "#app/phases/move-phase.js";
+import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase.js";
+import { ShowAbilityPhase } from "#app/phases/show-ability-phase.js";
+import { StatChangePhase, StatChangeCallback } from "#app/phases/stat-change-phase.js";
 
 export enum BattlerTagLapseType {
   FAINT,

src/data/berry.ts

@@ -1,4 +1,3 @@
-import { PokemonHealPhase, StatChangePhase } from "../phases";
 import { getPokemonNameWithAffix } from "../messages";
 import Pokemon, { HitResult } from "../field/pokemon";
 import { BattleStat } from "./battle-stat";
@@ -8,6 +7,8 @@ import { DoubleBerryEffectAbAttr, ReduceBerryUseThresholdAbAttr, applyAbAttrs }
 import i18next from "i18next";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { BerryType } from "#enums/berry-type";
+import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase.js";
+import { StatChangePhase } from "#app/phases/stat-change-phase.js";
 
 export function getBerryName(berryType: BerryType): string {
   return i18next.t(`berry:${BerryType[berryType]}.name`);

src/data/egg-moves.ts

@@ -37,7 +37,7 @@ export const speciesEggMoves = {
   [Species.SLOWPOKE]: [ Moves.BOUNCY_BUBBLE, Moves.FLAMETHROWER, Moves.MYSTICAL_POWER, Moves.SHED_TAIL ],
   [Species.MAGNEMITE]: [ Moves.PARABOLIC_CHARGE, Moves.BODY_PRESS, Moves.ICE_BEAM, Moves.THUNDERCLAP ],
   [Species.FARFETCHD]: [ Moves.IVY_CUDGEL, Moves.TRIPLE_ARROWS, Moves.ROOST, Moves.VICTORY_DANCE ],
-  [Species.DODUO]: [ Moves.ICE_SPINNER, Moves.MULTI_ATTACK, Moves.FLOATY_FALL, Moves.TRIPLE_ARROWS ],
+  [Species.DODUO]: [ Moves.TRIPLE_AXEL, Moves.MULTI_ATTACK, Moves.FLOATY_FALL, Moves.TRIPLE_ARROWS ],
   [Species.SEEL]: [ Moves.FREEZE_DRY, Moves.BOUNCY_BUBBLE, Moves.SLACK_OFF, Moves.STEAM_ERUPTION ],
   [Species.GRIMER]: [ Moves.SUCKER_PUNCH, Moves.CURSE, Moves.STRENGTH_SAP, Moves.NOXIOUS_TORQUE ],
   [Species.SHELLDER]: [ Moves.ROCK_BLAST, Moves.WATER_SHURIKEN, Moves.BANEFUL_BUNKER, Moves.BONE_RUSH ],
@@ -198,7 +198,7 @@ export const speciesEggMoves = {
   [Species.KYOGRE]: [ Moves.BOUNCY_BUBBLE, Moves.HURRICANE, Moves.FREEZE_DRY, Moves.ELECTRO_SHOT ],
   [Species.GROUDON]: [ Moves.STONE_AXE, Moves.SOLAR_BLADE, Moves.MORNING_SUN, Moves.SACRED_FIRE ],
   [Species.RAYQUAZA]: [ Moves.V_CREATE, Moves.DRAGON_DARTS, Moves.CORE_ENFORCER, Moves.OBLIVION_WING ],
-  [Species.JIRACHI]: [ Moves.TACHYON_CUTTER, Moves.FLOATY_FALL, Moves.TRIPLE_ARROWS, Moves.SHELL_SMASH ],
+  [Species.JIRACHI]: [ Moves.TACHYON_CUTTER, Moves.TRIPLE_ARROWS, Moves.ROCK_SLIDE, Moves.SHELL_SMASH ],
   [Species.DEOXYS]: [ Moves.COLLISION_COURSE, Moves.EARTH_POWER, Moves.PARTING_SHOT, Moves.LUMINA_CRASH ],
   [Species.TURTWIG]: [ Moves.SHELL_SMASH, Moves.MIGHTY_CLEAVE, Moves.ICE_SPINNER, Moves.SAPPY_SEED ],
   [Species.CHIMCHAR]: [ Moves.FIERY_DANCE, Moves.SECRET_SWORD, Moves.TRIPLE_AXEL, Moves.SACRED_FIRE ],
@@ -418,7 +418,7 @@ export const speciesEggMoves = {
   [Species.CELESTEELA]: [ Moves.RECOVER, Moves.BUZZY_BUZZ, Moves.SANDSEAR_STORM, Moves.OBLIVION_WING ],
   [Species.KARTANA]: [ Moves.MIGHTY_CLEAVE, Moves.PSYBLADE, Moves.BITTER_BLADE, Moves.BEHEMOTH_BLADE ],
   [Species.GUZZLORD]: [ Moves.SUCKER_PUNCH, Moves.COMEUPPANCE, Moves.SLACK_OFF, Moves.SHED_TAIL ],
-  [Species.NECROZMA]: [ Moves.CLANGOROUS_SOUL, Moves.SACRED_FIRE, Moves.ASTRAL_BARRAGE, Moves.CLANGOROUS_SOUL ],
+  [Species.NECROZMA]: [ Moves.CLANGOROUS_SOUL, Moves.SACRED_FIRE, Moves.ASTRAL_BARRAGE, Moves.DYNAMAX_CANNON ],
   [Species.MAGEARNA]: [ Moves.STRENGTH_SAP, Moves.EARTH_POWER, Moves.MOONBLAST, Moves.MAKE_IT_RAIN ],
   [Species.MARSHADOW]: [ Moves.POWER_UP_PUNCH, Moves.TRIPLE_AXEL, Moves.METEOR_MASH, Moves.STORM_THROW ],
   [Species.POIPOLE]: [ Moves.CORE_ENFORCER, Moves.ICE_BEAM, Moves.SEARING_SHOT, Moves.MALIGNANT_CHAIN ],
@@ -458,7 +458,7 @@ export const speciesEggMoves = {
   [Species.MORPEKO]: [ Moves.TRIPLE_AXEL, Moves.OBSTRUCT, Moves.SWORDS_DANCE, Moves.COLLISION_COURSE ],
   [Species.CUFANT]: [ Moves.LIQUIDATION, Moves.CURSE, Moves.COMBAT_TORQUE, Moves.GIGATON_HAMMER ],
   [Species.DRACOZOLT]: [ Moves.TRIPLE_AXEL, Moves.DRAGON_HAMMER, Moves.FIRE_LASH, Moves.DRAGON_DANCE ],
-  [Species.ARCTOZOLT]: [ Moves.TRIPLE_AXEL, Moves.AQUA_STEP, Moves.HIGH_HORSEPOWER, Moves.SHIFT_GEAR ],
+  [Species.ARCTOZOLT]: [ Moves.MOUNTAIN_GALE, Moves.AQUA_STEP, Moves.HIGH_HORSEPOWER, Moves.SHIFT_GEAR ],
   [Species.DRACOVISH]: [ Moves.TRIPLE_AXEL, Moves.DRAGON_HAMMER, Moves.THUNDER_FANG, Moves.DRAGON_DANCE ],
   [Species.ARCTOVISH]: [ Moves.ICE_FANG, Moves.THUNDER_FANG, Moves.HIGH_HORSEPOWER, Moves.SHIFT_GEAR ],
   [Species.DURALUDON]: [ Moves.CORE_ENFORCER, Moves.BODY_PRESS, Moves.RECOVER, Moves.TACHYON_CUTTER ],

src/data/move.ts

@@ -1,5 +1,4 @@
 import { ChargeAnim, MoveChargeAnim, initMoveAnim, loadMoveAnimAssets } from "./battle-anims";
-import { BattleEndPhase, MoveEndPhase, MovePhase, NewBattlePhase, PartyStatusCurePhase, PokemonHealPhase, StatChangePhase, SwitchPhase, SwitchSummonPhase } from "../phases";
 import { BattleStat, getBattleStatName } from "./battle-stat";
 import { EncoreTag, GulpMissileTag, HelpingHandTag, SemiInvulnerableTag, ShellTrapTag, StockpilingTag, TrappedTag, TypeBoostTag } from "./battler-tags";
 import { getPokemonNameWithAffix } from "../messages";
@@ -28,6 +27,15 @@ import { Biome } from "#enums/biome";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { MoveUsedEvent } from "#app/events/battle-scene.js";
+import { PartyStatusCurePhase } from "#app/phases/party-status-cure-phase.js";
+import { BattleEndPhase } from "#app/phases/battle-end-phase.js";
+import { MoveEndPhase } from "#app/phases/move-end-phase.js";
+import { MovePhase } from "#app/phases/move-phase.js";
+import { NewBattlePhase } from "#app/phases/new-battle-phase.js";
+import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase.js";
+import { StatChangePhase } from "#app/phases/stat-change-phase.js";
+import { SwitchPhase } from "#app/phases/switch-phase.js";
+import { SwitchSummonPhase } from "#app/phases/switch-summon-phase.js";
 
 export enum MoveCategory {
   PHYSICAL,
@@ -4430,6 +4438,39 @@ export class GulpMissileTagAttr extends MoveEffectAttr {
   }
 }
 
+/**
+ * Attribute to implement Jaw Lock's linked trapping effect between the user and target
+ * @extends AddBattlerTagAttr
+ */
+export class JawLockAttr extends AddBattlerTagAttr {
+  constructor() {
+    super(BattlerTagType.TRAPPED);
+  }
+
+  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    if (!super.canApply(user, target, move, args)) {
+      return false;
+    }
+
+    // If either the user or the target already has the tag, do not apply
+    if (user.getTag(TrappedTag) || target.getTag(TrappedTag)) {
+      return false;
+    }
+
+    const moveChance = this.getMoveChance(user, target, move, this.selfTarget);
+    if (moveChance < 0 || moveChance === 100 || user.randSeedInt(100) < moveChance) {
+      /**
+       * Add the tag to both the user and the target.
+       * The target's tag source is considered to be the user and vice versa
+       */
+      return target.addTag(BattlerTagType.TRAPPED, 1, move.id, user.id)
+          && user.addTag(BattlerTagType.TRAPPED, 1, move.id, target.id);
+    }
+
+    return false;
+  }
+}
+
 export class CurseAttr extends MoveEffectAttr {
 
   apply(user: Pokemon, target: Pokemon, move:Move, args: any[]): boolean {
@@ -4441,7 +4482,7 @@ export class CurseAttr extends MoveEffectAttr {
       const curseRecoilDamage = Math.max(1, Math.floor(user.getMaxHp() / 2));
       user.damageAndUpdate(curseRecoilDamage, HitResult.OTHER, false, true, true);
       user.scene.queueMessage(
-        i18next.t("battle:cursedOnAdd", {
+        i18next.t("battlerTags:cursedOnAdd", {
           pokemonNameWithAffix: getPokemonNameWithAffix(user),
           pokemonName: getPokemonNameWithAffix(target)
         })
@@ -7466,7 +7507,7 @@ export function initMoves() {
       .attr(OpponentHighHpPowerAttr, 120),
     new AttackMove(Moves.MAGMA_STORM, Type.FIRE, MoveCategory.SPECIAL, 100, 75, 5, -1, 0, 4)
       .attr(TrapAttr, BattlerTagType.MAGMA_STORM),
-    new StatusMove(Moves.DARK_VOID, Type.DARK, 50, 10, -1, 0, 4)
+    new StatusMove(Moves.DARK_VOID, Type.DARK, 80, 10, -1, 0, 4)  //Accuracy from Generations 4-6
       .attr(StatusEffectAttr, StatusEffect.SLEEP)
       .target(MoveTarget.ALL_NEAR_ENEMIES),
     new AttackMove(Moves.SEED_FLARE, Type.GRASS, MoveCategory.SPECIAL, 120, 85, 5, 40, 0, 4)
@@ -8305,8 +8346,7 @@ export function initMoves() {
       .attr(HighCritAttr)
       .attr(BypassRedirectAttr),
     new AttackMove(Moves.JAW_LOCK, Type.DARK, MoveCategory.PHYSICAL, 80, 100, 10, -1, 0, 8)
-      .attr(AddBattlerTagAttr, BattlerTagType.TRAPPED, false, false, 1, 1, false, true)
-      .attr(AddBattlerTagAttr, BattlerTagType.TRAPPED, true, false, 1, 1, false, true)
+      .attr(JawLockAttr)
       .bitingMove(),
     new SelfStatusMove(Moves.STUFF_CHEEKS, Type.NORMAL, -1, 10, -1, 0, 8) // TODO: Stuff Cheeks should not be selectable when the user does not have a berry, see wiki
       .attr(EatBerryAttr)

src/data/pokemon-forms.ts

@@ -837,6 +837,8 @@ export const pokemonFormChanges: PokemonFormChanges = {
     new SpeciesFormChange(Species.CRAMORANT, "", "gorging", new SpeciesFormChangeManualTrigger, true, new SpeciesFormChangeCondition(p => p.getHpRatio() < .5)),
     new SpeciesFormChange(Species.CRAMORANT, "gulping", "", new SpeciesFormChangeManualTrigger, true),
     new SpeciesFormChange(Species.CRAMORANT, "gorging", "", new SpeciesFormChangeManualTrigger, true),
+    new SpeciesFormChange(Species.CRAMORANT, "gulping", "", new SpeciesFormChangeActiveTrigger(false), true),
+    new SpeciesFormChange(Species.CRAMORANT, "gorging", "", new SpeciesFormChangeActiveTrigger(false), true),
   ]
 };
 

src/data/pokemon-species.ts

@@ -3559,7 +3559,7 @@ export const starterPassiveAbilities = {
   [Species.HEATRAN]: Abilities.EARTH_EATER,
   [Species.REGIGIGAS]: Abilities.MINDS_EYE,
   [Species.GIRATINA]: Abilities.SHADOW_SHIELD,
-  [Species.CRESSELIA]: Abilities.MAGIC_BOUNCE,
+  [Species.CRESSELIA]: Abilities.UNAWARE,
   [Species.PHIONE]: Abilities.SIMPLE,
   [Species.MANAPHY]: Abilities.PRIMORDIAL_SEA,
   [Species.DARKRAI]: Abilities.UNNERVE,

src/data/trainer-config.ts

@@ -1577,11 +1577,11 @@ export const trainerConfigs: TrainerConfigs = {
     })),
 
   [TrainerType.RIVAL]: new TrainerConfig((t = TrainerType.RIVAL)).setName("Finn").setHasGenders("Ivy").setHasCharSprite().setTitle("Rival").setStaticParty().setEncounterBgm(TrainerType.RIVAL).setBattleBgm("battle_rival").setMixedBattleBgm("battle_rival").setPartyTemplates(trainerPartyTemplates.RIVAL)
-    .setModifierRewardFuncs(() => modifierTypes.SUPER_EXP_CHARM, () => modifierTypes.EXP_SHARE)
+    .setModifierRewardFuncs(() => modifierTypes.SUPER_EXP_CHARM, () => modifierTypes.EXP_SHARE, () => modifierTypes.SHINY_CHARM, () => modifierTypes.ABILITY_CHARM)
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE, Species.CHIKORITA, Species.CYNDAQUIL, Species.TOTODILE, Species.TREECKO, Species.TORCHIC, Species.MUDKIP, Species.TURTWIG, Species.CHIMCHAR, Species.PIPLUP, Species.SNIVY, Species.TEPIG, Species.OSHAWOTT, Species.CHESPIN, Species.FENNEKIN, Species.FROAKIE, Species.ROWLET, Species.LITTEN, Species.POPPLIO, Species.GROOKEY, Species.SCORBUNNY, Species.SOBBLE, Species.SPRIGATITO, Species.FUECOCO, Species.QUAXLY], TrainerSlot.TRAINER, true))
     .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.PIDGEY, Species.HOOTHOOT, Species.TAILLOW, Species.STARLY, Species.PIDOVE, Species.FLETCHLING, Species.PIKIPEK, Species.ROOKIDEE, Species.WATTREL], TrainerSlot.TRAINER, true)),
   [TrainerType.RIVAL_2]: new TrainerConfig(++t).setName("Finn").setHasGenders("Ivy").setHasCharSprite().setTitle("Rival").setStaticParty().setMoneyMultiplier(1.25).setEncounterBgm(TrainerType.RIVAL).setBattleBgm("battle_rival").setMixedBattleBgm("battle_rival").setPartyTemplates(trainerPartyTemplates.RIVAL_2)
-    .setModifierRewardFuncs(() => modifierTypes.EXP_SHARE)
+    .setModifierRewardFuncs(() => modifierTypes.EXP_SHARE, () => modifierTypes.SHINY_CHARM)
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.IVYSAUR, Species.CHARMELEON, Species.WARTORTLE, Species.BAYLEEF, Species.QUILAVA, Species.CROCONAW, Species.GROVYLE, Species.COMBUSKEN, Species.MARSHTOMP, Species.GROTLE, Species.MONFERNO, Species.PRINPLUP, Species.SERVINE, Species.PIGNITE, Species.DEWOTT, Species.QUILLADIN, Species.BRAIXEN, Species.FROGADIER, Species.DARTRIX, Species.TORRACAT, Species.BRIONNE, Species.THWACKEY, Species.RABOOT, Species.DRIZZILE, Species.FLORAGATO, Species.CROCALOR, Species.QUAXWELL], TrainerSlot.TRAINER, true))
     .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.PIDGEOTTO, Species.HOOTHOOT, Species.TAILLOW, Species.STARAVIA, Species.TRANQUILL, Species.FLETCHINDER, Species.TRUMBEAK, Species.CORVISQUIRE, Species.WATTREL], TrainerSlot.TRAINER, true))
     .setPartyMemberFunc(2, getSpeciesFilterRandomPartyMemberFunc((species: PokemonSpecies) => !pokemonEvolutions.hasOwnProperty(species.speciesId) && !pokemonPrevolutions.hasOwnProperty(species.speciesId) && species.baseTotal >= 450)),

src/field/arena.ts

@@ -4,7 +4,6 @@ import { Constructor } from "#app/utils";
 import * as Utils from "../utils";
 import PokemonSpecies, { getPokemonSpecies } from "../data/pokemon-species";
 import { Weather, WeatherType, getTerrainClearMessage, getTerrainStartMessage, getWeatherClearMessage, getWeatherStartMessage } from "../data/weather";
-import { CommonAnimPhase } from "../phases";
 import { CommonAnim } from "../data/battle-anims";
 import { Type } from "../data/type";
 import Move from "../data/move";
@@ -21,6 +20,7 @@ import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { TimeOfDay } from "#enums/time-of-day";
 import { TrainerType } from "#enums/trainer-type";
+import { CommonAnimPhase } from "#app/phases/common-anim-phase.js";
 
 export class Arena {
   public scene: BattleScene;

src/field/pokemon.ts

@@ -17,7 +17,6 @@ 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 { DamagePhase, FaintPhase, LearnMovePhase, MoveEffectPhase, ObtainStatusEffectPhase, StatChangePhase, SwitchSummonPhase, ToggleDoublePositionPhase, MoveEndPhase } from "../phases";
 import { BattleStat } from "../data/battle-stat";
 import { BattlerTag, BattlerTagLapseType, EncoreTag, GroundedTag, HighestStatBoostTag, TypeImmuneTag, getBattlerTag, SemiInvulnerableTag, TypeBoostTag, ExposedTag } from "../data/battler-tags";
 import { WeatherType } from "../data/weather";
@@ -51,6 +50,15 @@ import { Biome } from "#enums/biome";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { getPokemonNameWithAffix } from "#app/messages.js";
+import { DamagePhase } from "#app/phases/damage-phase.js";
+import { FaintPhase } from "#app/phases/faint-phase.js";
+import { LearnMovePhase } from "#app/phases/learn-move-phase.js";
+import { MoveEffectPhase } from "#app/phases/move-effect-phase.js";
+import { MoveEndPhase } from "#app/phases/move-end-phase.js";
+import { ObtainStatusEffectPhase } from "#app/phases/obtain-status-effect-phase.js";
+import { StatChangePhase } from "#app/phases/stat-change-phase.js";
+import { SwitchSummonPhase } from "#app/phases/switch-summon-phase.js";
+import { ToggleDoublePositionPhase } from "#app/phases/toggle-double-position-phase.js";
 
 export enum FieldPosition {
   CENTER,
@@ -921,8 +929,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * by how many learnable moves there are for the {@linkcode Pokemon}.
    */
   getLearnableLevelMoves(): Moves[] {
-    let levelMoves = this.getLevelMoves(1, true).map(lm => lm[1]);
-    if (this.metBiome === -1 && !this.scene.gameMode.isFreshStartChallenge()) {
+    let levelMoves = this.getLevelMoves(1, true, false, true).map(lm => lm[1]);
+    if (this.metBiome === -1 && !this.scene.gameMode.isFreshStartChallenge() && !this.scene.gameMode.isDaily) {
       levelMoves = this.getUnlockedEggMoves().concat(levelMoves);
     }
     return levelMoves.filter(lm => !this.moveset.some(m => m?.moveId === lm));
@@ -1210,11 +1218,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    *
    * @param source - The Pokémon using the move.
    * @param move - The move being used.
-   * @returns The type damage multiplier or undefined if it's a status move
+   * @returns The type damage multiplier or 1 if it's a status move
    */
-  getMoveEffectiveness(source: Pokemon, move: PokemonMove): TypeDamageMultiplier | undefined {
+  getMoveEffectiveness(source: Pokemon, move: PokemonMove): TypeDamageMultiplier {
     if (move.getMove().category === MoveCategory.STATUS) {
-      return undefined;
+      return 1;
     }
 
     return this.getAttackMoveEffectiveness(source, move, !this.battleData?.abilityRevealed);
@@ -3223,14 +3231,18 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * Causes a Pokemon to leave the field (such as in preparation for a switch out/escape).
    * @param clearEffects Indicates if effects should be cleared (true) or passed
    * to the next pokemon, such as during a baton pass (false)
+   * @param hideInfo Indicates if this should also play the animation to hide the Pokemon's
+   * info container.
    */
-  leaveField(clearEffects: boolean = true) {
+  leaveField(clearEffects: boolean = true, hideInfo: boolean = true) {
     this.resetTurnData();
     if (clearEffects) {
       this.resetSummonData();
       this.resetBattleData();
     }
-    this.hideInfo();
+    if (hideInfo) {
+      this.hideInfo();
+    }
     this.setVisible(false);
     this.scene.field.remove(this);
     this.scene.triggerPokemonFormChange(this, SpeciesFormChangeActiveTrigger, true);
@@ -3780,7 +3792,7 @@ export class EnemyPokemon extends Pokemon {
       this.moveset = (formIndex !== undefined ? formIndex : this.formIndex)
         ? [
           new PokemonMove(Moves.DYNAMAX_CANNON),
-          new PokemonMove(Moves.CROSS_POISON),
+          new PokemonMove(Moves.SLUDGE_BOMB),
           new PokemonMove(Moves.FLAMETHROWER),
           new PokemonMove(Moves.RECOVER, 0, -4)
         ]

src/game-mode.ts

@@ -62,7 +62,7 @@ export class GameMode implements GameModeConfig {
    * @returns true if the game mode has that challenge
    */
   hasChallenge(challenge: Challenges): boolean {
-    return this.challenges.some(c => c.id === challenge);
+    return this.challenges.some(c => c.id === challenge && c.value !== 0);
   }
 
   /**

src/loading-scene.ts

@@ -42,6 +42,7 @@ export class LoadingScene extends SceneBase {
     this.loadImage("loading_bg", "arenas");
     this.loadImage("logo", "");
     // this.loadImage("pride-update", "events");
+    this.loadImage("august-variant-update", "events");
 
     // Load menu images
     this.loadAtlas("bg", "ui");

src/locales/ca_ES/dialogue.ts

@@ -2573,7 +2573,8 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: `@c{shock}Wow… You cleaned me out.\nAre you actually a beginner?
                    $@c{smile}Maybe it was a bit of luck but…\nWho knows you might just be able to go all the way.
                    $By the way, the professor asked me to give you these items. They look pretty cool.
-                   $@c{serious_smile_fists}Good luck out there!`
+                   $@c{serious_smile_fists}Good luck out there!
+                   $@c{smile}Oh- and I hope you enjoy the event!`
     },
   },
   "rival_female": {
@@ -2587,7 +2588,8 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: `@c{shock}You just started and you're already this strong?!@d{96}\n@c{angry}You totally cheated, didn't you?
                     $@c{smile_wave_wink}Just kidding!@d{64} @c{smile_eclosed}I lost fair and square… I have a feeling you're going to do really well out there.
                     $@c{smile}By the way, the professor wanted me to give you some items. Hopefully they're helpful!
-                    $@c{smile_wave}Do your best like always! I believe in you!`
+                    $@c{smile_wave}Do your best like always! I believe in you!
+                    $@c{smile}Oh- and I hope you enjoy the event!`
     },
   },
   "rival_2": {
@@ -2603,7 +2605,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
                 $@c{smile}That's alright, though. I figured this might happen.\n@c{serious_mopen_fists}It just means I need to try harder for next time!\n
                 $@c{smile}Oh, not that you really need the help, but I had an extra one of these lying around and figured you might want it.\n
                 $@c{serious_smile_fists}Don't expect another one after this, though!\nI can't keep giving my opponent an advantage after all.
-                $@c{smile}Anyway, take care!`
+                $@c{smile}Anyway, take care, and enjoy the event!`
     },
   },
   "rival_2_female": {
@@ -2619,7 +2621,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
                 $@c{smile}Aw well. That just means I'll have to train even harder for next time!
                 $@c{smile_wave}I also got you another one of these!\n@c{smile_wave_wink}No need to thank me~.
                 $@c{angry_mopen}This is the last one, though! You won't be getting anymore freebies from me after this!
-                $@c{smile_wave}Keep at it!`
+                $@c{smile_wave}Keep at it, and enjoy the event!`
     },
     "defeat": {
       1: "It's OK to lose sometimes…"

src/locales/de/dialogue.ts

@@ -2641,7 +2641,8 @@ export const PGMdialogue: DialogueTranslationEntries = {
                    $@c{smile}Vielleicht war es einfach etwas Glück, aber…\nWer weiß, vielleicht schaffst du es irgendwann
                    $ja wirklich ganz groß raus zu kommen.
                    $Übrigens, der Professor hat mich gebeten dir diese Items zu geben. Die sehen wirklich cool aus.
-                   $@c{serious_smile_fists}Viel Glück da draußen!`
+                   $@c{serious_smile_fists}Viel Glück da draußen!
+                    $@c{smile}Oh-und genieße das Event!`
     },
   },
   "rival_female": {
@@ -2656,7 +2657,8 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: `@c{shock}Du hast gerade erst angefangen und bist schon so stark?!@d{96} @c{angry}Du hast sowas von betrogen, oder?
                     $@c{smile_wave_wink}Ich mach nur Spaß!@d{64} @c{smile_eclosed}Ich habe ehrlich verloren… Ich habe das Gefühl, dass du es dort draußen weit bringen wirst.
                     $@c{smile}Übrigens, der Professor hat mich gebeten dir diese Items zu geben. Ich hoffe sie sind hilfreich!
-                    $@c{smile_wave}Gib wie immer dein Bestes! Ich glaube an dich!`
+                    $@c{smile_wave}Gib wie immer dein Bestes! Ich glaube an dich!
+                    $@c{smile}Oh-und genieße das Event!`
     },
   },
   "rival_2": {
@@ -2674,7 +2676,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
                 $@c{smile}Nicht, dass du wirklich Hilfe benötigen würdest, aber ich habe hier noch eins von diesen Dingern herumliegen.
                 $Du kannst es haben.\n
                 $@c{serious_smile_fists}Erwarte aber nicht, dass ich dir noch mehr gebe!\nIch kann meinen Rivalen doch keine Vorteile verschaffen.
-                $@c{smile}Egal, pass auf dich auf!`
+                $@c{smile}Egal, pass auf dich auf und genieße das Event!`
     },
   },
   "rival_2_female": {
@@ -2690,7 +2692,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
                 $@c{smile}Na gut. Das bedeutet ich muss noch härter tranieren!
                 $@c{smile_wave}Ich habe noch eins von diesen Dingern!\n@c{smile_wave_wink}Kein Grund mir zu danken~.
                 $@c{angry_mopen}Das ist aber das Letzte! Du bekommst ab jett keine Geschenke mehr von mir!
-                $@c{smile_wave}Bleib stark!`
+                $@c{smile_wave}Bleib stark und genieße das Event!`
     },
     "defeat": {
       1: "Es ist Ok manchmal zu verlieren…"

src/locales/en/dialogue.ts

@@ -2574,7 +2574,8 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: `@c{shock}Wow… You cleaned me out.\nAre you actually a beginner?
                    $@c{smile}Maybe it was a bit of luck but…\nWho knows you might just be able to go all the way.
                    $By the way, the professor asked me to give you these items. They look pretty cool.
-                   $@c{serious_smile_fists}Good luck out there!`
+                   $@c{serious_smile_fists}Good luck out there!
+                   $@c{smile}Oh- and I hope you enjoy the event!`
     },
   },
   "rival_female": {
@@ -2588,7 +2589,8 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: `@c{shock}You just started and you're already this strong?!@d{96}\n@c{angry}You totally cheated, didn't you?
                     $@c{smile_wave_wink}Just kidding!@d{64} @c{smile_eclosed}I lost fair and square… I have a feeling you're going to do really well out there.
                     $@c{smile}By the way, the professor wanted me to give you some items. Hopefully they're helpful!
-                    $@c{smile_wave}Do your best like always! I believe in you!`
+                    $@c{smile_wave}Do your best like always! I believe in you!
+                    $@c{smile}Oh- and I hope you enjoy the event!`
     },
   },
   "rival_2": {
@@ -2602,9 +2604,9 @@ export const PGMdialogue: DialogueTranslationEntries = {
     "victory": {
       1: `@c{neutral_eclosed}Oh. I guess I was overconfident.
                 $@c{smile}That's alright, though. I figured this might happen.\n@c{serious_mopen_fists}It just means I need to try harder for next time!\n
-                $@c{smile}Oh, not that you really need the help, but I had an extra one of these lying around and figured you might want it.\n
+                $@c{smile}Oh, not that you really need the help, but I had an extra one of each of these lying around and figured you might want them.\n
                 $@c{serious_smile_fists}Don't expect another one after this, though!\nI can't keep giving my opponent an advantage after all.
-                $@c{smile}Anyway, take care!`
+                $@c{smile}Anyway, take care, and enjoy the event!`
     },
   },
   "rival_2_female": {
@@ -2618,9 +2620,9 @@ export const PGMdialogue: DialogueTranslationEntries = {
     "victory": {
       1: `@c{neutral}I… wasn't supposed to lose that time…
                 $@c{smile}Aw well. That just means I'll have to train even harder for next time!
-                $@c{smile_wave}I also got you another one of these!\n@c{smile_wave_wink}No need to thank me~.
+                $@c{smile_wave}I also got you another two of these!\n@c{smile_wave_wink}No need to thank me~.
                 $@c{angry_mopen}This is the last one, though! You won't be getting anymore freebies from me after this!
-                $@c{smile_wave}Keep at it!`
+                $@c{smile_wave}Keep at it, and enjoy the event!`
     },
     "defeat": {
       1: "It's OK to lose sometimes…"

src/locales/es/dialogue.ts

@@ -2569,7 +2569,8 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: `@c{shock}Wow… You cleaned me out.\nAre you actually a beginner?
                    $@c{smile}Maybe it was a bit of luck but…\nWho knows you might just be able to go all the way.
                    $By the way, the professor asked me to give you these items. They look pretty cool.
-                   $@c{serious_smile_fists}Good luck out there!`
+                   $@c{serious_smile_fists}Good luck out there!
+                   $@c{smile}Oh- and I hope you enjoy the event!`
     },
   },
   "rival_female": {
@@ -2583,7 +2584,8 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: `@c{shock}You just started and you're already this strong?!@d{96}\n@c{angry}You totally cheated, didn't you?
                     $@c{smile_wave_wink}Just kidding!@d{64} @c{smile_eclosed}I lost fair and square… I have a feeling you're going to do really well out there.
                     $@c{smile}By the way, the professor wanted me to give you some items. Hopefully they're helpful!
-                    $@c{smile_wave}Do your best like always! I believe in you!`
+                    $@c{smile_wave}Do your best like always! I believe in you!
+                    $@c{smile}Oh- and I hope you enjoy the event!`
     },
   },
   "rival_2": {
@@ -2599,7 +2601,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
                 $@c{smile}That's alright, though. I figured this might happen.\n@c{serious_mopen_fists}It just means I need to try harder for next time!\n
                 $@c{smile}Oh, not that you really need the help, but I had an extra one of these lying around and figured you might want it.\n
                 $@c{serious_smile_fists}Don't expect another one after this, though!\nI can't keep giving my opponent an advantage after all.
-                $@c{smile}Anyway, take care!`
+                $@c{smile}Anyway, take care, and enjoy the event!`
     },
   },
   "rival_2_female": {
@@ -2615,7 +2617,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
                 $@c{smile}Aw well. That just means I'll have to train even harder for next time!
                 $@c{smile_wave}I also got you another one of these!\n@c{smile_wave_wink}No need to thank me~.
                 $@c{angry_mopen}This is the last one, though! You won't be getting anymore freebies from me after this!
-                $@c{smile_wave}Keep at it!`
+                $@c{smile_wave}Keep at it, and enjoy the event!`
     },
     "defeat": {
       1: "It's OK to lose sometimes…"

src/locales/fr/dialogue.ts

@@ -2372,7 +2372,8 @@ export const PGMdialogue: DialogueTranslationEntries = {
 	  1: `@c{shock}Wah… Tu m’as vraiment lavé.\nT’es vraiment un débutant ?
 				   $@c{smile}T’as peut-être eu de la chance, mais…\nPeut-être que t’arriveras jusqu’au bout du chemin.
 				   $D’ailleurs, le prof m’a demandé de te filer ces objets.\nIls ont l’air sympas.
-                   $@c{serious_smile_fists}Bonne chance à toi !`
+                   $@c{serious_smile_fists}Bonne chance à toi !
+                   $@c{smile}Oh, et profite bien de l’évènement !`
     },
   },
   "rival_female": {
@@ -2386,7 +2387,8 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: `@c{shock}Tu viens de commencer et t’es déjà si fort ?!@d{96}\n@c{angry}T’as triché non ? Avoue !
                     $@c{smile_wave_wink}J’déconne !@d{64} @c{smile_eclosed}J’ai perdu dans les règles…\nJ’ai le sentiment que tu vas très bien t’en sortir.
 					$@c{smile}D’ailleurs, le prof veut que je te donne ces quelques objets. Ils te seront utiles, pour sûr !
-					$@c{smile_wave}Fais de ton mieux, comme toujours !\nJe crois fort en toi !`
+					$@c{smile_wave}Fais de ton mieux, comme toujours !\nJe crois fort en toi !
+    					$@c{smile}Oh, et profite bien de l’évènement !`
     },
   },
   "rival_2": {
@@ -2402,7 +2404,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
 				$@c{smile}Pas grave, c’est OK. Je me doutais que ça arriverait.\n@c{serious_mopen_fists}Je vais juste devoir encore plus m’entrainer !\n
                 $@c{smile}Ah, et pas que t’aies réellement besoin d’aide, mais j’ai ça en trop sur moi qui pourrait t’intéresser.\n
 				$@c{serious_smile_fists}Mais n’espère plus en avoir d’autres !\nJe peux pas passer mon temps à aider mon adversaire.
-                $@c{smile}Bref, prends soin de toi !`
+                $@c{smile}Bref, prends soin de toi et profite bien de l’évènement !`
     },
   },
   "rival_2_female": {
@@ -2417,8 +2419,8 @@ export const PGMdialogue: DialogueTranslationEntries = {
 	  1: `@c{neutral}Je… J’étais pas encore supposée perdre…
 				$@c{smile}Bon. Ça veut juste dire que je vais devoir encore plus m’entrainer !
 				$@c{smile_wave}J’ai aussi ça en rab pour toi !\n@c{smile_wave_wink}Inutile de me remercier ~.
-                $@c{angry_mopen}C’était le dernier, terminé les cadeaux après celui-là !
-                $@c{smile_wave}Allez, tiens le coup !`
+                $@c{angry_mopen}C’étaient les derniers, terminé les cadeaux après ceux-là !
+                $@c{smile_wave}Allez, tiens le coup et profite bien de l’évènement !`
     },
     "defeat": {
       1: "Je suppose que c’est parfois normal de perdre…"
@@ -5051,7 +5053,8 @@ export const PGFdialogue: DialogueTranslationEntries = {
 	  1: `@c{shock}Wah… Tu m’as vraiment lavé.\nT’es vraiment une débutante ?
 				   $@c{smile}T’as peut-être eu de la chance, mais…\nPeut-être que t’arriveras jusqu’au bout du chemin.
 				   $D’ailleurs, le prof m’a demandé de te filer ces objets.\nIls ont l’air sympas.
-                   $@c{serious_smile_fists}Bonne chance à toi !`
+                   $@c{serious_smile_fists}Bonne chance à toi !
+		   $@c{smile}Oh, et profite bien de l’évènement !`
     },
   },
   "rival_female": {
@@ -5065,7 +5068,8 @@ export const PGFdialogue: DialogueTranslationEntries = {
       1: `@c{shock}Tu viens de commencer et t’es déjà si forte ?!@d{96}\n@c{angry}T’as triché non ? Avoue !
                     $@c{smile_wave_wink}J’déconne !@d{64} @c{smile_eclosed}J’ai perdu dans les règles…\nJ’ai le sentiment que tu vas très bien t’en sortir.
 					$@c{smile}D’ailleurs, le prof veut que je te donne ces quelques objets. Ils te seront utiles, pour sûr !
-					$@c{smile_wave}Fais de ton mieux, comme toujours !\nJe crois fort en toi !`
+					$@c{smile_wave}Fais de ton mieux, comme toujours !\nJe crois fort en toi !
+					$@c{smile}Oh, et profite bien de l’évènement !`
     },
   },
   "rival_2": {
@@ -5081,7 +5085,7 @@ export const PGFdialogue: DialogueTranslationEntries = {
 				$@c{smile}Pas grave, c’est OK. Je me doutais que ça arriverait.\n@c{serious_mopen_fists}Je vais juste devoir encore plus m’entrainer !\n
                 $@c{smile}Ah, et pas que t’aies réellement besoin d’aide, mais j’ai ça en trop sur moi qui pourrait t’intéresser.\n
 				$@c{serious_smile_fists}Mais n’espère plus en avoir d’autres !\nJe peux pas passer mon temps à aider mon adversaire.
-                $@c{smile}Bref, prends soin de toi !`
+                $@c{smile}Bref, prends soin de toi et profite bien de l’évènement !`
     },
   },
   "rival_2_female": {
@@ -5097,7 +5101,7 @@ export const PGFdialogue: DialogueTranslationEntries = {
 				$@c{smile}Bon. Ça veut juste dire que je vais devoir encore plus m’entrainer !
 				$@c{smile_wave}J’ai aussi ça en rab pour toi !\n@c{smile_wave_wink}Inutile de me remercier ~.
                 $@c{angry_mopen}C’était le dernier, terminé les cadeaux après celui-là !
-                $@c{smile_wave}Allez, tiens le coup !`
+                $@c{smile_wave}Allez, tiens le coup et profite bien de l’évènement !`
     },
     "defeat": {
       1: "Je suppose que c’est parfois normal de perdre…"

src/locales/it/ability-trigger.ts

@@ -25,39 +25,39 @@ export const abilityTriggers: SimpleTranslationEntries = {
   "postAttackStealHeldItem": "{{pokemonNameWithAffix}} ruba\n{{stolenItemType}} di {{defenderName}}!",
   "postDefendStealHeldItem": "{{pokemonNameWithAffix}} ruba\n{{stolenItemType}} di {{attackerName}}!",
   "copyFaintedAllyAbility": "L'abilità {{abilityName}} di {{pokemonNameWithAffix}} è passata all'alleato!",
-  "intimidateImmunity": "{{pokemonNameWithAffix}}'s {{abilityName}} prevented it from being Intimidated!",
-  "postSummonAllyHeal": "{{pokemonNameWithAffix}} drank down all the\nmatcha that {{pokemonName}} made!",
-  "postSummonClearAllyStats": "{{pokemonNameWithAffix}}'s stat changes\nwere removed!",
-  "postSummonTransform": "{{pokemonNameWithAffix}} transformed\ninto {{targetName}}!",
-  "protectStat": "{{pokemonNameWithAffix}}'s {{abilityName}}\nprevents lowering its {{statName}}!",
-  "statusEffectImmunityWithName": "{{pokemonNameWithAffix}}'s {{abilityName}}\nprevents {{statusEffectName}}!",
-  "statusEffectImmunity": "{{pokemonNameWithAffix}}'s {{abilityName}}\nprevents status problems!",
-  "battlerTagImmunity": "{{pokemonNameWithAffix}}'s {{abilityName}}\nprevents {{battlerTagName}}!",
-  "forewarn": "{{pokemonNameWithAffix}} was forewarned about {{moveName}}!",
-  "frisk": "{{pokemonNameWithAffix}} frisked {{opponentName}}'s {{opponentAbilityName}}!",
-  "postWeatherLapseHeal": "{{pokemonNameWithAffix}}'s {{abilityName}}\nrestored its HP a little!",
-  "postWeatherLapseDamage": "{{pokemonNameWithAffix}} is hurt\nby its {{abilityName}}!",
-  "postTurnLootCreateEatenBerry": "{{pokemonNameWithAffix}} harvested one {{berryName}}!",
-  "postTurnHeal": "{{pokemonNameWithAffix}}'s {{abilityName}}\nrestored its HP a little!",
-  "fetchBall": "{{pokemonNameWithAffix}} found a\n{{pokeballName}}!",
-  "healFromBerryUse": "{{pokemonNameWithAffix}}'s {{abilityName}}\nrestored its HP!",
-  "arenaTrap": "{{pokemonNameWithAffix}}'s {{abilityName}}\nprevents switching!",
-  "postBattleLoot": "{{pokemonNameWithAffix}} picked up\n{{itemName}}!",
-  "postFaintContactDamage": "{{pokemonNameWithAffix}}'s {{abilityName}}\nhurt its attacker!",
-  "postFaintHpDamage": "{{pokemonNameWithAffix}}'s {{abilityName}}\nhurt its attacker!",
-  "postSummonPressure": "{{pokemonNameWithAffix}} is exerting its Pressure!",
-  "postSummonMoldBreaker": "{{pokemonNameWithAffix}} breaks the mold!",
-  "postSummonAnticipation": "{{pokemonNameWithAffix}} shuddered!",
-  "postSummonTurboblaze": "{{pokemonNameWithAffix}} is radiating a blazing aura!",
-  "postSummonTeravolt": "{{pokemonNameWithAffix}} is radiating a bursting aura!",
-  "postSummonDarkAura": "{{pokemonNameWithAffix}} is radiating a Dark Aura!",
-  "postSummonFairyAura": "{{pokemonNameWithAffix}} is radiating a Fairy Aura!",
-  "postSummonNeutralizingGas": "{{pokemonNameWithAffix}}'s Neutralizing Gas filled the area!",
-  "postSummonAsOneGlastrier": "{{pokemonNameWithAffix}} has two Abilities!",
-  "postSummonAsOneSpectrier": "{{pokemonNameWithAffix}} has two Abilities!",
-  "postSummonVesselOfRuin": "{{pokemonNameWithAffix}}'s Vessel of Ruin lowered the {{statName}}\nof all surrounding Pokémon!",
-  "postSummonSwordOfRuin": "{{pokemonNameWithAffix}}'s Sword of Ruin lowered the {{statName}}\nof all surrounding Pokémon!",
-  "postSummonTabletsOfRuin": "{{pokemonNameWithAffix}}'s Tablets of Ruin lowered the {{statName}}\nof all surrounding Pokémon!",
-  "postSummonBeadsOfRuin": "{{pokemonNameWithAffix}}'s Beads of Ruin lowered the {{statName}}\nof all surrounding Pokémon!",
+  "intimidateImmunity": "{{abilityName}} impedisce a {{pokemonNameWithAffix}} di\nessere intimidito!",
+  "postSummonAllyHeal": "{{pokemonNameWithAffix}} beve il\ntè che {{pokemonName}} gli ha preparato!",
+  "postSummonClearAllyStats": "Le statistiche di {{pokemonNameWithAffix}}\ntornano alla normalità!",
+  "postSummonTransform": "{{pokemonNameWithAffix}} assume le sembianze\ndi {{targetName}}!",
+  "protectStat": "{{abilityName}} di {{pokemonNameWithAffix}}\npreviene la riduzione del/della suo/a {{statName}}!",
+  "statusEffectImmunityWithName": "{{abilityName}} di {{pokemonNameWithAffix}}\nnon gli fa subire il/lo/la {{statusEffectName}}!",
+  "statusEffectImmunity": "{{abilityName}} di {{pokemonNameWithAffix}}\npreviene i problemi di stato!",
+  "battlerTagImmunity": "{{abilityName}} di {{pokemonNameWithAffix}}\npreviene {{battlerTagName}}!",
+  "forewarn": "{{pokemonNameWithAffix}} è stato messo in guardia da {{moveName}}!",
+  "frisk": "{{pokemonNameWithAffix}} perquisice {{opponentName}}\ne trova la sua abilità, {{opponentAbilityName}}!",
+  "postWeatherLapseHeal": "{{pokemonNameWithAffix}} recupera alcuni PS\ncon {{abilityName}}!",
+  "postWeatherLapseDamage": "{{pokemonNameWithAffix}} subisce danni\na causa della sua abilità, {{abilityName}}!",
+  "postTurnLootCreateEatenBerry": "{{pokemonNameWithAffix}} raccoglie una {{berryName}}!",
+  "postTurnHeal": "{{pokemonNameWithAffix}} recupera alcuni PS\ncon {{abilityName}}!",
+  "fetchBall": "{{pokemonNameWithAffix}} ha trovato una\n{{pokeballName}}!",
+  "healFromBerryUse": "{{abilityName}} di {{pokemonNameWithAffix}}\nristabilisce parte dei PS!",
+  "arenaTrap": "L’abilità {{abilityName}} di {{pokemonNameWithAffix}}\nimpedisce la sostituzione!",
+  "postBattleLoot": "{{pokemonNameWithAffix}} ha raccolto\nil/l'/lo/la {{itemName}}!",
+  "postFaintContactDamage": "{{abilityName}} di {{pokemonNameWithAffix}}\nferisce il Pokémon che lo ha attaccato!",
+  "postFaintHpDamage": "{{abilityName}} di {{pokemonNameWithAffix}}\nferisce il Pokémon che lo ha attaccato!",
+  "postSummonPressure": "{{pokemonNameWithAffix}} fa pressione!",
+  "postSummonMoldBreaker": "{{pokemonNameWithAffix}} ha l’abilità Rompiforma!",
+  "postSummonAnticipation": "{{pokemonNameWithAffix}} rabbrividisce!",
+  "postSummonTurboblaze": "{{pokemonNameWithAffix}} emana un’aura infuocata!",
+  "postSummonTeravolt": "{{pokemonNameWithAffix}} emana un’aura repulsiva!",
+  "postSummonDarkAura": "L’abilità Auratetra di {{pokemonNameWithAffix}} è attiva.",
+  "postSummonFairyAura": "L’abilità Aurafolletto di {{pokemonNameWithAffix}} è attiva.",
+  "postSummonNeutralizingGas": "Il Gas Reagente di {{pokemonNameWithAffix}}\nsi diffonde tutt’intorno!",
+  "postSummonAsOneGlastrier": "{{pokemonNameWithAffix}} ha due abilità!",
+  "postSummonAsOneSpectrier": "{{pokemonNameWithAffix}} ha due abilità!",
+  "postSummonVesselOfRuin": "La/l'{{statName}} dei Pokémon intorno si indebolisce a causa\ndell'abilità Vaso Nefasto di {{pokemonNameWithAffix}}!",
+  "postSummonSwordOfRuin": "La/l'{{statName}} dei Pokémon intorno si indebolisce a causa\ndell'abilità Spada Nefasta di {{pokemonNameWithAffix}}!",
+  "postSummonTabletsOfRuin": "La/l'{{statName}} dei Pokémon intorno si indebolisce a causa\ndell'abilità Amuleto Nefasto di {{pokemonNameWithAffix}}!",
+  "postSummonBeadsOfRuin": "La/l'{{statName}} dei Pokémon intorno si indebolisce a causa\ndell'abilità Monile Nefasto di {{pokemonNameWithAffix}}!",
   "preventBerryUse": "{{pokemonNameWithAffix}} non riesce a\nmangiare le bacche per l'agitazione!",
 } as const;

src/locales/it/achv.ts

@@ -170,8 +170,8 @@ export const PGMachv: AchievementTranslationEntries = {
     description: "Vinci in modalità classica",
   },
   "UNEVOLVED_CLASSIC_VICTORY": {
-    name: "Bring Your Child To Work Day",
-    description: "Beat the game in Classic Mode with at least one unevolved party member."
+    name: "Alternanza scuola-lavoro",
+    description: "Completa la modalità classica con almeno un membro della squadra non evoluto completamente."
   },
 
   "MONO_GEN_ONE": {
@@ -269,8 +269,8 @@ export const PGMachv: AchievementTranslationEntries = {
     name: "Follettini e follettine",
   },
   "FRESH_START": {
-    name: "First Try!",
-    description: "Complete the Fresh Start challenge."
+    name: "Buona la prima!",
+    description: "Completa la modalità sfida 'Un nuovo inizio'."
   }
 } as const;
 

src/locales/it/battle.ts

@@ -74,22 +74,22 @@ export const battle: SimpleTranslationEntries = {
   "fainted": "{{pokemonNameWithAffix}} non è più in\ngrado di combattere!",
   "statsAnd": "e",
   "stats": "statistiche",
-  "statRose_one": "{{pokemonNameWithAffix}}'s {{stats}} è aumentato/a!",
-  "statRose_other": "{{pokemonNameWithAffix}}'s {{stats}} rose!",
-  "statSharplyRose_one": "{{pokemonNameWithAffix}}'s {{stats}} è aumentato/a molto!",
-  "statSharplyRose_other": "{{pokemonNameWithAffix}}'s {{stats}} sharply rose!",
-  "statRoseDrastically_one": "{{pokemonNameWithAffix}}'s {{stats}} è aumentato/a drasticamente!",
-  "statRoseDrastically_other": "{{pokemonNameWithAffix}}'s {{stats}} rose drastically!",
-  "statWontGoAnyHigher_one": "{{pokemonNameWithAffix}}'s {{stats}} non può aumentare più di così!",
-  "statWontGoAnyHigher_other": "{{pokemonNameWithAffix}}'s {{stats}} won't go any higher!",
-  "statFell_one": "{{pokemonNameWithAffix}}'s {{stats}} è diminuito/a!",
-  "statFell_other": "{{pokemonNameWithAffix}}'s {{stats}} fell!",
-  "statHarshlyFell_one": "{{pokemonNameWithAffix}}'s {{stats}} è diminuito/a molto!",
-  "statHarshlyFell_other": "{{pokemonNameWithAffix}}'s {{stats}} harshly fell!",
-  "statSeverelyFell_one": "{{pokemonNameWithAffix}}'s {{stats}} è diminuito/a drasticamente!",
-  "statSeverelyFell_other": "{{pokemonNameWithAffix}}'s {{stats}} severely fell!",
-  "statWontGoAnyLower_one": "{{pokemonNameWithAffix}}'s {{stats}} non può diminuire più di così!",
-  "statWontGoAnyLower_other": "{{pokemonNameWithAffix}}'s {{stats}} won't go any lower!",
+  "statRose_one": "La statistica {{stats}} di {{pokemonNameWithAffix}} è aumentata!",
+  "statRose_other": "Le statistiche {{stats}} di {{pokemonNameWithAffix}} sono aumentate!",
+  "statSharplyRose_one": "La statistica {{stats}} di {{pokemonNameWithAffix}} è aumentata molto!",
+  "statSharplyRose_other": "Le statistiche {{stats}} di {{pokemonNameWithAffix}} sono aumentate molto!",
+  "statRoseDrastically_one": "La statistica {{stats}} di {{pokemonNameWithAffix}} è aumentata drasticamente!",
+  "statRoseDrastically_other": "Le statistiche {{stats}} di {{pokemonNameWithAffix}} sono aumentate drasticamente!",
+  "statWontGoAnyHigher_one": "La statistica {{stats}} di {{pokemonNameWithAffix}} non può aumentare di più!",
+  "statWontGoAnyHigher_other": "Le statistiche {{stats}} di {{pokemonNameWithAffix}} non possono aumentare di più!",
+  "statFell_one": "La statistica {{stats}} di {{pokemonNameWithAffix}} è diminuita!",
+  "statFell_other": "Le statistiche {{stats}} di {{pokemonNameWithAffix}} sono diminuite!",
+  "statHarshlyFell_one": "La statistica {{stats}} di {{pokemonNameWithAffix}} è diminuita molto!",
+  "statHarshlyFell_other": "Le statistiche {{stats}} di {{pokemonNameWithAffix}} sono diminuite molto!",
+  "statSeverelyFell_one": "La statistica {{stats}} di {{pokemonNameWithAffix}} è diminuita drasticamente!",
+  "statSeverelyFell_other": "Le statistiche {{stats}} di {{pokemonNameWithAffix}} sono diminuite drasticamente!",
+  "statWontGoAnyLower_one": "La statistica {{stats}} di {{pokemonNameWithAffix}} non può diminuire di più!",
+  "statWontGoAnyLower_other": "Le statistiche {{stats}} di {{pokemonNameWithAffix}} non possono diminuire di più!",
   "transformedIntoType": "{{pokemonName}} diventa\ndi tipo {{type}} type!",
   "retryBattle": "Vuoi riprovare dall'inizio della lotta?",
   "unlockedSomething": "{{unlockedThing}}\nè stato/a sbloccato/a.",

src/locales/it/battler-tags.ts

@@ -1,14 +1,14 @@
 import { SimpleTranslationEntries } from "#app/interfaces/locales";
 
 export const battlerTags: SimpleTranslationEntries = {
-  "trappedDesc": "trapping",
-  "flinchedDesc": "flinching",
-  "confusedDesc": "confusion",
-  "infatuatedDesc": "infatuation",
-  "seedDesc": "seeding",
-  "nightmareDesc": "nightmares",
-  "ingrainDesc": "roots",
-  "drowsyDesc": "drowsiness",
+  "trappedDesc": "intrappolando",
+  "flinchedDesc": "tentennando",
+  "confusedDesc": "confuso",
+  "infatuatedDesc": "infatuato",
+  "seedDesc": "pieno di semi",
+  "nightmareDesc": "incubi",
+  "ingrainDesc": "radici",
+  "drowsyDesc": "assonnato",
   "rechargingLapse": "{{pokemonNameWithAffix}} deve\nricaricarsi!",
   "trappedOnAdd": "{{pokemonNameWithAffix}} non può\npiù fuggire!",
   "trappedOnRemove": "{{pokemonNameWithAffix}} è stato liberato\nda {{moveName}}",

src/locales/it/challenges.ts

@@ -2,7 +2,7 @@ import { TranslationEntries } from "#app/interfaces/locales";
 
 export const challenges: TranslationEntries = {
   "title": "Modificatori delle sfide",
-  "illegalEvolution": "{{pokemon}} changed into an ineligble pokémon\nfor this challenge!",
+  "illegalEvolution": "{{pokemon}} non è più utilizzabile\nsecondo le regole della sfida!",
   "singleGeneration": {
     "name": "Mono gen",
     "desc": "Puoi usare solo Pokémon di {{gen}} generazione.",
@@ -23,8 +23,8 @@ export const challenges: TranslationEntries = {
     "desc_default": "Puoi usare solo Pokémon del tipo selezionato."
   },
   "freshStart": {
-    "name": "Fresh Start",
-    "desc": "You can only use the original starters, and only as if you had just started PokéRogue.",
+    "name": "Un nuovo inizio",
+    "desc": "Puoi usare solo gli starter originali, e come se avessi appena cominciato Pokérogue.",
     "value.0": "Off",
     "value.1": "On",
   }

src/locales/it/dialogue.ts

@@ -2569,7 +2569,8 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: `@c{shock}Wow… You cleaned me out.\nAre you actually a beginner?
                    $@c{smile}Maybe it was a bit of luck but…\nWho knows you might just be able to go all the way.
                    $By the way, the professor asked me to give you these items. They look pretty cool.
-                   $@c{serious_smile_fists}Good luck out there!`
+                   $@c{serious_smile_fists}Good luck out there!
+                   $@c{smile}Oh- and I hope you enjoy the event!`
     },
   },
   "rival_female": {
@@ -2583,7 +2584,8 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: `@c{shock}You just started and you're already this strong?!@d{96}\n@c{angry}You totally cheated, didn't you?
                     $@c{smile_wave_wink}Just kidding!@d{64} @c{smile_eclosed}I lost fair and square… I have a feeling you're going to do really well out there.
                     $@c{smile}By the way, the professor wanted me to give you some items. Hopefully they're helpful!
-                    $@c{smile_wave}Do your best like always! I believe in you!`
+                    $@c{smile_wave}Do your best like always! I believe in you!
+                    $@c{smile}Oh- and I hope you enjoy the event!`
     },
   },
   "rival_2": {
@@ -2599,7 +2601,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
                 $@c{smile}That's alright, though. I figured this might happen.\n@c{serious_mopen_fists}It just means I need to try harder for next time!\n
                 $@c{smile}Oh, not that you really need the help, but I had an extra one of these lying around and figured you might want it.\n
                 $@c{serious_smile_fists}Don't expect another one after this, though!\nI can't keep giving my opponent an advantage after all.
-                $@c{smile}Anyway, take care!`
+                $@c{smile}Anyway, take care, and enjoy the event!`
     },
   },
   "rival_2_female": {
@@ -2615,7 +2617,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
                 $@c{smile}Aw well. That just means I'll have to train even harder for next time!
                 $@c{smile_wave}I also got you another one of these!\n@c{smile_wave_wink}No need to thank me~.
                 $@c{angry_mopen}This is the last one, though! You won't be getting anymore freebies from me after this!
-                $@c{smile_wave}Keep at it!`
+                $@c{smile_wave}Keep at it, and enjoy the event!`
     },
     "defeat": {
       1: "It's OK to lose sometimes…"

src/locales/it/menu.ts

@@ -17,7 +17,7 @@ export const menu: SimpleTranslationEntries = {
   "username": "Nome utente",
   "password": "Password",
   "login": "Accedi",
-  "orUse": "Or use",
+  "orUse": "O usa",
   "register": "Registrati",
   "emptyUsername": "Nome utente mancante!",
   "invalidLoginUsername": "Nome utente non valido!",
@@ -39,9 +39,9 @@ export const menu: SimpleTranslationEntries = {
   "weeklyRankings": "Classifica settimanale",
   "noRankings": "Nessuna classifica",
   "positionIcon": "#",
-  "usernameScoreboard": "Username",
-  "score": "Score",
-  "wave": "Wave",
+  "usernameScoreboard": "Nome utente",
+  "score": "Punteggio",
+  "wave": "Onda",
   "loading": "Caricamento…",
   "loadingAsset": "Caricamento asset: {{assetName}}",
   "playersOnline": "Giocatori online",

src/locales/it/modifier-type.ts

@@ -101,7 +101,7 @@ export const modifierType: ModifierTypeTranslationEntries = {
     },
     "TmModifierTypeWithInfo": {
       name: "MT{{moveId}} - {{moveName}}",
-      description: "Insegna {{moveName}} a un Pokémon\n(Hold C or Shift for more info).",
+      description: "Insegna {{moveName}} a un Pokémon\n(Tieni premuto C o Shift per maggiori informazioni).",
     },
     "EvolutionItemModifierType": {
       description: "Fa evolvere determinate specie di Pokémon.",
@@ -153,7 +153,7 @@ export const modifierType: ModifierTypeTranslationEntries = {
 
     "REVIVER_SEED": { name: "Revitalseme", description: "Il possessore recupera 1/2 di PS in caso di KO causato da un colpo diretto." },
 
-    "WHITE_HERB": { name: "Erbachiara", description: "An item to be held by a Pokémon. It will restore any lowered stat in battle." },
+    "WHITE_HERB": { name: "Erbachiara", description: "Strumento da dare a un Pokémon. Ripristina le statistiche ridotte in lotta." },
 
     "ETHER": { name: "Etere" },
     "MAX_ETHER": { name: "Etere max" },

src/locales/it/modifier.ts

@@ -1,14 +1,14 @@
 import { SimpleTranslationEntries } from "#app/interfaces/locales";
 
 export const modifier: SimpleTranslationEntries = {
-  "surviveDamageApply": "{{pokemonNameWithAffix}} hung on\nusing its {{typeName}}!",
-  "turnHealApply": "{{pokemonNameWithAffix}} restored a little HP using\nits {{typeName}}!",
-  "hitHealApply": "{{pokemonNameWithAffix}} restored a little HP using\nits {{typeName}}!",
-  "pokemonInstantReviveApply": "{{pokemonNameWithAffix}} was revived\nby its {{typeName}}!",
-  "pokemonResetNegativeStatStageApply": "{{pokemonNameWithAffix}}'s lowered stats were restored\nby its {{typeName}}!",
-  "moneyInterestApply": "You received interest of ₽{{moneyAmount}}\nfrom the {{typeName}}!",
-  "turnHeldItemTransferApply": "{{pokemonNameWithAffix}}'s {{itemName}} was absorbed\nby {{pokemonName}}'s {{typeName}}!",
-  "contactHeldItemTransferApply": "{{pokemonNameWithAffix}}'s {{itemName}} was snatched\nby {{pokemonName}}'s {{typeName}}!",
-  "enemyTurnHealApply": "{{pokemonNameWithAffix}}\nrestored some HP!",
+  "surviveDamageApply": "{{pokemonNameWithAffix}} resiste\ngrazie al/alla suo/a {{typeName}}!",
+  "turnHealApply": "{{pokemonNameWithAffix}} recupera alcuni PS con\nil/la suo/a {{typeName}}!",
+  "hitHealApply": "{{pokemonNameWithAffix}} recupera alcuni PS con\nil/la suo/a {{typeName}}!",
+  "pokemonInstantReviveApply": "{{pokemonNameWithAffix}} torna in forze\ngrazie al/alla suo/a {{typeName}}!",
+  "pokemonResetNegativeStatStageApply": "La riduzione alle statistiche di {{pokemonNameWithAffix}}\nviene annullata grazie al/alla suo/a {{typeName}}!",
+  "moneyInterestApply": "Ricevi un interesse pari a {{moneyAmount}}₽\ngrazie al/allo/a {{typeName}}!",
+  "turnHeldItemTransferApply": "Il/l'/lo/la {{itemName}} di {{pokemonNameWithAffix}} è stato assorbito\ndal {{typeName}} di {{pokemonName}}!",
+  "contactHeldItemTransferApply": "Il/l'/lo/la {{itemName}} di {{pokemonNameWithAffix}} è stato rubato\nda {{pokemonName}} con {{typeName}}!",
+  "enemyTurnHealApply": "{{pokemonNameWithAffix}}\nristabilisce parte dei PS!",
   "bypassSpeedChanceApply": "{{pokemonName}} agisce più rapidamente del normale grazie al suo {{itemName}}!",
 } as const;

src/locales/it/move-trigger.ts

@@ -57,10 +57,10 @@ export const moveTriggers: SimpleTranslationEntries = {
   "sacrificialFullRestore": "{{pokemonName}} riceve i benefici\neffetti di Curardore!",
   "invertStats": "Le modifiche alle statistiche di {{pokemonName}}\nvengono invertite!",
   "resetStats": "Tutte le modifiche alle statistiche sono state annullate!",
-  "statEliminated": "All stat changes were eliminated!",
+  "statEliminated": "Tutte le modifiche alle statistiche sono state annullate!",
   "faintCountdown": "{{pokemonName}}\nandrà KO dopo {{turnCount}} turni.",
   "copyType": "{{pokemonName}} assume il tipo\ndi {{targetPokemonName}}!",
   "suppressAbilities": "L’abilità di {{pokemonName}}\nperde ogni efficacia!",
   "swapArenaTags": "{{pokemonName}} ha invertito gli effetti attivi\nnelle due metà del campo!",
-  "exposedMove": "{{pokemonName}} identified\n{{targetPokemonName}}!",
+  "exposedMove": "{{pokemonName}} ha identificato\n{{targetPokemonName}}!",
 } as const;

src/locales/it/move.ts

@@ -2915,7 +2915,7 @@ export const move: MoveTranslationEntries = {
   },
   zippyZap: {
     name: "Sprintaboom",
-    effect: "The user attacks the target with bursts of electricity at high speed. This move always goes first and raises the user's evasiveness.",
+    effect: "Un attacco elettrico ad altissima velocità. Questa mossa ha priorità alta e aumenta l'elusione dell'utilizzatore.",
   },
   splishySplash: {
     name: "Surfasplash",

src/locales/ja/dialogue.ts

@@ -2573,7 +2573,8 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: `@c{shock}Wow… You cleaned me out.\nAre you actually a beginner?
                    $@c{smile}Maybe it was a bit of luck but…\nWho knows you might just be able to go all the way.
                    $By the way, the professor asked me to give you these items. They look pretty cool.
-                   $@c{serious_smile_fists}Good luck out there!`
+                   $@c{serious_smile_fists}Good luck out there!
+                   $@c{smile}Oh- and I hope you enjoy the event!`
     },
   },
   "rival_female": {
@@ -2587,7 +2588,8 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: `@c{shock}You just started and you're already this strong?!@d{96}\n@c{angry}You totally cheated, didn't you?
                     $@c{smile_wave_wink}Just kidding!@d{64} @c{smile_eclosed}I lost fair and square… I have a feeling you're going to do really well out there.
                     $@c{smile}By the way, the professor wanted me to give you some items. Hopefully they're helpful!
-                    $@c{smile_wave}Do your best like always! I believe in you!`
+                    $@c{smile_wave}Do your best like always! I believe in you!
+                    $@c{smile}Oh- and I hope you enjoy the event!`
     },
   },
   "rival_2": {
@@ -2603,7 +2605,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
                 $@c{smile}That's alright, though. I figured this might happen.\n@c{serious_mopen_fists}It just means I need to try harder for next time!\n
                 $@c{smile}Oh, not that you really need the help, but I had an extra one of these lying around and figured you might want it.\n
                 $@c{serious_smile_fists}Don't expect another one after this, though!\nI can't keep giving my opponent an advantage after all.
-                $@c{smile}Anyway, take care!`
+                $@c{smile}Anyway, take care, and enjoy the event!`
     },
   },
   "rival_2_female": {
@@ -2619,7 +2621,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
                 $@c{smile}Aw well. That just means I'll have to train even harder for next time!
                 $@c{smile_wave}I also got you another one of these!\n@c{smile_wave_wink}No need to thank me~.
                 $@c{angry_mopen}This is the last one, though! You won't be getting anymore freebies from me after this!
-                $@c{smile_wave}Keep at it!`
+                $@c{smile_wave}Keep at it, and enjoy the event!`
     },
     "defeat": {
       1: "It's OK to lose sometimes…"

src/locales/ko/dialogue.ts

@@ -2569,7 +2569,8 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: `@c{shock}와… 정말 깔끔하게 당했네.\n초보자 맞아?
                    $@c{smile}운이 따른 건지도 모르겠지만…\n그래도 정말 꿈을 이룰 지도.
                    $그나저나, 박사님께서 이걸 전해달라고 하시더라.\n좋아 보이던데.
-                   $@c{serious_smile_fists}아무튼, 힘 내는거야!`
+                   $@c{serious_smile_fists}아무튼, 힘 내는거야!
+                   $@c{smile}아- 그리고 이벤트 즐겁게 보내!`
     },
   },
   "rival_female": {
@@ -2583,7 +2584,8 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: `@c{shock}왜 벌써 이렇게 센 건데?!@d{96}\n@c{angry}아니면 뭔가 속임수, 그런 거?
                     $@c{smile_wave_wink}농담, 농담!@d{64} @c{smile_eclosed}내가 진 거 맞아…\n너 정말 앞으로도 잘 하겠는데.
                     $@c{smile}아 그래, 박사님께서 전해달라던 물건.\n도움이 되면 좋겠어!
-                    $@c{smile_wave}항상 최선을 다 하라구! 믿고 있을게!`
+                    $@c{smile_wave}항상 최선을 다 하라구! 믿고 있을게!
+                    $@c{smile}아- 그리고 이벤트 즐겁게 보내!`
     },
   },
   "rival_2": {
@@ -2599,7 +2601,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
                 $@c{smile}그래, 또 지고 말았네.\n@c{serious_mopen_fists}좀 더 열심히 훈련을 해야겠어!\n
                 $@c{smile}너한테 도움이 필요할 것 같지는 않지만, 이거.\n남는 게 있어서 말이야.
                 $@c{serious_smile_fists}물론 이번이 마지막이야, 알겠지?\n공평하게 하지 않으면 그게 내 핑계거리가 되고 말거야.
-                $@c{smile}이제 갈게. 앞으로도 조심하고!`
+                $@c{smile}이제 갈게. 앞으로도 조심하고, 이벤트도 즐겁게 보내!`
     },
   },
   "rival_2_female": {
@@ -2615,7 +2617,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
                 $@c{smile}으, 그래. 더 열심히 훈련하면 되겠지!
                 $@c{smile_wave}이것도 하나 더 챙겨왔으니 받아!\n@c{smile_wave_wink}감사 인사는 됐다구~.
                 $@c{angry_mopen}하지만, 마지막이야!\n또 이렇게 공짜로 나눠주진 않을 테니까!
-                $@c{smile_wave}그럼!`
+                $@c{smile_wave}그럼! 이벤트 잘 즐기고!`
     },
     "defeat": {
       1: "가끔은 지는 것도 괜찮아…"

src/locales/pt_BR/menu.ts

@@ -35,11 +35,11 @@ export const menu: SimpleTranslationEntries = {
   "sessionSuccess": "Sessão carregada com sucesso.",
   "failedToLoadSession": "Não foi possível carregar os dados da sua sessão.\nEles podem estar corrompidos.",
   "boyOrGirl": "Você é um menino ou uma menina?",
-  "evolving": "Que?\n{{pokemonName}} tá evoluindo!",
+  "evolving": "Quê?\n{{pokemonName}} tá evoluindo!",
   "stoppedEvolving": "{{pokemonName}} parou de evoluir.",
   "pauseEvolutionsQuestion": "Gostaria de pausar evoluções para {{pokemonName}}?\nEvoluções podem ser religadas na tela de equipe.",
   "evolutionsPaused": "Evoluções foram paradas para {{pokemonName}}.",
-  "evolutionDone": "Parabéns!\nSeu {{pokemonName}} evolui para {{evolvedPokemonName}}!",
+  "evolutionDone": "Parabéns!\nSeu {{pokemonName}} evoluiu para {{evolvedPokemonName}}!",
   "dailyRankings": "Classificação Diária",
   "weeklyRankings": "Classificação Semanal",
   "noRankings": "Sem Classificação",

src/locales/pt_BR/modifier.ts

@@ -4,7 +4,7 @@ export const modifier: SimpleTranslationEntries = {
   "surviveDamageApply": "{{pokemonNameWithAffix}} aguentou o tranco\nusando sua {{typeName}}!",
   "turnHealApply": "{{pokemonNameWithAffix}} restaurou um pouco de PS usando\nsuas {{typeName}}!",
   "hitHealApply": "{{pokemonNameWithAffix}} restaurou um pouco de PS usando\nsua {{typeName}}!",
-  "pokemonInstantReviveApply": "{{pokemonNameWithAffix}} foi revivido\npor sua {{typeName}}!",
+  "pokemonInstantReviveApply": "{{pokemonNameWithAffix}} foi reanimado\npor sua {{typeName}}!",
   "pokemonResetNegativeStatStageApply": "Os atributos diminuídos de {{pokemonNameWithAffix}} foram\nrestaurados por seu(sua) {{typeName}}!",
   "moneyInterestApply": "Você recebeu um juros de ₽{{moneyAmount}}\nde sua {{typeName}}!",
   "turnHeldItemTransferApply": "{{itemName}} de {{pokemonNameWithAffix}} foi absorvido(a)\npelo {{typeName}} de {{pokemonName}}!",

src/locales/pt_BR/move-trigger.ts

@@ -26,7 +26,7 @@ export const moveTriggers: SimpleTranslationEntries = {
   "soothingAromaWaftedThroughArea": "Um aroma suave se espalhou pelo ambiente!",
   "sprangUp": "{{pokemonName}} se levantou!",
   "choseDoomDesireAsDestiny": "{{pokemonName}} escolheu\no Desejo da Perdição como seu destino!",
-  "vanishedInstantly": "{{pokemonName}} desapareceu/nde repente!",
+  "vanishedInstantly": "{{pokemonName}} desapareceu\nde repente!",
   "tookTargetIntoSky": "{{pokemonName}} levou {{targetName}}\npara o céu!",
   "becameCloakedInFreezingLight": "{{pokemonName}} ficou envolto/nem uma luz congelante!",
   "becameCloakedInFreezingAir": "{{pokemonName}} ficou envolto/nem ar congelante!",

src/locales/pt_BR/party-ui-handler.ts

@@ -15,7 +15,7 @@ export const partyUiHandler: SimpleTranslationEntries = {
   "ALL": "Tudo",
   "PASS_BATON": "Passar Bastão",
   "UNPAUSE_EVOLUTION": "Ativar Evolução",
-  "REVIVE": "Reviver",
+  "REVIVE": "Reanimar",
   "RENAME": "Renomear",
 
   "choosePokemon": "Escolha um Pokémon.",