src/battle-scene.ts

@@ -161,13 +161,6 @@ export default class BattleScene extends SceneBase {
   public moveAnimations: boolean = true;
   public expGainsSpeed: integer = 0;
   public skipSeenDialogues: boolean = false;
-  /**
-   * Determines if the egg hatching animation should be skipped
-   * - 0 = Never (never skip animation)
-   * - 1 = Ask (ask to skip animation when hatching 2 or more eggs)
-   * - 2 = Always (automatically skip animation when hatching 2 or more eggs)
-   */
-  public eggSkipPreference: number = 0;
 
   /**
      * Defines the experience gain display mode.

src/data/pokemon-species.ts

@@ -657,24 +657,6 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali
     return this.getSpeciesForLevel(level, allowEvolving, true, strength, currentWave);
   }
 
-  /**
-   * @see {@linkcode getSpeciesForLevel} uses an ease in and ease out sine function:
-   * @see {@link https://easings.net/#easeInSine}
-   * @see {@link https://easings.net/#easeOutSine}
-   * Ease in is similar to an exponential function with slower growth, as in, x is directly related to y, and increase in y is higher for higher x.
-   * Ease out looks more similar to a logarithmic function shifted to the left. It's still a direct relation but it plateaus instead of increasing in growth.
-   *
-   * This function is used to calculate the x given to these functions, which is used for evolution chance.
-   *
-   * First is maxLevelDiff, which is a denominator for evolution chance for mons without wild evolution delay.
-   * This means a lower value of x will lead to a higher evolution chance.
-   *
-   * It's also used for preferredMinLevel, which is used when an evolution delay exists.
-   * The calculation with evolution delay is a weighted average of the easeIn and easeOut functions where preferredMinLevel is the denominator.
-   * This also means a lower value of x will lead to a higher evolution chance.
-   * @param strength {@linkcode PartyMemberStrength} The strength of the party member in question
-   * @returns {@linkcode integer} The level difference from expected evolution level tolerated for a mon to be unevolved. Lower value = higher evolution chance.
-   */
   private getStrengthLevelDiff(strength: PartyMemberStrength): integer {
     switch (Math.min(strength, PartyMemberStrength.STRONGER)) {
     case PartyMemberStrength.WEAKEST:
@@ -684,9 +666,9 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali
     case PartyMemberStrength.WEAK:
       return 20;
     case PartyMemberStrength.AVERAGE:
-      return 8;
+      return 10;
     case PartyMemberStrength.STRONG:
-      return 4;
+      return 5;
     default:
       return 0;
     }
@@ -734,7 +716,7 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali
           if (strength === PartyMemberStrength.STRONGER) {
             evolutionChance = 1;
           } else {
-            const maxLevelDiff = this.getStrengthLevelDiff(strength); //The maximum distance from the evolution level tolerated for the mon to not evolve
+            const maxLevelDiff = this.getStrengthLevelDiff(strength);
             const minChance: number = 0.875 - 0.125 * strength;
 
             evolutionChance = Math.min(minChance + easeInFunc(Math.min(level - ev.level, maxLevelDiff) / maxLevelDiff) * (1 - minChance), 1);
@@ -753,6 +735,11 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali
           evolutionChance = Math.min(0.65 * easeInFunc(Math.min(Math.max(level - evolutionLevel, 0), preferredMinLevel) / preferredMinLevel) + 0.35 * easeOutFunc(Math.min(Math.max(level - evolutionLevel, 0), preferredMinLevel * 2.5) / (preferredMinLevel * 2.5)), 1);
         }
       }
+      /* (Most) Trainers shouldn't be using unevolved Pokemon by the third gym leader / wave 80. Exceptions to this include Breeders, whose large teams are balanced by the use of weaker pokemon */
+      if (currentWave >= 80 && forTrainer && strength > PartyMemberStrength.WEAKER) {
+        evolutionChance = 1;
+        noEvolutionChance = 0;
+      }
 
       if (evolutionChance > 0) {
         if (isRegionalEvolution) {

src/data/trainer-config.ts

@@ -556,64 +556,64 @@ export class TrainerConfig {
     switch (team) {
     case "rocket": {
       return {
-        [TrainerPoolTier.COMMON]: [Species.RATTATA, Species.KOFFING, Species.EKANS, Species.ZUBAT, Species.MAGIKARP, Species.HOUNDOUR, Species.ONIX, Species.CUBONE, Species.GROWLITHE, Species.MURKROW, Species.GASTLY, Species.EXEGGCUTE, Species.VOLTORB, Species.DROWZEE, Species.VILEPLUME],
+        [TrainerPoolTier.COMMON]: [Species.RATTATA, Species.KOFFING, Species.EKANS, Species.GYARADOS, Species.TAUROS, Species.SCYTHER, Species.CUBONE, Species.GROWLITHE, Species.MURKROW, Species.GASTLY, Species.EXEGGCUTE, Species.VOLTORB],
-        [TrainerPoolTier.UNCOMMON]: [Species.PORYGON, Species.MANKEY, Species.MAGNEMITE, Species.ALOLA_SANDSHREW, Species.ALOLA_MEOWTH, Species.ALOLA_GRIMER, Species.ALOLA_GEODUDE, Species.PALDEA_TAUROS, Species.OMANYTE, Species.KABUTO, Species.MAGBY, Species.ELEKID],
+        [TrainerPoolTier.UNCOMMON]: [Species.PORYGON, Species.ALOLA_RATTATA, Species.ALOLA_SANDSHREW, Species.ALOLA_MEOWTH, Species.ALOLA_GRIMER, Species.ALOLA_GEODUDE],
         [TrainerPoolTier.RARE]: [Species.DRATINI, Species.LARVITAR]
       };
     }
     case "magma": {
       return {
-        [TrainerPoolTier.COMMON]: [Species.GROWLITHE, Species.SLUGMA, Species.SOLROCK, Species.HIPPOPOTAS, Species.BALTOY, Species.ROLYCOLY, Species.GLIGAR, Species.TORKOAL, Species.HOUNDOUR, Species.MAGBY],
+        [TrainerPoolTier.COMMON]: [Species.NUMEL, Species.POOCHYENA, Species.SLUGMA, Species.SOLROCK, Species.HIPPOPOTAS, Species.SANDACONDA, Species.PHANPY, Species.ROLYCOLY, Species.GLIGAR],
-        [TrainerPoolTier.UNCOMMON]: [Species.TRAPINCH, Species.SILICOBRA, Species.RHYHORN, Species.ANORITH, Species.LILEEP, Species.HISUI_GROWLITHE, Species.TURTONATOR, Species.ARON, Species.BARBOACH],
+        [TrainerPoolTier.UNCOMMON]: [Species.TRAPINCH, Species.HEATMOR],
         [TrainerPoolTier.RARE]: [Species.CAPSAKID, Species.CHARCADET]
       };
     }
     case "aqua": {
       return {
-        [TrainerPoolTier.COMMON]: [Species.CORPHISH, Species.SPHEAL, Species.CLAMPERL, Species.CHINCHOU, Species.WOOPER, Species.WINGULL, Species.TENTACOOL, Species.AZURILL, Species.LOTAD, Species.WAILMER, Species.REMORAID],
+        [TrainerPoolTier.COMMON]: [Species.CARVANHA, Species.CORPHISH, Species.ZIGZAGOON, Species.CLAMPERL, Species.CHINCHOU, Species.WOOPER, Species.WINGULL, Species.TENTACOOL, Species.QWILFISH],
-        [TrainerPoolTier.UNCOMMON]: [Species.MANTYKE, Species.HISUI_QWILFISH, Species.ARROKUDA, Species.DHELMISE, Species.CLOBBOPUS, Species.FEEBAS, Species.PALDEA_WOOPER, Species.HORSEA, Species.SKRELP],
+        [TrainerPoolTier.UNCOMMON]: [Species.MANTINE, Species.BASCULEGION, Species.REMORAID, Species.ARROKUDA],
-        [TrainerPoolTier.RARE]: [Species.DONDOZO, Species.BASCULEGION]
+        [TrainerPoolTier.RARE]: [Species.DONDOZO]
       };
     }
     case "galactic": {
       return {
-        [TrainerPoolTier.COMMON]: [Species.BRONZOR, Species.SWINUB, Species.YANMA, Species.LICKITUNG, Species.TANGELA, Species.MAGBY, Species.ELEKID, Species.SKORUPI, Species.ZUBAT, Species.MURKROW, Species.MAGIKARP, Species.VOLTORB],
+        [TrainerPoolTier.COMMON]: [Species.GLAMEOW, Species.STUNKY, Species.BRONZOR, Species.CARNIVINE, Species.GROWLITHE, Species.QWILFISH, Species.SNEASEL],
-        [TrainerPoolTier.UNCOMMON]: [Species.HISUI_GROWLITHE, Species.HISUI_QWILFISH, Species.SNEASEL, Species.DUSKULL, Species.ROTOM, Species.HISUI_VOLTORB, Species.GLIGAR, Species.ABRA],
+        [TrainerPoolTier.UNCOMMON]: [Species.HISUI_GROWLITHE, Species.HISUI_QWILFISH, Species.HISUI_SNEASEL],
-        [TrainerPoolTier.RARE]: [Species.URSALUNA, Species.HISUI_LILLIGANT, Species.SPIRITOMB, Species.HISUI_SNEASEL]
+        [TrainerPoolTier.RARE]: [Species.HISUI_ZORUA, Species.HISUI_SLIGGOO]
       };
     }
     case "plasma": {
       return {
-        [TrainerPoolTier.COMMON]: [Species.YAMASK, Species.ROGGENROLA, Species.JOLTIK, Species.TYMPOLE, Species.FRILLISH, Species.FERROSEED, Species.SANDILE, Species.TIMBURR, Species.DARUMAKA, Species.FOONGUS, Species.CUBCHOO, Species.VANILLITE],
+        [TrainerPoolTier.COMMON]: [Species.SCRAFTY, Species.LILLIPUP, Species.PURRLOIN, Species.FRILLISH, Species.VENIPEDE, Species.GOLETT, Species.TIMBURR, Species.DARUMAKA, Species.AMOONGUSS],
-        [TrainerPoolTier.UNCOMMON]: [Species.PAWNIARD, Species.VULLABY, Species.ZORUA, Species.DRILBUR, Species.KLINK, Species.TYNAMO, Species.GALAR_DARUMAKA, Species.GOLETT, Species.MIENFOO, Species.DURANT, Species.SIGILYPH],
+        [TrainerPoolTier.UNCOMMON]: [Species.PAWNIARD, Species.VULLABY, Species.ZORUA, Species.DRILBUR, Species.KLINK],
-        [TrainerPoolTier.RARE]: [Species.HISUI_ZORUA, Species.AXEW, Species.DEINO, Species.HISUI_BRAVIARY]
+        [TrainerPoolTier.RARE]: [Species.DRUDDIGON, Species.BOUFFALANT, Species.AXEW, Species.DEINO, Species.DURANT]
       };
     }
     case "flare": {
       return {
-        [TrainerPoolTier.COMMON]: [Species.FLETCHLING, Species.LITLEO, Species.INKAY, Species.HELIOPTILE, Species.ELECTRIKE, Species.SKORUPI, Species.PURRLOIN, Species.CLAWITZER, Species.PANCHAM, Species.ESPURR, Species.BUNNELBY],
+        [TrainerPoolTier.COMMON]: [Species.FLETCHLING, Species.LITLEO, Species.INKAY, Species.HELIOPTILE, Species.ELECTRIKE, Species.SKRELP, Species.GULPIN, Species.PURRLOIN, Species.POOCHYENA, Species.SCATTERBUG],
-        [TrainerPoolTier.UNCOMMON]: [Species.LITWICK, Species.SNEASEL, Species.PUMPKABOO, Species.PHANTUMP, Species.HONEDGE, Species.BINACLE, Species.BERGMITE, Species.HOUNDOUR, Species.SKRELP, Species.SLIGGOO],
+        [TrainerPoolTier.UNCOMMON]: [Species.LITWICK, Species.SNEASEL, Species.PANCHAM, Species.PAWNIARD],
-        [TrainerPoolTier.RARE]: [Species.NOIVERN, Species.HISUI_AVALUGG, Species.HISUI_SLIGGOO]
+        [TrainerPoolTier.RARE]: [Species.NOIVERN, Species.DRUDDIGON]
       };
     }
     case "aether": {
       return {
-        [TrainerPoolTier.COMMON]: [ Species.BRUXISH, Species.SLOWPOKE, Species.BALTOY, Species.EXEGGCUTE, Species.ABRA, Species.ALOLA_RAICHU, Species.ELGYEM, Species.NATU, Species.BLIPBUG, Species.GIRAFARIG, Species.ORANGURU],
+        [TrainerPoolTier.COMMON]: [ Species.BRUXISH, Species.SLOWPOKE, Species.BALTOY, Species.EXEGGCUTE, Species.ABRA, Species.ALOLA_RAICHU, Species.ELGYEM, Species.NATU],
-        [TrainerPoolTier.UNCOMMON]: [Species.GALAR_SLOWPOKE, Species.MEDITITE, Species.BELDUM, Species.HATENNA, Species.INKAY, Species.RALTS, Species.GALAR_MR_MIME],
+        [TrainerPoolTier.UNCOMMON]: [Species.GALAR_SLOWKING, Species.MEDITITE, Species.BELDUM, Species.ORANGURU, Species.HATTERENE, Species.INKAY, Species.RALTS],
-        [TrainerPoolTier.RARE]: [Species.ARMAROUGE, Species.HISUI_BRAVIARY, Species.PORYGON]
+        [TrainerPoolTier.RARE]: [Species.ARMAROUGE, Species.GIRAFARIG, Species.PORYGON]
       };
     }
     case "skull": {
       return {
-        [TrainerPoolTier.COMMON]: [ Species.MAREANIE, Species.ALOLA_GRIMER, Species.GASTLY, Species.ZUBAT, Species.FOMANTIS, Species.VENIPEDE, Species.BUDEW, Species.KOFFING, Species.STUNKY, Species.CROAGUNK, Species.NIDORAN_F],
+        [TrainerPoolTier.COMMON]: [ Species.MAREANIE, Species.ALOLA_GRIMER, Species.GASTLY, Species.ZUBAT, Species.LURANTIS, Species.VENIPEDE, Species.BUDEW, Species.KOFFING],
-        [TrainerPoolTier.UNCOMMON]: [Species.GALAR_SLOWPOKE, Species.SKORUPI, Species.PALDEA_WOOPER, Species.VULLABY, Species.HISUI_QWILFISH, Species.GLIMMET],
+        [TrainerPoolTier.UNCOMMON]: [Species.GALAR_SLOWBRO, Species.SKORUPI, Species.PALDEA_WOOPER, Species.NIDORAN_F, Species.CROAGUNK, Species.MANDIBUZZ],
-        [TrainerPoolTier.RARE]: [Species.SKRELP, Species.HISUI_SNEASEL]
+        [TrainerPoolTier.RARE]: [Species.DRAGALGE, Species.HISUI_SNEASEL]
       };
     }
     case "macro": {
       return {
-        [TrainerPoolTier.COMMON]: [ Species.HATENNA, Species.FEEBAS, Species.BOUNSWEET, Species.SALANDIT, Species.GALAR_PONYTA, Species.GOTHITA, Species.FROSLASS, Species.VULPIX, Species.FRILLISH, Species.ODDISH, Species.SINISTEA],
+        [TrainerPoolTier.COMMON]: [ Species.HATTERENE, Species.MILOTIC, Species.TSAREENA, Species.SALANDIT, Species.GALAR_PONYTA, Species.GOTHITA, Species.FROSLASS],
-        [TrainerPoolTier.UNCOMMON]: [Species.VULLABY, Species.MAREANIE, Species.ALOLA_VULPIX, Species.TOGEPI, Species.GALAR_CORSOLA, Species.APPLIN],
+        [TrainerPoolTier.UNCOMMON]: [Species.MANDIBUZZ, Species.MAREANIE, Species.ALOLA_VULPIX, Species.TOGEPI, Species.GALAR_CORSOLA, Species.SINISTEA, Species.APPLIN],
         [TrainerPoolTier.RARE]: [Species.TINKATINK, Species.HISUI_LILLIGANT]
       };
     }
@@ -1328,9 +1328,9 @@ export const trainerConfigs: TrainerConfigs = {
     ),
   [TrainerType.ROCKET_GRUNT]: new TrainerConfig(++t).setHasGenders("Rocket Grunt Female").setHasDouble("Rocket Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_rocket_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene))
     .setSpeciesPools({
-      [TrainerPoolTier.COMMON]: [Species.WEEDLE, Species.RATTATA, Species.EKANS, Species.SANDSHREW, Species.ZUBAT, Species.GEODUDE, Species.KOFFING, Species.GRIMER, Species.ODDISH, Species.SLOWPOKE],
+      [TrainerPoolTier.COMMON]: [Species.WEEDLE, Species.RATTATA, Species.EKANS, Species.SANDSHREW, Species.ZUBAT, Species.GEODUDE, Species.KOFFING, Species.GRIMER, Species.ODDISH],
-      [TrainerPoolTier.UNCOMMON]: [Species.GYARADOS, Species.LICKITUNG, Species.TAUROS, Species.MANKEY, Species.SCYTHER, Species.ELEKID, Species.MAGBY, Species.CUBONE, Species.GROWLITHE, Species.MURKROW, Species.GASTLY, Species.EXEGGCUTE, Species.VOLTORB, Species.MAGNEMITE],
+      [TrainerPoolTier.UNCOMMON]: [Species.GYARADOS, Species.TAUROS, Species.SCYTHER, Species.CUBONE, Species.GROWLITHE, Species.MURKROW, Species.GASTLY, Species.EXEGGCUTE, Species.VOLTORB],
-      [TrainerPoolTier.RARE]: [Species.PORYGON, Species.ALOLA_RATTATA, Species.ALOLA_SANDSHREW, Species.ALOLA_MEOWTH, Species.ALOLA_GRIMER, Species.ALOLA_GEODUDE, Species.PALDEA_TAUROS, Species.OMANYTE, Species.KABUTO],
+      [TrainerPoolTier.RARE]: [Species.PORYGON, Species.ALOLA_RATTATA, Species.ALOLA_SANDSHREW, Species.ALOLA_MEOWTH, Species.ALOLA_GRIMER, Species.ALOLA_GEODUDE],
       [TrainerPoolTier.SUPER_RARE]: [Species.DRATINI, Species.LARVITAR]
     }),
   [TrainerType.ARCHER]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("rocket_admin", "rocket", [Species.HOUNDOOM]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_rocket_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
@@ -1339,63 +1339,63 @@ export const trainerConfigs: TrainerConfigs = {
   [TrainerType.PETREL]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("rocket_admin", "rocket", [Species.WEEZING]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_rocket_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
   [TrainerType.MAGMA_GRUNT]: new TrainerConfig(++t).setHasGenders("Magma Grunt Female").setHasDouble("Magma Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aqua_magma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene))
     .setSpeciesPools({
-      [TrainerPoolTier.COMMON]: [Species.SLUGMA, Species.POOCHYENA, Species.NUMEL, Species.ZIGZAGOON, Species.DIGLETT, Species.MAGBY, Species.TORKOAL, Species.GROWLITHE, Species.BALTOY],
+      [TrainerPoolTier.COMMON]: [Species.SLUGMA, Species.POOCHYENA, Species.NUMEL, Species.ZIGZAGOON, Species.DIGLETT, Species.MAGBY, Species.TORKOAL, Species.BALTOY, Species.BARBOACH],
-      [TrainerPoolTier.UNCOMMON]: [Species.SOLROCK, Species.HIPPOPOTAS, Species.SANDACONDA, Species.PHANPY, Species.ROLYCOLY, Species.GLIGAR, Species.RHYHORN, Species.HEATMOR],
+      [TrainerPoolTier.UNCOMMON]: [Species.SOLROCK, Species.HIPPOPOTAS, Species.SANDACONDA, Species.PHANPY, Species.ROLYCOLY, Species.GLIGAR],
-      [TrainerPoolTier.RARE]: [Species.TRAPINCH, Species.LILEEP, Species.ANORITH, Species.HISUI_GROWLITHE, Species.TURTONATOR, Species.ARON],
+      [TrainerPoolTier.RARE]: [Species.TRAPINCH, Species.HEATMOR],
       [TrainerPoolTier.SUPER_RARE]: [Species.CAPSAKID, Species.CHARCADET]
     }),
   [TrainerType.TABITHA]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("magma_admin", "magma", [Species.CAMERUPT]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aqua_magma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
   [TrainerType.COURTNEY]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("magma_admin_female", "magma", [Species.CAMERUPT]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aqua_magma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
   [TrainerType.AQUA_GRUNT]: new TrainerConfig(++t).setHasGenders("Aqua Grunt Female").setHasDouble("Aqua Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aqua_magma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene))
     .setSpeciesPools({
-      [TrainerPoolTier.COMMON]: [Species.CARVANHA, Species.WAILMER, Species.ZIGZAGOON, Species.LOTAD, Species.CORPHISH, Species.SPHEAL, Species.REMORAID, Species.QWILFISH, Species.BARBOACH],
+      [TrainerPoolTier.COMMON]: [Species.CARVANHA, Species.WAILMER, Species.ZIGZAGOON, Species.LOTAD, Species.CORPHISH, Species.SPHEAL],
-      [TrainerPoolTier.UNCOMMON]: [Species.CLAMPERL, Species.CHINCHOU, Species.WOOPER, Species.WINGULL, Species.TENTACOOL, Species.AZURILL, Species.CLOBBOPUS, Species.HORSEA],
+      [TrainerPoolTier.UNCOMMON]: [Species.CLAMPERL, Species.CHINCHOU, Species.WOOPER, Species.WINGULL, Species.TENTACOOL, Species.QWILFISH],
-      [TrainerPoolTier.RARE]: [Species.MANTINE, Species.DHELMISE, Species.HISUI_QWILFISH, Species.ARROKUDA, Species.PALDEA_WOOPER, Species.SKRELP],
+      [TrainerPoolTier.RARE]: [Species.MANTINE, Species.BASCULEGION, Species.REMORAID, Species.ARROKUDA],
-      [TrainerPoolTier.SUPER_RARE]: [Species.DONDOZO, Species.BASCULEGION]
+      [TrainerPoolTier.SUPER_RARE]: [Species.DONDOZO]
     }),
   [TrainerType.MATT]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("aqua_admin", "aqua", [Species.SHARPEDO]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aqua_magma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
   [TrainerType.SHELLY]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("aqua_admin_female", "aqua", [Species.SHARPEDO]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aqua_magma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
   [TrainerType.GALACTIC_GRUNT]: new TrainerConfig(++t).setHasGenders("Galactic Grunt Female").setHasDouble("Galactic Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_galactic_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene))
     .setSpeciesPools({
-      [TrainerPoolTier.COMMON]: [Species.GLAMEOW, Species.STUNKY, Species.CROAGUNK, Species.SHINX, Species.WURMPLE, Species.BRONZOR, Species.DRIFLOON, Species.BURMY, Species.CARNIVINE],
+      [TrainerPoolTier.COMMON]: [Species.GLAMEOW, Species.STUNKY, Species.CROAGUNK, Species.SHINX, Species.WURMPLE, Species.BRONZOR, Species.DRIFLOON, Species.BURMY],
-      [TrainerPoolTier.UNCOMMON]: [Species.LICKITUNG, Species.RHYHORN, Species.TANGELA, Species.ZUBAT, Species.YANMA, Species.SKORUPI, Species.GLIGAR, Species.SWINUB],
+      [TrainerPoolTier.UNCOMMON]: [Species.CARNIVINE, Species.GROWLITHE, Species.QWILFISH, Species.SNEASEL],
-      [TrainerPoolTier.RARE]: [Species.HISUI_GROWLITHE, Species.HISUI_QWILFISH, Species.SNEASEL, Species.ELEKID, Species.MAGBY, Species.DUSKULL],
+      [TrainerPoolTier.RARE]: [Species.HISUI_GROWLITHE, Species.HISUI_QWILFISH, Species.HISUI_SNEASEL],
-      [TrainerPoolTier.SUPER_RARE]: [Species.ROTOM, Species.SPIRITOMB, Species.HISUI_SNEASEL]
+      [TrainerPoolTier.SUPER_RARE]: [Species.HISUI_ZORUA, Species.HISUI_SLIGGOO]
     }),
   [TrainerType.JUPITER]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("galactic_commander_female", "galactic", [Species.SKUNTANK]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_galactic_admin").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
   [TrainerType.MARS]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("galactic_commander_female", "galactic", [Species.PURUGLY]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_galactic_admin").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
   [TrainerType.SATURN]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("galactic_commander", "galactic", [Species.TOXICROAK]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_galactic_admin").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
   [TrainerType.PLASMA_GRUNT]: new TrainerConfig(++t).setHasGenders("Plasma Grunt Female").setHasDouble("Plasma Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_plasma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene))
     .setSpeciesPools({
-      [TrainerPoolTier.COMMON]: [Species.PATRAT, Species.LILLIPUP, Species.PURRLOIN, Species.SCRAFTY, Species.WOOBAT, Species.VANILLITE, Species.SANDILE, Species.TRUBBISH, Species.TYMPOLE],
+      [TrainerPoolTier.COMMON]: [Species.PATRAT, Species.LILLIPUP, Species.PURRLOIN, Species.SCRAFTY, Species.WOOBAT, Species.VANILLITE, Species.SANDILE, Species.TRUBBISH],
-      [TrainerPoolTier.UNCOMMON]: [Species.FRILLISH, Species.VENIPEDE, Species.GOLETT, Species.TIMBURR, Species.DARUMAKA, Species.FOONGUS, Species.JOLTIK],
+      [TrainerPoolTier.UNCOMMON]: [Species.FRILLISH, Species.VENIPEDE, Species.GOLETT, Species.TIMBURR, Species.DARUMAKA, Species.AMOONGUSS],
-      [TrainerPoolTier.RARE]: [Species.PAWNIARD, Species.RUFFLET, Species.VULLABY, Species.ZORUA, Species.DRILBUR, Species.KLINK, Species.CUBCHOO, Species.MIENFOO, Species.DURANT, Species.BOUFFALANT],
+      [TrainerPoolTier.RARE]: [Species.PAWNIARD, Species.VULLABY, Species.ZORUA, Species.DRILBUR, Species.KLINK],
-      [TrainerPoolTier.SUPER_RARE]: [Species.DRUDDIGON, Species.HISUI_ZORUA, Species.AXEW, Species.DEINO]
+      [TrainerPoolTier.SUPER_RARE]: [Species.DRUDDIGON, Species.BOUFFALANT, Species.AXEW, Species.DEINO, Species.DURANT]
     }),
   [TrainerType.ZINZOLIN]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("plasma_sage", "plasma", [Species.CRYOGONAL]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_plasma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
   [TrainerType.ROOD]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("plasma_sage", "plasma", [Species.SWOOBAT]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_plasma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
   [TrainerType.FLARE_GRUNT]: new TrainerConfig(++t).setHasGenders("Flare Grunt Female").setHasDouble("Flare Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_flare_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene))
     .setSpeciesPools({
-      [TrainerPoolTier.COMMON]: [Species.FLETCHLING, Species.LITLEO, Species.PONYTA, Species.INKAY, Species.HOUNDOUR, Species.SKORUPI, Species.SCRAFTY, Species.CROAGUNK, Species.SCATTERBUG, Species.ESPURR],
+      [TrainerPoolTier.COMMON]: [Species.FLETCHLING, Species.LITLEO, Species.PONYTA, Species.INKAY, Species.HOUNDOUR, Species.SKORUPI, Species.SCRAFTY, Species.CROAGUNK],
-      [TrainerPoolTier.UNCOMMON]: [Species.HELIOPTILE, Species.ELECTRIKE, Species.SKRELP, Species.PANCHAM, Species.PURRLOIN, Species.POOCHYENA, Species.BINACLE, Species.CLAUNCHER, Species.PUMPKABOO, Species.PHANTUMP],
+      [TrainerPoolTier.UNCOMMON]: [Species.HELIOPTILE, Species.ELECTRIKE, Species.SKRELP, Species.GULPIN, Species.PURRLOIN, Species.POOCHYENA, Species.SCATTERBUG],
-      [TrainerPoolTier.RARE]: [Species.LITWICK, Species.SNEASEL, Species.PAWNIARD, Species.BERGMITE, Species.SLIGGOO],
+      [TrainerPoolTier.RARE]: [Species.LITWICK, Species.SNEASEL, Species.PANCHAM, Species.PAWNIARD],
-      [TrainerPoolTier.SUPER_RARE]: [Species.NOIVERN, Species.HISUI_SLIGGOO, Species.HISUI_AVALUGG]
+      [TrainerPoolTier.SUPER_RARE]: [Species.NOIVERN, Species.DRUDDIGON]
     }),
   [TrainerType.BRYONY]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("flare_admin_female", "flare", [Species.LIEPARD]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_flare_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
   [TrainerType.XEROSIC]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("flare_admin", "flare", [Species.MALAMAR]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_flare_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
   [TrainerType.AETHER_GRUNT]: new TrainerConfig(++t).setHasGenders("Aether Grunt Female").setHasDouble("Aether Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aether_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene))
     .setSpeciesPools({
-      [TrainerPoolTier.COMMON]: [ Species.PIKIPEK, Species.ROCKRUFF, Species.ALOLA_DIGLETT, Species.ALOLA_EXEGGUTOR, Species.YUNGOOS, Species.CORSOLA, Species.ALOLA_GEODUDE, Species.ALOLA_RAICHU, Species.BOUNSWEET, Species.LILLIPUP, Species.KOMALA, Species.MORELULL, Species.COMFEY, Species.TOGEDEMARU],
+      [TrainerPoolTier.COMMON]: [ Species.PIKIPEK, Species.ROCKRUFF, Species.ALOLA_DIGLETT, Species.YUNGOOS, Species.CORSOLA, Species.ALOLA_GEODUDE, Species.BOUNSWEET, Species.LILLIPUP, Species.ALOLA_MAROWAK],
-      [TrainerPoolTier.UNCOMMON]: [ Species.POLIWAG, Species.STUFFUL, Species.ORANGURU, Species.PASSIMIAN, Species.BRUXISH, Species.MINIOR, Species.WISHIWASHI, Species.CRABRAWLER, Species.CUTIEFLY, Species.ORICORIO, Species.MUDBRAY, Species.PYUKUMUKU, Species.ALOLA_MAROWAK],
+      [TrainerPoolTier.UNCOMMON]: [ Species.POLIWAG, Species.STUFFUL, Species.ALOLA_EXEGGUTOR, Species.CRABRAWLER, Species.CUTIEFLY, Species.ALOLA_RAICHU, Species.ORICORIO, Species.MUDBRAY],
-      [TrainerPoolTier.RARE]: [ Species.GALAR_CORSOLA, Species.ALOLA_SANDSHREW, Species.ALOLA_VULPIX, Species.TURTONATOR, Species.DRAMPA],
+      [TrainerPoolTier.RARE]: [ Species.ORANGURU, Species.PASSIMIAN, Species.GALAR_CORSOLA, Species.ALOLA_SANDSHREW, Species.ALOLA_VULPIX, Species.TURTONATOR, Species.DRAMPA],
       [TrainerPoolTier.SUPER_RARE]: [Species.JANGMO_O, Species.PORYGON]
     }),
   [TrainerType.FABA]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("aether_admin", "aether", [Species.HYPNO]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aether_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
   [TrainerType.SKULL_GRUNT]: new TrainerConfig(++t).setHasGenders("Skull Grunt Female").setHasDouble("Skull Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_skull_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene))
     .setSpeciesPools({
-      [TrainerPoolTier.COMMON]: [ Species.SALANDIT, Species.ALOLA_RATTATA, Species.EKANS, Species.ALOLA_MEOWTH, Species.SCRAGGY, Species.KOFFING, Species.ALOLA_GRIMER, Species.MAREANIE, Species.SPINARAK, Species.TRUBBISH],
+      [TrainerPoolTier.COMMON]: [ Species.SALANDIT, Species.ALOLA_RATTATA, Species.ALOLA_MEOWTH, Species.SCRAGGY, Species.KOFFING, Species.ALOLA_GRIMER, Species.MAREANIE, Species.SPINARAK, Species.TRUBBISH],
-      [TrainerPoolTier.UNCOMMON]: [ Species.FOMANTIS, Species.SABLEYE, Species.SANDILE, Species.HOUNDOUR, Species.ALOLA_MAROWAK, Species.GASTLY, Species.PANCHAM, Species.DROWZEE, Species.ZUBAT, Species.VENIPEDE, Species.VULLABY],
+      [TrainerPoolTier.UNCOMMON]: [ Species.FOMANTIS, Species.SABLEYE, Species.SANDILE, Species.ALOLA_MAROWAK, Species.PANCHAM, Species.DROWZEE, Species.ZUBAT, Species.VENIPEDE, Species.VULLABY],
-      [TrainerPoolTier.RARE]: [Species.SANDYGAST, Species.PAWNIARD, Species.MIMIKYU, Species.DHELMISE, Species.WISHIWASHI, Species.NYMBLE],
+      [TrainerPoolTier.RARE]: [Species.SANDYGAST, Species.PAWNIARD, Species.MIMIKYU, Species.DHELMISE, Species.GASTLY, Species.WISHIWASHI],
       [TrainerPoolTier.SUPER_RARE]: [Species.GRUBBIN, Species.DEWPIDER]
     }),
   [TrainerType.PLUMERIA]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("skull_admin", "skull", [Species.SALAZZLE]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_skull_admin").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
@@ -1698,10 +1698,10 @@ export const trainerConfigs: TrainerConfigs = {
 
   [TrainerType.ROCKET_BOSS_GIOVANNI_1]: new TrainerConfig(t = TrainerType.ROCKET_BOSS_GIOVANNI_1).setName("Giovanni").initForEvilTeamLeader("Rocket Boss", []).setMixedBattleBgm("battle_rocket_boss").setVictoryBgm("victory_team_plasma")
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.PERSIAN, Species.ALOLA_PERSIAN]))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.DUGTRIO, Species.ALOLA_DUGTRIO]))
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.NIDOKING, Species.NIDOQUEEN]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.HONCHKROW]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.RHYPERIOR]))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.NIDOKING, Species.NIDOQUEEN]))
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.DUGTRIO, Species.ALOLA_DUGTRIO]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.RHYPERIOR]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.MAROWAK, Species.ALOLA_MAROWAK]))
     .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.KANGASKHAN], TrainerSlot.TRAINER, true, p => {
       p.setBoss(true, 2);
       p.generateAndPopulateMoveset();
@@ -1716,7 +1716,7 @@ export const trainerConfigs: TrainerConfigs = {
       p.pokeball = PokeballType.ULTRA_BALL;
     }))
     .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.HIPPOWDON]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.EXCADRILL, Species.GARCHOMP]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.EXCADRILL]))
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.KANGASKHAN], TrainerSlot.TRAINER, true, p => {
       p.setBoss(true, 2);
       p.generateAndPopulateMoveset();
@@ -1724,7 +1724,7 @@ export const trainerConfigs: TrainerConfigs = {
       p.formIndex = 1;
       p.generateName();
     }))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.GASTRODON, Species.SEISMITOAD]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.GASTRODON]))
     .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.MEWTWO], TrainerSlot.TRAINER, true, p => {
       p.setBoss(true, 2);
       p.generateAndPopulateMoveset();
@@ -1842,7 +1842,7 @@ export const trainerConfigs: TrainerConfigs = {
       p.formIndex = 1;
       p.generateName();
     }))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.WEAVILE, Species.SNEASLER], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.WEAVILE], TrainerSlot.TRAINER, true, p => {
       p.setBoss(true, 2);
       p.generateAndPopulateMoveset();
       p.pokeball = PokeballType.ULTRA_BALL;
@@ -1873,7 +1873,7 @@ export const trainerConfigs: TrainerConfigs = {
     .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.BASCULEGION, Species.JELLICENT ], TrainerSlot.TRAINER, true, p => {
       p.generateAndPopulateMoveset();
       p.gender = Gender.MALE;
-      p.formIndex = 0;
+      p.formIndex = 1;
     }))
     .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.KINGAMBIT ]))
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.VOLCARONA, Species.SLITHER_WING ]))

