Merge branch 'beta' into prabbyd-bug3984SecondBranch

* Update trainer-config.ts

* Update trainer-config.ts

* Devolve 98% of the list

* Update trainer-config.ts

* Update trainer-config.ts

* Update Pools / Minor Giovanni Changes

* Update trainer-config.ts

* Make Ghetsis2 Basculegion/Jellicent male

---------

Co-authored-by: Tempoanon <163687446+Tempo-anon@users.noreply.github.com>

src/battle-scene.ts

@@ -161,6 +161,13 @@ 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/battler-tags.ts

@@ -1885,22 +1885,18 @@ export class CursedTag extends BattlerTag {
     return ret;
   }
 }
-
+/**
-export class DoubleShockedTag extends BattlerTag {
+ * Battler tag for attacks that remove a type post use.
-  constructor() {
+ */
-    super(BattlerTagType.DOUBLE_SHOCKED, BattlerTagLapseType.CUSTOM, 1, Moves.DOUBLE_SHOCK);
+export class RemovedTypeTag extends BattlerTag {
-  }
+  constructor(tagType: BattlerTagType, lapseType: BattlerTagLapseType, sourceMove: Moves) {
-}
+    super(tagType, lapseType, 1, sourceMove);
-
-export class BurnedUpTag extends BattlerTag {
-  constructor() {
-    super(BattlerTagType.BURNED_UP, BattlerTagLapseType.CUSTOM, 1, Moves.BURN_UP);
   }
 }
 
 /**
  * Battler tag for effects that ground the source, allowing Ground-type moves to hit them.
- * @item `IGNORE_FLYING`: Persistent grounding effects (i.e. from Smack Down and Thousand Waves)
+ * @description `IGNORE_FLYING`: Persistent grounding effects (i.e. from Smack Down and Thousand Waves)
  */
 export class GroundedTag extends BattlerTag {
   constructor(tagType: BattlerTagType, lapseType: BattlerTagLapseType, sourceMove: Moves) {
@@ -1909,10 +1905,8 @@ export class GroundedTag extends BattlerTag {
 }
 
 /**
- * @item `ROOSTED`: Tag for temporary grounding if only source of ungrounding is flying and pokemon uses Roost.
+ * @description `ROOSTED`: Tag for temporary grounding if only source of ungrounding is flying and pokemon uses Roost.
  * Roost removes flying type from a pokemon for a single turn.
- *
- * Need to add check for terrastalized pokemon
  */
 
 export class RoostedTag extends BattlerTag {
@@ -1962,7 +1956,7 @@ export class RoostedTag extends BattlerTag {
       if (this.isBasePureFlying && !isCurrentlyDualType) {
         modifiedTypes = [Type.NORMAL];
       } else {
-        if ((!!pokemon.getTag(BurnedUpTag) || !!pokemon.getTag(DoubleShockedTag)) && isOriginallyDualType && !isCurrentlyDualType) {
+        if (!!pokemon.getTag(RemovedTypeTag) && isOriginallyDualType && !isCurrentlyDualType) {
           modifiedTypes = [Type.UNKNOWN];
         } else {
           modifiedTypes = currentTypes.filter(type => type !== Type.FLYING);
@@ -2338,9 +2332,9 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: number, source
   case BattlerTagType.ROOSTED:
     return new RoostedTag();
   case BattlerTagType.BURNED_UP:
-    return new BurnedUpTag();
+    return new RemovedTypeTag(tagType, BattlerTagLapseType.CUSTOM, sourceMove);
   case BattlerTagType.DOUBLE_SHOCKED:
-    return new DoubleShockedTag();
+    return new RemovedTypeTag(tagType, BattlerTagLapseType.CUSTOM, sourceMove);
   case BattlerTagType.SALT_CURED:
     return new SaltCuredTag(sourceId);
   case BattlerTagType.CURSED:

src/data/pokemon-species.ts

@@ -657,6 +657,24 @@ 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:
@@ -666,9 +684,9 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali
     case PartyMemberStrength.WEAK:
       return 20;
     case PartyMemberStrength.AVERAGE:
-      return 10;
+      return 8;
     case PartyMemberStrength.STRONG:
-      return 5;
+      return 4;
     default:
       return 0;
     }
@@ -716,7 +734,7 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali
           if (strength === PartyMemberStrength.STRONGER) {
             evolutionChance = 1;
           } else {
-            const maxLevelDiff = this.getStrengthLevelDiff(strength);
+            const maxLevelDiff = this.getStrengthLevelDiff(strength); //The maximum distance from the evolution level tolerated for the mon to not evolve
             const minChance: number = 0.875 - 0.125 * strength;
 
             evolutionChance = Math.min(minChance + easeInFunc(Math.min(level - ev.level, maxLevelDiff) / maxLevelDiff) * (1 - minChance), 1);
@@ -735,11 +753,6 @@ 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.GYARADOS, Species.TAUROS, Species.SCYTHER, Species.CUBONE, Species.GROWLITHE, Species.MURKROW, Species.GASTLY, Species.EXEGGCUTE, Species.VOLTORB],
+        [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.UNCOMMON]: [Species.PORYGON, Species.ALOLA_RATTATA, Species.ALOLA_SANDSHREW, Species.ALOLA_MEOWTH, Species.ALOLA_GRIMER, Species.ALOLA_GEODUDE],
+        [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.RARE]: [Species.DRATINI, Species.LARVITAR]
       };
     }
     case "magma": {
       return {
-        [TrainerPoolTier.COMMON]: [Species.NUMEL, Species.POOCHYENA, Species.SLUGMA, Species.SOLROCK, Species.HIPPOPOTAS, Species.SANDACONDA, Species.PHANPY, Species.ROLYCOLY, Species.GLIGAR],
+        [TrainerPoolTier.COMMON]: [Species.GROWLITHE, Species.SLUGMA, Species.SOLROCK, Species.HIPPOPOTAS, Species.BALTOY, Species.ROLYCOLY, Species.GLIGAR, Species.TORKOAL, Species.HOUNDOUR, Species.MAGBY],
-        [TrainerPoolTier.UNCOMMON]: [Species.TRAPINCH, Species.HEATMOR],
+        [TrainerPoolTier.UNCOMMON]: [Species.TRAPINCH, Species.SILICOBRA, Species.RHYHORN, Species.ANORITH, Species.LILEEP, Species.HISUI_GROWLITHE, Species.TURTONATOR, Species.ARON, Species.BARBOACH],
         [TrainerPoolTier.RARE]: [Species.CAPSAKID, Species.CHARCADET]
       };
     }
     case "aqua": {
       return {
-        [TrainerPoolTier.COMMON]: [Species.CARVANHA, Species.CORPHISH, Species.ZIGZAGOON, Species.CLAMPERL, Species.CHINCHOU, Species.WOOPER, Species.WINGULL, Species.TENTACOOL, Species.QWILFISH],
+        [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.UNCOMMON]: [Species.MANTINE, Species.BASCULEGION, Species.REMORAID, Species.ARROKUDA],
+        [TrainerPoolTier.UNCOMMON]: [Species.MANTYKE, Species.HISUI_QWILFISH, Species.ARROKUDA, Species.DHELMISE, Species.CLOBBOPUS, Species.FEEBAS, Species.PALDEA_WOOPER, Species.HORSEA, Species.SKRELP],
-        [TrainerPoolTier.RARE]: [Species.DONDOZO]
+        [TrainerPoolTier.RARE]: [Species.DONDOZO, Species.BASCULEGION]
       };
     }
     case "galactic": {
       return {
-        [TrainerPoolTier.COMMON]: [Species.GLAMEOW, Species.STUNKY, Species.BRONZOR, Species.CARNIVINE, Species.GROWLITHE, Species.QWILFISH, Species.SNEASEL],
+        [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.UNCOMMON]: [Species.HISUI_GROWLITHE, Species.HISUI_QWILFISH, Species.HISUI_SNEASEL],
+        [TrainerPoolTier.UNCOMMON]: [Species.HISUI_GROWLITHE, Species.HISUI_QWILFISH, Species.SNEASEL, Species.DUSKULL, Species.ROTOM, Species.HISUI_VOLTORB, Species.GLIGAR, Species.ABRA],
-        [TrainerPoolTier.RARE]: [Species.HISUI_ZORUA, Species.HISUI_SLIGGOO]
+        [TrainerPoolTier.RARE]: [Species.URSALUNA, Species.HISUI_LILLIGANT, Species.SPIRITOMB, Species.HISUI_SNEASEL]
       };
     }
     case "plasma": {
       return {
-        [TrainerPoolTier.COMMON]: [Species.SCRAFTY, Species.LILLIPUP, Species.PURRLOIN, Species.FRILLISH, Species.VENIPEDE, Species.GOLETT, Species.TIMBURR, Species.DARUMAKA, Species.AMOONGUSS],
+        [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.UNCOMMON]: [Species.PAWNIARD, Species.VULLABY, Species.ZORUA, Species.DRILBUR, Species.KLINK],
+        [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.RARE]: [Species.DRUDDIGON, Species.BOUFFALANT, Species.AXEW, Species.DEINO, Species.DURANT]
+        [TrainerPoolTier.RARE]: [Species.HISUI_ZORUA, Species.AXEW, Species.DEINO, Species.HISUI_BRAVIARY]
       };
     }
     case "flare": {
       return {
-        [TrainerPoolTier.COMMON]: [Species.FLETCHLING, Species.LITLEO, Species.INKAY, Species.HELIOPTILE, Species.ELECTRIKE, Species.SKRELP, Species.GULPIN, Species.PURRLOIN, Species.POOCHYENA, Species.SCATTERBUG],
+        [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.UNCOMMON]: [Species.LITWICK, Species.SNEASEL, Species.PANCHAM, Species.PAWNIARD],
+        [TrainerPoolTier.UNCOMMON]: [Species.LITWICK, Species.SNEASEL, Species.PUMPKABOO, Species.PHANTUMP, Species.HONEDGE, Species.BINACLE, Species.BERGMITE, Species.HOUNDOUR, Species.SKRELP, Species.SLIGGOO],
-        [TrainerPoolTier.RARE]: [Species.NOIVERN, Species.DRUDDIGON]
+        [TrainerPoolTier.RARE]: [Species.NOIVERN, Species.HISUI_AVALUGG, Species.HISUI_SLIGGOO]
       };
     }
     case "aether": {
       return {
-        [TrainerPoolTier.COMMON]: [ Species.BRUXISH, Species.SLOWPOKE, Species.BALTOY, Species.EXEGGCUTE, Species.ABRA, Species.ALOLA_RAICHU, Species.ELGYEM, Species.NATU],
+        [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.UNCOMMON]: [Species.GALAR_SLOWKING, Species.MEDITITE, Species.BELDUM, Species.ORANGURU, Species.HATTERENE, Species.INKAY, Species.RALTS],
+        [TrainerPoolTier.UNCOMMON]: [Species.GALAR_SLOWPOKE, Species.MEDITITE, Species.BELDUM, Species.HATENNA, Species.INKAY, Species.RALTS, Species.GALAR_MR_MIME],
-        [TrainerPoolTier.RARE]: [Species.ARMAROUGE, Species.GIRAFARIG, Species.PORYGON]
+        [TrainerPoolTier.RARE]: [Species.ARMAROUGE, Species.HISUI_BRAVIARY, Species.PORYGON]
       };
     }
     case "skull": {
       return {
-        [TrainerPoolTier.COMMON]: [ Species.MAREANIE, Species.ALOLA_GRIMER, Species.GASTLY, Species.ZUBAT, Species.LURANTIS, Species.VENIPEDE, Species.BUDEW, Species.KOFFING],
+        [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.UNCOMMON]: [Species.GALAR_SLOWBRO, Species.SKORUPI, Species.PALDEA_WOOPER, Species.NIDORAN_F, Species.CROAGUNK, Species.MANDIBUZZ],
+        [TrainerPoolTier.UNCOMMON]: [Species.GALAR_SLOWPOKE, Species.SKORUPI, Species.PALDEA_WOOPER, Species.VULLABY, Species.HISUI_QWILFISH, Species.GLIMMET],
-        [TrainerPoolTier.RARE]: [Species.DRAGALGE, Species.HISUI_SNEASEL]
+        [TrainerPoolTier.RARE]: [Species.SKRELP, Species.HISUI_SNEASEL]
       };
     }
     case "macro": {
       return {
-        [TrainerPoolTier.COMMON]: [ Species.HATTERENE, Species.MILOTIC, Species.TSAREENA, Species.SALANDIT, Species.GALAR_PONYTA, Species.GOTHITA, Species.FROSLASS],
+        [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.UNCOMMON]: [Species.MANDIBUZZ, Species.MAREANIE, Species.ALOLA_VULPIX, Species.TOGEPI, Species.GALAR_CORSOLA, Species.SINISTEA, Species.APPLIN],
+        [TrainerPoolTier.UNCOMMON]: [Species.VULLABY, Species.MAREANIE, Species.ALOLA_VULPIX, Species.TOGEPI, Species.GALAR_CORSOLA, 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],
+      [TrainerPoolTier.COMMON]: [Species.WEEDLE, Species.RATTATA, Species.EKANS, Species.SANDSHREW, Species.ZUBAT, Species.GEODUDE, Species.KOFFING, Species.GRIMER, Species.ODDISH, Species.SLOWPOKE],
-      [TrainerPoolTier.UNCOMMON]: [Species.GYARADOS, Species.TAUROS, Species.SCYTHER, Species.CUBONE, Species.GROWLITHE, Species.MURKROW, Species.GASTLY, Species.EXEGGCUTE, Species.VOLTORB],
+      [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.RARE]: [Species.PORYGON, Species.ALOLA_RATTATA, Species.ALOLA_SANDSHREW, Species.ALOLA_MEOWTH, Species.ALOLA_GRIMER, Species.ALOLA_GEODUDE],
+      [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.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.BALTOY, Species.BARBOACH],
+      [TrainerPoolTier.COMMON]: [Species.SLUGMA, Species.POOCHYENA, Species.NUMEL, Species.ZIGZAGOON, Species.DIGLETT, Species.MAGBY, Species.TORKOAL, Species.GROWLITHE, Species.BALTOY],
-      [TrainerPoolTier.UNCOMMON]: [Species.SOLROCK, Species.HIPPOPOTAS, Species.SANDACONDA, Species.PHANPY, Species.ROLYCOLY, Species.GLIGAR],
+      [TrainerPoolTier.UNCOMMON]: [Species.SOLROCK, Species.HIPPOPOTAS, Species.SANDACONDA, Species.PHANPY, Species.ROLYCOLY, Species.GLIGAR, Species.RHYHORN, Species.HEATMOR],
-      [TrainerPoolTier.RARE]: [Species.TRAPINCH, Species.HEATMOR],
+      [TrainerPoolTier.RARE]: [Species.TRAPINCH, Species.LILEEP, Species.ANORITH, Species.HISUI_GROWLITHE, Species.TURTONATOR, Species.ARON],
       [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],
+      [TrainerPoolTier.COMMON]: [Species.CARVANHA, Species.WAILMER, Species.ZIGZAGOON, Species.LOTAD, Species.CORPHISH, Species.SPHEAL, Species.REMORAID, Species.QWILFISH, Species.BARBOACH],
-      [TrainerPoolTier.UNCOMMON]: [Species.CLAMPERL, Species.CHINCHOU, Species.WOOPER, Species.WINGULL, Species.TENTACOOL, Species.QWILFISH],
+      [TrainerPoolTier.UNCOMMON]: [Species.CLAMPERL, Species.CHINCHOU, Species.WOOPER, Species.WINGULL, Species.TENTACOOL, Species.AZURILL, Species.CLOBBOPUS, Species.HORSEA],
-      [TrainerPoolTier.RARE]: [Species.MANTINE, Species.BASCULEGION, Species.REMORAID, Species.ARROKUDA],
+      [TrainerPoolTier.RARE]: [Species.MANTINE, Species.DHELMISE, Species.HISUI_QWILFISH, Species.ARROKUDA, Species.PALDEA_WOOPER, Species.SKRELP],
-      [TrainerPoolTier.SUPER_RARE]: [Species.DONDOZO]
+      [TrainerPoolTier.SUPER_RARE]: [Species.DONDOZO, Species.BASCULEGION]
     }),
   [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],
+      [TrainerPoolTier.COMMON]: [Species.GLAMEOW, Species.STUNKY, Species.CROAGUNK, Species.SHINX, Species.WURMPLE, Species.BRONZOR, Species.DRIFLOON, Species.BURMY, Species.CARNIVINE],
-      [TrainerPoolTier.UNCOMMON]: [Species.CARNIVINE, Species.GROWLITHE, Species.QWILFISH, Species.SNEASEL],
+      [TrainerPoolTier.UNCOMMON]: [Species.LICKITUNG, Species.RHYHORN, Species.TANGELA, Species.ZUBAT, Species.YANMA, Species.SKORUPI, Species.GLIGAR, Species.SWINUB],
-      [TrainerPoolTier.RARE]: [Species.HISUI_GROWLITHE, Species.HISUI_QWILFISH, Species.HISUI_SNEASEL],
+      [TrainerPoolTier.RARE]: [Species.HISUI_GROWLITHE, Species.HISUI_QWILFISH, Species.SNEASEL, Species.ELEKID, Species.MAGBY, Species.DUSKULL],
-      [TrainerPoolTier.SUPER_RARE]: [Species.HISUI_ZORUA, Species.HISUI_SLIGGOO]
+      [TrainerPoolTier.SUPER_RARE]: [Species.ROTOM, Species.SPIRITOMB, Species.HISUI_SNEASEL]
     }),
   [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],
+      [TrainerPoolTier.COMMON]: [Species.PATRAT, Species.LILLIPUP, Species.PURRLOIN, Species.SCRAFTY, Species.WOOBAT, Species.VANILLITE, Species.SANDILE, Species.TRUBBISH, Species.TYMPOLE],
-      [TrainerPoolTier.UNCOMMON]: [Species.FRILLISH, Species.VENIPEDE, Species.GOLETT, Species.TIMBURR, Species.DARUMAKA, Species.AMOONGUSS],
+      [TrainerPoolTier.UNCOMMON]: [Species.FRILLISH, Species.VENIPEDE, Species.GOLETT, Species.TIMBURR, Species.DARUMAKA, Species.FOONGUS, Species.JOLTIK],
-      [TrainerPoolTier.RARE]: [Species.PAWNIARD, Species.VULLABY, Species.ZORUA, Species.DRILBUR, Species.KLINK],
+      [TrainerPoolTier.RARE]: [Species.PAWNIARD, Species.RUFFLET, Species.VULLABY, Species.ZORUA, Species.DRILBUR, Species.KLINK, Species.CUBCHOO, Species.MIENFOO, Species.DURANT, Species.BOUFFALANT],
-      [TrainerPoolTier.SUPER_RARE]: [Species.DRUDDIGON, Species.BOUFFALANT, Species.AXEW, Species.DEINO, Species.DURANT]
+      [TrainerPoolTier.SUPER_RARE]: [Species.DRUDDIGON, Species.HISUI_ZORUA, Species.AXEW, Species.DEINO]
     }),
   [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],