src/locales/ca_ES/arena-flyout.json

@@ -1,40 +1 @@
-{
+{}
-  "activeBattleEffects": "Efectes d'Arena Activa",
-  "player": "Jugador",
-  "neutral": "Neutre",
-  "enemy": "Enemic",
-  "sunny": "Assolellat",
-  "rain": "Plujós",
-  "sandstorm": "Tempesta Sorra",
-  "hail": "Calamarsa",
-  "snow": "Neu",
-  "fog": "Boira",
-  "heavyRain": "Diluvi",
-  "harshSun": "Sol Abrasador",
-  "strongWinds": "Vents Forts",
-  "misty": "Camp de Boira",
-  "electric": "Camp Elèctric",
-  "grassy": "Camp d'Herba",
-  "psychic": "Camp Psíquic",
-  "mudSport": "Xipollejo Fang",
-  "waterSport": "Hidrorraig",
-  "spikes": "Pues",
-  "toxicSpikes": "Pues Tòxiques",
-  "mist": "Boirina",
-  "futureSight": "Premonició",
-  "doomDesire": "Desig Ocult",
-  "wish": "Desig",
-  "stealthRock": "Trampa Roques",
-  "stickyWeb": "Xarxa Viscosa",
-  "trickRoom": "Espai Rar",
-  "gravity": "Gravetat",
-  "reflect": "Reflex",
-  "lightScreen": "Pantalla de Llum",
-  "auroraVeil": "Vel Aurora",
-  "quickGuard": "Anticipi",
-  "wideGuard": "Vasta Guàrdia",
-  "matBlock": "Escut Tatami",
-  "craftyShield": "Truc Defensa",
-  "tailwind": "Vent Afí",
-  "happyHour": "Paga Extra"
-}

src/locales/ca_ES/biome.json

@@ -1,38 +1 @@
-{
+{}
-  "unknownLocation": "En algun lloc que no recordes",
-  "TOWN": "Poble",
-  "PLAINS": "Vall",
-  "GRASS": "Camp",
-  "TALL_GRASS": "Herba Alta",
-  "METROPOLIS": "Metròpoli",
-  "FOREST": "Bosc",
-  "SEA": "Mar",
-  "SWAMP": "Pantà",
-  "BEACH": "Platja",
-  "LAKE": "Llac",
-  "SEABED": "Fons Marí",
-  "MOUNTAIN": "Muntanya",
-  "BADLANDS": "Badlands",
-  "CAVE": "Cova",
-  "DESERT": "Desert",
-  "ICE_CAVE": "Cova Gelada",
-  "MEADOW": "Prat",
-  "POWER_PLANT": "Planta d'Energia",
-  "VOLCANO": "Volcà",
-  "GRAVEYARD": "Cementiri",
-  "DOJO": "Dojo",
-  "FACTORY": "Fàbrica",
-  "RUINS": "Ruïnes Antigues",
-  "WASTELAND": "Terra Erma",
-  "ABYSS": "Avenc",
-  "SPACE": "Espai",
-  "CONSTRUCTION_SITE": "Obra",
-  "JUNGLE": "Jungla",
-  "FAIRY_CAVE": "Cova de Fades",
-  "TEMPLE": "Temple",
-  "SLUM": "Suburbi",
-  "SNOWY_FOREST": "Bosc Nevat",
-  "ISLAND": "Illa",
-  "LABORATORY": "Laboratori",
-  "END": "???"
-}

src/locales/ca_ES/common.json

@@ -1,8 +1 @@
-{
+{}
-  "start": "Començar",
-  "luckIndicator": "Sort:",
-  "shinyOnHover": "Variocolor",
-  "commonShiny": "Comú",
-  "rareShiny": "Rar",
-  "epicShiny": "Èpica"
-}

src/locales/ca_ES/config.ts

@@ -53,48 +53,7 @@ import terrain from "./terrain.json";
 import modifierSelectUiHandler from "./modifier-select-ui-handler.json";
 import moveTriggers from "./move-trigger.json";
 import runHistory from "./run-history.json";
-import mysteryEncounterMessages from "./mystery-encounter-messages.json";
-import lostAtSea from "./mystery-encounters/lost-at-sea-dialogue.json";
-import mysteriousChest from "./mystery-encounters/mysterious-chest-dialogue.json";
-import mysteriousChallengers from "./mystery-encounters/mysterious-challengers-dialogue.json";
-import darkDeal from "./mystery-encounters/dark-deal-dialogue.json";
-import departmentStoreSale from "./mystery-encounters/department-store-sale-dialogue.json";
-import fieldTrip from "./mystery-encounters/field-trip-dialogue.json";
-import fieryFallout from "./mystery-encounters/fiery-fallout-dialogue.json";
-import fightOrFlight from "./mystery-encounters/fight-or-flight-dialogue.json";
-import safariZone from "./mystery-encounters/safari-zone-dialogue.json";
-import shadyVitaminDealer from "./mystery-encounters/shady-vitamin-dealer-dialogue.json";
-import slumberingSnorlax from "./mystery-encounters/slumbering-snorlax-dialogue.json";
-import trainingSession from "./mystery-encounters/training-session-dialogue.json";
-import theStrongStuff from "./mystery-encounters/the-strong-stuff-dialogue.json";
-import pokemonSalesman from "./mystery-encounters/the-pokemon-salesman-dialogue.json";
-import offerYouCantRefuse from "./mystery-encounters/an-offer-you-cant-refuse-dialogue.json";
-import delibirdy from "./mystery-encounters/delibirdy-dialogue.json";
-import absoluteAvarice from "./mystery-encounters/absolute-avarice-dialogue.json";
-import aTrainersTest from "./mystery-encounters/a-trainers-test-dialogue.json";
-import trashToTreasure from "./mystery-encounters/trash-to-treasure-dialogue.json";
-import berriesAbound from "./mystery-encounters/berries-abound-dialogue.json";
-import clowningAround from "./mystery-encounters/clowning-around-dialogue.json";
-import partTimer from "./mystery-encounters/part-timer-dialogue.json";
-import dancingLessons from "./mystery-encounters/dancing-lessons-dialogue.json";
-import weirdDream from "./mystery-encounters/weird-dream-dialogue.json";
-import theWinstrateChallenge from "./mystery-encounters/the-winstrate-challenge-dialogue.json";
-import teleportingHijinks from "./mystery-encounters/teleporting-hijinks-dialogue.json";
-import bugTypeSuperfan from "./mystery-encounters/bug-type-superfan-dialogue.json";
-import funAndGames from "./mystery-encounters/fun-and-games-dialogue.json";
-import uncommonBreed from "./mystery-encounters/uncommon-breed-dialogue.json";
-import globalTradeSystem from "./mystery-encounters/global-trade-system-dialogue.json";
 
-/**
- * Dialogue/Text token injection patterns that can be used:
- * - `$` will be treated as a new line for Message and Dialogue strings.
- * - `@d{<number>}` will add a time delay to text animation for Message and Dialogue strings.
- * - `@s{<sound_effect_key>}` will play a specified sound effect for Message and Dialogue strings.
- * - `@f{<number>}` will fade the screen to black for the given duration, then fade back in for Message and Dialogue strings.
- * - `{{<token>}}` (MYSTERY ENCOUNTERS ONLY) will auto-inject the matching dialogue token value that is stored in {@link IMysteryEncounter.dialogueTokens}.
- *   - (see [i18next interpolations](https://www.i18next.com/translation-function/interpolation)) for more details.
- * - `@[<TextStyle>]{<text>}` (STATIC TEXT ONLY, NOT USEABLE WITH {@link UI.showText()} OR {@link UI.showDialogue()}) will auto-color the given text to a specified {@link TextStyle} (e.g. `TextStyle.SUMMARY_GREEN`).
- */
 export const caEsConfig = {
   ability,
   abilityTriggers,
@@ -151,39 +110,4 @@ export const caEsConfig = {
   modifierSelectUiHandler,
   moveTriggers,
   runHistory,
-  mysteryEncounter: {
-    // DO NOT REMOVE
-    "unit_test_dialogue": "{{test}}{{test}} {{test{{test}}}} {{test1}} {{test\}} {{test\\}} {{test\\\}} {test}}",
-    mysteriousChallengers,
-    mysteriousChest,
-    darkDeal,
-    fightOrFlight,
-    slumberingSnorlax,
-    trainingSession,
-    departmentStoreSale,
-    shadyVitaminDealer,
-    fieldTrip,
-    safariZone,
-    lostAtSea,
-    fieryFallout,
-    theStrongStuff,
-    pokemonSalesman,
-    offerYouCantRefuse,
-    delibirdy,
-    absoluteAvarice,
-    aTrainersTest,
-    trashToTreasure,
-    berriesAbound,
-    clowningAround,
-    partTimer,
-    dancingLessons,
-    weirdDream,
-    theWinstrateChallenge,
-    teleportingHijinks,
-    bugTypeSuperfan,
-    funAndGames,
-    uncommonBreed,
-    globalTradeSystem
-  },
-  mysteryEncounterMessages
 };

src/locales/ca_ES/menu.json

@@ -1,55 +1 @@
-{
+{}
-  "cancel": "Cancel-la",
-  "continue": "Continuar",
-  "dailyRun": "Repte Diari (Beta)",
-  "loadGame": "Carregar Partida",
-  "newGame": "Nova Partida",
-  "settings": "Opcions",
-  "selectGameMode": "Trieu un mode de joc",
-  "logInOrCreateAccount": "Inicieu sessió o creeu un compte per començar. No cal correu electrònic!",
-  "username": "Usuari",
-  "password": "Contrasenya",
-  "login": "Iniciar Sessió",
-  "orUse": "O Usa",
-  "register": "Registrar-se",
-  "emptyUsername": "L'usuari no pot estar buit",
-  "invalidLoginUsername": "L'usuari no és vàlid",
-  "invalidRegisterUsername": "L'usuari només pot contenir lletres, números i guions baixos",
-  "invalidLoginPassword": "La contrasenya no és vàlida",
-  "invalidRegisterPassword": "La Contrasenya ha de tenir 6 o més caràcters",
-  "usernameAlreadyUsed": "L'usuari ja està en ús",
-  "accountNonExistent": "L'usuari no existeix",
-  "unmatchingPassword": "La contrasenya no coincideix",
-  "passwordNotMatchingConfirmPassword": "La contrasenya ha de coincidir amb la contrasenya de confirmació",
-  "confirmPassword": "Confirmeu la Contrasenya",
-  "registrationAgeWarning": "En registrar-te, confirmes que tens 13 anys o més.",
-  "backToLogin": "Torna a Iniciar Sessió",
-  "failedToLoadSaveData": "No s'han pogut carregar les dades desades. Torneu a carregar la pàgina.\nSi això continua, comproveu #announcements a Discord.",
-  "sessionSuccess": "Sessió carregada amb èxit.",
-  "failedToLoadSession": "No s'han pogut carregar les dades de la sessió.\nÉs possible que estiguin malmeses.",
-  "boyOrGirl": "Ets Nen o Nena?",
-  "evolving": "Que?\n{{pokemonName}} està evolucionant!",
-  "stoppedEvolving": "Prou?\nL'evolució de {{pokemonName}} s'ha aturat!",
-  "pauseEvolutionsQuestion": "Vols aturar les evolucions de {{pokémon Name}}?\nSempre poden ser activades des de la pantalla del teu equip.",
-  "evolutionsPaused": "L'evolució s'ha posat en pausa per a ",
-  "evolutionDone": "Enhorabona!\n{{pokemonName}} ha evolucionat a {{evolvedPokemonName}}!",
-  "dailyRankings": "Rànquings Diaris",
-  "weeklyRankings": "Rànquings Setmanals",
-  "noRankings": "Sense Rànquings",
-  "positionIcon": "#",
-  "usernameScoreboard": "Usuari",
-  "score": "Puntuació",
-  "wave": "Onada",
-  "loading": "Carregant…",
-  "loadingAsset": "Carregant actius: {{assetName}}",
-  "playersOnline": "Jugadors en Línia",
-  "yes":"sí",
-  "no":"No",
-  "disclaimer": "AVÍS",
-  "disclaimerDescription": "Aquest joc encara no s'ha completat; podríeu tenir problemes de joc (inclosa la possible pèrdua de dades desades),\n el joc pot canviar sense previ avís, i el joc es pot actualitzar o completar o no.",
-  "choosePokemon": "Elegir un Pokémon.",
-  "renamePokemon": "Rebatejar Pokémon",
-  "rename": "Rebatejar",
-  "nickname": "Sobrenom",
-  "errorServerDown": "Vaja! S'ha produït un problema en contactar amb el servidor.\n\nPots deixar aquesta pestanya oberta,\nel joc es tornarà a connectar automàticament."
-}

src/locales/ca_ES/mystery-encounter-messages.json

@@ -1 +0,0 @@
-{}

src/locales/ca_ES/mystery-encounters/a-trainers-test-dialogue.json

@@ -1 +0,0 @@
-{}

src/locales/ca_ES/mystery-encounters/absolute-avarice-dialogue.json

@@ -1 +0,0 @@
-{}

src/locales/ca_ES/mystery-encounters/an-offer-you-cant-refuse-dialogue.json

@@ -1 +0,0 @@
-{}

src/locales/ca_ES/mystery-encounters/berries-abound-dialogue.json

@@ -1 +0,0 @@
-{}

src/locales/ca_ES/mystery-encounters/bug-type-superfan-dialogue.json

@@ -1 +0,0 @@
-{}

src/locales/ca_ES/mystery-encounters/clowning-around-dialogue.json

@@ -1 +0,0 @@
-{}

src/locales/ca_ES/mystery-encounters/dancing-lessons-dialogue.json

@@ -1 +0,0 @@
-{}

src/locales/ca_ES/mystery-encounters/dark-deal-dialogue.json

@@ -1 +0,0 @@
-{}

src/locales/ca_ES/mystery-encounters/delibirdy-dialogue.json

@@ -1 +0,0 @@
-{}

src/locales/ca_ES/mystery-encounters/department-store-sale-dialogue.json

@@ -1 +0,0 @@
-{}

src/locales/ca_ES/mystery-encounters/field-trip-dialogue.json

@@ -1 +0,0 @@
-{}

src/locales/ca_ES/mystery-encounters/fiery-fallout-dialogue.json

@@ -1 +0,0 @@
-{}

src/locales/ca_ES/mystery-encounters/fight-or-flight-dialogue.json

@@ -1 +0,0 @@
-{}

src/locales/ca_ES/mystery-encounters/fun-and-games-dialogue.json

@@ -1 +0,0 @@
-{}

src/locales/ca_ES/mystery-encounters/global-trade-system-dialogue.json

@@ -1 +0,0 @@
-{}

src/locales/ca_ES/mystery-encounters/lost-at-sea-dialogue.json

@@ -1 +0,0 @@
-{}

src/locales/ca_ES/mystery-encounters/mysterious-challengers-dialogue.json

@@ -1 +0,0 @@
-{}

src/locales/ca_ES/mystery-encounters/mysterious-chest-dialogue.json

@@ -1 +0,0 @@
-{}

src/locales/ca_ES/mystery-encounters/part-timer-dialogue.json

@@ -1 +0,0 @@
-{}

src/locales/ca_ES/mystery-encounters/safari-zone-dialogue.json

@@ -1 +0,0 @@
-{}

src/locales/ca_ES/mystery-encounters/shady-vitamin-dealer-dialogue.json

@@ -1 +0,0 @@
-{}

src/locales/ca_ES/mystery-encounters/slumbering-snorlax-dialogue.json

@@ -1 +0,0 @@
-{}

src/locales/ca_ES/mystery-encounters/teleporting-hijinks-dialogue.json

@@ -1 +0,0 @@
-{}

src/locales/ca_ES/mystery-encounters/the-pokemon-salesman-dialogue.json

@@ -1 +0,0 @@
-{}

src/locales/ca_ES/mystery-encounters/the-strong-stuff-dialogue.json

@@ -1 +0,0 @@
-{}

src/locales/ca_ES/mystery-encounters/the-winstrate-challenge-dialogue.json

@@ -1 +0,0 @@
-{}

src/locales/ca_ES/mystery-encounters/training-session-dialogue.json

@@ -1 +0,0 @@
-{}

src/locales/ca_ES/mystery-encounters/trash-to-treasure-dialogue.json

@@ -1 +0,0 @@
-{}

src/locales/ca_ES/mystery-encounters/uncommon-breed-dialogue.json

@@ -1 +0,0 @@
-{}

src/locales/ca_ES/mystery-encounters/weird-dream-dialogue.json

@@ -1 +0,0 @@
-{}

src/locales/ca_ES/nature.json

@@ -1,27 +1 @@
-{
+{}
-  "Hardy": "Forta",
-  "Lonely": "Esquerpa",
-  "Brave": "Audaç",
-  "Adamant": "Ferma",
-  "Naughty": "Múrria",
-  "Bold": "Agosarada",
-  "Docile": "Dòcil",
-  "Relaxed": "Relaxat",
-  "Impish": "Frenètic",
-  "Lax": "Despreocupat",
-  "Timid": "Poruc",
-  "Hasty": "Àvid",
-  "Serious": "Seriós",
-  "Jolly": "Jovial",
-  "Naive": "Ingenu",
-  "Modest": "Modesta",
-  "Mild": "Suau",
-  "Quiet": "Tranquil",
-  "Bashful": "Vergonyós",
-  "Rash": "Imprudent",
-  "Calm": "Serena",
-  "Gentle": "Amable",
-  "Sassy": "Descarat",
-  "Careful": "Cautelós",
-  "Quirky": "Estrany"
-}

src/locales/ca_ES/pokemon-info.json

@@ -1,40 +1 @@
-{
+{}
-  "Stat": {
-    "HP": "PS",
-    "HPshortened": "PS",
-    "ATK": "Atac",
-    "ATKshortened": "Ata",
-    "DEF": "Defensa",
-    "DEFshortened": "Def",
-    "SPATK": "At. Esp.",
-    "SPATKshortened": "AtEsp",
-    "SPDEF": "Def. Esp.",
-    "SPDEFshortened": "DefEsp",
-    "SPD": "Velocitat",
-    "SPDshortened": "Veloc.",
-    "ACC": "Precisió",
-    "EVA": "Evació"
-  },
-  "Type": {
-    "UNKNOWN": "???",
-    "NORMAL": "Normal",
-    "FIGHTING": "Lluita",
-    "FLYING": "Volador",
-    "POISON": "Verí",
-    "GROUND": "Terra",
-    "ROCK": "Roca",
-    "BUG": "Bestiola",
-    "GHOST": "Fantasma",
-    "STEEL": "Acer",
-    "FIRE": "Foc",
-    "WATER": "Aigua",
-    "GRASS": "Planta",
-    "ELECTRIC": "Elèctric",
-    "PSYCHIC": "Psíquic",
-    "ICE": "Gel",
-    "DRAGON": "Drac",
-    "DARK": "Sinistre",
-    "FAIRY": "Fada",
-    "STELLAR": "Astral"
-  }
-}

src/locales/en/settings.json

@@ -11,10 +11,6 @@
   "expGainsSpeed": "EXP Gains Speed",
   "expPartyDisplay": "Show EXP Party",
   "skipSeenDialogues": "Skip Seen Dialogues",
-  "eggSkip": "Egg Skip",
-  "never": "Never",
-  "always": "Always",
-  "ask": "Ask",
   "battleStyle": "Battle Style",
   "enableRetries": "Enable Retries",
   "hideIvs": "Hide IV scanner",

src/locales/es/battle.json

@@ -12,10 +12,10 @@
   "trainerDefeated": "¡Has derrotado a\n{{trainerName}}!",
   "moneyWon": "¡Has ganado\n₽{{moneyAmount}} por vencer!",
   "pokemonCaught": "¡{{pokemonName}} atrapado!",
-  "pokemonObtained": "¡Has recibido a {{pokemonName}}!",
+  "pokemonObtained": "You got {{pokemonName}}!",
-  "pokemonBrokeFree": "¡Oh, no!\n¡El Pokémon se ha escapado!",
+  "pokemonBrokeFree": "Oh no!\nThe Pokémon broke free!",
-  "pokemonFled": "¡El {{pokemonName}} salvaje ha huido!",
+  "pokemonFled": "The wild {{pokemonName}} fled!",
-  "playerFled": "¡Huiste del {{pokemonName}}!",
+  "playerFled": "You fled from the {{pokemonName}}!",
   "addedAsAStarter": "{{pokemonName}} ha sido añadido\na tus iniciales!",
   "partyFull": "Tu equipo esta completo.\n¿Quieres liberar un Pokémon para meter a {{pokemonName}}?",
   "pokemon": "Pokémon",
@@ -51,7 +51,7 @@
   "noPokeballTrainer": "¡No puedes atrapar a los\nPokémon de los demás!",
   "noPokeballMulti": "¡No se pueden lanzar Poké Balls\ncuando hay más de un Pokémon!",
   "noPokeballStrong": "¡Este Pokémon es demasiado fuerte para ser capturado!\nNecesitas bajarle los PS primero!",
-  "noPokeballMysteryEncounter": "¡No puedes capturar este Pokémon!",
+  "noPokeballMysteryEncounter": "You aren't able to\ncatch this Pokémon!",
   "noEscapeForce": "Una fuerza misteriosa\nte impide huir.",
   "noEscapeTrainer": "¡No puedes huir de los\ncombates contra Entrenadores!",
   "noEscapePokemon": "¡El movimiento {{moveName}} de {{pokemonName}} impide la huida!",
@@ -91,5 +91,5 @@
   "statSeverelyFell_other": "¡{{stats}} de\n{{pokemonNameWithAffix}} han bajado muchísimo!",
   "statWontGoAnyLower_one": "¡El {{stats}} de {{pokemonNameWithAffix}} no puede bajar más!",
   "statWontGoAnyLower_other": "¡{{stats}} de\n{{pokemonNameWithAffix}} no pueden bajar más!",
-  "mysteryEncounterAppeared": "¿Que es esto?"
+  "mysteryEncounterAppeared": "What's this?"
 }