+      [TrainerPoolTier.COMMON]: [Species.FLETCHLING, Species.LITLEO, Species.PONYTA, Species.INKAY, Species.HOUNDOUR, Species.SKORUPI, Species.SCRAFTY, Species.CROAGUNK, Species.SCATTERBUG, Species.ESPURR],
-      [TrainerPoolTier.UNCOMMON]: [Species.HELIOPTILE, Species.ELECTRIKE, Species.SKRELP, Species.GULPIN, Species.PURRLOIN, Species.POOCHYENA, Species.SCATTERBUG],
+      [TrainerPoolTier.UNCOMMON]: [Species.HELIOPTILE, Species.ELECTRIKE, Species.SKRELP, Species.PANCHAM, Species.PURRLOIN, Species.POOCHYENA, Species.BINACLE, Species.CLAUNCHER, Species.PUMPKABOO, Species.PHANTUMP],
-      [TrainerPoolTier.RARE]: [Species.LITWICK, Species.SNEASEL, Species.PANCHAM, Species.PAWNIARD],
+      [TrainerPoolTier.RARE]: [Species.LITWICK, Species.SNEASEL, Species.PAWNIARD, Species.BERGMITE, Species.SLIGGOO],
-      [TrainerPoolTier.SUPER_RARE]: [Species.NOIVERN, Species.DRUDDIGON]
+      [TrainerPoolTier.SUPER_RARE]: [Species.NOIVERN, Species.HISUI_SLIGGOO, Species.HISUI_AVALUGG]
     }),
   [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.YUNGOOS, Species.CORSOLA, Species.ALOLA_GEODUDE, Species.BOUNSWEET, Species.LILLIPUP, Species.ALOLA_MAROWAK],