src/locales/es/dialogue.json

@@ -51,112 +51,112 @@
   },
   "stat_trainer_buck": {
     "encounter": {
-      "1": "Para que luego no digas que no te he advertido: soy muy fuerte.",
+      "1": "...I'm telling you right now. I'm seriously tough. Act surprised!",
-      "2": "¡Noto cómo tiemblan mis Pokémon dentro de sus Poké Balls!"
+      "2": "I can feel my Pokémon shivering inside their Pokéballs!"
     },
     "victory": {
-      "1": "¡Je, je, je!\n¡Eres una máquina!",
+      "1": "Heeheehee!\nSo hot, you!",
-      "2": "¡Je, je, je!\n¡Eres una máquina!"
+      "2": "Heeheehee!\nSo hot, you!"
     },
     "defeat": {
-      "1": "¡Vaya! supongo que te quedaste sin fuerzas.",
+      "1": "Whoa! You're all out of gas, I guess.",
-      "2": "¡Vaya! supongo que te quedaste sin fuerzas."
+      "2": "Whoa! You're all out of gas, I guess."
     }
   },
   "stat_trainer_cheryl": {
     "encounter": {
-      "1": "Mis Pokémon han estado deseando una batalla.",
+      "1": "My Pokémon have been itching for a battle.",
-      "2": "Debería advertirte de que mis Pokémon son un poco... hiperactivos."
+      "2": "I should warn you, my Pokémon can be quite rambunctious."
     },
     "victory": {
-      "1": "No es fácil encontrar el equilibrio entre ataque y defensa...",
+      "1": "Striking the right balance of offense and defense... It's not easy to do.",
-      "2": "No es fácil encontrar el equilibrio entre ataque y defensa..."
+      "2": "Striking the right balance of offense and defense... It's not easy to do."
     },
     "defeat": {
-      "1": "Necesitas curar a tus Pokémon?",
+      "1": "Do your Pokémon need any healing?",
-      "2": "Necesitas curar a tus Pokémon?"
+      "2": "Do your Pokémon need any healing?"
     }
   },
   "stat_trainer_marley": {
     "encounter": {
-      "1": "... Vale.\n¡Voy a esforzarme al máximo!",
+      "1": "... OK.\nI'll do my best.",
-      "2": "... Vale.\nNo... perderé... !"
+      "2": "... OK.\nI... won't lose...!"
     },
     "victory": {
-      "1": "... ¡Eeeh!",
+      "1": "... Awww.",
-      "2": "... ¡Eeeh!"
+      "2": "... Awww."
     },
     "defeat": {
-      "1": "... Adiós.",
+      "1": "... Goodbye.",
-      "2": "... Adiós."
+      "2": "... Goodbye."
     }
   },
   "stat_trainer_mira": {
     "encounter": {
-      "1": "Serás sorprendido por Maiza!",
+      "1": "You will be shocked by Mira!",
-      "2": "¡Maiza te mostrará que Mira ya no se pierde!"
+      "2": "Mira will show you that Mira doesn't get lost anymore!"
     },
     "victory": {
-      "1": "Maiza se pregunta si puede llegar muy lejos en esta tierra.",
+      "1": "Mira wonders if she can get very far in this land.",
-      "2": "Maiza se pregunta si puede llegar muy lejos en esta tierra."
+      "2": "Mira wonders if she can get very far in this land."
     },
     "defeat": {
-      "1": "¡Maiza sabía que ganaría!",
+      "1": "Mira knew she would win!",
-      "2": "¡Maiza sabía que ganaría!"
+      "2": "Mira knew she would win!"
     }
   },
   "stat_trainer_riley": {
     "encounter": {
-      "1": "¡Combatir es nuestra manera de saludarnos!",
+      "1": "Battling is our way of greeting!",
-      "2": "Vamos a hacer lo imposible por derrotar a tu equipo."
+      "2": "We're pulling out all the stops to put your Pokémon down."
     },
     "victory": {
-      "1": "A veces combatimos entre nosotros y otras veces unimos fuerzas.$Es maravilloso ser entrenador.",
+      "1": "At times we battle, and sometimes we team up...$It's great how Trainers can interact.",
-      "2": "A veces combatimos entre nosotros y otras veces unimos fuerzas.$Es maravilloso ser entrenador."
+      "2": "At times we battle, and sometimes we team up...$It's great how Trainers can interact."
     },
     "defeat": {
-      "1": "Vaya demostración pusiste.\nMejor suerte la próxima vez.",
+      "1": "You put up quite the display.\nBetter luck next time.",
-      "2": "Vaya demostración pusiste.\nMejor suerte la próxima vez."
+      "2": "You put up quite the display.\nBetter luck next time."
     }
   },
   "winstrates_victor": {
     "encounter": {
-      "1": "¡Qué entusiasmo! ¡Así me gusta!"
+      "1": "That's the spirit! I like you!"
     },
     "victory": {
-      "1": "¡Ayyy! ¡Eres más fuerte de lo que pensaba!"
+      "1": "A-ha! You're stronger than I thought!"
     }
   },
   "winstrates_victoria": {
     "encounter": {
-      "1": "Huy, huy, huy... ¡Qué joven eres!$Pero le has dado una buena tunda a mi marido...$No hay que fiarse...¡Lucha ahora contra mí!"
+      "1": "My goodness! Aren't you young?$You must be quite the trainer to beat my husband, though.$Now I suppose it's my turn to battle!"
     },
     "victory": {
-      "1": "¡Ay! ¡No puedo creer que seas tan fuerte!"
+      "1": "Uwah! Just how strong are you?!"
     }
   },
   "winstrates_vivi": {
     "encounter": {
-      "1": "¿Eres más fuerte que mamá? ¡Halaaa!$¡Pero yo también soy fuerte!\n¡Ahora vas a ver!"
+      "1": "You're stronger than Mom? Wow!$But I'm strong, too!\nReally! Honestly!"
     },
     "victory": {
-      "1": "Pero... ¿he perdido?\nSnif, snif... ¡Abuelitaaa!"
+      "1": "Huh? Did I really lose?\nSnivel... Grandmaaa!"
     }
   },
   "winstrates_vicky": {
     "encounter": {
-      "1": "¿Cómo te atreves a hacer llorar a mi nieta? ¡Voy a echarle un buen rapapolvo a tu equipo Pokémon! ¡Vas a ver lo que es bueno!"
+      "1": "How dare you make my precious\ngranddaughter cry!$I see I need to teach you a lesson.\nPrepare to feel the sting of defeat!"
     },
     "victory": {
-      "1": "¡Jarl! Eres fuerte...\nLos demás tenían razón..."
+      "1": "Whoa! So strong!\nMy granddaughter wasn't lying."
     }
   },
   "winstrates_vito": {
     "encounter": {
-      "1": "He entrenado con toda mi familia,\ntoda enterita.$¡No voy a perder!"
+      "1": "I trained together with my whole family,\nevery one of us!$I'm not losing to anyone!"
     },
     "victory": {
-      "1": "Logré superar a toda mi familia.\nNunca había perdido..."
+      "1": "I was better than everyone in my family.\nI've never lost before..."
     }
   }
 }

src/locales/fr/dialogue.json

@@ -501,112 +501,112 @@
   },
   "stat_trainer_buck": {
     "encounter": {
-      "1": "Je te préviens… Je suis sacrément coriace ! Fais comme si tu ne t’y attendais pas !",
+      "1": "...I'm telling you right now. I'm seriously tough. Act surprised!",
-      "2": "Je sens mes Pokémon gigoter dans leurs Poké Balls !"
+      "2": "I can feel my Pokémon shivering inside their Pokéballs!"
     },
     "victory": {
-      "1": "Hé, hé, hé !\nTu mets le feu !",
+      "1": "Heeheehee!\nSo hot, you!",
-      "2": "Hé, hé, hé !\nTu mets le feu !"
+      "2": "Heeheehee!\nSo hot, you!"
     },
     "defeat": {
-      "1": "Oh ? En panne de carburant je suppose ?",
+      "1": "Whoa! You're all out of gas, I guess.",
-      "2": "Oh ? En panne de carburant je suppose ?"
+      "2": "Whoa! You're all out of gas, I guess."
     }
   },
   "stat_trainer_cheryl": {
     "encounter": {
-      "1": "Mes Pokémon meurent d’envie de se battre.",
+      "1": "My Pokémon have been itching for a battle.",
-      "2": "Je dois te prévenir que mes Pokémon peuvent se montrer un peu exubérants."
+      "2": "I should warn you, my Pokémon can be quite rambunctious."
     },
     "victory": {
-      "1": "Trouver le bon équilibre en attaque et défense…\nCe n’est pas la chose la plus aisée.",
+      "1": "Striking the right balance of offense and defense... It's not easy to do.",
-      "2": "Trouver le bon équilibre en attaque et défense…\nCe n’est pas la chose la plus aisée."
+      "2": "Striking the right balance of offense and defense... It's not easy to do."
     },
     "defeat": {
-      "1": "T’as besoin que je soigne ton équipe ?",
+      "1": "Do your Pokémon need any healing?",
-      "2": "T’as besoin que je soigne ton équipe ?"
+      "2": "Do your Pokémon need any healing?"
     }
   },
   "stat_trainer_marley": {
     "encounter": {
-      "1": "OK…\nJe ferai de mon mieux.",
+      "1": "... OK.\nI'll do my best.",
-      "2": "OK…\nJe… Je peux le faire… !"
+      "2": "... OK.\nI... won't lose...!"
     },
     "victory": {
-      "1": "Argh…",
+      "1": "... Awww.",
-      "2": "Argh…"
+      "2": "... Awww."
     },
     "defeat": {
-      "1": "Au revoir…",
+      "1": "... Goodbye.",
-      "2": "Au revoir…"
+      "2": "... Goodbye."
     }
   },
   "stat_trainer_mira": {
     "encounter": {
-      "1": "Maïté va t’éblouir !",
+      "1": "You will be shocked by Mira!",
-      "2": "Je vais te prouver que je ne me mélange plus les pédales !"
+      "2": "Mira will show you that Mira doesn't get lost anymore!"
     },
     "victory": {
-      "1": "Hum… Je me demande si je suis à la hauteur de ici…",
+      "1": "Mira wonders if she can get very far in this land.",
-      "2": "Hum… Je me demande si je suis à la hauteur de ici…"
+      "2": "Mira wonders if she can get very far in this land."
     },
     "defeat": {
-      "1": "Maïté savait qu’elle t’éblouirait !",
+      "1": "Mira knew she would win!",
-      "2": "Maïté savait qu’elle t’éblouirait !"
+      "2": "Mira knew she would win!"
     }
   },
   "stat_trainer_riley": {
     "encounter": {
-      "1": "Le combat, c’est une façon de se saluer pour nous !",
+      "1": "Battling is our way of greeting!",
-      "2": "On va mettre le paquet pour venir à bout de ton équipe."
+      "2": "We're pulling out all the stops to put your Pokémon down."
     },
     "victory": {
-      "1": "Parfois, on fait équipe…\nEt parfois, on s’affronte…$La vie des Dresseurs est pleine de rebondissements.",
+      "1": "At times we battle, and sometimes we team up...$It's great how Trainers can interact.",
-      "2": "Parfois, on fait équipe…\nEt parfois, on s’affronte…$La vie des Dresseurs est pleine de rebondissements.."
+      "2": "At times we battle, and sometimes we team up...$It's great how Trainers can interact."
     },
     "defeat": {
-      "1": "Tu t’en tire bien.\nTu feras mieux la prochaine fois.",
+      "1": "You put up quite the display.\nBetter luck next time.",
-      "2": "Tu t’en tire bien.\nTu feras mieux la prochaine fois."
+      "2": "You put up quite the display.\nBetter luck next time."
     }
   },
   "winstrates_victor": {
     "encounter": {
-      "1": "Bon esprit ! J’aime ça !"
+      "1": "That's the spirit! I like you!"
     },
     "victory": {
-      "1": "Mince !\nTu as un meilleur niveau que je ne le pensais !"
+      "1": "A-ha! You're stronger than I thought!"
     }
   },
   "winstrates_victoria": {
     "encounter": {
-      "1": "Oh, ciel ! Ce que tu es jeune !$Mais si tu as battu mon mari, c’est que tu sais t’y prendre.$À nous deux, maintenant !"
+      "1": "My goodness! Aren't you young?$You must be quite the trainer to beat my husband, though.$Now I suppose it's my turn to battle!"
     },
     "victory": {
-      "1": "Ciel ! Cette force !\nJ’en suis toute retournée !"
+      "1": "Uwah! Just how strong are you?!"
     }
   },
   "winstrates_vivi": {
     "encounter": {
-      "1": "Tu as un meilleur niveau que maman ?\nWaouh!$Mais moi aussi, je suis forte !\nVraiment ! Honnêtement !"
+      "1": "You're stronger than Mom? Wow!$But I'm strong, too!\nReally! Honestly!"
     },
     "victory": {
-      "1": "Quoi ?\nNe me dis pas que j’ai perdu !"
+      "1": "Huh? Did I really lose?\nSnivel... Grandmaaa!"
     }
   },
   "winstrates_vicky": {
     "encounter": {
-      "1": "Comment oses-tu faire pleurer mon adorable petite-fille !$Tu vas me le payer !\nTes Pokémon vont mordre la poussière !"
+      "1": "How dare you make my precious\ngranddaughter cry!$I see I need to teach you a lesson.\nPrepare to feel the sting of defeat!"
     },
     "victory": {
-      "1": "Ouh! Quelle puissance…\nMa petite-fille avait raison…"
+      "1": "Whoa! So strong!\nMy granddaughter wasn't lying."
     }
   },
   "winstrates_vito": {
     "encounter": {
-      "1": "On s’entraine tous ensemble, avec les membres de ma famille !$Je ne perds contre personne !"
+      "1": "I trained together with my whole family,\nevery one of us!$I'm not losing to anyone!"
     },
     "victory": {
-      "1": "J’ai toujours été le meilleur de la famille.\nJe n’avais encore jamais perdu…"
+      "1": "I was better than everyone in my family.\nI've never lost before..."
     }
   },
   "brock": {

src/locales/fr/egg.json

@@ -11,7 +11,7 @@
   "gachaTypeLegendary": "Taux de Légendaires élevé",
   "gachaTypeMove": "Taux de Capacité Œuf Rare élevé",
   "gachaTypeShiny": "Taux de Chromatiques élevé",
-  "eventType": "Évènement Mystère",
+  "eventType": "Évènement mystère",
   "selectMachine": "Sélectionnez une machine.",
   "notEnoughVouchers": "Vous n’avez pas assez de coupons !",
   "tooManyEggs": "Vous avez trop d’Œufs !",

src/locales/fr/mystery-encounters/a-trainers-test-dialogue.json

@@ -8,20 +8,20 @@
   "cheryl": {
     "intro_dialogue": "Bonjour, mon nom est Sara.$J’ai une requête un peu particulière à proposer,\nà quelqu’un de plutôt fort comme toi.$Je porte avec moi deux Œufs de Pokémon,\nmais j’aimerais que quelqu’un prenne soin d’un.$Si tu parviens à me démontrer toute ta force,\nje te donne l’Œuf le plus rare !",
     "accept": "On y va ?",
-    "decline": "Je peux comprendre. Il semblerait que\nton équipe ne soit pas très en forme là.$Laisse-moi m’en occuper."
+    "decline": "Je peux comprendre. Il semblerait que\nton équipe ne soit pas très en forme là.$Laisse-moi m'en occuper."
   },
   "marley": {
-    "intro_dialogue": "Je…@d{64} je m’appelle Viviane.$Je peux te demander un truc ?…$J’ai deux Œufs de Pokémon sur moi,\net j’aimerais que quelqu’un prenne soin d’un.$Si t’arrives à me battre,\nje te donne le plus rare…",
+    "intro_dialogue": "Je…@d{64} je m’appelle Viviane.$Je peux te demander un truc ?…$J'ai deux Œufs de Pokémon sur moi,\net j’aimerais que quelqu’un prenne soin d’un.$Si t’arrives à me battre,\nje te donne le plus rare…",
     "accept": "… D’accord.",
     "decline": "… D’accord.$Tes Pokémon on l’air blessés…\nLaisse-moi les aider."
   },
   "mira": {
-    "intro_dialogue": "Salut ! Moi, c’est Maïté!$J’ai quelque chose\nà demander à quelqu’un de fortiche comme toi !$J’ai deux Œufs de Pokémon sur moi,\net j’aimerais que quelqu’un prenne soin d’un d’eux !$Si t’acceptes de me prouver ta force,\nje te donnerai le plus rare !",
+    "intro_dialogue": "Salut ! Moi, c’est Maïté!$J’ai quelque chose\nà demander à quelqu'un de fortiche comme toi !$J'ai deux Œufs de Pokémon sur moi,\net j’aimerais que quelqu’un prenne soin d’un d’eux !$Si t’acceptes de me prouver ta force,\nje te donnerai le plus rare !",
     "accept": "Un combat, pour de vrai ?\nOuiiiii !",
     "decline": "Oh, pas de combat ?\nPas grave !$Je vais quand même soigner ton équipe !"
   },
   "riley": {
-    "intro_dialogue": "Enchanté, je m’appelle Armand.$J’ai une proposition un peu étange\npour une personne de ton calibre.$Je poste deux Œufs de Pokémon avec moi\nmais j’aimerais en donner un à quelqu’un d’autre.$Si tu prouves en être digne,\nje te donnerai le plus rare !",
+    "intro_dialogue": "Enchanté, je m’appelle Armand.$J'ai une proposition un peu étange\npour une personne de ton calibre.$Je poste deux Œufs de Pokémon avec moi\nmais j’aimerais en donner un à quelqu’un d’autre.$Si tu prouves en être digne,\nje te donnerai le plus rare !",
     "accept": "Ce regard…\nBattons-nous.",
     "decline": "Je comprends, ton équpie m’a l’air lessivée.$Laisse-moi t’aider."
   },

src/locales/fr/mystery-encounters/clowning-around-dialogue.json

@@ -1,34 +1,34 @@
 {
-  "intro": "Mais c’est…@d{64} un clown ?",
+  "intro": "It's...@d{64} a clown?",
   "speaker": "Clown",
-  "intro_dialogue": "T’as l’air clownesque, prépare-toi pour un combat magistral !$Je vais te montrer ce que sont les arts de la rue !",
+  "intro_dialogue": "Bumbling buffoon, brace for a brilliant battle!\nYou'll be beaten by this brawling busker!",
-  "title": "Bouffonneries",
+  "title": "Clowning Around",
-  "description": "Quelque chose semble louche. Ce Clown semble très motivé de vous provoquer en combat, mais dans quel but ?\n\nLe {{blacephalonName}} est très étrange, comme s’il possédait @[TOOLTIP_TITLE]{des types et un talent inhabituels.}",
+  "description": "Something is off about this encounter. The clown seems eager to goad you into a battle, but to what end?\n\nThe {{blacephalonName}} is especially strange, like it has @[TOOLTIP_TITLE]{weird types and ability.}",
-  "query": "Que voulez-vous faire ?",
+  "query": "What will you do?",
   "option": {
     "1": {
-      "label": "Combattre le Clown",
+      "label": "Battle the Clown",
-      "tooltip": "(-) Combat étrange\n(?) Affecte les talents des Pokémon",
+      "tooltip": "(-) Strange Battle\n(?) Affects Pokémon Abilities",
-      "selected": "Vos Pokémon sont prêts pour cette performance pathétique !",
+      "selected": "Your pitiful Pokémon are poised for a pathetic performance!",
-      "apply_ability_dialogue": "Un spectacle sensationnel !\nVotre savoir-faire est en harmonie avec votre compétences !",
+      "apply_ability_dialogue": "A sensational showcase!\nYour savvy suits a sensational skill as spoils!",
-      "apply_ability_message": "Le Clown vous propose d’Échanger définitivement le talent d’un de vos Pokémon contre {{ability}} !",
+      "apply_ability_message": "The clown is offering to permanently Skill Swap one of your Pokémon's ability to {{ability}}!",
-      "ability_prompt": "Voulez-vous définitivement donner le talent {{ability}} à un Pokémon ?",
+      "ability_prompt": "Would you like to permanently teach a Pokémon the {{ability}} ability?",
-      "ability_gained": "@s{level_up_fanfare}{{chosenPokemon}} obtient le talent {{ability}} !"
+      "ability_gained": "@s{level_up_fanfare}{{chosenPokemon}} gained the {{ability}} ability!"
     },
     "2": {
-      "label": "Rester de marbre",
+      "label": "Remain Unprovoked",
-      "tooltip": "(-) Agace le Clown\n(?) Affecte les objets de vos Pokémon",
+      "tooltip": "(-) Upsets the Clown\n(?) Affects Pokémon Items",
-      "selected": "Ça se défile lâchement d’un duel exceptionnel ?\nTâte ma colère !",
+      "selected": "Dismal dodger, you deny a delightful duel?\nFeel my fury!",
-      "selected_2": "Le {{blacephalonName}} du Clown utilise\nTour de Magie !$Tous les objets de {{switchPokemon}}\nsont échangés au hasard !",
+      "selected_2": "The clown's {{blacephalonName}} uses Trick!\nAll of your {{switchPokemon}}'s items were randomly swapped!",
-      "selected_3": "Sombre imbécile, tombe dans mon piège !"
+      "selected_3": "Flustered fool, fall for my flawless deception!"
     },
     "3": {
-      "label": "Retouner les insultes",
+      "label": "Return the Insults",
-      "tooltip": "(-) Agace le Clown\n(?) Affecte les types de vos Pokémon",
+      "tooltip": "(-) Upsets the Clown\n(?) Affects Pokémon Types",
-      "selected": "Ça se défile lâchement d’un duel exceptionnel ?\nTâte ma colère !",
+      "selected": "Dismal dodger, you deny a delightful duel?\nFeel my fury!",
-      "selected_2": "Le {{blacephalonName}} du Clown utilise\nune étrange capacité !$Tous les types de votre équipe\nsont échangés au hasard !",
+      "selected_2": "The clown's {{blacephalonName}} uses a strange move!\nAll of your team's types were randomly swapped!",
-      "selected_3": "Sombre imbécile, tombe dans mon piège !"
+      "selected_3": "Flustered fool, fall for my flawless deception!"
     }
   },
-  "outro": "Le Clown et sa bande disparaissent\ndans un nuage de fumée."
+  "outro": "The clown and his cohorts\ndisappear in a puff of smoke."
 }

src/locales/fr/mystery-encounters/dancing-lessons-dialogue.json

@@ -1,27 +1,27 @@
 {
-  "intro": "Un {{oricorioName}} dance tristement seul, sans partenaire.",
+  "intro": "An {{oricorioName}} dances sadly alone, without a partner.",
-  "title": "Lessons de danse",
+  "title": "Dancing Lessons",
-  "description": "Ce {{oricorioName}} ne semble pas agressif, mais triste tout au plus.\n\nPeut-être a-t-il juste besoin de quelqu’un avec qui danser…",
+  "description": "The {{oricorioName}} doesn't seem aggressive, if anything it seems sad.\n\nMaybe it just wants someone to dance with...",
-  "query": "Que voulez-vous faire ?",
+  "query": "What will you do?",
   "option": {
     "1": {
-      "label": "Le combattre",
+      "label": "Battle It",
-      "tooltip": "(-) Combat difficile\n(+) Gain d’un Bâton",
+      "tooltip": "(-) Tough Battle\n(+) Gain a Baton",
-      "selected": "Le {{oricorioName}} est desemparé et tente de se défendre !",
+      "selected": "The {{oricorioName}} is distraught and moves to defend itself!",
-      "boss_enraged": "La peur de {{oricorioName}} augumente beaucoup ses stats !"
+      "boss_enraged": "The {{oricorioName}}'s fear boosted its stats!"
     },
     "2": {
-      "label": "Apprendre sa danse",
+      "label": "Learn Its Dance",
-      "tooltip": "(+) Apprendre Danse Éveil à un Pokémon",
+      "tooltip": "(+) Teach a Pokémon Revelation Dance",
-      "selected": "Vos scrutez {{oricorioName}} de près pendant sa danse…$@s{level_up_fanfare}Votre {{selectedPokemon}} apprend Danse Éveil de {{oricorioName}} !"
+      "selected": "You watch the {{oricorioName}} closely as it performs its dance...$@s{level_up_fanfare}Your {{selectedPokemon}} learned from the {{oricorioName}}!"
     },
     "3": {
-      "label": "Lui montrer une danse",
+      "label": "Show It a Dance",
-      "tooltip": "(-) Apprendre à {{oricorioName}} une capacité dansante\n(+) Le {{oricorioName}} vous apprécie",
+      "tooltip": "(-) Teach the {{oricorioName}} a Dance Move\n(+) The {{oricorioName}} Will Like You",
-      "disabled_tooltip": "Votre Pokémon doit connaitre une capacité dansante pour choisir cette option.",
+      "disabled_tooltip": "Your Pokémon need to know a Dance move for this.",
-      "select_prompt": "Sélectionnez une capacité dansante.",
+      "select_prompt": "Select a Dance type move to use.",
-      "selected": "Le {{oricorioName}} observe avec fascination\n{{selectedPokemon}} exécuter {{selectedMove}} !$Il adore le démonstration !$@s{level_up_fanfare}Le {{oricorioName}} veut se joindre à votre équipe !"
+      "selected": "The {{oricorioName}} watches in fascination as\n{{selectedPokemon}} shows off {{selectedMove}}!$It loves the display!$@s{level_up_fanfare}The {{oricorioName}} wants to join your party!"
     }
   },
-  "invalid_selection": "Il ne connait aucune capacité dansante"
+  "invalid_selection": "This Pokémon doesn't know a Dance move"
 }

src/locales/fr/mystery-encounters/dark-deal-dialogue.json

@@ -1,24 +1,24 @@
 
 
 {
-  "intro": "Un homme suspect vêtu d’un manteau en lambeaux\nse tient au milieu du chemin…",
+  "intro": "A strange man in a tattered coat\nstands in your way...",
-  "speaker": "Type chelou",
+  "speaker": "Shady Guy",
-  "intro_dialogue": "Hé, toi!$Je travaille sur un dispositif qui permet\nd’éveiller la puissance d’un Pokémon !$Il restructure complètement les atomes du Pokémon\nen une forme bien plus puissante.$Héhé…@d{64} Je n’ai besoin que de sac-@d{32}\nEuuh, sujets tests, pour prouver son fonctionnement.",
+  "intro_dialogue": "Hey, you!$I've been working on a new device\nto bring out a Pokémon's latent power!$It completely rebinds the Pokémon's atoms\nat a molecular level into a far more powerful form.$Hehe...@d{64} I just need some sac-@d{32}\nErr, test subjects, to prove it works.",
-  "title": "L’Expérience interdite",
+  "title": "Dark Deal",
-  "description": "Le type chelou tient dans ses mains quelques Poké Balls.\n« T’inquites pas, je gère ! Voilà quelques Poké Balls plutôt efficaces en caution, tout ce dont j’ai besoin, c’est un de tes Pokémon ! Héhé… »",
+  "description": "The disturbing fellow holds up some Pokéballs.\n\"I'll make it worth your while! You can have these strong Pokéballs as payment, All I need is a Pokémon from your team! Hehe...\"",
-  "query": "Que voulez-vous faire ?",
+  "query": "What will you do?",
   "option": {
     "1": {
-      "label": "Accepter",
+      "label": "Accept",
-      "tooltip": "(+) 5 Rogue Balls\n(?) Améliorer un Pokémon au hasard",
+      "tooltip": "(+) 5 Rogue Balls\n(?) Enhance a Random Pokémon",
-      "selected_dialogue": "Ah bien, ce {{pokeName}} fera parfaitement l’affaire !$Je précise que si quelque chose tourne mal,\nje ne suis pas responsable !@d{32} Héhé…",
+      "selected_dialogue": "Let's see, that {{pokeName}} will do nicely!$Remember, I'm not responsible\nif anything bad happens!@d{32} Hehe...",
-      "selected_message": "L’homme vous remet 5 Rogue Balls.$Votre {{pokeName}} saute dans l’étrange dispositif…$Le dispositif émet des lumières\nclignotantes et des bruits douteux !$…@d{96} Quelque chose sort du dispositif avec fureur !"
+      "selected_message": "The man hands you 5 Rogue Balls.${{pokeName}} hops into the strange machine...$Flashing lights and weird noises\nstart coming from the machine!$...@d{96} Something emerges\nfrom the device, raging wildly!"
     },
     "2": {
-      "label": "Refuser",
+      "label": "Refuse",
-      "tooltip": "(-) Aucune récompense",
+      "tooltip": "(-) No Rewards",
-      "selected": "On a même plus le droit d’aider maintenant ?\nPfff !"
+      "selected": "Not gonna help a poor fellow out?\nPah!"
     }
   },
-  "outro": "Après cette épuisante rencontre,\nvous reprenez vos esprits et repartez."
+  "outro": "After the harrowing encounter,\nyou collect yourself and depart."
 }

src/locales/fr/mystery-encounters/delibirdy-dialogue.json

@@ -1,29 +1,29 @@
 
 
 {
-  "intro": "Une horde de {{delibirdName}} apparait !",
+  "intro": "A pack of {{delibirdName}} have appeared!",
-  "title": "Cas d’oiseaux",
+  "title": "Delibir-dy",
-  "description": "Les {{delibirdName}} vous scrutent avec curiosité, comme s’ils attendaient quelque chose. Peut-être que leur donner un objet ou un peu d’argent pourrait les satisfaire ?",
+  "description": "The {{delibirdName}}s are looking at you expectantly, as if they want something. Perhaps giving them an item or some money would satisfy them?",
-  "query": "Que voulez-vous faire ?",
+  "query": "What will you give them?",
-  "invalid_selection": "Ce Pokémon ne porte pas ce genre d’objet.",
+  "invalid_selection": "Pokémon doesn't have that kind of item.",
   "option": {
     "1": {
-      "label": "Donner de l’argent",
+      "label": "Give Money",
-      "tooltip": "(-) Donner {{money, money}} aux {{delibirdName}}\n(+) Recevez un objet",
+      "tooltip": "(-) Give the {{delibirdName}}s {{money, money}}\n(+) Receive a Gift Item",
-      "selected": "Vous lancez de l’argent aux {{delibirdName}},\nqui se lancent dans une grande délibération.$Ils reviennent ravis vers vous avec un cadeau !"
+      "selected": "You toss the money to the {{delibirdName}}s,\nwho chatter amongst themselves excitedly.$They turn back to you and happily give you a present!"
     },
     "2": {
-      "label": "Donner de la nourriture",
+      "label": "Give Food",
-      "tooltip": "(-) Donner une Baie ou une Résugraine aux {{delibirdName}}\n(+) Recevez un objet",
+      "tooltip": "(-) Give the {{delibirdName}}s a Berry or Reviver Seed\n(+) Receive a Gift Item",
-      "select_prompt": "Sélectionner un objet à donner.",
+      "select_prompt": "Select an item to give.",
-      "selected": "Vous lancez la {{chosenItem}} aux {{delibirdName}},\nqui se lancent dans une grande délibération.$Ils reviennent ravis vers vous avec un cadeau !"
+      "selected": "You toss the {{chosenItem}} to the {{delibirdName}}s,\nwho chatter amongst themselves excitedly.$They turn back to you and happily give you a present!"
     },
     "3": {
-      "label": "Donner un objet",
+      "label": "Give an Item",
-      "tooltip": "(-) Donner un objet tenu aux {{delibirdName}}\n(+) Recevez un objet",
+      "tooltip": "(-) Give the {{delibirdName}}s a Held Item\n(+) Receive a Gift Item",
-      "select_prompt": "Sélectionner un objet à donner.",
+      "select_prompt": "Select an item to give.",
-      "selected": "Vous lancez l’objet {{chosenItem}} aux {{delibirdName}},\nqui se lancent dans une grande délibération.$Ils reviennent ravis vers vous avec un cadeau !"
+      "selected": "You toss the {{chosenItem}} to the {{delibirdName}}s,\nwho chatter amongst themselves excitedly.$They turn back to you and happily give you a present!"
     }
   },
-  "outro": "La horde de {{delibirdName}} repartent dans la joie.$Un bien curieux échange !"
+  "outro": "The {{delibirdName}} pack happily waddles off into the distance.$What a curious little exchange!"
 }

src/locales/fr/mystery-encounters/department-store-sale-dialogue.json

@@ -1,27 +1,27 @@
 {
-  "intro": "Il y a une dame avec des tas de sacs de courses.",
+  "intro": "It's a lady with a ton of shopping bags.",
-  "speaker": "Cliente",
+  "speaker": "Shopper",
-  "intro_dialogue": "Bonjour !\nToi aussi t’es là pour les incroyables promos ?$Il y a un coupon spécial que tu peux utiliser en échange\nd’un objet gratuit pendant toute la durée de la promo !$J’en ai un en trop.\nTiens, prends-le!",
+  "intro_dialogue": "Hello! Are you here for\nthe amazing sales too?$There's a special coupon that you can\nredeem for a free item during the sale!$I have an extra one. Here you go!",
-  "title": "Promos au Centre Commercial",
+  "title": "Department Store Sale",
-  "description": "Vous voyez des produits où que vous regardez ! Il y a 4 comptoirs auprès desquels vous pouvez dépenser ce coupon contre une grande variété d’objets. Que de choix !",
+  "description": "There is merchandise in every direction! It looks like there are 4 counters where you can redeem the coupon for various items. The possibilities are endless!",
-  "query": "À quel comptoir se rendre ?",
+  "query": "Which counter will you go to?",
   "option": {
     "1": {
-      "label": "Comptoir de CT",
+      "label": "TM Counter",
-      "tooltip": "(+) Boutique de CT"
+      "tooltip": "(+) TM Shop"
     },
     "2": {
-      "label": "Comptoir de Vitamines",
+      "label": "Vitamin Counter",
-      "tooltip": "(+) Boutique de Vitamines"
+      "tooltip": "(+) Vitamin Shop"
     },
     "3": {
-      "label": "Comptoir d’Objets de Combat",
+      "label": "Battle Item Counter",
-      "tooltip": "(+) Boutique d’objets de boost"
+      "tooltip": "(+) X Item Shop"
     },
     "4": {
-      "label": "Comptoir de Poké Balls",
+      "label": "Pokéball Counter",
-      "tooltip": "(+) Boutique de Poké Balls"
+      "tooltip": "(+) Pokéball Shop"
     }
   },
-  "outro": "Quelle affaire ! Vous devriez revenir y faire vos achats plus souvent."
+  "outro": "What a deal! You should shop there more often."
 }

src/locales/fr/mystery-encounters/field-trip-dialogue.json

@@ -1,31 +1,31 @@
 {
-  "intro": "C’est une enseignante avec ses élèves !",
+  "intro": "It's a teacher and some school children!",
-  "speaker": "Enseignante",
+  "speaker": "Teacher",
-  "intro_dialogue": "Hé, bonjour ! Aurais-tu une minute à accorder à mes élèves ?$Je leur apprends ce que sont les capacités et\nj’adorerais que tu leur fasse une démosntration.$Tu serais d’accord pour nous montrer ça avec un de tes Pokémon ?",
+  "intro_dialogue": "Hello, there! Would you be able to\nspare a minute for my students?$I'm teaching them about Pokémon moves\nand would love to show them a demonstration.$Would you mind showing us one of\nthe moves your Pokémon can use?",
-  "title": "En situation réelle",
+  "title": "Field Trip",
-  "description": "Une enseignante vous demande de faire la démonstration d’une capacité d’un de vos Pokémon. En fonction de la capacité, elle pourrait vous donner quelque chose d’utile.",
+  "description": "A teacher is requesting a move demonstration from a Pokémon. Depending on the move you choose, she might have something useful for you in exchange.",
-  "query": "Utiliser une capacité de quelle catégorie ?",
+  "query": "Which move category will you show off?",
   "option": {
     "1": {
-      "label": "Physique",
+      "label": "A Physical Move",
-      "tooltip": "(+) Récompense d’objets Physiques"
+      "tooltip": "(+) Physical Item Rewards"
     },
     "2": {
-      "label": "Spéciale",
+      "label": "A Special Move",
-      "tooltip": "(+) Récompense d’objets Spéciaux"
+      "tooltip": "(+) Special Item Rewards"
     },
     "3": {
-      "label": "De Statut",
+      "label": "A Status Move",
-      "tooltip": "(+) Récompense d’objets de Statut"
+      "tooltip": "(+) Status Item Rewards"
     },
-    "selected": "{{pokeName}} fait une incroyable démonstration de sa capacité {{move}} !"
+    "selected": "{{pokeName}} shows off an awesome display of {{move}}!"
   },
-  "second_option_prompt": "Choisissez une capacité à utiliser.",
+  "second_option_prompt": "Choose a move for your Pokémon to use.",
-  "incorrect": "…$Ce n’est pas une capacité {{moveCategory}} !\nJe suis désolée, mais je ne peux rien te donner.$Venez les enfants, on va chercher mieux ailleurs.",
+  "incorrect": "...$That isn't a {{moveCategory}} move!\nI'm sorry, but I can't give you anything.$Come along children, we'll\nfind a better demonstration elsewhere.",
-  "incorrect_exp": "Il semble que vous avez appris une précieuse leçon ?$Votre Pokémon a gagné un peu d’expérience.",
+  "incorrect_exp": "Looks like you learned a valuable lesson?$Your Pokémon also gained some experience.",
-  "correct": "Merci beaucoup de nous avoir accordé de ton temps !\nJ’espère que ces quelques objets de seront utiles !",
+  "correct": "Thank you so much for your kindness!\nI hope these items might be of use to you!",
-  "correct_exp": "{{pokeName}} a aussi gagné un beaucoup d’expérience !",
+  "correct_exp": "{{pokeName}} also gained some valuable experience!",
-  "status": "de Statut",
+  "status": "Status",
-  "physical": "Physique",
+  "physical": "Physical",
-  "special": "Spéciale"
+  "special": "Special"
 }

src/locales/it/battle.json

@@ -14,10 +14,10 @@
   "moneyWon": "Hai vinto {{moneyAmount}}₽",
   "moneyPickedUp": "Hai raccolto ₽{{moneyAmount}}!",
   "pokemonCaught": "Preso! {{pokemonName}} è stato catturato!",
-  "pokemonObtained": "Hai ricevuto {{pokemonName}}!",
+  "pokemonObtained": "You got {{pokemonName}}!",
-  "pokemonBrokeFree": "Oh no!\nIl Pokémon è uscito dalla Poké Ball!",
+  "pokemonBrokeFree": "Oh no!\nThe Pokémon broke free!",
-  "pokemonFled": "{pokemonName}} selvatico è fuggito!",
+  "pokemonFled": "The wild {{pokemonName}} fled!",
-  "playerFled": "Sei fuggito/a da {{pokemonName}}!",
+  "playerFled": "You fled from the {{pokemonName}}!",
   "addedAsAStarter": "{{pokemonName}} è stato\naggiunto agli starter!",
   "partyFull": "La tua squadra è al completo.\nVuoi liberare un Pokémon per far spazio a {{pokemonName}}?",
   "pokemon": "Pokémon",
@@ -53,7 +53,7 @@
   "noPokeballTrainer": "Non puoi catturare\nPokémon di altri allenatori!",
   "noPokeballMulti": "Puoi lanciare una Poké Ball\nsolo quando rimane un singolo Pokémon!",
   "noPokeballStrong": "Il Pokémon avversario è troppo forte per essere catturato!\nDevi prima indebolirlo.",
-  "noPokeballMysteryEncounter": "Non ti è possibile\ncatturare questo Pokémon!",
+  "noPokeballMysteryEncounter": "You aren't able to\ncatch this Pokémon!",
   "noEscapeForce": "Una forza misteriosa\nimpedisce la fuga.",
   "noEscapeTrainer": "Non puoi sottrarti\nalla lotta con un'allenatore!",
   "noEscapePokemon": "{{moveName}} di {{pokemonName}}\npreviene la {{escapeVerb}}!",
@@ -101,5 +101,5 @@
   "congratulations": "Congratulazioni!",
   "beatModeFirstTime": "{{speciesName}} ha completato la modalità {{gameMode}} per la prima volta!\nHai ricevuto {{newModifier}}!",
   "ppReduced": "I PP della mossa {{moveName}} di\n{{targetName}} sono stati ridotti di {{reduction}}!",
-  "mysteryEncounterAppeared": "Che succede?"
+  "mysteryEncounterAppeared": "What's this?"
 }