+      [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.UNCOMMON]: [ Species.POLIWAG, Species.STUFFUL, Species.ALOLA_EXEGGUTOR, Species.CRABRAWLER, Species.CUTIEFLY, Species.ALOLA_RAICHU, Species.ORICORIO, Species.MUDBRAY],
+      [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.RARE]: [ Species.ORANGURU, Species.PASSIMIAN, Species.GALAR_CORSOLA, Species.ALOLA_SANDSHREW, Species.ALOLA_VULPIX, Species.TURTONATOR, Species.DRAMPA],
+      [TrainerPoolTier.RARE]: [ 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.ALOLA_MEOWTH, Species.SCRAGGY, Species.KOFFING, Species.ALOLA_GRIMER, Species.MAREANIE, Species.SPINARAK, Species.TRUBBISH],
+      [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.UNCOMMON]: [ Species.FOMANTIS, Species.SABLEYE, Species.SANDILE, Species.ALOLA_MAROWAK, Species.PANCHAM, Species.DROWZEE, Species.ZUBAT, Species.VENIPEDE, Species.VULLABY],
+      [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.RARE]: [Species.SANDYGAST, Species.PAWNIARD, Species.MIMIKYU, Species.DHELMISE, Species.GASTLY, Species.WISHIWASHI],
+      [TrainerPoolTier.RARE]: [Species.SANDYGAST, Species.PAWNIARD, Species.MIMIKYU, Species.DHELMISE, Species.WISHIWASHI, Species.NYMBLE],
       [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.NIDOKING, Species.NIDOQUEEN]))
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.DUGTRIO, Species.ALOLA_DUGTRIO]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.RHYPERIOR]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.HONCHKROW]))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.DUGTRIO, Species.ALOLA_DUGTRIO]))
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.NIDOKING, Species.NIDOQUEEN]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.MAROWAK, Species.ALOLA_MAROWAK]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.RHYPERIOR]))
     .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]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.EXCADRILL, Species.GARCHOMP]))
     .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]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.GASTRODON, Species.SEISMITOAD]))
     .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], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.WEAVILE, Species.SNEASLER], 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 = 1;