src/locales/it/egg.json

@@ -11,7 +11,7 @@
   "gachaTypeLegendary": "Tasso dei leggendari aumentato",
   "gachaTypeMove": "Tasso delle mosse rare da uova aumentato",
   "gachaTypeShiny": "Tasso degli shiny aumentato",
-  "eventType": "Evento Misterioso",
+  "eventType": "Mystery Event",
   "selectMachine": "Seleziona un macchinario.",
   "notEnoughVouchers": "Non hai abbastanza biglietti!",
   "tooManyEggs": "Hai troppe uova!",

src/locales/it/modifier-type.json

@@ -69,18 +69,18 @@
       "description": "Aumenta l'/la {{stat}} di base del possessore del 10%."
     },
     "PokemonBaseStatTotalModifierType": {
-      "name": "Succo Shuckle",
+      "name": "Shuckle Juice",
-      "description": "{{increaseDecrease}} tutte le statistiche del possessore di {{statValue}}. Shuckle ti ha {{blessCurse}}.",
+      "description": "{{increaseDecrease}} all of the holder's base stats by {{statValue}}. You were {{blessCurse}} by the Shuckle.",
       "extra": {
-        "increase": "Aumenta",
+        "increase": "Increases",
-        "decrease": "Diminuisce",
+        "decrease": "Decreases",
-        "blessed": "benedetto/a",
+        "blessed": "blessed",
-        "cursed": "maledetto/a"
+        "cursed": "cursed"
       }
     },
     "PokemonBaseStatFlatModifierType": {
-      "name": "Dolce Gateau",
+      "name": "Old Gateau",
-      "description": "Aumenta le statistiche {{stats}} del possessore di {{statValue}}. Trovato dopo uno strano sogno."
+      "description": "Increases the holder's {{stats}} base stats by {{statValue}}. Found after a strange dream."
     },
     "AllPokemonFullHpRestoreModifierType": {
       "description": "Restituisce il 100% dei PS a tutti i Pokémon."
@@ -417,11 +417,11 @@
       "description": "Aggiunge l'1% di possibilità che un Pokémon selvatico sia una fusione."
     },
 
-    "MYSTERY_ENCOUNTER_SHUCKLE_JUICE": { "name": "Succo Shuckle" },
+    "MYSTERY_ENCOUNTER_SHUCKLE_JUICE": { "name": "Shuckle Juice" },
-    "MYSTERY_ENCOUNTER_BLACK_SLUDGE": { "name": "Fangopece", "description": "L'odore è talmente sgradevole che i prezzi dei negozi aumentano drasticamente." },
+    "MYSTERY_ENCOUNTER_BLACK_SLUDGE": { "name": "Black Sludge", "description": "The stench is so powerful that shops will only sell you items at a steep cost increase." },
-    "MYSTERY_ENCOUNTER_MACHO_BRACE": { "name": "Crescicappa", "description": "Sconfiggere un Pokémon aumenta di 1 il punteggio Crescicappa. Maggiore il punteggio, maggiore l'aumento alle statistiche, con un ulteriore bonus al massimo." },
+    "MYSTERY_ENCOUNTER_MACHO_BRACE": { "name": "Macho Brace", "description": "Defeating a Pokémon grants the holder a Macho Brace stack. Each stack slightly boosts stats, with an extra bonus at max stacks." },
-    "MYSTERY_ENCOUNTER_OLD_GATEAU": { "name": "Dolce Gateau", "description": "Aumenta le statistiche {{stats}} del possessore di {{statValue}}." },
+    "MYSTERY_ENCOUNTER_OLD_GATEAU": { "name": "Old Gateau", "description": "Increases the holder's {{stats}} stats by {{statValue}}." },
-    "MYSTERY_ENCOUNTER_GOLDEN_BUG_NET": { "name": "Retino Dorato", "description": "Infonde fortuna nel possessore affinché trovi più Pokémon coleottero. Ha uno strano peso." }
+    "MYSTERY_ENCOUNTER_GOLDEN_BUG_NET": { "name": "Golden Bug Net", "description": "Imbues the owner with luck to find Bug Type Pokémon more often. Has a strange heft to it." }
   },
   "SpeciesBoosterItem": {
     "LIGHT_BALL": {

src/locales/it/mystery-encounter-messages.json

@@ -1,6 +1,6 @@
 {
-  "paid_money": "Hai pagato {{amount, number}}₽.",
+  "paid_money": "You paid ₽{{amount, number}}.",
-  "receive_money": "Hai ricevuto {{amount, number}}₽!",
+  "receive_money": "You received ₽{{amount, number}}!",
-  "affects_pokedex": "Influisce sul Pokédex",
+  "affects_pokedex": "Affects Pokédex Data",
-  "cancel_option": "Torna alla scelta dell'incontro."
+  "cancel_option": "Return to encounter option select."
 }

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

@@ -15,7 +15,7 @@
   "UNPAUSE_EVOLUTION": "Consenti evoluzione",
   "REVIVE": "Revitalizza",
   "RENAME": "Rinomina",
-  "SELECT": "Seleziona",
+  "SELECT": "Select",
   "choosePokemon": "Scegli un Pokémon.",
   "doWhatWithThisPokemon": "Hai selezionato questo Pokémon.",
   "noEnergy": "{{pokemonName}} non ha più energie\nper lottare!",

src/locales/it/trainer-names.json

@@ -158,15 +158,15 @@
   "marnie_piers_double": "Mary & Ginepro",
   "piers_marnie_double": "Ginepro & Mary",
 
-  "buck": "Chicco",
+  "buck": "Buck",
-  "cheryl": "Demetra",
+  "cheryl": "Cheryl",
-  "marley": "Risetta",
+  "marley": "Marley",
-  "mira": "Matilde",
+  "mira": "Mira",
-  "riley": "Fabiolo",
+  "riley": "Riley",
-  "victor": "Vincenzo",
+  "victor": "Victor",
-  "victoria": "Vittoria",
+  "victoria": "Victoria",
-  "vivi": "Viviana",
+  "vivi": "Vivi",
   "vicky": "Vicky",
-  "vito": "Enrico",
+  "vito": "Vito",
-  "bug_type_superfan": "Fan n.1 dei tipi Coleottero"
+  "bug_type_superfan": "Bug-Type Superfan"
 }

src/locales/it/trainer-titles.json

@@ -36,6 +36,6 @@
   "skull_admin": "Ufficiale Team Skull",
   "macro_admin": "Vicepresidente Macro Cosmos",
 
-  "the_winstrates": "Famiglia Vinci'"
+  "the_winstrates": "The Winstrates'"
 }
 

src/locales/ja/battle.json

@@ -97,5 +97,5 @@
   "congratulations": "おめでとうございます！！",
   "beatModeFirstTime": "初めて　{{speciesName}}が　{{gameMode}}モードを　クリアした!\n{{newModifier}}を　手に入れた!",
   "ppReduced": "{{targetName}}の　{{moveName}}を　{{reduction}}削った!",
-  "mysteryEncounterAppeared": "あれ？"
+  "mysteryEncounterAppeared": "What's this?"
 }

src/locales/ja/bgm-name.json

@@ -148,8 +148,8 @@
   "menu": "ポケダン空 ようこそ！ ポケモンたちのせかいへ！",
   "title": "ポケダン空 トップメニュー",
 
-  "mystery_encounter_weird_dream": "ポケダン空　じげんのとう",
+  "mystery_encounter_weird_dream": "PMD EoS Temporal Spire",
-  "mystery_encounter_fun_and_games": "ポケダン空　おやかたプクリン",
+  "mystery_encounter_fun_and_games": "PMD EoS Guildmaster Wigglytuff",
-  "mystery_encounter_gen_5_gts": "BW　GTS",
+  "mystery_encounter_gen_5_gts": "BW GTS",
-  "mystery_encounter_gen_6_gts": "XY　GTS"
+  "mystery_encounter_gen_6_gts": "XY GTS"
 }

src/locales/ja/modifier-type.json

@@ -2,71 +2,71 @@
   "ModifierType": {
     "AddPokeballModifierType": {
       "name": "{{modifierCount}}x {{pokeballName}}",
-      "description": "{{pokeballName}}を　{{modifierCount}}個　手に入れる　(所有: {{pokeballAmount}})\n捕捉率：{{catchRate}}"
+      "description": "{{pokeballName}} x{{modifierCount}}こ てにいれる (インベントリ: {{pokeballAmount}}) \nほそくりつ: {{catchRate}}"
     },
     "AddVoucherModifierType": {
       "name": "{{modifierCount}}x {{voucherTypeName}}",
-      "description": "{{voucherTypeName}}を {{modifierCount}}個 手に入れる"
+      "description": "{{voucherTypeName}} x{{modifierCount}}こ てにいれる"
     },
     "PokemonHeldItemModifierType": {
       "extra": {
-        "inoperable": "{{pokemonName}}は　このアイテムを\n持つ　ことが　できません！",
+        "inoperable": "{{pokemonName}} はこのアイテムを\nもつことができません！",
-        "tooMany": "{{pokemonName}}は　このアイテムを\n持ちすぎています！"
+        "tooMany": "{{pokemonName}} はこのアイテムを\nもちすぎています！"
       }
     },
     "PokemonHpRestoreModifierType": {
-      "description": "ポケモン　一匹の　{{restorePoints}}HP、または　{{restorePercent}}%　のどちらか　高い方を　回復する",
+      "description": "ポケモンの HPを {{restorePoints}} または {{restorePercent}}%のどちらか たかいほうを かいふくする",
       "extra": {
-        "fully": "ポケモン 1匹の HPを すべて 回復する",
+        "fully": "ポケモンのHPをすべてかいふくする",
-        "fullyWithStatus": "ポケモン　1匹の　HPと　状態異常を　すべて　回復する"
+        "fullyWithStatus": "ポケモンの HPと じょうたいいじょうを かいふくする"
       }
     },
     "PokemonReviveModifierType": {
-      "description": "ひんしに　なった　ポケモン　1匹を　元気にした上で\nHPを　{{restorePercent}}%　回復する"
+      "description": "ひんしになってしまったポケモンの HP {{restorePercent}}%を かいふくする"
     },
     "PokemonStatusHealModifierType": {
-      "description": "ポケモン　1匹の　状態の　異常を　すべて　回復する"
+      "description": "すべてのじょうたいいじょうを なおす"
     },
     "PokemonPpRestoreModifierType": {
-      "description": "ポケモンが　覚えている　技のうち\n1つの　PPを　10だけ　回復する",
+      "description": "ポケモンが おぼえている わざの PPを {{restorePoints}}ずつ かいふくする",
       "extra": {
-        "fully": "ポケモンが　覚えている　技のうち\n1つの　PPを　すべて　回復する"
+        "fully": "ポケモンが おぼえている わざの PPを すべて かいふくする"
       }
     },
     "PokemonAllMovePpRestoreModifierType": {
-      "description": "ポケモンが　覚えている　4つの　技の　PPを　{{restorePoints}}ずつ　回復する",
+      "description": "ポケモンが おぼえている 4つの わざの PPを {{restorePoints}}ずつ かいふくする",
       "extra": {
-        "fully": "ポケモンが　覚えている　4つの　技の　PPを　すべて　回復する"
+        "fully": "ポケモンが おぼえている 4つの わざの PPを すべて かいふくする"
       }
     },
     "PokemonPpUpModifierType": {
-      "description": "ポケモンが　覚えている　技のうち　1つの　PPの　最大値を　5ごとに　{{upPoints}}ポイントずつ　上げる（最大3）"
+      "description": "ポケモンのわざのさいだいPPを さいだいPP 5ごとに {{upPoints}} ポイントずつ ふやします（さいだい3）"
     },
     "PokemonNatureChangeModifierType": {
-      "name": "{{natureName}}ミント",
+      "name": "{{natureName}} Mint",
-      "description": "ポケモン　1匹の　性格を　「{{natureName}}」に　変える。\nその上、スターター画面でも　{{natureName}}が　選べるように　なる。"
+      "description": "ポケモンのせいかくを {{natureName}}にかえて スターターのせいかくをえいきゅうにかいじょする"
     },
     "DoubleBattleChanceBoosterModifierType": {
       "description": "バトル{{battleCount}}回の間 　ダブルバトルになる　　確率を　4倍に　する"
     },
     "TempStatStageBoosterModifierType": {
-      "description": "全員の　手持ちポケモンの　{{stat}}を　最大５回の　バトルの間に　{{amount}}　上げる",
+      "description": "全員の　手持ちポケモンの　{{stat}}を　最大５回の　バトルの間に　{{amount}}あげる.",
       "extra": {
-        "stage": "1段階",
+        "stage": "１段階",
-        "percentage": "30%"
+        "percentage": "３０％"
       }
     },
     "AttackTypeBoosterModifierType": {
-      "description": "ポケモンの　{{moveType}}タイプの　技の　威力を　20%　上げる"
+      "description": "ポケモンの {{moveType}}タイプのわざのいりょくを20パーセントあげる"
     },
     "PokemonLevelIncrementModifierType": {
-      "description": "ポケモンの　レベルを　{{levels}}　上げる"
+      "description": "ポケモンのレベルを1あげる"
     },
     "AllPokemonLevelIncrementModifierType": {
-      "description": "手持ちポケモンの　全員のレベルを　{{levels}}　上げる"
+      "description": "すべてのパーティメンバーのレベルを1あげる"
     },
     "BaseStatBoosterModifierType": {
-      "description": "ポケモンの　基本の{{stat}}を　10%　あげる。\n個体値が　高けば高いほど　持てる限界が　上がる"
+      "description": "ポケモンの{{stat}}のきほんステータスを10パーセントあげる。こたいちがたかいほどスタックのげんかいもたかくなる。"
     },
     "PokemonBaseStatTotalModifierType": {
       "name": "Shuckle Juice",
@@ -83,185 +83,339 @@
       "description": "Increases the holder's {{stats}} base stats by {{statValue}}. Found after a strange dream."
     },
     "AllPokemonFullHpRestoreModifierType": {
-      "description": "手持ちポケモン　全員の　HPを　すべて　回復する"
+      "description": "すべてのポケモンのHPを100パーセントかいふくする"
     },
     "AllPokemonFullReviveModifierType": {
-      "description": "ひんしに　なってしまった　ポケモン　全員の　HPを　すべて　回復する"
+      "description": "ひんしになったすべてのポケモンをふっかつさせ HPをぜんかいふくする"
     },
     "MoneyRewardModifierType": {
-      "description": "{{moneyMultiplier}}額の　円を　与える（{{moneyAmount}}円）",
+      "description": "{{moneyMultiplier}}ぶんのきんがくをあたえる (₽{{moneyAmount}})",
       "extra": {
-        "small": "小",
+        "small": "すくない",
-        "moderate": "ある金",
+        "moderate": "ふつう",
-        "large": "多"
+        "large": "おおい"
       }
     },
     "ExpBoosterModifierType": {
-      "description": "もらえる　経験値を　{{boostPercent}}%　増やす"
+      "description": "もらえるけいけんちを {{boostPercent}}パーセントふやす"
     },
     "PokemonExpBoosterModifierType": {
-      "description": "持っているポケモンの　もらう経験値を {{boostPercent}}%　増やす"
+      "description": "もっているポケモンのけいけんちを {{boostPercent}}パーセントふやす"
     },
     "PokemonFriendshipBoosterModifierType": {
-      "description": "持っているポケモンの　なかよし度の収穫が　勝利ごとに　50%　上がる"
+      "description": "しょうりごとに 50%パーセント なかよく なりやすくなる"
     },
     "PokemonMoveAccuracyBoosterModifierType": {
-      "description": "技の　命中率を　{{accuracyAmount}}　増やす（最大　100）"
+      "description": "わざのめいちゅうりつを{{accuracyAmount}}ふやす (さいだい100)"
     },
     "PokemonMultiHitModifierType": {
-      "description": "持たせると　攻撃が　もう一度　当たるが、\n威力が 減る（1個：60%減る/2個：75%減る/3個：82.5%減る）"
+      "description": "こうげきがもういちどあたる。そのたびにいりょくがそれぞれ60/75/82.5%へる"
     },
     "TmModifierType": {
-      "name": "TM{{moveId}}\n{{moveName}}",
+      "name": "TM{{moveId}} - {{moveName}}",
-      "description": "ポケモンに {{moveName}}を　教える"
+      "description": "ポケモンに {{moveName}} をおしえる"
     },
     "TmModifierTypeWithInfo": {
-      "name": "TM{{moveId}}\n{{moveName}}",
+      "name": "TM{{moveId}} - {{moveName}}",
-      "description": "ポケモンに {{moveName}}を　教える\n（Cキー／Shiftキーを押すと　技情報が見える)"
+      "description": "ポケモンに {{moveName}} をおしえる\n(Hold C or Shift for more info)"
     },
     "EvolutionItemModifierType": {
-      "description": "ある特定の　ポケモンを　進化させる"
+      "description": "とくていのポケモンをしんかさせる"
     },
     "FormChangeItemModifierType": {
-      "description": "ある特定の　ポケモンを　フォームチェンジさせる"
+      "description": "とくていのポケモンをフォームチェンジさせる"
     },
     "FusePokemonModifierType": {
-      "description": "2匹の　ポケモンを　吸収合体する（特性が移動し、基本能力とタイプを分け、覚える技を共有する）"
+      "description": "2匹のポケモンをけつごうする (とくせいをいどうし、きほんステータスとタイプをわけ、わざプールをきょうゆうする)"
     },
     "TerastallizeModifierType": {
-      "name": "テラピース{{teraType}}",
+      "name": "{{teraType}} Tera Shard",
-      "description": "ポケモンを　{{teraType}}タイプに　テラスタルさせる（最大10回のバトルの間）"
+      "description": "ポケモンを{{teraType}}タイプにテラスタル（10かいのバトルまで）"
     },
     "ContactHeldItemTransferChanceModifierType": {
-      "description": "持っているポケモンが　攻撃すると　相手の持っている\nアイテムを {{chancePercent}}%の　確率で　盗む"
+      "description": "こうげきするとき あいてがもっているアイテムを {{chancePercent}}パーセントのかくりつでぬすむ"
     },
     "TurnHeldItemTransferModifierType": {
-      "description": "毎ターン　相手から　一つの　持っている\nアイテム　を吸い込んで　盗む"
+      "description": "まいターン あいてからひとつのもちものをてにいれる"
     },
     "EnemyAttackStatusEffectChanceModifierType": {
-      "description": "攻撃技に　{{chancePercent}}%の　確率で　{{statusEffect}}を　与える"
+      "description": "こうげきわざに {{chancePercent}}パーセントのかくりつで {{statusEffect}}をあたえる"
     },
     "EnemyEndureChanceModifierType": {
-      "description": "ひんしに　なりそうな　技を　受けても\n{{chancePercent}}%の　確率で　HPを　1だけ　残して　耐える"
+      "description": "こうげきをこらえるかくりつを{{chancePercent}}パーセントふやす"
+    },
+    "RARE_CANDY": {
+      "name": "ふしぎなアメ"
+    },
+    "RARER_CANDY": {
+      "name": "もっとふしぎなアメ"
+    },
+    "MEGA_BRACELET": {
+      "name": "メガバングル",
+      "description": "メガストーンがつかえるようになる"
+    },
+    "DYNAMAX_BAND": {
+      "name": "ダイマックスバンド",
+      "description": "ダイスープがつかえるようになる"
+    },
+    "TERA_ORB": {
+      "name": "テラスタルオーブ",
+      "description": "テラピースがつかえるようになる"
+    },
+    "MAP": {
+      "name": "ちず",
+      "description": "わかれみちでいきさきをえらべるようになる"
+    },
+    "POTION": {
+      "name": "キズぐすり"
+    },
+    "SUPER_POTION": {
+      "name": "いいキズぐすり"
+    },
+    "HYPER_POTION": {
+      "name": "すごいキズぐすり"
+    },
+    "MAX_POTION": {
+      "name": "まんたんのくすり"
+    },
+    "FULL_RESTORE": {
+      "name": "かいふくのくすり"
+    },
+    "REVIVE": {
+      "name": "げんきのかけら"
+    },
+    "MAX_REVIVE": {
+      "name": "げんきのかたまり"
+    },
+    "FULL_HEAL": {
+      "name": "なんでもなおし"
+    },
+    "SACRED_ASH": {
+      "name": "せいなるはい"
+    },
+    "REVIVER_SEED": {
+      "name": "ふっかつのタネ",
+      "description": "ひんしになったときもっているポケモンをHPはんぶんでふっかつさせる"
+    },
+    "WHITE_HERB": {
+      "name": "White Herb",
+      "description": "An item to be held by a Pokémon. It will restore any lowered stat in battle."
+    },
+    "ETHER": {
+      "name": "ピーピーエイド"
+    },
+    "MAX_ETHER": {
+      "name": "ピーピーリカバー"
+    },
+    "ELIXIR": {
+      "name": "ピーピーエイダー"
+    },
+    "MAX_ELIXIR": {
+      "name": "ピーピーマックス"
+    },
+    "PP_UP": {
+      "name": "ポイントアップ"
+    },
+    "PP_MAX": {
+      "name": "ポイントマックス"
+    },
+    "LURE": {
+      "name": "ダブルバトルコロン"
+    },
+    "SUPER_LURE": {
+      "name": "シルバーコロン"
+    },
+    "MAX_LURE": {
+      "name": "ゴールドコロン"
+    },
+    "MEMORY_MUSHROOM": {
+      "name": "きおくキノコ",
+      "description": "ポケモンのわすれたわざをおぼえさせる"
+    },
+    "EXP_SHARE": {
+      "name": "がくしゅうそうち",
+      "description": "バトルにさんかしていないポケモンが けいけんちの20パーセントをもらう"
+    },
+    "EXP_BALANCE": {
+      "name": "バランスそうち",
+      "description": "レベルがひくいパーティメンバーがもらうけいけんちがふえる"
+    },
+    "OVAL_CHARM": {
+      "name": "まるいおまもり",
+      "description": "バトルにふくすうのポケモンがさんかするとけいけんちが10パーセントふえる"
+    },
+    "EXP_CHARM": {
+      "name": "けいけんちおまもり"
+    },
+    "SUPER_EXP_CHARM": {
+      "name": "いいけいけんちおまもり"
+    },
+    "GOLDEN_EXP_CHARM": {
+      "name": "ゴールドけいけんちおまもり"
+    },
+    "LUCKY_EGG": {
+      "name": "しあわせタマゴ"
+    },
+    "GOLDEN_EGG": {
+      "name": "おうごんタマゴ"
+    },
+    "SOOTHE_BELL": {
+      "name": "やすらぎのすず"
+    },
+    "SCOPE_LENS": {
+      "name": "ピントレンズ",
+      "description": "弱点が 見える レンズ。持たせた ポケモンの技が 急所に 当たりやすくなる。"
+    },
+    "DIRE_HIT": { 
+      "name": "クリティカット", 
+      "extra": { 
+        "raises": "きゅうしょりつ"
+      } 
+    },
+    "LEEK": {
+      "name": "ながねぎ",
+      "description": "とても長くて 硬いクキ。カモネギに 持たせると 技が 急所に 当たりやすくなる。"
+    },
+    "EVIOLITE": {
+      "name": "しんかのきせき",
+      "description": "進化の不思議な かたまり。持たせると 進化前ポケモンの 防御と 特防が あがる。"
+    },
+    "SOUL_DEW": {
+      "name": "こころのしずく",
+      "description": "ポケモンのせいかくがステータスにあたえるえいきょうを10%ふやす（合算）"
+    },
+    "NUGGET": {
+      "name": "きんのたま"
+    },
+    "BIG_NUGGET": {
+      "name": "でかいきんのたま"
+    },
+    "RELIC_GOLD": {
+      "name": "こだいのきんか"
+    },
+    "AMULET_COIN": {
+      "name": "おまもりこばん",
+      "description": "もらえる おかねが 20パーセント ふえる"
+    },
+    "GOLDEN_PUNCH": {
+      "name": "ゴールドパンチ",
+      "description": "あたえたちょくせつダメージの50パーセントをおかねとしてもらえる"
+    },
+    "COIN_CASE": {
+      "name": "コインケース",
+      "description": "10かいのバトルごとにもちきんの10パーセントをりしとしてうけとる"
+    },
+    "LOCK_CAPSULE": {
+      "name": "ロックカプセル",
+      "description": "リロールするときにアイテムのレアリティをロックできる"
+    },
+    "GRIP_CLAW": {
+      "name": "ねばりのかぎづめ"
+    },
+    "WIDE_LENS": {
+      "name": "こうかくレンズ"
+    },
+    "MULTI_LENS": {
+      "name": "マルチレンズ"
+    },
+    "HEALING_CHARM": {
+      "name": "ヒーリングチャーム",
+      "description": "HPをかいふくするわざとアイテムのこうかを10パーセントあげる (ふっかつはのぞく)"
+    },
+    "CANDY_JAR": {
+      "name": "アメボトル",
+      "description": "ふしぎなアメのアイテムでふえるレベルが1ふえる"
+    },
+    "BERRY_POUCH": {
+      "name": "きのみぶくろ",
+      "description": "つかったきのみがつかわれないかくりつを30パーセントふやす"
+    },
+    "FOCUS_BAND": {
+      "name": "きあいのハチマキ",
+      "description": "ひんしになるダメージをうけてもHP1でたえるかくりつを10パーセントふやす"
+    },
+    "QUICK_CLAW": {
+      "name": "せんせいのツメ",
+      "description": "すばやさにかかわらず さきにこうどうするかくりつを10パーセントふやす (ゆうせんどのあと)"
+    },
+    "KINGS_ROCK": {
+      "name": "おうじゃのしるし",
+      "description": "こうげきわざがあいてをひるませるかくりつを10パーセントふやす"
+    },
+    "LEFTOVERS": {
+      "name": "たべのこし",
+      "description": "ポケモンのさいだいHPの1/16をまいターンかいふくする"
+    },
+    "SHELL_BELL": {
+      "name": "かいがらのすず",
+      "description": "ポケモンがあたえたダメージの1/8をかいふくする"
+    },
+    "TOXIC_ORB": {
+      "name": "どくどくだま",
+      "description": "ターンの終わりに すでに じょうたいじょうしょうが なければ もうどくの じょうたいに なる"
+    },
+    "FLAME_ORB": {
+      "name": "かえんだま",
+      "description": "ターンの終わりに すでに じょうたいじょうしょうが なければ やけどの じょうたいに なる"
+    },
+    "BATON": {
+      "name": "バトン",
+      "description": "ポケモンをこうたいするときにこうかをひきつぎ わなをかいひすることもできる"
+    },
+    "SHINY_CHARM": {
+      "name": "ひかるおまもり",
+      "description": "やせいのポケモンがいろちがいポケモンであるかくりつをおおきくふやす"
+    },
+    "ABILITY_CHARM": {
+      "name": "とくせいおまもり",
+      "description": "やせいのポケモンがかくれとくせいをもつかくりつをおおきくふやす"
+    },
+    "IV_SCANNER": {
+      "name": "こたいちスキャナー",
+      "description": "やせいのポケモンのこたいちをスキャンできる。スタックごとに2つのこたいちがあきらかになる。もっともたかいこたいちがさいしょにひょうじされる"
+    },
+    "DNA_SPLICERS": {
+      "name": "いでんしのくさび"
+    },
+    "MINI_BLACK_HOLE": {
+      "name": "ミニブラックホール"
+    },
+    "GOLDEN_POKEBALL": {
+      "name": "ゴールドモンスターボール",
+      "description": "バトルごとに1つのアイテムオプションをふやす"
+    },
+    "ENEMY_DAMAGE_BOOSTER": {
+      "name": "ダメージトークン",
+      "description": "ダメージを5%ふやす"
+    },
+    "ENEMY_DAMAGE_REDUCTION": {
+      "name": "プロテクショントークン",
+      "description": "うけるダメージを2.5%へらす"
+    },
+    "ENEMY_HEAL": {
+      "name": "かいふくトークン",
+      "description": "まいターンさいだいHPの2%をかいふくする"
+    },
+    "ENEMY_ATTACK_POISON_CHANCE": {
+      "name": "どくトークン"
+    },
+    "ENEMY_ATTACK_PARALYZE_CHANCE": {
+      "name": "まひトークン"
+    },
+    "ENEMY_ATTACK_BURN_CHANCE": {
+      "name": "やけどトークン"
+    },
+    "ENEMY_STATUS_EFFECT_HEAL_CHANCE": {
+      "name": "なおしトークン",
+      "description": "まいターン2.5%のかくりつでじょうたいじょうしょうをかいふくする"
+    },
+    "ENEMY_ENDURE_CHANCE": {
+      "name": "こらえるトークン"
+    },
+    "ENEMY_FUSED_CHANCE": {
+      "name": "フュージョントークン",
+      "description": "やせいのポケモンがフュージョンするかくりつを1%ふやす"
     },
-	
-    "RARE_CANDY": { "name": "ふしぎなアメ" },								 																																					  
-    "RARER_CANDY": { "name": "ふかしぎなアメ" },							   
-
-    "MEGA_BRACELET": { "name": "メガバングル", "description": "メガストーンが　見つけられる　ように　なる" },
-    "DYNAMAX_BAND": { "name": "ダイマックスバンド", "description": "ダイキノコが　見つけられる　ように　なる" },
-    "TERA_ORB": { "name": "テラスタルオーブ", "description": "テラピースが　見つけられる　ように　なる" },
-
-    "MAP": { "name": "ちず", "description": "分かれ道で　行き先が　選べる　よう　になる" },
-										   
-    "POTION": { "name": "キズぐすり" },
-    "SUPER_POTION": { "name": "いいキズぐすり" },
-    "HYPER_POTION": { "name": "すごいキズぐすり" },																			
-    "MAX_POTION": { "name": "まんたんのくすり" },																																			 
-    "FULL_RESTORE": { "name": "かいふくのくすり" },
-
-    "REVIVE": { "name": "げんきのかけら" },
-    "MAX_REVIVE": { "name": "げんきのかたまり" },
-																																			
-    "FULL_HEAL": { "name": "なんでもなおし" },
-
-    "SACRED_ASH": { "name": "せいなるはい" },
-
-    "REVIVER_SEED": { "name": "ふっかつのタネ", "description": "持たせると 直接攻撃から　ひんしに　なれば\n復活して　HPを　50%　回復する" },
-										   
-    "WHITE_HERB":{ "name": "しろいハーブ", "description": "持たせた ポケモンの能力が さがったとき 1度だけ 元の状態に 戻す" },
- 
-    "ETHER": { "name": "ピーピーエイド" },
-    "MAX_ETHER": { "name": "ピーピーリカバー" },
-
-    "ELIXIR": { "name": "ピーピーエイダー" },
-    "MAX_ELIXIR": { "name": "ピーピーマックス" },
-								 
-    "PP_UP": { "name": "ポイントアップ" },
-    "PP_MAX": { "name": "ポイントマックス" },
-
-    "LURE": { "name": "むしよせコロン" },
-    "SUPER_LURE": { "name": "シルバーコロン" },
-    "MAX_LURE": { "name": "ゴールドコロン" },
- 
-    "MEMORY_MUSHROOM": { "name": "きおくのキノコ", "description": "1匹の　ポケモンの　忘れた技を　1つ　覚えさせる" },
-
-    "EXP_SHARE": { "name": "がくしゅうそうち", "description": "バトルに　参加していない　ポケモンが　参加したポケモンの　経験値を　20%　もらう" },
-    "EXP_BALANCE": { "name": "バランスそうち", "description": "レベルが低い　手持ちポケモンの　もらう　経験値が　増える" },
-			   
-    "OVAL_CHARM": { "name": "まるいおまもり", "description": "バトルに　複数の　ポケモンが　参加すると、\n経験値が　参加したポケモンずつ　10%　増える" },
-
-    "EXP_CHARM": { "name": "けいけんおまもり" },
-    "SUPER_EXP_CHARM": { "name": "いいけいけんおまもり" },
-    "GOLDEN_EXP_CHARM": { "name": "ゴールドけいけんちおまもり" },
-
-    "LUCKY_EGG": { "name": "しあわせタマゴ" },
-    "GOLDEN_EGG": { "name": "ゴールドタマゴ" },
- 
-    "SOOTHE_BELL": { "name": "やすらぎのすず" },
-
-    "SCOPE_LENS": { "name": "ピントレンズ", "description": "弱点が　見える　レンズ。\n持たせた　ポケモンの技が　急所に　当たりやすくなる"},
-    "DIRE_HIT": { "name": "クリティカット", "extra": { "raises": "急所率" } },
-    "LEEK": { "name": "ながねぎ", "description": "とても長くて　硬いクキ。\nカモネギに　持たせると　技が　急所に　当たりやすくなる"},
-
-    "EVIOLITE": { "name": "しんかのきせき", "description": "進化の不思議な かたまり。\n持たせると 進化前ポケモンの 防御と 特防が あがる" },
-																																									 
-    "SOUL_DEW": { "name": "こころのしずく", "description": "持たせると　ポケモンの　性格が　能力に与える　影響は　10%　増える（合算）" }, 
-
-    "NUGGET": { "name": "きんのたま" },
-    "BIG_NUGGET": { "name": "でかいきんのたま" },
-    "RELIC_GOLD": { "name": "こだいのきんか" },
-
-    "AMULET_COIN": { "name": "おまもりこばん", "description": "もらえる　お金が　20%　増える" },
-    "GOLDEN_PUNCH": { "name": "ゴールドパンチ", "description": "持たせると　与える　直接なダメージの　50%が　お金として　もらえる" },
-    "COIN_CASE": { "name": "コインケース", "description": "10回の　バトルごとに　持ち金の　10%を　利子として　受け取れる" },
-
-    "LOCK_CAPSULE": { "name": "ロックカプセル", "description": "ご褒美の　選択肢変更するとき　アイテムの　レア度を固定できる　ように　なる" },
-
-    "GRIP_CLAW": { "name": "ねばりのかぎづめ" },
-    "WIDE_LENS": { "name": "こうかくレンズ" },
-
-    "MULTI_LENS": { "name": "マルチレンズ" },
-
-    "HEALING_CHARM": { "name": "かいふくおまもり", "description": "回復する　技や　アイテムの　効果を　10%　あげる（復活アイテムは除く）" },
-    "CANDY_JAR": { "name": "アメボトル", "description": "ふしぎなアメや　ふかしぎなアメで あげるレベルを　1　増える" },
- 
-    "BERRY_POUCH": { "name": "きのみぶくろ", "description": "使ったきのみは　無くならない　30%の可能性を　加える" },
-
-    "FOCUS_BAND": { "name": "きあいのハチマキ", "description": "持たせると　ひんしに なりそうな 技を 受けても\n10%の可能性で　HPを 1だけ 残して 耐える" },
-																										  
-    "QUICK_CLAW": { "name": "せんせいのツメ", "description": "持たせると　10%の可能性で　相手より　先に　行動できる　（優先技のあと）" },
-																															
-    "KINGS_ROCK": { "name": "おうじゃのしるし", "description": "持たせると　攻撃して　ダメージを　与えたときに\n10%の可能性で　相手を　ひるませる" },
-
-    "LEFTOVERS": { "name": "たべのこし", "description": "持たせると　毎ターン　最大HPの　1/16を　回復する" },
-    "SHELL_BELL": { "name": "かいがらのすず", "description": "持たせると　ポケモンが　相手に　与えたダメージの　1/8をHPとして　回復する." },
-
-    "TOXIC_ORB": { "name": "どくどくだま", "description": "触ると　毒をだす　不思議な玉。\n持たせると　戦闘中に　猛毒の状態に　なる" },
-    "FLAME_ORB": { "name": "かえんだま", "description": "触ると　熱をだす　不思議な玉。\n持たせると　戦闘中に　やけどの状態に　なる。" },
-
-    "BATON": { "name": "バトン", "description": "持たせると　入れ替えるとき　控えのポケモンが\n能力変化を　受けつげる　（逃げられなくする　技や　特性も　回避する）" },
-
-    "SHINY_CHARM": { "name": "ひかるおまもり", "description": "色違いの　ポケモンと　大きく　出会いやすくなる" },
-    "ABILITY_CHARM": { "name": "とくせいおまもり", "description": "隠れ特性がある　ポケモンと　大きく　出会いやすくなる" },
-									  
-    "IV_SCANNER": { "name": "こたいちスキャナー", "description": "野生ポケモンの　個体値を　検査できる。　一つのスキャナーあたり\n個体値が　2つ　見える。　最高の　個体値が　最初に　見える。" },
-
-    "DNA_SPLICERS": { "name": "いでんしのくさび" },
-
-    "MINI_BLACK_HOLE": { "name": "ミニブラックホール" },
-																																				  
-    "GOLDEN_POKEBALL": { "name": "ゴールドモンスターボール", "description": "バトル後に　もう　一つの　ご褒美の　選択肢を　加える" },
-
-    "ENEMY_DAMAGE_BOOSTER": { "name": "ダメージトークン", "description": "ダメージを　5%　あげる" },
-    "ENEMY_DAMAGE_REDUCTION": { "name": "ぼうごトークン", "description": "受けたダメージを　2.5%　さげる" },
-    "ENEMY_HEAL": { "name": "かいふくトークン", "description": "毎ターン　最大HPの　2%を　回復する" },
-    "ENEMY_ATTACK_POISON_CHANCE": { "name": "どくトークン" },				 
-    "ENEMY_ATTACK_PARALYZE_CHANCE": { "name": "まひトークン" },						   							   
-    "ENEMY_ATTACK_BURN_CHANCE": { "name": "やけどトークン" },
-    "ENEMY_STATUS_EFFECT_HEAL_CHANCE": { "name": "なんでもなおしトークン", "description": "毎ターン　状態異常を　治せる　2.5%の可能性を　加える" }, 
-    "ENEMY_ENDURE_CHANCE": { "name": "こらえるトークン" },
-    "ENEMY_FUSED_CHANCE": { "name": "がったいトークン", "description": "野生ポケモンは　吸収合体している　1%の可能性を　加える" },
 
     "MYSTERY_ENCOUNTER_SHUCKLE_JUICE": { "name": "Shuckle Juice" },
     "MYSTERY_ENCOUNTER_BLACK_SLUDGE": { "name": "Black Sludge", "description": "The stench is so powerful that shops will only sell you items at a steep cost increase." },
@@ -270,10 +424,22 @@
     "MYSTERY_ENCOUNTER_GOLDEN_BUG_NET": { "name": "Golden Bug Net", "description": "Imbues the owner with luck to find Bug Type Pokémon more often. Has a strange heft to it." }
   },
   "SpeciesBoosterItem": {
-    "LIGHT_BALL": { "name": "でんきだま", "description": "ピカチュウに　持たせると　攻撃と　特攻が　あがる　不思議な玉" },
+    "LIGHT_BALL": {
-    "THICK_CLUB": { "name": "ふといホネ", "description": "なにかの　硬いホネ。　カラカラ　または　ガラガラに　持たせると　攻撃が　あがる" },
+      "name": "でんきだま",
-    "METAL_POWDER": { "name": "メタルパウダー", "description": "メタモンに　持たせると　防御が　あがる　不思議な粉。　とても　こまかくて　硬い" },
+      "description": "ピカチュウに 持たせると 攻撃と 特攻が あがる 不思議な玉。"
-    "QUICK_POWDER": { "name": "スピードパウダー", "description": "メタモンに　持たせると　素早さが　あがる　不思議な粉。　とても　こまかくて　硬い" }
+    },
+    "THICK_CLUB": {
+      "name": "ふといホネ",
+      "description": "なにかの 硬いホネ。カラカラ または ガラガラに 持たせると 攻撃が あがる。"
+    },
+    "METAL_POWDER": {
+      "name": "メタルパウダー",
+      "description": "メタモンに 持たせると 防御が あがる 不思議な粉。とても こまかくて 硬い。"
+    },
+    "QUICK_POWDER": {
+      "name": "スピードパウダー",
+      "description": "メタモンに 持たせると 素早さが あがる 不思議 粉。とても こまかくて 硬い。"
+    }
   },
   "TempStatStageBoosterItem": {
     "x_attack": "プラスパワー",
@@ -312,8 +478,7 @@
     "carbos": "インドメタシン"
   },
   "EvolutionItem": {
-    "NONE": "なし",
+    "NONE": "None",
-	
     "LINKING_CORD": "つながりのヒモ",
     "SUN_STONE": "たいようのいし",
     "MOON_STONE": "つきのいし",
@@ -330,7 +495,6 @@
     "TART_APPLE": "すっぱいりんご",
     "STRAWBERRY_SWEET": "いちごアメざいく",
     "UNREMARKABLE_TEACUP": "ボンサクのちゃわん",
-
     "CHIPPED_POT": "かけたポット",
     "BLACK_AUGURITE": "くろのきせき",
     "GALARICA_CUFF": "ガラナツブレス",
@@ -345,8 +509,7 @@
     "SYRUPY_APPLE": "みついりりんご"
   },
   "FormChangeItem": {
-    "NONE": "なし",
+    "NONE": "None",
-	
     "ABOMASITE": "ユキノオナイト",
     "ABSOLITE": "アブソルナイト",
     "AERODACTYLITE": "プテラナイト",
@@ -395,7 +558,6 @@
     "SWAMPERTITE": "ラグラージナイト",
     "TYRANITARITE": "バンギラスナイト",
     "VENUSAURITE": "フシギバナイト",
-	
     "BLUE_ORB": "あいいろのたま",
     "RED_ORB": "べにいろのたま",
     "SHARP_METEORITE": "シャープなうんせき",
@@ -423,44 +585,6 @@
     "BURN_DRIVE": "ブレイズカセット",
     "CHILL_DRIVE": "フリーズカセット",
     "DOUSE_DRIVE": "アクアカセット",
-    "ULTRANECROZIUM_Z": "ウルトラネクロZ",
+    "ULTRANECROZIUM_Z": "ウルトラネクロZ"
-
-    "FIST_PLATE": "こぶしのプレート",
-    "SKY_PLATE": "あおぞらプレート",
-    "TOXIC_PLATE": "もうどくプレート",
-    "EARTH_PLATE": "だいちのプレート",
-    "STONE_PLATE": "がんせきプレート",
-    "INSECT_PLATE": "たまむしプレート",
-    "SPOOKY_PLATE": "もののけプレート",
-    "IRON_PLATE": "こうてつプレート",
-    "FLAME_PLATE": "ひのたまプレート",
-    "SPLASH_PLATE": "しずくプレート",
-    "MEADOW_PLATE": "みどりのプレート",
-    "ZAP_PLATE": "いかずちプレート",
-    "MIND_PLATE": "ふしぎのプレート",
-    "ICICLE_PLATE": "つららのプレート",
-    "DRACO_PLATE": "りゅうのプレート",
-    "DREAD_PLATE": "こわもてプレート",
-    "PIXIE_PLATE": "せいれいプレート",
-    "BLANK_PLATE": "まっさらプレート",
-    "LEGEND_PLATE": "レジェンドプレート",
-    "FIGHTING_MEMORY": "ファイトメモリ",
-    "FLYING_MEMORY": "フライングメモリ",
-    "POISON_MEMORY": "ポイズンメモリ",
-    "GROUND_MEMORY": "グラウンドメモリ",
-    "ROCK_MEMORY": "ロックメモリ",
-    "BUG_MEMORY": "バグメモリ",
-    "GHOST_MEMORY": "ゴーストメモリ",
-    "STEEL_MEMORY": "スチールメモリ",
-    "FIRE_MEMORY": "ファイヤーメモリ",
-    "WATER_MEMORY": "ウオーターメモリ",
-    "GRASS_MEMORY": "グラスメモリ",
-    "ELECTRIC_MEMORY": "エレクトロメモリ",
-    "PSYCHIC_MEMORY": "サイキックメモリ",
-    "ICE_MEMORY": "アイスメモリ",
-    "DRAGON_MEMORY": "ドラゴンメモリ",
-    "DARK_MEMORY": "ダークメモリ",
-    "FAIRY_MEMORY": "フェアリーメモリ",
-    "NORMAL_MEMORY": "ノーマルメモリ"
   }
 }