+      p.formIndex = 0;
     }))
     .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.KINGAMBIT ]))
     .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.VOLCARONA, Species.SLITHER_WING ]))

src/locales/ca_ES/arena-flyout.json

@@ -1 +1,40 @@
-{}
+{
+  "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 +1,38 @@
-{}
+{
+  "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 +1,8 @@
-{}
+{
+  "start": "Començar",
+  "luckIndicator": "Sort:",
+  "shinyOnHover": "Variocolor",
+  "commonShiny": "Comú",
+  "rareShiny": "Rar",
+  "epicShiny": "Èpica"
+}

src/locales/ca_ES/menu.json

@@ -1 +1,55 @@
-{}
+{
+  "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/nature.json

@@ -1 +1,27 @@
-{}
+{
+  "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 +1,40 @@
-{}
+{
+  "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,6 +11,10 @@
   "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/ja/modifier-type.json

@@ -2,424 +2,258 @@
   "ModifierType": {
     "AddPokeballModifierType": {
       "name": "{{modifierCount}}x {{pokeballName}}",
-      "description": "{{pokeballName}} x{{modifierCount}}こ てにいれる (インベントリ: {{pokeballAmount}}) \nほそくりつ: {{catchRate}}"
+      "description": "{{pokeballName}}を　{{modifierCount}}個　手に入れる　(所有: {{pokeballAmount}})\n捕捉率：{{catchRate}}"
     },
     "AddVoucherModifierType": {
       "name": "{{modifierCount}}x {{voucherTypeName}}",
-      "description": "{{voucherTypeName}} x{{modifierCount}}こ てにいれる"
+      "description": "{{voucherTypeName}}を {{modifierCount}}個 手に入れる"
     },
     "PokemonHeldItemModifierType": {
       "extra": {
-        "inoperable": "{{pokemonName}} はこのアイテムを\nもつことができません！",
+        "inoperable": "{{pokemonName}}は　このアイテムを\n持つ　ことが　できません！",
-        "tooMany": "{{pokemonName}} はこのアイテムを\nもちすぎています！"
+        "tooMany": "{{pokemonName}}は　このアイテムを\n持ちすぎています！"
       }
     },
     "PokemonHpRestoreModifierType": {
-      "description": "ポケモンの HPを {{restorePoints}} または {{restorePercent}}%のどちらか たかいほうを かいふくする",
+      "description": "ポケモン　一匹の　{{restorePoints}}HP、または　{{restorePercent}}%　のどちらか　高い方を　回復する",
       "extra": {
-        "fully": "ポケモンのHPをすべてかいふくする",
+        "fully": "ポケモン 1匹の HPを すべて 回復する",
-        "fullyWithStatus": "ポケモンの HPと じょうたいいじょうを かいふくする"
+        "fullyWithStatus": "ポケモン　1匹の　HPと　状態異常を　すべて　回復する"
       }
     },
     "PokemonReviveModifierType": {
-      "description": "ひんしになってしまったポケモンの HP {{restorePercent}}%を かいふくする"
+      "description": "ひんしに　なった　ポケモン　1匹を　元気にした上で\nHPを　{{restorePercent}}%　回復する"
     },
     "PokemonStatusHealModifierType": {
-      "description": "すべてのじょうたいいじょうを なおす"
+      "description": "ポケモン　1匹の　状態の　異常を　すべて　回復する"
     },
     "PokemonPpRestoreModifierType": {
-      "description": "ポケモンが おぼえている わざの PPを {{restorePoints}}ずつ かいふくする",
+      "description": "ポケモンが　覚えている　技のうち\n1つの　PPを　10だけ　回復する",
       "extra": {
-        "fully": "ポケモンが おぼえている わざの PPを すべて かいふくする"
+        "fully": "ポケモンが　覚えている　技のうち\n1つの　PPを　すべて　回復する"
       }
     },
     "PokemonAllMovePpRestoreModifierType": {
-      "description": "ポケモンが おぼえている 4つの わざの PPを {{restorePoints}}ずつ かいふくする",
+      "description": "ポケモンが　覚えている　4つの　技の　PPを　{{restorePoints}}ずつ　回復する",
       "extra": {
-        "fully": "ポケモンが おぼえている 4つの わざの PPを すべて かいふくする"
+        "fully": "ポケモンが　覚えている　4つの　技の　PPを　すべて　回復する"
       }
     },
     "PokemonPpUpModifierType": {
-      "description": "ポケモンのわざのさいだいPPを さいだいPP 5ごとに {{upPoints}} ポイントずつ ふやします（さいだい3）"
+      "description": "ポケモンが　覚えている　技のうち　1つの　PPの　最大値を　5ごとに　{{upPoints}}ポイントずつ　上げる（最大3）"
     },
     "PokemonNatureChangeModifierType": {
-      "name": "{{natureName}} Mint",
+      "name": "{{natureName}}ミント",
-      "description": "ポケモンのせいかくを {{natureName}}にかえて スターターのせいかくをえいきゅうにかいじょする"
+      "description": "ポケモン　1匹の　性格を　「{{natureName}}」に　変える。\nその上、スターター画面でも　{{natureName}}が　選べるように　なる。"
     },
     "DoubleBattleChanceBoosterModifierType": {
       "description": "バトル{{battleCount}}回の間 　ダブルバトルになる　　確率を　4倍に　する"
     },
     "TempStatStageBoosterModifierType": {
-      "description": "全員の　手持ちポケモンの　{{stat}}を　最大５回の　バトルの間に　{{amount}}あげる.",
+      "description": "全員の　手持ちポケモンの　{{stat}}を　最大５回の　バトルの間に　{{amount}}　上げる",
       "extra": {
-        "stage": "１段階",
+        "stage": "1段階",
-        "percentage": "３０％"
+        "percentage": "30%"
       }
     },
     "AttackTypeBoosterModifierType": {
-      "description": "ポケモンの {{moveType}}タイプのわざのいりょくを20パーセントあげる"
+      "description": "ポケモンの　{{moveType}}タイプの　技の　威力を　20%　上げる"
     },
     "PokemonLevelIncrementModifierType": {
-      "description": "ポケモンのレベルを1あげる"
+      "description": "ポケモンの　レベルを　{{levels}}　上げる"
     },
     "AllPokemonLevelIncrementModifierType": {
-      "description": "すべてのパーティメンバーのレベルを1あげる"
+      "description": "手持ちポケモンの　全員のレベルを　{{levels}}　上げる"
     },
     "BaseStatBoosterModifierType": {
-      "description": "ポケモンの{{stat}}のきほんステータスを10パーセントあげる。こたいちがたかいほどスタックのげんかいもたかくなる。"
+      "description": "ポケモンの　基本の{{stat}}を　10%　あげる。\n個体値が　高けば高いほど　持てる限界が　上がる"
     },
     "AllPokemonFullHpRestoreModifierType": {
-      "description": "すべてのポケモンのHPを100パーセントかいふくする"
+      "description": "手持ちポケモン　全員の　HPを　すべて　回復する"
     },
     "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": "こうげきがもういちどあたる。そのたびにいりょくがそれぞれ60/75/82.5%へる"
+      "description": "持たせると　攻撃が　もう一度　当たるが、\n威力が 減る（1個：60%減る/2個：75%減る/3個：82.5%減る）"
     },
     "TmModifierType": {
-      "name": "TM{{moveId}} - {{moveName}}",
+      "name": "TM{{moveId}}\n{{moveName}}",
-      "description": "ポケモンに {{moveName}} をおしえる"
+      "description": "ポケモンに {{moveName}}を　教える"
     },
     "TmModifierTypeWithInfo": {
-      "name": "TM{{moveId}} - {{moveName}}",
+      "name": "TM{{moveId}}\n{{moveName}}",
-      "description": "ポケモンに {{moveName}} をおしえる\n(Hold C or Shift for more info)"
+      "description": "ポケモンに {{moveName}}を　教える\n（Cキー／Shiftキーを押すと　技情報が見える)"
     },
     "EvolutionItemModifierType": {
-      "description": "とくていのポケモンをしんかさせる"
+      "description": "ある特定の　ポケモンを　進化させる"
     },
     "FormChangeItemModifierType": {
-      "description": "とくていのポケモンをフォームチェンジさせる"
+      "description": "ある特定の　ポケモンを　フォームチェンジさせる"
     },
     "FusePokemonModifierType": {
-      "description": "2匹のポケモンをけつごうする (とくせいをいどうし、きほんステータスとタイプをわけ、わざプールをきょうゆうする)"
+      "description": "2匹の　ポケモンを　吸収合体する（特性が移動し、基本能力とタイプを分け、覚える技を共有する）"
     },
     "TerastallizeModifierType": {
-      "name": "{{teraType}} Tera Shard",
+      "name": "テラピース{{teraType}}",
-      "description": "ポケモンを{{teraType}}タイプにテラスタル（10かいのバトルまで）"
+      "description": "ポケモンを　{{teraType}}タイプに　テラスタルさせる（最大10回のバトルの間）"
     },
     "ContactHeldItemTransferChanceModifierType": {
-      "description": "こうげきするとき あいてがもっているアイテムを {{chancePercent}}パーセントのかくりつでぬすむ"
+      "description": "持っているポケモンが　攻撃すると　相手の持っている\nアイテムを {{chancePercent}}%の　確率で　盗む"
     },
     "TurnHeldItemTransferModifierType": {
-      "description": "まいターン あいてからひとつのもちものをてにいれる"
+      "description": "毎ターン　相手から　一つの　持っている\nアイテム　を吸い込んで　盗む"
     },
     "EnemyAttackStatusEffectChanceModifierType": {
-      "description": "こうげきわざに {{chancePercent}}パーセントのかくりつで {{statusEffect}}をあたえる"
+      "description": "攻撃技に　{{chancePercent}}%の　確率で　{{statusEffect}}を　与える"
     },
     "EnemyEndureChanceModifierType": {
-      "description": "こうげきをこらえるかくりつを{{chancePercent}}パーセントふやす"
+      "description": "ひんしに　なりそうな　技を　受けても\n{{chancePercent}}%の　確率で　HPを　1だけ　残して　耐える"
-    },
+    },
-    "RARE_CANDY": {
+	
-      "name": "ふしぎなアメ"
+    "RARE_CANDY": { "name": "ふしぎなアメ" },								 																																					  
-    },
+    "RARER_CANDY": { "name": "ふかしぎなアメ" },							   
-    "RARER_CANDY": {
+
-      "name": "もっとふしぎなアメ"
+    "MEGA_BRACELET": { "name": "メガバングル", "description": "メガストーンが　見つけられる　ように　なる" },
-    },
+    "DYNAMAX_BAND": { "name": "ダイマックスバンド", "description": "ダイキノコが　見つけられる　ように　なる" },
-    "MEGA_BRACELET": {
+    "TERA_ORB": { "name": "テラスタルオーブ", "description": "テラピースが　見つけられる　ように　なる" },
-      "name": "メガバングル",
+
-      "description": "メガストーンがつかえるようになる"
+    "MAP": { "name": "ちず", "description": "分かれ道で　行き先が　選べる　よう　になる" },
-    },
+										   
-    "DYNAMAX_BAND": {
+    "POTION": { "name": "キズぐすり" },
-      "name": "ダイマックスバンド",
+    "SUPER_POTION": { "name": "いいキズぐすり" },
-      "description": "ダイスープがつかえるようになる"
+    "HYPER_POTION": { "name": "すごいキズぐすり" },																			
-    },
+    "MAX_POTION": { "name": "まんたんのくすり" },																																			 
-    "TERA_ORB": {
+    "FULL_RESTORE": { "name": "かいふくのくすり" },
-      "name": "テラスタルオーブ",
+
-      "description": "テラピースがつかえるようになる"
+    "REVIVE": { "name": "げんきのかけら" },
-    },
+    "MAX_REVIVE": { "name": "げんきのかたまり" },
-    "MAP": {
+																																			
-      "name": "ちず",
+    "FULL_HEAL": { "name": "なんでもなおし" },
-      "description": "わかれみちでいきさきをえらべるようになる"
+
-    },
+    "SACRED_ASH": { "name": "せいなるはい" },
-    "POTION": {
+
-      "name": "キズぐすり"
+    "REVIVER_SEED": { "name": "ふっかつのタネ", "description": "持たせると 直接攻撃から　ひんしに　なれば\n復活して　HPを　50%　回復する" },
-    },
+										   
-    "SUPER_POTION": {
+    "WHITE_HERB":{ "name": "しろいハーブ", "description": "持たせた ポケモンの能力が さがったとき 1度だけ 元の状態に 戻す" },
-      "name": "いいキズぐすり"
+ 
-    },
+    "ETHER": { "name": "ピーピーエイド" },
-    "HYPER_POTION": {
+    "MAX_ETHER": { "name": "ピーピーリカバー" },
-      "name": "すごいキズぐすり"
+
-    },
+    "ELIXIR": { "name": "ピーピーエイダー" },
-    "MAX_POTION": {
+    "MAX_ELIXIR": { "name": "ピーピーマックス" },
-      "name": "まんたんのくすり"
+								 
-    },
+    "PP_UP": { "name": "ポイントアップ" },
-    "FULL_RESTORE": {
+    "PP_MAX": { "name": "ポイントマックス" },
-      "name": "かいふくのくすり"
+
-    },
+    "LURE": { "name": "むしよせコロン" },
-    "REVIVE": {
+    "SUPER_LURE": { "name": "シルバーコロン" },
-      "name": "げんきのかけら"
+    "MAX_LURE": { "name": "ゴールドコロン" },
-    },
+ 
-    "MAX_REVIVE": {
+    "MEMORY_MUSHROOM": { "name": "きおくのキノコ", "description": "1匹の　ポケモンの　忘れた技を　1つ　覚えさせる" },
-      "name": "げんきのかたまり"
+
-    },
+    "EXP_SHARE": { "name": "がくしゅうそうち", "description": "バトルに　参加していない　ポケモンが　参加したポケモンの　経験値を　20%　もらう" },
-    "FULL_HEAL": {
+    "EXP_BALANCE": { "name": "バランスそうち", "description": "レベルが低い　手持ちポケモンの　もらう　経験値が　増える" },
-      "name": "なんでもなおし"
+			   
-    },
+    "OVAL_CHARM": { "name": "まるいおまもり", "description": "バトルに　複数の　ポケモンが　参加すると、\n経験値が　参加したポケモンずつ　10%　増える" },
-    "SACRED_ASH": {
+
-      "name": "せいなるはい"
+    "EXP_CHARM": { "name": "けいけんおまもり" },
-    },
+    "SUPER_EXP_CHARM": { "name": "いいけいけんおまもり" },
-    "REVIVER_SEED": {
+    "GOLDEN_EXP_CHARM": { "name": "ゴールドけいけんちおまもり" },
-      "name": "ふっかつのタネ",
+
-      "description": "ひんしになったときもっているポケモンをHPはんぶんでふっかつさせる"
+    "LUCKY_EGG": { "name": "しあわせタマゴ" },
-    },
+    "GOLDEN_EGG": { "name": "ゴールドタマゴ" },
-    "WHITE_HERB": {
+ 
-      "name": "White Herb",
+    "SOOTHE_BELL": { "name": "やすらぎのすず" },
-      "description": "An item to be held by a Pokémon. It will restore any lowered stat in battle."
+
-    },
+    "SCOPE_LENS": { "name": "ピントレンズ", "description": "弱点が　見える　レンズ。\n持たせた　ポケモンの技が　急所に　当たりやすくなる"},
-    "ETHER": {
+    "DIRE_HIT": { "name": "クリティカット", "extra": { "raises": "急所率" } },
-      "name": "ピーピーエイド"
+    "LEEK": { "name": "ながねぎ", "description": "とても長くて　硬いクキ。\nカモネギに　持たせると　技が　急所に　当たりやすくなる"},
-    },
+
-    "MAX_ETHER": {
+    "EVIOLITE": { "name": "しんかのきせき", "description": "進化の不思議な かたまり。\n持たせると 進化前ポケモンの 防御と 特防が あがる" },
-      "name": "ピーピーリカバー"
+																																									 
-    },
+    "SOUL_DEW": { "name": "こころのしずく", "description": "持たせると　ポケモンの　性格が　能力に与える　影響は　10%　増える（合算）" }, 
-    "ELIXIR": {
+
-      "name": "ピーピーエイダー"
+    "NUGGET": { "name": "きんのたま" },
-    },
+    "BIG_NUGGET": { "name": "でかいきんのたま" },
-    "MAX_ELIXIR": {
+    "RELIC_GOLD": { "name": "こだいのきんか" },
-      "name": "ピーピーマックス"
+
-    },
+    "AMULET_COIN": { "name": "おまもりこばん", "description": "もらえる　お金が　20%　増える" },
-    "PP_UP": {
+    "GOLDEN_PUNCH": { "name": "ゴールドパンチ", "description": "持たせると　与える　直接なダメージの　50%が　お金として　もらえる" },
-      "name": "ポイントアップ"
+    "COIN_CASE": { "name": "コインケース", "description": "10回の　バトルごとに　持ち金の　10%を　利子として　受け取れる" },
-    },
+
-    "PP_MAX": {
+    "LOCK_CAPSULE": { "name": "ロックカプセル", "description": "ご褒美の　選択肢変更するとき　アイテムの　レア度を固定できる　ように　なる" },
-      "name": "ポイントマックス"
+
-    },
+    "GRIP_CLAW": { "name": "ねばりのかぎづめ" },
-    "LURE": {
+    "WIDE_LENS": { "name": "こうかくレンズ" },
-      "name": "ダブルバトルコロン"
+
-    },
+    "MULTI_LENS": { "name": "マルチレンズ" },
-    "SUPER_LURE": {
+
-      "name": "シルバーコロン"
+    "HEALING_CHARM": { "name": "かいふくおまもり", "description": "回復する　技や　アイテムの　効果を　10%　あげる（復活アイテムは除く）" },
-    },
+    "CANDY_JAR": { "name": "アメボトル", "description": "ふしぎなアメや　ふかしぎなアメで あげるレベルを　1　増える" },
-    "MAX_LURE": {
+ 
-      "name": "ゴールドコロン"
+    "BERRY_POUCH": { "name": "きのみぶくろ", "description": "使ったきのみは　無くならない　30%の可能性を　加える" },
-    },
+
-    "MEMORY_MUSHROOM": {
+    "FOCUS_BAND": { "name": "きあいのハチマキ", "description": "持たせると　ひんしに なりそうな 技を 受けても\n10%の可能性で　HPを 1だけ 残して 耐える" },
-      "name": "きおくキノコ",
+																										  
-      "description": "ポケモンのわすれたわざをおぼえさせる"
+    "QUICK_CLAW": { "name": "せんせいのツメ", "description": "持たせると　10%の可能性で　相手より　先に　行動できる　（優先技のあと）" },
-    },
+																															
-    "EXP_SHARE": {
+    "KINGS_ROCK": { "name": "おうじゃのしるし", "description": "持たせると　攻撃して　ダメージを　与えたときに\n10%の可能性で　相手を　ひるませる" },
-      "name": "がくしゅうそうち",
+
-      "description": "バトルにさんかしていないポケモンが けいけんちの20パーセントをもらう"
+    "LEFTOVERS": { "name": "たべのこし", "description": "持たせると　毎ターン　最大HPの　1/16を　回復する" },
-    },
+    "SHELL_BELL": { "name": "かいがらのすず", "description": "持たせると　ポケモンが　相手に　与えたダメージの　1/8をHPとして　回復する." },
-    "EXP_BALANCE": {
+
-      "name": "バランスそうち",
+    "TOXIC_ORB": { "name": "どくどくだま", "description": "触ると　毒をだす　不思議な玉。\n持たせると　戦闘中に　猛毒の状態に　なる" },
-      "description": "レベルがひくいパーティメンバーがもらうけいけんちがふえる"
+    "FLAME_ORB": { "name": "かえんだま", "description": "触ると　熱をだす　不思議な玉。\n持たせると　戦闘中に　やけどの状態に　なる。" },
-    },
+
-    "OVAL_CHARM": {
+    "BATON": { "name": "バトン", "description": "持たせると　入れ替えるとき　控えのポケモンが\n能力変化を　受けつげる　（逃げられなくする　技や　特性も　回避する）" },
-      "name": "まるいおまもり",
+
-      "description": "バトルにふくすうのポケモンがさんかするとけいけんちが10パーセントふえる"
+    "SHINY_CHARM": { "name": "ひかるおまもり", "description": "色違いの　ポケモンと　大きく　出会いやすくなる" },
-    },
+    "ABILITY_CHARM": { "name": "とくせいおまもり", "description": "隠れ特性がある　ポケモンと　大きく　出会いやすくなる" },
-    "EXP_CHARM": {
+									  
-      "name": "けいけんちおまもり"
+    "IV_SCANNER": { "name": "こたいちスキャナー", "description": "野生ポケモンの　個体値を　検査できる。　一つのスキャナーあたり\n個体値が　2つ　見える。　最高の　個体値が　最初に　見える。" },
-    },
+
-    "SUPER_EXP_CHARM": {
+    "DNA_SPLICERS": { "name": "いでんしのくさび" },
-      "name": "いいけいけんちおまもり"
+
-    },
+    "MINI_BLACK_HOLE": { "name": "ミニブラックホール" },
-    "GOLDEN_EXP_CHARM": {
+																																				  
-      "name": "ゴールドけいけんちおまもり"
+    "GOLDEN_POKEBALL": { "name": "ゴールドモンスターボール", "description": "バトル後に　もう　一つの　ご褒美の　選択肢を　加える" },
-    },
+
-    "LUCKY_EGG": {
+    "ENEMY_DAMAGE_BOOSTER": { "name": "ダメージトークン", "description": "ダメージを　5%　あげる" },
-      "name": "しあわせタマゴ"
+    "ENEMY_DAMAGE_REDUCTION": { "name": "ぼうごトークン", "description": "受けたダメージを　2.5%　さげる" },
-    },
+    "ENEMY_HEAL": { "name": "かいふくトークン", "description": "毎ターン　最大HPの　2%を　回復する" },
-    "GOLDEN_EGG": {
+    "ENEMY_ATTACK_POISON_CHANCE": { "name": "どくトークン" },				 
-      "name": "おうごんタマゴ"
+    "ENEMY_ATTACK_PARALYZE_CHANCE": { "name": "まひトークン" },						   							   
-    },
+    "ENEMY_ATTACK_BURN_CHANCE": { "name": "やけどトークン" },
-    "SOOTHE_BELL": {
+    "ENEMY_STATUS_EFFECT_HEAL_CHANCE": { "name": "なんでもなおしトークン", "description": "毎ターン　状態異常を　治せる　2.5%の可能性を　加える" }, 
-      "name": "やすらぎのすず"
+    "ENEMY_ENDURE_CHANCE": { "name": "こらえるトークン" },
-    },
+    "ENEMY_FUSED_CHANCE": { "name": "がったいトークン", "description": "野生ポケモンは　吸収合体している　1%の可能性を　加える" }	   
-    "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%ふやす"
-    }
   },
   "SpeciesBoosterItem": {
-    "LIGHT_BALL": {
+    "LIGHT_BALL": { "name": "でんきだま", "description": "ピカチュウに　持たせると　攻撃と　特攻が　あがる　不思議な玉" },
-      "name": "でんきだま",
+    "THICK_CLUB": { "name": "ふといホネ", "description": "なにかの　硬いホネ。　カラカラ　または　ガラガラに　持たせると　攻撃が　あがる" },
-      "description": "ピカチュウに 持たせると 攻撃と 特攻が あがる 不思議な玉。"
+    "METAL_POWDER": { "name": "メタルパウダー", "description": "メタモンに　持たせると　防御が　あがる　不思議な粉。　とても　こまかくて　硬い" },
-    },
+    "QUICK_POWDER": { "name": "スピードパウダー", "description": "メタモンに　持たせると　素早さが　あがる　不思議な粉。　とても　こまかくて　硬い" }
-    "THICK_CLUB": {
-      "name": "ふといホネ",
-      "description": "なにかの 硬いホネ。カラカラ または ガラガラに 持たせると 攻撃が あがる。"
-    },
-    "METAL_POWDER": {
-      "name": "メタルパウダー",
-      "description": "メタモンに 持たせると 防御が あがる 不思議な粉。とても こまかくて 硬い。"
-    },
-    "QUICK_POWDER": {
-      "name": "スピードパウダー",
-      "description": "メタモンに 持たせると 素早さが あがる 不思議 粉。とても こまかくて 硬い。"
-    }
   },
   "TempStatStageBoosterItem": {
     "x_attack": "プラスパワー",
@@ -458,7 +292,8 @@
     "carbos": "インドメタシン"
   },
   "EvolutionItem": {
-    "NONE": "None",
+    "NONE": "なし",
+	
     "LINKING_CORD": "つながりのヒモ",
     "SUN_STONE": "たいようのいし",
     "MOON_STONE": "つきのいし",
@@ -475,6 +310,7 @@
     "TART_APPLE": "すっぱいりんご",
     "STRAWBERRY_SWEET": "いちごアメざいく",
     "UNREMARKABLE_TEACUP": "ボンサクのちゃわん",
+
     "CHIPPED_POT": "かけたポット",
     "BLACK_AUGURITE": "くろのきせき",
     "GALARICA_CUFF": "ガラナツブレス",
@@ -489,7 +325,8 @@
     "SYRUPY_APPLE": "みついりりんご"
   },
   "FormChangeItem": {
-    "NONE": "None",
+    "NONE": "なし",
+	
     "ABOMASITE": "ユキノオナイト",
     "ABSOLITE": "アブソルナイト",
     "AERODACTYLITE": "プテラナイト",
@@ -538,6 +375,7 @@
     "SWAMPERTITE": "ラグラージナイト",
     "TYRANITARITE": "バンギラスナイト",
     "VENUSAURITE": "フシギバナイト",
+	
     "BLUE_ORB": "あいいろのたま",
     "RED_ORB": "べにいろのたま",
     "SHARP_METEORITE": "シャープなうんせき",
@@ -565,6 +403,44 @@
     "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

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

src/locales/ko/challenges.json

@@ -1,6 +1,7 @@
 {
   "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정신을 차려 싸울 수 있게 되었다!",
-  "pokemonResetNegativeStatStageApply": "{{pokemonNameWithAffix}}[[는]] {{typeName}}[[로]]\n상태를 원래대로 되돌렸다!",
+  "resetNegativeStatStageApply": "{{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,9 +4,10 @@
   "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,8 +13,7 @@
     "SPD": "스피드",
     "SPDshortened": "스피드",
     "ACC": "명중률",
-    "EVA": "회피율",
+    "EVA": "회피율"
-    "HPStat": "HP"
   },
   "Type": {
     "UNKNOWN": "Unknown",

src/phases/egg-lapse-phase.ts

@@ -17,14 +17,13 @@ import { EggHatchData } from "#app/data/egg-hatch-data";
 export class EggLapsePhase extends Phase {
 
   private eggHatchData: EggHatchData[] = [];
-  private readonly minEggsToPromptSkip: number = 5;
+  private readonly minEggsToSkip: number = 2;
   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;
     });
@@ -32,8 +31,7 @@ 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);
@@ -46,6 +44,10 @@ 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,6 +126,7 @@ 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",
@@ -281,6 +282,26 @@ 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"),
@@ -727,6 +748,9 @@ 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;

src/test/moves/roost.test.ts

@@ -38,7 +38,6 @@ describe("Moves - Roost", () => {
   /**
    * Roost's behavior should be defined as:
    * The pokemon loses its flying type for a turn. If the pokemon was ungroundd solely due to being a flying type, it will be grounded until end of turn.
-   *
    * 1. Pure Flying type pokemon -> become normal type until end of turn
    * 2. Dual Flying/X type pokemon -> become type X until end of turn
    * 3. Pokemon that use burn up into roost (ex. Moltres) -> become flying due to burn up, then typeless until end of turn after using roost
@@ -47,8 +46,6 @@ describe("Moves - Roost", () => {
    *    and pokemon post Burn up become ()
    * 5. If a pokemon is also ungrounded due to other reasons (such as levitate), it will stay ungrounded post roost, despite not being flying type.
    * 6. Non flying types using roost (such as dunsparce) are already grounded, so this move will only heal and have no other effects.
-   *
-   * Also making the user pokemon go first so we can check if the pokemon took damage post roost
    */
 
   test(