src/locales/ko/battle.json

@@ -48,10 +48,7 @@
   "moveNotImplemented": "{{moveName}}[[는]] 아직 구현되지 않아 사용할 수 없다…",
   "moveNoPP": "기술의 남은 포인트가 없다!",
   "moveDisabled": "{{moveName}}[[를]] 쓸 수 없다!",
-  "canOnlyUseMove": "{{pokemonName}}[[는]]\n{{moveName}}밖에 쓸 수 없다!",
-  "moveCannotBeSelected": "{{moveName}}[[를]] 쓸 수 없다!",
   "disableInterruptedMove": "{{pokemonNameWithAffix}}의 {{moveName}}[[는]]\n사용할 수 없다.",
-  "throatChopInterruptedMove": "{{pokemonName}}[[는]]\n지옥찌르기 효과로 기술을 쓸 수 없다!",
   "noPokeballForce": "본 적 없는 힘이\n볼을 사용하지 못하게 한다.",
   "noPokeballTrainer": "다른 트레이너의 포켓몬은 잡을 수 없다!",
   "noPokeballMulti": "안돼! 2마리 있어서\n목표를 정할 수가 없어…!",
@@ -70,7 +67,6 @@
   "skipItemQuestion": "아이템을 받지 않고 넘어가시겠습니까?",
   "itemStackFull": "{{fullItemName}}의 소지 한도에 도달했습니다.\n{{itemname}}[[를]] 대신 받습니다.",
   "eggHatching": "어라…?",
-  "eggSkipPrompt": "알 부화 요약 화면으로 바로 넘어가시겠습니까?",
   "ivScannerUseQuestion": "{{pokemonName}}에게 개체값탐지기를 사용하시겠습니까?",
   "wildPokemonWithAffix": "야생 {{pokemonName}}",
   "foePokemonWithAffix": "상대 {{pokemonName}}",
@@ -99,7 +95,7 @@
   "statSeverelyFell_other": "{{pokemonNameWithAffix}}의\n{{stats}}[[가]] 매우 크게 떨어졌다!",
   "statWontGoAnyLower_one": "{{pokemonNameWithAffix}}의\n{{stats}}[[는]] 더 떨어지지 않는다!",
   "statWontGoAnyLower_other": "{{pokemonNameWithAffix}}의\n{{stats}}[[는]] 더 떨어지지 않는다!",
-  "transformedIntoType": "{{pokemonName}}[[는]]\n{{type}}타입이 됐다!",
+  "transformedIntoType": "{{pokemonName}} transformed\ninto the {{type}} type!",
   "retryBattle": "이 배틀의 처음부터 재도전하시겠습니까?",
   "unlockedSomething": "{{unlockedThing}}[[가]]\n해금되었다.",
   "congratulations": "축하합니다!",

src/locales/ko/challenges.json

@@ -1,7 +1,6 @@
 {
   "title": "챌린지 조건 설정",
   "illegalEvolution": "{{pokemon}}[[는]] 현재의 챌린지에\n부적합한 포켓몬이 되었습니다!",
-  "noneSelected": "미선택",
   "singleGeneration": {
     "name": "단일 세대",
     "desc": "{{gen}}의 포켓몬만 사용할 수 있습니다.",

src/locales/ko/modifier.json

@@ -3,7 +3,7 @@
   "turnHealApply": "{{pokemonNameWithAffix}}[[는]]\n{{typeName}}[[로]] 인해 조금 회복했다.",
   "hitHealApply": "{{pokemonNameWithAffix}}[[는]]\n{{typeName}}[[로]] 인해 조금 회복했다.",
   "pokemonInstantReviveApply": "{{pokemonNameWithAffix}}[[는]] {{typeName}}[[로]]\n정신을 차려 싸울 수 있게 되었다!",
-  "resetNegativeStatStageApply": "{{pokemonNameWithAffix}}[[는]] {{typeName}}[[로]]\n상태를 원래대로 되돌렸다!",
+  "pokemonResetNegativeStatStageApply": "{{pokemonNameWithAffix}}[[는]] {{typeName}}[[로]]\n상태를 원래대로 되돌렸다!",
   "moneyInterestApply": "{{typeName}}[[로]]부터\n₽{{moneyAmount}}[[를]] 받았다!",
   "turnHeldItemTransferApply": "{{pokemonName}}의 {{typeName}}[[는]]\n{{pokemonNameWithAffix}}의 {{itemName}}[[를]] 흡수했다!",
   "contactHeldItemTransferApply": "{{pokemonName}}의 {{typeName}}[[는]]\n{{pokemonNameWithAffix}}의 {{itemName}}[[를]] 가로챘다!",

src/locales/ko/move-trigger.json

@@ -4,10 +4,9 @@
   "absorbedElectricity": "{{pokemonName}}는(은)\n전기를 흡수했다!",
   "switchedStatChanges": "{{pokemonName}}[[는]] 상대와 자신의\n능력 변화를 바꿨다!",
   "switchedTwoStatChanges": "{{pokemonName}} 상대와 자신의 {{firstStat}}과 {{secondStat}}의 능력 변화를 바꿨다!",
-  "switchedStat": "{{pokemonName}}[[는]] 서로의 {{stat}}[[를]] 교체했다!",
+  "switchedStat": "{{pokemonName}} 서로의 {{stat}}를 교체했다!",
-  "sharedGuard": "{{pokemonName}}[[는]] 서로의 가드를 셰어했다!",
+  "sharedGuard": "{{pokemonName}} 서로의 가드를 셰어했다!",
-  "sharedPower": "{{pokemonName}}[[는]] 서로의 파워를 셰어했다!",
+  "sharedPower": "{{pokemonName}} 서로의 파워를 셰어했다!",
-  "shiftedStats": "{{pokemonName}}[[는]] {{statToSwitch}}[[와]] {{statToSwitchWith}}[[를]] 바꿨다!",
   "goingAllOutForAttack": "{{pokemonName}}[[는]]\n전력을 다하기 시작했다!",
   "regainedHealth": "{{pokemonName}}[[는]]\n기력을 회복했다!",
   "keptGoingAndCrashed": "{{pokemonName}}[[는]]\n의욕이 넘쳐서 땅에 부딪쳤다!",

src/locales/ko/pokemon-info.json

@@ -13,7 +13,8 @@
     "SPD": "스피드",
     "SPDshortened": "스피드",
     "ACC": "명중률",
-    "EVA": "회피율"
+    "EVA": "회피율",
+    "HPStat": "HP"
   },
   "Type": {
     "UNKNOWN": "Unknown",

src/phases/egg-lapse-phase.ts

@@ -17,13 +17,14 @@ import { EggHatchData } from "#app/data/egg-hatch-data";
 export class EggLapsePhase extends Phase {
 
   private eggHatchData: EggHatchData[] = [];
-  private readonly minEggsToSkip: number = 2;
+  private readonly minEggsToPromptSkip: number = 5;
   constructor(scene: BattleScene) {
     super(scene);
   }
 
   start() {
     super.start();
+
     const eggsToHatch: Egg[] = this.scene.gameData.eggs.filter((egg: Egg) => {
       return Overrides.EGG_IMMEDIATE_HATCH_OVERRIDE ? true : --egg.hatchWaves < 1;
     });
@@ -31,7 +32,8 @@ export class EggLapsePhase extends Phase {
     this.eggHatchData= [];
 
     if (eggsToHatchCount > 0) {
-      if (eggsToHatchCount >= this.minEggsToSkip && this.scene.eggSkipPreference === 1) {
+
+      if (eggsToHatchCount >= this.minEggsToPromptSkip) {
         this.scene.ui.showText(i18next.t("battle:eggHatching"), 0, () => {
           // show prompt for skip
           this.scene.ui.showText(i18next.t("battle:eggSkipPrompt"), 0);
@@ -44,10 +46,6 @@ export class EggLapsePhase extends Phase {
           }
           );
         }, 100, true);
-      } else if (eggsToHatchCount >= this.minEggsToSkip && this.scene.eggSkipPreference === 2) {
-        this.scene.queueMessage(i18next.t("battle:eggHatching"));
-        this.hatchEggsSkipped(eggsToHatch);
-        this.showSummary();
       } else {
         // regular hatches, no summary
         this.scene.queueMessage(i18next.t("battle:eggHatching"));

src/system/settings/settings.ts

@@ -126,7 +126,6 @@ export const SettingKeys = {
   EXP_Gains_Speed: "EXP_GAINS_SPEED",
   EXP_Party_Display: "EXP_PARTY_DISPLAY",
   Skip_Seen_Dialogues: "SKIP_SEEN_DIALOGUES",
-  Egg_Skip: "EGG_SKIP",
   Battle_Style: "BATTLE_STYLE",
   Enable_Retries: "ENABLE_RETRIES",
   Hide_IVs: "HIDE_IVS",
@@ -282,26 +281,6 @@ export const Setting: Array<Setting> = [
     default: 0,
     type: SettingType.GENERAL
   },
-  {
-    key: SettingKeys.Egg_Skip,
-    label: i18next.t("settings:eggSkip"),
-    options: [
-      {
-        value: "Never",
-        label: i18next.t("settings:never")
-      },
-      {
-        value: "Ask",
-        label: i18next.t("settings:ask")
-      },
-      {
-        value: "Always",
-        label: i18next.t("settings:always")
-      }
-    ],
-    default: 1,
-    type: SettingType.GENERAL
-  },
   {
     key: SettingKeys.Battle_Style,
     label: i18next.t("settings:battleStyle"),
@@ -748,9 +727,6 @@ export function setSetting(scene: BattleScene, setting: string, value: integer):
   case SettingKeys.Skip_Seen_Dialogues:
     scene.skipSeenDialogues = Setting[index].options[value].value === "On";
     break;
-  case SettingKeys.Egg_Skip:
-    scene.eggSkipPreference = value;
-    break;
   case SettingKeys.Battle_Style:
     scene.battleStyle = value;
     break;