diff --git a/public/images/pokemon/exp/shiny/4077.png b/public/images/pokemon/exp/shiny/4077.png
index f2f5891883d..ab414e058e1 100644
Binary files a/public/images/pokemon/exp/shiny/4077.png and b/public/images/pokemon/exp/shiny/4077.png differ
diff --git a/public/images/pokemon/variant/_masterlist.json b/public/images/pokemon/variant/_masterlist.json
index ff28e68160e..757630ab6b5 100644
--- a/public/images/pokemon/variant/_masterlist.json
+++ b/public/images/pokemon/variant/_masterlist.json
@@ -10806,7 +10806,7 @@
 			"962": [
 				1,
 				1,
-				2
+				1
 			],
 			"967": [
 				0,
@@ -11095,4 +11095,4 @@
 			1
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/public/images/pokemon/variant/exp/back/962.json b/public/images/pokemon/variant/exp/back/962.json
index 860c4515df7..118a0f26768 100644
--- a/public/images/pokemon/variant/exp/back/962.json
+++ b/public/images/pokemon/variant/exp/back/962.json
@@ -28,5 +28,20 @@
 		"fffbff": "edf8e6",
 		"7b827b": "6a856a",
 		"a7aba7": "98a798"
+	},
+	"2": {
+		"342930": "754156",
+		"0f0f0f": "0f0f0f",
+		"4a3942": "a5777f",
+		"937d85": "2f2655",
+		"b9aaaf": "453863",
+		"665b60": "211f45",
+		"efe3e1": "67548a",
+		"a7aba7": "ddac84",
+		"fffbff": "f7e5d0",
+		"e64c62": "aba7a8",
+		"993e49": "797877",
+		"501d25": "545151",
+		"7b827b": "a96c4b"
 	}
-}
\ No newline at end of file
+}
diff --git a/public/images/pokemon/variant/exp/back/962_3.json b/public/images/pokemon/variant/exp/back/962_3.json
deleted file mode 100644
index 397453d3274..00000000000
--- a/public/images/pokemon/variant/exp/back/962_3.json
+++ /dev/null
@@ -1,167 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "962_3.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 224,
-				"h": 224
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 82,
-						"h": 86
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 82,
-						"h": 86
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 87,
-						"h": 79
-					},
-					"frame": {
-						"x": 0,
-						"y": 86,
-						"w": 87,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 6,
-						"w": 92,
-						"h": 74
-					},
-					"frame": {
-						"x": 82,
-						"y": 0,
-						"w": 92,
-						"h": 74
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 38,
-						"w": 91,
-						"h": 59
-					},
-					"frame": {
-						"x": 0,
-						"y": 165,
-						"w": 91,
-						"h": 59
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 36,
-						"w": 91,
-						"h": 60
-					},
-					"frame": {
-						"x": 87,
-						"y": 74,
-						"w": 91,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 41,
-						"w": 101,
-						"h": 41
-					},
-					"frame": {
-						"x": 91,
-						"y": 134,
-						"w": 101,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 101,
-						"h": 97
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 40,
-						"w": 100,
-						"h": 38
-					},
-					"frame": {
-						"x": 91,
-						"y": 175,
-						"w": 100,
-						"h": 38
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:ee54d59ae73a6775b5d1d9b10f273445:828dff0b1dc45966e927a7a1419412f2:1e70eb3d02dd5c47565da4b5d26e2400$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/962_3.png b/public/images/pokemon/variant/exp/back/962_3.png
deleted file mode 100644
index 9356040a0e9..00000000000
Binary files a/public/images/pokemon/variant/exp/back/962_3.png and /dev/null differ
diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 922a145780b..1455994ce48 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -126,6 +126,7 @@ export default class BattleScene extends SceneBase {
   public bgmVolume: number = 1;
   public fieldVolume: number = 1;
   public seVolume: number = 1;
+  public uiVolume: number = 1;
   public gameSpeed: integer = 1;
   public damageNumbersMode: integer = 0;
   public reroll: boolean = false;
@@ -1755,6 +1756,7 @@ export default class BattleScene extends SceneBase {
         } else {
           const soundDetails = sound.key.split("/");
           switch (soundDetails[0]) {
+
           case "battle_anims":
           case "cry":
             if (soundDetails[1].startsWith("PRSFX- ")) {
@@ -1791,6 +1793,16 @@ export default class BattleScene extends SceneBase {
     try {
       const keyDetails = key.split("/");
       switch (keyDetails[0]) {
+      case "level_up_fanfare":
+      case "item_fanfare":
+      case "minor_fanfare":
+      case "heal":
+      case "evolution":
+      case "evolution_fanfare":
+        // These sounds are loaded in as BGM, but played as sound effects
+        // When these sounds are updated in updateVolume(), they are treated as BGM however because they are placed in the BGM Cache through being called by playSoundWithoutBGM()
+        config["volume"] = this.masterVolume * this.bgmVolume;
+        break;
       case "battle_anims":
       case "cry":
         config["volume"] = this.masterVolume * this.fieldVolume;
@@ -1799,9 +1811,11 @@ export default class BattleScene extends SceneBase {
           config["volume"] *= 0.5;
         }
         break;
-      case "se":
       case "ui":
-      default:
+        //As of, right now this applies to the "select", "menu_open", "error" sound effects
+        config["volume"] = this.masterVolume * this.uiVolume;
+        break;
+      case "se":
         config["volume"] = this.masterVolume * this.seVolume;
         break;
       }
diff --git a/src/data/daily-run.ts b/src/data/daily-run.ts
index b875877f99e..0a02defe052 100644
--- a/src/data/daily-run.ts
+++ b/src/data/daily-run.ts
@@ -49,7 +49,8 @@ export function getDailyRunStarters(scene: BattleScene, seed: string): Starter[]
       const costSpecies = Object.keys(speciesStarters)
         .map(s => parseInt(s) as Species)
         .filter(s => speciesStarters[s] === cost);
-      const starterSpecies = getPokemonSpecies(getPokemonSpecies(Utils.randSeedItem(costSpecies)).getTrainerSpeciesForLevel(startingLevel, true, PartyMemberStrength.STRONGER));
+      const randPkmSpecies = getPokemonSpecies(Utils.randSeedItem(costSpecies));
+      const starterSpecies = getPokemonSpecies(randPkmSpecies.getTrainerSpeciesForLevel(startingLevel, true, PartyMemberStrength.STRONGER));
       starters.push(getDailyRunStarter(scene, starterSpecies, startingLevel));
     }
   }, 0, seed);
diff --git a/src/data/pokemon-evolutions.ts b/src/data/pokemon-evolutions.ts
index 6dfa08ab471..6479d620182 100644
--- a/src/data/pokemon-evolutions.ts
+++ b/src/data/pokemon-evolutions.ts
@@ -1582,7 +1582,8 @@ export const pokemonEvolutions: PokemonEvolutions = {
     new SpeciesEvolution(Species.BLISSEY, 1, null, new SpeciesFriendshipEvolutionCondition(200), SpeciesWildEvolutionDelay.LONG)
   ],
   [Species.PICHU]: [
-    new SpeciesEvolution(Species.PIKACHU, 1, null, new SpeciesFriendshipEvolutionCondition(90), SpeciesWildEvolutionDelay.SHORT)
+    new SpeciesFormEvolution(Species.PIKACHU, "spiky", "partner", 1, null, new SpeciesFriendshipEvolutionCondition(90), SpeciesWildEvolutionDelay.SHORT),
+    new SpeciesFormEvolution(Species.PIKACHU, "", "", 1, null, new SpeciesFriendshipEvolutionCondition(90), SpeciesWildEvolutionDelay.SHORT),
   ],
   [Species.CLEFFA]: [
     new SpeciesEvolution(Species.CLEFAIRY, 1, null, new SpeciesFriendshipEvolutionCondition(160), SpeciesWildEvolutionDelay.SHORT)
diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts
index c29854b3adc..9ed20ade9eb 100644
--- a/src/data/pokemon-species.ts
+++ b/src/data/pokemon-species.ts
@@ -1,24 +1,21 @@
-
+import { Localizable } from "#app/interfaces/locales";
+import { Abilities } from "#enums/abilities";
+import { PartyMemberStrength } from "#enums/party-member-strength";
+import { Species } from "#enums/species";
+import { QuantizerCelebi, argbFromRgba, rgbaFromArgb } from "@material/material-color-utilities";
+import i18next from "i18next";
 import BattleScene, { AnySound } from "../battle-scene";
-import { Variant, variantColorCache } from "./variant";
-import { variantData } from "./variant";
+import { GameMode } from "../game-mode";
+import { StarterMoveset } from "../system/game-data";
+import * as Utils from "../utils";
+import { uncatchableSpecies } from "./biomes";
+import { speciesEggMoves } from "./egg-moves";
 import { GrowthRate } from "./exp";
 import { EvolutionLevel, SpeciesWildEvolutionDelay, pokemonEvolutions, pokemonPrevolutions } from "./pokemon-evolutions";
 import { Type } from "./type";
 import { LevelMoves, pokemonFormLevelMoves, pokemonFormLevelMoves as pokemonSpeciesFormLevelMoves, pokemonSpeciesLevelMoves } from "./pokemon-level-moves";
-import { uncatchableSpecies } from "./biomes";
-import * as Utils from "../utils";
-import { StarterMoveset } from "../system/game-data";
-import { speciesEggMoves } from "./egg-moves";
-import { GameMode } from "../game-mode";
-import { QuantizerCelebi, argbFromRgba, rgbaFromArgb } from "@material/material-color-utilities";
-import { VariantSet } from "./variant";
-import i18next from "i18next";
-import { Localizable } from "#app/interfaces/locales";
 import { Stat } from "#enums/stat";
-import { Abilities } from "#enums/abilities";
-import { PartyMemberStrength } from "#enums/party-member-strength";
-import { Species } from "#enums/species";
+import { Variant, VariantSet, variantColorCache, variantData } from "./variant";
 
 export enum Region {
   NORMAL,
@@ -28,7 +25,15 @@ export enum Region {
   PALDEA
 }
 
-export function getPokemonSpecies(species: Species | Species[]): PokemonSpecies {
+/**
+ * Gets the {@linkcode PokemonSpecies} object associated with the {@linkcode Species} enum given
+ * @param species The species to fetch
+ * @returns The associated {@linkcode PokemonSpecies} object
+ */
+export function getPokemonSpecies(species: Species | Species[] | undefined): PokemonSpecies {
+  if (!species) {
+    throw new Error("`species` must not be undefined in `getPokemonSpecies()`");
+  }
   // If a special pool (named trainers) is used here it CAN happen that they have a array as species (which means choose one of those two). So we catch that with this code block
   if (Array.isArray(species)) {
     // Pick a random species from the list
@@ -648,8 +653,8 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali
     return this.getSpeciesForLevel(level, allowEvolving, false, (isBoss ? PartyMemberStrength.WEAKER : PartyMemberStrength.AVERAGE) + (gameMode?.isEndless ? 1 : 0));
   }
 
-  getTrainerSpeciesForLevel(level: integer, allowEvolving: boolean = false, strength: PartyMemberStrength): Species {
-    return this.getSpeciesForLevel(level, allowEvolving, true, strength);
+  getTrainerSpeciesForLevel(level: integer, allowEvolving: boolean = false, strength: PartyMemberStrength, currentWave: number = 0): Species {
+    return this.getSpeciesForLevel(level, allowEvolving, true, strength, currentWave);
   }
 
   private getStrengthLevelDiff(strength: PartyMemberStrength): integer {
@@ -669,7 +674,7 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali
     }
   }
 
-  getSpeciesForLevel(level: integer, allowEvolving: boolean = false, forTrainer: boolean = false, strength: PartyMemberStrength = PartyMemberStrength.WEAKER): Species {
+  getSpeciesForLevel(level: integer, allowEvolving: boolean = false, forTrainer: boolean = false, strength: PartyMemberStrength = PartyMemberStrength.WEAKER, currentWave: number = 0): Species {
     const prevolutionLevels = this.getPrevolutionLevels();
 
     if (prevolutionLevels.length) {
@@ -730,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) {
@@ -754,7 +764,7 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali
 
     for (const weight of evolutionPool.keys()) {
       if (randValue < weight) {
-        return getPokemonSpecies(evolutionPool.get(weight)!).getSpeciesForLevel(level, true, forTrainer, strength); // TODO: is the bang correct?
+        return getPokemonSpecies(evolutionPool.get(weight)).getSpeciesForLevel(level, true, forTrainer, strength, currentWave);
       }
     }
 
diff --git a/src/data/trainer-config.ts b/src/data/trainer-config.ts
index 5f47ce42a62..36f75a60c49 100644
--- a/src/data/trainer-config.ts
+++ b/src/data/trainer-config.ts
@@ -142,7 +142,7 @@ export const trainerPartyTemplates = {
   FIVE_WEAK_BALANCED: new TrainerPartyTemplate(5, PartyMemberStrength.WEAK, false, true),
   SIX_WEAKER: new TrainerPartyTemplate(6, PartyMemberStrength.WEAKER),
   SIX_WEAKER_SAME: new TrainerPartyTemplate(6, PartyMemberStrength.WEAKER, true),
-  SIX_WEAK_SAME: new TrainerPartyTemplate(6, PartyMemberStrength.WEAKER, true),
+  SIX_WEAK_SAME: new TrainerPartyTemplate(6, PartyMemberStrength.WEAK, true),
   SIX_WEAK_BALANCED: new TrainerPartyTemplate(6, PartyMemberStrength.WEAK, false, true),
 
   GYM_LEADER_1: new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(1, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(1, PartyMemberStrength.STRONG)),
@@ -965,7 +965,7 @@ function getRandomPartyMemberFunc(speciesPool: Species[], trainerSlot: TrainerSl
   return (scene: BattleScene, level: integer, strength: PartyMemberStrength) => {
     let species = Utils.randSeedItem(speciesPool);
     if (!ignoreEvolution) {
-      species = getPokemonSpecies(species).getTrainerSpeciesForLevel(level, true, strength);
+      species = getPokemonSpecies(species).getTrainerSpeciesForLevel(level, true, strength, scene.currentBattle.waveIndex);
     }
     return scene.addEnemyPokemon(getPokemonSpecies(species), level, trainerSlot, undefined, undefined, postProcess);
   };
@@ -975,7 +975,7 @@ function getSpeciesFilterRandomPartyMemberFunc(speciesFilter: PokemonSpeciesFilt
   const originalSpeciesFilter = speciesFilter;
   speciesFilter = (species: PokemonSpecies) => (allowLegendaries || (!species.legendary && !species.subLegendary && !species.mythical)) && !species.isTrainerForbidden() && originalSpeciesFilter(species);
   return (scene: BattleScene, level: integer, strength: PartyMemberStrength) => {
-    const ret = scene.addEnemyPokemon(getPokemonSpecies(scene.randomSpecies(scene.currentBattle.waveIndex, level, false, speciesFilter).getTrainerSpeciesForLevel(level, true, strength)), level, trainerSlot, undefined, undefined, postProcess);
+    const ret = scene.addEnemyPokemon(getPokemonSpecies(scene.randomSpecies(scene.currentBattle.waveIndex, level, false, speciesFilter).getTrainerSpeciesForLevel(level, true, strength, scene.currentBattle.waveIndex)), level, trainerSlot, undefined, undefined, postProcess);
     return ret;
   };
 }
diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 56091ebe6c3..28096c6cba5 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -2761,7 +2761,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   }
 
   private fusionFaintCry(callback: Function): void {
-    const key = this.getSpeciesForm().getCryKey(this.formIndex);
+    const key = `cry/${this.getSpeciesForm().getCryKey(this.formIndex)}`;
     let i = 0;
     let rate = 0.85;
     const cry = this.scene.playSound(key, { rate: rate }) as AnySound;
@@ -2769,7 +2769,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     const tintSprite = this.getTintSprite();
     let duration = cry.totalDuration * 1000;
 
-    let fusionCry = this.scene.playSound(this.getFusionSpeciesForm().getCryKey(this.fusionFormIndex), { rate: rate }) as AnySound;
+    const fusionCryKey = `cry/${this.getFusionSpeciesForm().getCryKey(this.fusionFormIndex)}`;
+    let fusionCry = this.scene.playSound(fusionCryKey, { rate: rate }) as AnySound;
     fusionCry.stop();
     duration = Math.min(duration, fusionCry.totalDuration * 1000);
     fusionCry.destroy();
@@ -2813,7 +2814,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
         }
         if (i === transitionIndex) {
           SoundFade.fadeOut(this.scene, cry, Utils.fixedInt(Math.ceil((duration / rate) * 0.2)));
-          fusionCry = this.scene.playSound(this.getFusionSpeciesForm().getCryKey(this.fusionFormIndex), Object.assign({ seek: Math.max(fusionCry.totalDuration * 0.4, 0), rate: rate }));
+          fusionCry = this.scene.playSound(fusionCryKey, Object.assign({ seek: Math.max(fusionCry.totalDuration * 0.4, 0), rate: rate }));
           SoundFade.fadeIn(this.scene, fusionCry, Utils.fixedInt(Math.ceil((duration / rate) * 0.2)), this.scene.masterVolume * this.scene.seVolume, 0);
         }
         rate *= 0.99;
diff --git a/src/field/trainer.ts b/src/field/trainer.ts
index 68ebabbbe23..02827d0d69d 100644
--- a/src/field/trainer.ts
+++ b/src/field/trainer.ts
@@ -359,12 +359,12 @@ export default class Trainer extends Phaser.GameObjects.Container {
       let species = useNewSpeciesPool
         ? getPokemonSpecies(newSpeciesPool[Math.floor(Math.random() * newSpeciesPool.length)])
         : template.isSameSpecies(index) && index > offset
-          ? getPokemonSpecies(battle.enemyParty[offset].species.getTrainerSpeciesForLevel(level, false, template.getStrength(offset)))
+          ? getPokemonSpecies(battle.enemyParty[offset].species.getTrainerSpeciesForLevel(level, false, template.getStrength(offset), this.scene.currentBattle.waveIndex))
           : this.genNewPartyMemberSpecies(level, strength);
 
       // If the species is from newSpeciesPool, we need to adjust it based on the level and strength
       if (newSpeciesPool) {
-        species = getPokemonSpecies(species.getSpeciesForLevel(level, true, true, strength));
+        species = getPokemonSpecies(species.getSpeciesForLevel(level, true, true, strength, this.scene.currentBattle.waveIndex));
       }
 
       ret = this.scene.addEnemyPokemon(species, level, !this.isDouble() || !(index % 2) ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER);
@@ -393,7 +393,7 @@ export default class Trainer extends Phaser.GameObjects.Container {
       species = this.scene.randomSpecies(battle.waveIndex, level, false, this.config.speciesFilter);
     }
 
-    let ret = getPokemonSpecies(species.getTrainerSpeciesForLevel(level, true, strength));
+    let ret = getPokemonSpecies(species.getTrainerSpeciesForLevel(level, true, strength, this.scene.currentBattle.waveIndex));
     let retry = false;
 
     console.log(ret.getName());
@@ -412,7 +412,7 @@ export default class Trainer extends Phaser.GameObjects.Container {
       console.log("Attempting reroll of species evolution to fit specialty type...");
       let evoAttempt = 0;
       while (retry && evoAttempt++ < 10) {
-        ret = getPokemonSpecies(species.getTrainerSpeciesForLevel(level, true, strength));
+        ret = getPokemonSpecies(species.getTrainerSpeciesForLevel(level, true, strength, this.scene.currentBattle.waveIndex));
         console.log(ret.name);
         if (this.config.specialtyTypes.find(t => ret.isOfType(t))) {
           retry = false;
diff --git a/src/locales/de/dialogue-female.json b/src/locales/de/dialogue-female.json
index e71e03453a7..e6ab044d002 100644
--- a/src/locales/de/dialogue-female.json
+++ b/src/locales/de/dialogue-female.json
@@ -355,6 +355,30 @@
       "1": "Ich werde für das nächste Rennen tunen."
     }
   },
+  "firebreather": {
+    "encounter": {
+      "1": "Meine Flammen werden dich verschlingen!",
+      "2": "Meine Seele hat Feuer gefangen. Ich werde dir zeigen, wie heiß sie brennt!",
+      "3": "Komm näher und sieh dir meine Flammen an!"
+    },
+    "victory": {
+      "1": "Verbrannt bis zur Asche...",
+      "2": "Yow! Das ist heiß!",
+      "3": "Auuu! Ich habe mir die Nasenspitze verbrannt!"
+    }
+  },
+  "sailor": {
+    "encounter": {
+      "1": "Matrose, du gehst über Bord, wenn du verlierst!",
+      "2": "Komm schon! Mein Stolz als Seemann steht auf dem Spiel!",
+      "3": "Ahoj! Bist du seekrank?"
+    },
+    "victory": {
+      "1": "Argh! Von einem Kind besiegt!",
+      "2": "Dein Geist hat mich versenkt!",
+      "3": "Ich glaube, ich bin der der seekrank ist..."
+    }
+  },
   "archer": {
     "encounter": {
       "1": "Bevor du weitergehst, lass uns sehen, wie du dich gegen uns, Team Rocket, schlägst!",
@@ -535,30 +559,6 @@
       "3": "Wunderbar! Bemerkenswert! Deine Fähigkeiten und dein Mut sind lobenswert."
     }
   },
-  "firebreather": {
-    "encounter": {
-      "1": "Meine Flammen werden dich verschlingen!",
-      "2": "Meine Seele hat Feuer gefangen. Ich werde dir zeigen, wie heiß sie brennt!",
-      "3": "Komm näher und sieh dir meine Flammen an!"
-    },
-    "victory": {
-      "1": "Verbrannt bis zur Asche...",
-      "2": "Yow! Das ist heiß!",
-      "3": "Auuu! Ich habe mir die Nasenspitze verbrannt!"
-    }
-  },
-  "sailor": {
-    "encounter": {
-      "1": "Matrose, du gehst über Bord, wenn du verlierst!",
-      "2": "Komm schon! Mein Stolz als Seemann steht auf dem Spiel!",
-      "3": "Ahoj! Bist du seekrank?"
-    },
-    "victory": {
-      "1": "Argh! Von einem Kind besiegt!",
-      "2": "Dein Geist hat mich versenkt!",
-      "3": "Ich glaube, ich bin der der seekrank ist..."
-    }
-  },
   "rocket_grunt": {
     "encounter": {
       "1": "Jetzt gibt es Ärger!…\n$und es kommt noch härter!\n$Wir wollen über die Erde regieren…\n$und naja du kennst den Rest…!",
@@ -2455,7 +2455,7 @@
       "1": "@c{smile}Hey, du auch hier?\n@c{smile_eclosed}Immernoch ungeschlagen, hmm…?\n$@c{serious_mopen_fists}Ich weiß es sieht so aus, als wäre ich dir hierher gefolgt, aber das ist so nicht ganz richtig.\n$@c{serious_smile_fists}Ehrlicherweise kann ich es, seit du mich damals besiegt hast, garnicht erwarten erneut gegen dich zu kämpfen.\n$Ich habe selbst hart traniert. Ich werde dir diesesmal also ein würdigerer Gegner sein!.\n$@c{serious_mopen_fists}Halt dich nicht zurück, genauso wie beim letzten Mal!\nLos gehts!"
     },
     "victory": {
-      "1": "@c{neutral_eclosed}Oh. Ich war also zu sehr von mir überzeugt.\n$@c{smile}Das ist Ok. Ich hatte mir schon gedacht, dass sowas passiert.\n\n$@c{serious_mopen_fists}Es bedeutet einfach, dass ich mich beim nächsten Mal mehr anstrengen muss!\n\n$@c{smile}Nicht, dass du wirklich Hilfe benötigen würdest, aber ich habe hier noch eins von diesen Dingern herumliegen.\n$Du kannst es haben.\n\n$@c{serious_smile_fists}Erwarte aber nicht, dass ich dir noch mehr gebe!\nIch kann meinen Rivalen doch keine Vorteile verschaffen.\n$@c{smile}Egal, pass auf dich auf und genieße das Event!"
+      "1": "@c{neutral_eclosed}Oh. Ich war also zu sehr von mir überzeugt.\n$@c{smile}Das ist Ok. Ich hatte mir schon gedacht, dass sowas passiert.\n\n$@c{serious_mopen_fists}Es bedeutet einfach, dass ich mich beim nächsten Mal mehr anstrengen muss!\n\n$@c{smile}Nicht, dass du wirklich Hilfe benötigen würdest, aber ich habe hier noch eins von diesen Dingern herumliegen.\n$Du kannst es haben.\n\n$@c{serious_smile_fists}Erwarte aber nicht, dass ich dir noch mehr gebe!\nIch kann meinen Rivalen doch keine Vorteile verschaffen.\n$@c{smile}Egal, pass auf dich auf!"
     }
   },
   "rival_2_female": {
@@ -2463,7 +2463,7 @@
       "1": "@c{smile_wave}Oh, wie schön dich hier zu trefen. Sieht so aus als wärst du noch ungeschlagen. @c{angry_mopen}Hmm… Nicht schlecht!\n$@c{angry_mopen}Ich weiß was du denkst, und nein, ich habe dich nicht verfolgt. @c{smile_eclosed}Ich bin einfach in der Gegend gewesen.\n$@c{smile_ehalf}Ich freu mich für dich, aber ich muss dich wissen lassen, dass es auch Ok ist ab und zu mal zu verlieren.\n$@c{smile}Wir lernen oft mehr aus unseren Fehlern, als aus unseren Erfolgen.\n$@c{angry_mopen}Auf jeden Fall habe ich für unseren Rückkampf hart traniert. Also zeig mir was du drauf hast!"
     },
     "victory": {
-      "1": "@c{neutral}Ich… sollte dieses Mal doch nicht verlieren…\n$@c{smile}Na gut. Das bedeutet ich muss noch härter tranieren!\n$@c{smile_wave}Ich habe noch eins von diesen Dingern!\n@c{smile_wave_wink}Kein Grund mir zu danken~.\n$@c{angry_mopen}Das ist aber das Letzte! Du bekommst ab jett keine Geschenke mehr von mir!\n$@c{smile_wave}Bleib stark und genieße das Event!"
+      "1": "@c{neutral}Ich… sollte dieses Mal doch nicht verlieren…\n$@c{smile}Na gut. Das bedeutet ich muss noch härter tranieren!\n$@c{smile_wave}Ich habe noch eins von diesen Dingern!\n@c{smile_wave_wink}Kein Grund mir zu danken~.\n$@c{angry_mopen}Das ist aber das Letzte! Du bekommst ab jett keine Geschenke mehr von mir!\n$@c{smile_wave}Bleib stark!"
     },
     "defeat": {
       "1": "Es ist Ok manchmal zu verlieren…"
@@ -2542,4 +2542,4 @@
       "1": "@c{smile_ehalf}Ich… Ich denke ich habe meine Aufgabe erfüllt.\n$@c{smile_eclosed}Versprich mir… Nachdem du die Welt geheilt hast… Komm bitte sicher nach Hause. \n$@c{smile_ehalf}…Danke."
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/de/dialogue-male.json b/src/locales/de/dialogue-male.json
index 0f8e0122c8c..f8d062ceb8d 100644
--- a/src/locales/de/dialogue-male.json
+++ b/src/locales/de/dialogue-male.json
@@ -355,6 +355,30 @@
       "1": "Ich werde für das nächste Rennen tunen."
     }
   },
+  "firebreather": {
+    "encounter": {
+      "1": "Meine Flammen werden dich verschlingen!",
+      "2": "Meine Seele hat Feuer gefangen. Ich werde dir zeigen, wie heiß sie brennt!",
+      "3": "Komm näher und sieh dir meine Flammen an!"
+    },
+    "victory": {
+      "1": "Verbrannt bis zur Asche...",
+      "2": "Yow! Das ist heiß!",
+      "3": "Auuu! Ich habe mir die Nasenspitze verbrannt!"
+    }
+  },
+  "sailor": {
+    "encounter": {
+      "1": "Matrose, du gehst über Bord, wenn du verlierst!",
+      "2": "Komm schon! Mein Stolz als Seemann steht auf dem Spiel!",
+      "3": "Ahoj! Bist du seekrank?"
+    },
+    "victory": {
+      "1": "Argh! Von einem Kind besiegt!",
+      "2": "Dein Geist hat mich versenkt!",
+      "3": "Ich glaube, ich bin der der seekrank ist..."
+    }
+  },
   "archer": {
     "encounter": {
       "1": "Bevor du weitergehst, lass uns sehen, wie du dich gegen uns, Team Rocket, schlägst!",
@@ -535,30 +559,6 @@
       "3": "Wunderbar! Bemerkenswert! Deine Fähigkeiten und dein Mut sind lobenswert."
     }
   },
-  "firebreather": {
-    "encounter": {
-      "1": "Meine Flammen werden dich verschlingen!",
-      "2": "Meine Seele hat Feuer gefangen. Ich werde dir zeigen, wie heiß sie brennt!",
-      "3": "Komm näher und sieh dir meine Flammen an!"
-    },
-    "victory": {
-      "1": "Verbrannt bis zur Asche...",
-      "2": "Yow! Das ist heiß!",
-      "3": "Auuu! Ich habe mir die Nasenspitze verbrannt!"
-    }
-  },
-  "sailor": {
-    "encounter": {
-      "1": "Matrose, du gehst über Bord, wenn du verlierst!",
-      "2": "Komm schon! Mein Stolz als Seemann steht auf dem Spiel!",
-      "3": "Ahoj! Bist du seekrank?"
-    },
-    "victory": {
-      "1": "Argh! Von einem Kind besiegt!",
-      "2": "Dein Geist hat mich versenkt!",
-      "3": "Ich glaube, ich bin der der seekrank ist..."
-    }
-  },
   "rocket_grunt": {
     "encounter": {
       "1": "Jetzt gibt es Ärger!…\n$und es kommt noch härter!\n$Wir wollen über die Erde regieren…\n$und naja du kennst den Rest…!",
@@ -2439,7 +2439,7 @@
       "1": "@c{smile}Hey, ich habe dich gesucht! Ich weiß, dass du es nicht erwarten konntest loszugehen,\n$aber hättest ja wenigstens Tschüss sagen können...\n$@c{smile_eclosed}Du verfolgst also wirklich deinen Traum?\nIch kann es kaum glauben.\n$@c{serious_smile_fists}Da wir schon einmal hier sind, wie wäre es mit einem Kampf?\nImmerhin muss ich doch sicherstellen, dass du bereit bist.\n$@c{serious_mopen_fists}Halte dich nicht zurück, zeig mir alles was du hast!"
     },
     "victory": {
-      "1": "@c{shock}Wow…Du hast mich komplett überrumpelt.\nBist du wirklich ein Anfänger?\n$@c{smile}Vielleicht war es einfach etwas Glück, aber…\nWer weiß, vielleicht schaffst du es irgendwann\n$ja wirklich ganz groß raus zu kommen.\n$Übrigens, der Professor hat mich gebeten dir diese Items zu geben. Die sehen wirklich cool aus.\n$@c{serious_smile_fists}Viel Glück da draußen!\n$@c{smile}Oh-und genieße das Event!"
+      "1": "@c{shock}Wow…Du hast mich komplett überrumpelt.\nBist du wirklich ein Anfänger?\n$@c{smile}Vielleicht war es einfach etwas Glück, aber…\nWer weiß, vielleicht schaffst du es irgendwann\n$ja wirklich ganz groß raus zu kommen.\n$Übrigens, der Professor hat mich gebeten dir diese Items zu geben. Die sehen wirklich cool aus.\n$@c{serious_smile_fists}Viel Glück da draußen!"
     }
   },
   "rival_female": {
@@ -2447,7 +2447,7 @@
       "1": "@c{smile_wave}Da bist du! Ich habe schon überall nach dir gesucht!\n@c{angry_mopen}Hast du etwas vergessen\n$deiner besten Freundin Tschüss zu sagen?\n$@c{smile_ehalf}Du folgst deinem Traum, oder?\nDas ist wirklich heute…\n$@c{smile}Naja, ich vergeben dir, dass du mich vergessen hast, aber nur unter einer Bedingung. @c{smile_wave_wink}Du musst gegen mich kämpfen!\n$@c{angry_mopen}Gib alles! Wir wollen doch nicht, dass dein Abenteuer endet bevor es begonnen hat, richtig?"
     },
     "victory": {
-      "1": "@c{shock}Du hast gerade erst angefangen und bist schon so stark?!@d{96} @c{angry}Du hast sowas von betrogen, oder?\n$@c{smile_wave_wink}Ich mach nur Spaß!@d{64} @c{smile_eclosed}Ich habe ehrlich verloren… Ich habe das Gefühl, dass du es dort draußen weit bringen wirst.\n$@c{smile}Übrigens, der Professor hat mich gebeten dir diese Items zu geben. Ich hoffe sie sind hilfreich!\n$@c{smile_wave}Gib wie immer dein Bestes! Ich glaube an dich!\n$@c{smile}Oh-und genieße das Event!"
+      "1": "@c{shock}Du hast gerade erst angefangen und bist schon so stark?!@d{96} @c{angry}Du hast sowas von betrogen, oder?\n$@c{smile_wave_wink}Ich mach nur Spaß!@d{64} @c{smile_eclosed}Ich habe ehrlich verloren… Ich habe das Gefühl, dass du es dort draußen weit bringen wirst.\n$@c{smile}Übrigens, der Professor hat mich gebeten dir diese Items zu geben. Ich hoffe sie sind hilfreich!\n$@c{smile_wave}Gib wie immer dein Bestes! Ich glaube an dich!"
     }
   },
   "rival_2": {
@@ -2455,7 +2455,7 @@
       "1": "@c{smile}Hey, du auch hier?\n@c{smile_eclosed}Immernoch ungeschlagen, hmm…?\n$@c{serious_mopen_fists}Ich weiß es sieht so aus, als wäre ich dir hierher gefolgt, aber das ist so nicht ganz richtig.\n$@c{serious_smile_fists}Ehrlicherweise kann ich es, seit du mich damals besiegt hast, garnicht erwarten erneut gegen dich zu kämpfen.\n$Ich habe selbst hart traniert. Ich werde dir diesesmal also ein würdigerer Gegner sein!.\n$@c{serious_mopen_fists}Halt dich nicht zurück, genauso wie beim letzten Mal!\nLos gehts!"
     },
     "victory": {
-      "1": "@c{neutral_eclosed}Oh. Ich war also zu sehr von mir überzeugt.\n$@c{smile}Das ist Ok. Ich hatte mir schon gedacht, dass sowas passiert.\n\n$@c{serious_mopen_fists}Es bedeutet einfach, dass ich mich beim nächsten Mal mehr anstrengen muss!\n\n$@c{smile}Nicht, dass du wirklich Hilfe benötigen würdest, aber ich habe hier noch eins von diesen Dingern herumliegen.\n$Du kannst es haben.\n\n$@c{serious_smile_fists}Erwarte aber nicht, dass ich dir noch mehr gebe!\nIch kann meinen Rivalen doch keine Vorteile verschaffen.\n$@c{smile}Egal, pass auf dich auf und genieße das Event!"
+      "1": "@c{neutral_eclosed}Oh. Ich war also zu sehr von mir überzeugt.\n$@c{smile}Das ist Ok. Ich hatte mir schon gedacht, dass sowas passiert.\n\n$@c{serious_mopen_fists}Es bedeutet einfach, dass ich mich beim nächsten Mal mehr anstrengen muss!\n\n$@c{smile}Nicht, dass du wirklich Hilfe benötigen würdest, aber ich habe hier noch eins von diesen Dingern herumliegen.\n$Du kannst es haben.\n\n$@c{serious_smile_fists}Erwarte aber nicht, dass ich dir noch mehr gebe!\nIch kann meinen Rivalen doch keine Vorteile verschaffen.\n$@c{smile}Egal, pass auf dich auf!"
     }
   },
   "rival_2_female": {
@@ -2463,7 +2463,7 @@
       "1": "@c{smile_wave}Oh, wie schön dich hier zu trefen. Sieht so aus als wärst du noch ungeschlagen. @c{angry_mopen}Hmm… Nicht schlecht!\n$@c{angry_mopen}Ich weiß was du denkst, und nein, ich habe dich nicht verfolgt. @c{smile_eclosed}Ich bin einfach in der Gegend gewesen.\n$@c{smile_ehalf}Ich freu mich für dich, aber ich muss dich wissen lassen, dass es auch Ok ist ab und zu mal zu verlieren.\n$@c{smile}Wir lernen oft mehr aus unseren Fehlern, als aus unseren Erfolgen.\n$@c{angry_mopen}Auf jeden Fall habe ich für unseren Rückkampf hart traniert. Also zeig mir was du drauf hast!"
     },
     "victory": {
-      "1": "@c{neutral}Ich… sollte dieses Mal doch nicht verlieren…\n$@c{smile}Na gut. Das bedeutet ich muss noch härter tranieren!\n$@c{smile_wave}Ich habe noch eins von diesen Dingern!\n@c{smile_wave_wink}Kein Grund mir zu danken~.\n$@c{angry_mopen}Das ist aber das Letzte! Du bekommst ab jett keine Geschenke mehr von mir!\n$@c{smile_wave}Bleib stark und genieße das Event!"
+      "1": "@c{neutral}Ich… sollte dieses Mal doch nicht verlieren…\n$@c{smile}Na gut. Das bedeutet ich muss noch härter tranieren!\n$@c{smile_wave}Ich habe noch eins von diesen Dingern!\n@c{smile_wave_wink}Kein Grund mir zu danken~.\n$@c{angry_mopen}Das ist aber das Letzte! Du bekommst ab jett keine Geschenke mehr von mir!\n$@c{smile_wave}Bleib stark"
     },
     "defeat": {
       "1": "Es ist Ok manchmal zu verlieren…"
@@ -2542,4 +2542,4 @@
       "1": "@c{smile_ehalf}Ich… Ich denke ich habe meine Aufgabe erfüllt.\n$@c{smile_eclosed}Versprich mir… Nachdem du die Welt geheilt hast… Komm bitte sicher nach Hause. \n$@c{smile_ehalf}…Danke."
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/de/settings.json b/src/locales/de/settings.json
index f3c4ba5b40e..d72a026cf5a 100644
--- a/src/locales/de/settings.json
+++ b/src/locales/de/settings.json
@@ -63,6 +63,7 @@
   "bgmVolume": "Hintergrundmusik",
   "fieldVolume": "Rufe & Attacken",
   "seVolume": "Spezialeffekte",
+  "uiVolume": "Benutzeroberfläche",
   "musicPreference": "Musik Präferenz",
   "mixed": "Gemischt",
   "gamepadPleasePlug": "Bitte einen Controller anschließen oder eine Taste drücken.",
diff --git a/src/locales/en/settings.json b/src/locales/en/settings.json
index 947dfe98bb4..6528f0368fe 100644
--- a/src/locales/en/settings.json
+++ b/src/locales/en/settings.json
@@ -63,6 +63,7 @@
   "bgmVolume": "BGM Volume",
   "fieldVolume": "Field Volume",
   "seVolume": "SE Volume",
+  "uiVolume": "UI Volume",
   "musicPreference": "Music Preference",
   "mixed": "Mixed",
   "gamepadPleasePlug": "Please Plug in a Gamepad or Press a Button",
diff --git a/src/locales/es/ability-trigger.json b/src/locales/es/ability-trigger.json
index f49b0a784db..8bbcc80662c 100644
--- a/src/locales/es/ability-trigger.json
+++ b/src/locales/es/ability-trigger.json
@@ -1,11 +1,62 @@
 {
   "blockRecoilDamage": "¡{{abilityName}} de {{pokemonName}}\nlo protegió del daño de retroceso!",
   "badDreams": "¡{{pokemonName}} está atormentado!",
+  "costar": "¡{{pokemonName}} copió los cambios de características de {{allyName}}!",
   "iceFaceAvoidedDamage": "¡{{pokemonNameWithAffix}} evitó\ndaño con {{abilityName}}!",
+  "perishBody": "¡{{abilityName}} de {{pokemonName}} debilitará a ambos Pokémon en 3 turnos!",
+  "poisonHeal": "¡{{pokemonNameWithAffix}} restauró algunos de sus PS gracias a {{abilityName}}!",
   "trace": "¡{{pokemonName}} ha copiado la habilidad {{abilityName}} \nde {{targetName}}!",
   "windPowerCharged": "¡{{pokemonName}} se ha cargado de electricidad gracias a {{moveName}}!",
   "quickDraw": "¡{{pokemonName}} ataca primero gracias a la habilidad Mano Rápida!",
   "disguiseAvoidedDamage": "¡El disfraz de {{pokemonNameWithAffix}} se ha roto!",
-  "preventBerryUse": "{{pokemonNameWithAffix}} está muy nervioso y no puede comer bayas!",
-  "weatherEffectDisappeared": "El tiempo atmosférico ya no ejerce ninguna influencia."
-}
\ No newline at end of file
+  "blockItemTheft": "¡{{pokemonNameWithAffix}} evitó el robo gracias a {{abilityName}}!",
+  "typeImmunityHeal": "¡{{pokemonNameWithAffix}} restauró algunos de sus PS gracias a {{abilityName}}!",
+  "nonSuperEffectiveImmunity": "¡{{pokemonNameWithAffix}} evitó el daño gracias a {{abilityName}}!",
+  "moveImmunity": "¡No afecta a {{pokemonNameWithAffix}}!",
+  "reverseDrain": "¡{{pokemonNameWithAffix}} absorbió lodo líquido!",
+  "postDefendTypeChange": "¡{{abilityName}} de {{pokemonNameWithAffix}} cambió a tipo {{typeName}}!",
+  "postDefendContactDamage": "¡{{abilityName}} de {{pokemonNameWithAffix}} ha herido a su atacante!",
+  "postDefendAbilitySwap": "¡{{pokemonNameWithAffix}} intercambió su habilidad con su objetivo!",
+  "postDefendAbilityGive": "¡{{pokemonNameWithAffix}} cambió la habilidad del objetivo por {{abilityName}}!",
+  "postDefendMoveDisable": "¡{{moveName}} de {{pokemonNameWithAffix}} ha sido anulado!",
+  "pokemonTypeChange": "¡{{pokemonNameWithAffix}} ha cambiado a tipo {{moveType}}!",
+  "postAttackStealHeldItem": "¡{{pokemonNameWithAffix}} robó {{stolenItemType}} de {{defenderName}}!",
+  "postDefendStealHeldItem": "¡{{pokemonNameWithAffix}} robó {{stolenItemType}} de {{attackerName}}!",
+  "copyFaintedAllyAbility": "¡{{abilityName}} de {{pokemonNameWithAffix}} fue copiada!",
+  "intimidateImmunity": "¡{{abilityName}} de {{pokemonNameWithAffix}} evita que sea intimidado!",
+  "postSummonAllyHeal": "¡{{pokemonNameWithAffix}} se ha bebido el té que ha preparado {{pokemonName}}!",
+  "postSummonClearAllyStats": "¡Los cambios de características de {{pokemonNameWithAffix}} fueron eliminados!",
+  "postSummonTransform": "¡{{pokemonNameWithAffix}} se transformó en {{targetName}}!",
+  "protectStat": "¡{{abilityName}} de {{pokemonNameWithAffix}} evita que baje su {{statName}}!",
+  "statusEffectImmunityWithName": "¡{{abilityName}} de {{pokemonNameWithAffix}} evita {{statusEffectName}}!",
+  "statusEffectImmunity": "¡{{abilityName}} de {{pokemonNameWithAffix}} evita los problemas de estado!",
+  "battlerTagImmunity": "¡{{abilityName}} de {{pokemonNameWithAffix}} previene {{battlerTagName}}!",
+  "forewarn": "¡{{pokemonNameWithAffix}} ha detectado el movimiento {{moveName}}!",
+  "frisk": "¡{{pokemonNameWithAffix}} ha cacheado {{opponentAbilityName}} de {{opponentName}}!",
+  "postWeatherLapseHeal": "¡{{pokemonNameWithAffix}} restauró algunos de sus PS gracias a {{abilityName}}!",
+  "postWeatherLapseDamage": "¡{{pokemonNameWithAffix}} se hizo daño por su {{abilityName}}!",
+  "postTurnLootCreateEatenBerry": "¡{{pokemonNameWithAffix}} recogió una {{berryName}}!",
+  "postTurnHeal": "¡{{pokemonNameWithAffix}} restauró algunos de sus PS gracias a {{abilityName}}!",
+  "fetchBall": "¡{{pokemonNameWithAffix}} encontró {{pokeballName}}!",
+  "healFromBerryUse": "¡{{pokemonNameWithAffix}} se curó gracias a {{abilityName}}!",
+  "arenaTrap": "¡{{pokemonNameWithAffix}} impide el cambio con {{abilityName}}!",
+  "postBattleLoot": "¡{{pokemonNameWithAffix}} recogió {{itemName}}!",
+  "postFaintContactDamage": "¡{{abilityName}} de {{pokemonNameWithAffix}} hizo daño a su atacante!",
+  "postFaintHpDamage": "¡{{abilityName}} de {{pokemonNameWithAffix}} hizo daño a su atacante!",
+  "postSummonPressure": "¡{{pokemonNameWithAffix}} ejerce Presión!",
+  "weatherEffectDisappeared": "El tiempo atmosférico ya no ejerce ninguna influencia.",
+  "postSummonMoldBreaker": "¡{{pokemonNameWithAffix}} rompió el molde!",
+  "postSummonAnticipation": "¡{{pokemonNameWithAffix}} se anticipó!",
+  "postSummonTurboblaze": "¡{{pokemonNameWithAffix}} irradia un aura llameante!",
+  "postSummonTeravolt": "¡{{pokemonNameWithAffix}} irradia un aura chisporroteante!",
+  "postSummonDarkAura": "¡{{pokemonNameWithAffix}} irradia un aura oscura!",
+  "postSummonFairyAura": "¡{{pokemonNameWithAffix}} irradia un aura feérica!",
+  "postSummonNeutralizingGas": "¡El Gas Reactivo de {{pokemonNameWithAffix}} se propaga por toda la zona!",
+  "postSummonAsOneGlastrier": "¡{{pokemonNameWithAffix}} tiene dos Habilidades!",
+  "postSummonAsOneSpectrier": "¡{{pokemonNameWithAffix}} tiene dos Habilidades!",
+  "postSummonVesselOfRuin": "¡{{pokemonNameWithAffix}} ha mermado {{statName}} de los demás Pokémon con Caldero Debacle!",
+  "postSummonSwordOfRuin": "¡{{pokemonNameWithAffix}} ha mermado {{statName}} de los demás Pokémon con Espada Debacle!",
+  "postSummonTabletsOfRuin": "¡{{pokemonNameWithAffix}} ha mermado {{statName}} de los demás Pokémon con Tablilla Debacle!",
+  "postSummonBeadsOfRuin": "¡{{pokemonNameWithAffix}} ha mermado {{statName}} de los demás Pokémon con Abalorio Debacle!",
+  "preventBerryUse": "{{pokemonNameWithAffix}} está muy nervioso y no puede comer bayas!"
+}
diff --git a/src/locales/fr/bgm-name.json b/src/locales/fr/bgm-name.json
index f97523e109b..975ddcad7b2 100644
--- a/src/locales/fr/bgm-name.json
+++ b/src/locales/fr/bgm-name.json
@@ -45,6 +45,7 @@
   "battle_legendary_lake_trio": "ROSA - Vs. Gardiens des Lacs",
   "battle_legendary_sinnoh": "ROSA - Vs. Légendaire de Sinnoh",
   "battle_legendary_dia_pal": "ROSA - Vs. Dialga/Palkia",
+  "battle_legendary_origin_forme": "LPA - Vs. Dialga/Palkia Originel",
   "battle_legendary_giratina": "ROSA - Vs. Giratina",
   "battle_legendary_arceus": "HGSS - Vs. Arceus",
   "battle_legendary_unova": "NB - Vs. Légendaire d’Unys",
@@ -59,6 +60,7 @@
   "battle_legendary_zac_zam": "ÉB - Vs. Zacian/Zamazenta",
   "battle_legendary_glas_spec": "ÉB - Vs. Blizzeval/Spectreval",
   "battle_legendary_calyrex": "ÉB - Vs. Sylveroy",
+  "battle_legendary_riders": "ÉB - Vs. Sylveroy Cavalier du Froid/d’Effroi",
   "battle_legendary_birds_galar": "ÉB - Vs. Oiseaux Légendaires de Galar",
   "battle_legendary_ruinous": "ÉV - Vs. Trésors du fléau",
   "battle_legendary_kor_mir": "ÉV - Profondeurs de la Zone Zéro (Combat)",
diff --git a/src/locales/fr/settings.json b/src/locales/fr/settings.json
index 3b0794c502d..181a593cc99 100644
--- a/src/locales/fr/settings.json
+++ b/src/locales/fr/settings.json
@@ -63,6 +63,7 @@
   "bgmVolume": "Vol. musique",
   "fieldVolume": "Vol. combats",
   "seVolume": "Vol. effets",
+  "uiVolume": "Vol. menus",
   "musicPreference": "Préf. musicale",
   "mixed": "Mixte",
   "gamepadPleasePlug": "Veuillez brancher une manette ou appuyer sur un bouton.",
diff --git a/src/locales/ja/battle-info.json b/src/locales/ja/battle-info.json
index 9e26dfeeb6e..2959cdda332 100644
--- a/src/locales/ja/battle-info.json
+++ b/src/locales/ja/battle-info.json
@@ -1 +1,3 @@
-{}
\ No newline at end of file
+{
+  "generation": "{{generation}}世代"
+}
diff --git a/src/locales/ja/game-stats-ui-handler.json b/src/locales/ja/game-stats-ui-handler.json
index 9e26dfeeb6e..25bb21f701a 100644
--- a/src/locales/ja/game-stats-ui-handler.json
+++ b/src/locales/ja/game-stats-ui-handler.json
@@ -1 +1,42 @@
-{}
\ No newline at end of file
+{
+  "stats": "統計",
+  "playTime": "プレー時間",
+  "totalBattles": "合計バトル数",
+  "starters": "スターター数",
+  "shinyStarters": "色違いスターター数",
+  "speciesSeen": "合計発見数",
+  "speciesCaught": "合計捕獲数",
+  "ribbonsOwned": "リボン数",
+  "classicRuns": "クラシックラン",
+  "classicWins": "クラシック勝利",
+  "dailyRunAttempts": "デイリーラン",
+  "dailyRunWins": "デイリーラン勝利",
+  "endlessRuns": "エンドレスラン",
+  "highestWaveEndless": "エンドレス最高ウェーブ",
+  "highestMoney": "最大貯金",
+  "highestDamage": "最大ダメージ",
+  "highestHPHealed": "最大HP回復",
+  "pokemonEncountered": "遭遇したポケモン",
+  "pokemonDefeated": "倒したポケモン",
+  "pokemonCaught": "捕まえたポケモン",
+  "eggsHatched": "ふかしたタマゴ",
+  "subLegendsSeen": "見つけた順伝説",
+  "subLegendsCaught": "捕まえた順伝説",
+  "subLegendsHatched": "ふかした順伝説",
+  "legendsSeen": "見つけた伝説",
+  "legendsCaught": "捕まえた伝説",
+  "legendsHatched": "ふかした伝説",
+  "mythicalsSeen": "見つけた幻ポケモン",
+  "mythicalsCaught": "捕まえた幻ポケモン",
+  "mythicalsHatched": "ふかした幻ポケモン",
+  "shiniesSeen": "見つけた色違い",
+  "shiniesCaught": "捕まえた色違い",
+  "shiniesHatched": "ふかした色違い",
+  "pokemonFused": "合体したポケモン",
+  "trainersDefeated": "倒したトレーナー",
+  "eggsPulled": "引いたタマゴ",
+  "rareEggsPulled": "引いたレアタマゴ",
+  "epicEggsPulled": "引いた超レアタマゴ",
+  "legendaryEggsPulled": "引いた伝説タマゴ",
+  "manaphyEggsPulled": "引いたマナフィタマゴ"
+}
\ No newline at end of file
diff --git a/src/locales/ja/menu-ui-handler.json b/src/locales/ja/menu-ui-handler.json
index e9bec2cf0ae..beb014b84a9 100644
--- a/src/locales/ja/menu-ui-handler.json
+++ b/src/locales/ja/menu-ui-handler.json
@@ -1,19 +1,26 @@
 {
-  "GAME_SETTINGS": "せってい",
-  "ACHIEVEMENTS": "じっせき",
-  "STATS": "とうけい",
-  "RUN_HISTORY":"ラン履歴",
+  "GAME_SETTINGS": "設定",
+  "ACHIEVEMENTS": "実績",
+  "STATS": "統計",
   "EGG_LIST": "タマゴリスト",
   "EGG_GACHA": "タマゴガチャ",
-  "MANAGE_DATA": "データかんり",
+  "MANAGE_DATA": "データ管理",
   "COMMUNITY": "コミュニティ",
+  "SAVE_AND_QUIT": "保存して終了",
   "LOG_OUT": "ログアウト",
   "slot": "スロット {{slotNumber}}",
   "importSession": "セッションのインポート",
+  "importSlotSelect": "インポート先の　スロットを　選んでください",
   "exportSession": "セッションのエクスポート",
-  "importRunHistory":"ラン履歴インポート",
-  "exportRunHistory":"ラン履歴エクスポート",
+  "exportSlotSelect": "エクスポート元の　スロットを　選んでください",
   "importData": "データのインポート",
   "exportData": "データのエクスポート",
-  "cancel": "キャンセル"
+  "consentPreferences": "同意設定",
+  "linkDiscord": "Discord連携",
+  "unlinkDiscord": "Discord連携解除",
+  "linkGoogle": "Google連携",
+  "unlinkGoogle": "Google連携解除",
+  "cancel": "キャンセル",
+  "losingProgressionWarning": "戦闘開始からの　データが　保存されません。\nよろしいですか？",
+  "noEggs": "現在　タマゴを　ふかしていません！"
 }
\ No newline at end of file
diff --git a/src/locales/ja/modifier-select-ui-handler.json b/src/locales/ja/modifier-select-ui-handler.json
index 9e26dfeeb6e..9370f01491e 100644
--- a/src/locales/ja/modifier-select-ui-handler.json
+++ b/src/locales/ja/modifier-select-ui-handler.json
@@ -1 +1,12 @@
-{}
\ No newline at end of file
+{
+  "transfer": "アイテム移行",
+  "reroll": "選択肢変更",
+  "lockRarities": "レア度の固定",
+  "checkTeam": "チームを確認",
+  "transferDesc": "ポケモンの　手持ちアイテムを　移行する",
+  "rerollDesc": "お金を　使って　アイテムの　選択肢を　変更する",
+  "lockRaritiesDesc": "選択肢を　変更するときの　レア度を　固定する\n（選択肢変更金額を影響する）",
+  "checkTeamDesc": "チームの　状態を　確認する\nフォルムチェンジアイテムを　有効・無効にする",
+  "rerollCost": "{{formattedMoney}}円",
+  "itemCost": "{{formattedMoney}}円"
+}
diff --git a/src/locales/ja/pokemon-form-battle.json b/src/locales/ja/pokemon-form-battle.json
index 9e26dfeeb6e..adbc7b4b3da 100644
--- a/src/locales/ja/pokemon-form-battle.json
+++ b/src/locales/ja/pokemon-form-battle.json
@@ -1 +1,14 @@
-{}
\ No newline at end of file
+{
+  "mega": "メガ{{pokemonName}}",
+  "mega-x": "メガ{{pokemonName}}X",
+  "mega-y": "メガ{{pokemonName}}Y",
+  "primal": "ゲンシ{{pokemonName}}",
+  "gigantamax": "キョダイ{{pokemonName}}",
+  "eternamax": "E・{{pokemonName}}",
+  "megaChange": "{{preName}}は\nメガ{{pokemonName}}に　メガシンカした！",
+  "gigantamaxChange": "{{preName}}は\nキョダイマックスした！",
+  "eternamaxChange": "{{preName}}は\nムゲンダイマックスした！",
+  "revertChange": "{{pokemonName}}は\n元の姿に　戻った！",
+  "formChange": "{{preName}}は\n姿を　変えた！",
+  "disguiseChange": "ばけのかわが　みがわりに　なった！"
+}
diff --git a/src/locales/ja/pokemon-form.json b/src/locales/ja/pokemon-form.json
index 9e26dfeeb6e..76124904456 100644
--- a/src/locales/ja/pokemon-form.json
+++ b/src/locales/ja/pokemon-form.json
@@ -1 +1,170 @@
-{}
\ No newline at end of file
+{
+  "pikachuCosplay": "コスプレ",
+  "pikachuCoolCosplay": "クールなコスプレ",
+  "pikachuBeautyCosplay": "きれいなコスプレ",
+  "pikachuCuteCosplay": "かわいいコスプレ",
+  "pikachuSmartCosplay": "かしこいコスプレ",
+  "pikachuToughCosplay": "パワフルなコスプレ",
+  "pikachuPartner": "パートナー",
+  "eeveePartner": "パートナー",
+  "pichuSpiky": "ギザみみ",
+  "unownA": "A",
+  "unownB": "B",
+  "unownC": "C",
+  "unownD": "D",
+  "unownE": "E",
+  "unownF": "F",
+  "unownG": "G",
+  "unownH": "H",
+  "unownI": "I",
+  "unownJ": "J",
+  "unownK": "K",
+  "unownL": "L",
+  "unownM": "M",
+  "unownN": "N",
+  "unownO": "O",
+  "unownP": "P",
+  "unownQ": "Q",
+  "unownR": "R",
+  "unownS": "S",
+  "unownT": "T",
+  "unownU": "U",
+  "unownV": "V",
+  "unownW": "W",
+  "unownX": "X",
+  "unownY": "Y",
+  "unownZ": "Z",
+  "unownExclamation": "!",
+  "unownQuestion": "?",
+  "castformSunny": "たいよう",
+  "castformRainy": "あまみず",
+  "castformSnowy": "ゆきぐも",
+  "deoxysNormal": "ノーマル",
+  "burmyPlant": "くさき",
+  "burmySandy": "すなち",
+  "burmyTrash": "ゴミ",
+  "shellosEast": "ひがし",
+  "shellosWest": "にし",
+  "rotomHeat": "ヒート",
+  "rotomWash": "ウォッシュ",
+  "rotomFrost": "フロスト",
+  "rotomFan": "スピン",
+  "rotomMow": "カット",
+  "giratinaAltered": "アナザー",
+  "shayminLand": "ランド",
+  "basculinRedStriped": "赤筋",
+  "basculinBlueStriped": "青筋",
+  "basculinWhiteStriped": "白筋",
+  "deerlingSpring": "春",
+  "deerlingSummer": "夏",
+  "deerlingAutumn": "秋",
+  "deerlingWinter": "冬",
+  "tornadusIncarnate": "けしん",
+  "thundurusIncarnate": "けしん",
+  "landorusIncarnate": "けしん",
+  "keldeoOrdinary": "いつも",
+  "meloettaAria": "ボイス",
+  "meloettaPirouette": "ステップ",
+  "froakieBattleBond": "きずなへんげ",
+  "scatterbugMeadow": "はなぞの",
+  "scatterbugIcySnow": "ひょうせつ",
+  "scatterbugPolar": "ゆきぐに",
+  "scatterbugTundra": "せつげん",
+  "scatterbugContinental": "たいりく",
+  "scatterbugGarden": "ていえん",
+  "scatterbugElegant": "みやび",
+  "scatterbugModern": "モダン",
+  "scatterbugMarine": "マリン",
+  "scatterbugArchipelago": "ぐんとう",
+  "scatterbugHighPlains": "こうや",
+  "scatterbugSandstorm": "さじん",
+  "scatterbugRiver": "たいが",
+  "scatterbugMonsoon": "スコール",
+  "scatterbugSavanna": "サバンナ",
+  "scatterbugSun": "たいよう",
+  "scatterbugOcean": "オーシャン",
+  "scatterbugJungle": "ジャングル",
+  "scatterbugFancy": "ファンシー",
+  "scatterbugPokeBall": "ボール",
+  "flabebeRed": "赤",
+  "flabebeYellow": "黄",
+  "flabebeOrange": "オレンジ",
+  "flabebeBlue": "青",
+  "flabebeWhite": "白",
+  "furfrouHeart": "ハート",
+  "furfrouStar": "スター",
+  "furfrouDiamond": "ダイア",
+  "furfrouDebutante": "レディ",
+  "furfrouMatron": "マダム",
+  "furfrouDandy": "ジェントル",
+  "furfrouLaReine": "クイーン",
+  "furfrouKabuki": "カブキ",
+  "furfrouPharaoh": "キングダム",
+  "pumpkabooSmall": "ちいさい",
+  "pumpkabooLarge": "おおきい",
+  "pumpkabooSuper": "とくだい",
+  "xerneasNeutral": "リラックス",
+  "xerneasActive": "アクティブ",
+  "zygarde50": "50%フォルム",
+  "zygarde10": "10%フォルム",
+  "zygarde50Pc": "50%フォルム　スワームチェンジ",
+  "zygarde10Pc": "10%フォルム　スワームチェンジ",
+  "zygardeComplete": "パーフェクトフォルム",
+  "oricorioBaile": "めらめら",
+  "oricorioPompom": "ぱちぱち",
+  "oricorioPau": "ふらふら",
+  "oricorioSensu": "まいまい",
+  "rockruffOwnTempo": "マイペース",
+  "miniorRedMeteor": "赤　りゅうせい",
+  "miniorOrangeMeteor": "オレンジ　りゅうせい",
+  "miniorYellowMeteor": "黄　りゅうせい",
+  "miniorGreenMeteor": "緑　りゅうせい",
+  "miniorBlueMeteor": "水色　りゅうせい",
+  "miniorIndigoMeteor": "青 りゅうせい",
+  "miniorVioletMeteor": "紫 りゅうせい",
+  "miniorRed": "赤",
+  "miniorOrange": "オレンジ",
+  "miniorYellow": "黄",
+  "miniorGreen": "緑",
+  "miniorBlue": "水色",
+  "miniorIndigo": "青",
+  "miniorViolet": "紫",
+  "mimikyuDisguised": "ばけたすがた",
+  "mimikyuBusted": "ばれたすがた",
+  "magearnaOriginal": "500ねんまえ",
+  "marshadowZenith": "Zパワー",
+  "sinisteaPhony": "がんさく",
+  "sinisteaAntique": "しんさく",
+  "eiscueNoIce": "ナイスなし",
+  "indeedeeMale": "オス",
+  "indeedeeFemale": "メス",
+  "morpekoFullBelly": "まんぷく",
+  "zacianHeroOfManyBattles": "れきせんのゆうしゃ",
+  "zamazentaHeroOfManyBattles": "れきせんのゆうしゃ",
+  "zarudeDada": "とうちゃん",
+  "enamorusIncarnate": "けしん",
+  "squawkabillyGreenPlumage": "グリーンフェザー",
+  "squawkabillyBluePlumage": "ブルーフェザー",
+  "squawkabillyYellowPlumage": "イエローフェザー",
+  "squawkabillyWhitePlumage": "ホワイトフェザー",
+  "tatsugiriCurly": "そったすがた",
+  "tatsugiriDroopy": "たれたすがた",
+  "tatsugiriStretchy": "のびたすがた",
+  "gimmighoulChest": "はこ",
+  "gimmighoulRoaming": "とほ",
+  "koraidonApexBuild": "かんぜんけいたい",
+  "koraidonLimitedBuild":"せいげんけいたい",
+  "koraidonSprintingBuild":"しっそうけいたい",
+  "koraidonSwimmingBuild":"ゆうえいけいたい",
+  "koraidonGlidingBuild":"かっくうけいたい",
+  "miraidonUltimateMode":"コンプリートモード",
+  "miraidonLowPowerMode":"リミテッドモード",
+  "miraidonDriveMode":"ドライブモード",
+  "miraidonAquaticMode":"フロートモード",
+  "miraidonGlideMode":"グライドモード",
+  "poltchageistCounterfeit": "マガイモノ",
+  "poltchageistArtisan": "タカイモノ",
+  "paldeaTaurosCombat": "コンバット",
+  "paldeaTaurosBlaze": "ブレイズ",
+  "paldeaTaurosAqua": "ウォーター"
+}
\ No newline at end of file
diff --git a/src/locales/ko/pokemon-summary.json b/src/locales/ko/pokemon-summary.json
index 5742058e45c..3deec35c62d 100644
--- a/src/locales/ko/pokemon-summary.json
+++ b/src/locales/ko/pokemon-summary.json
@@ -11,34 +11,7 @@
   "cancel": "그만둔다",
   "memoString": "{{natureFragment}}.\n{{metFragment}}",
   "metFragment": {
-    "normal": "{{biome}}에서\nLv{{level}}일 때 만났다.",
-    "apparently": "{{biome}}에서\nLv{{level}}일 때 만난 것 같다."
-  },
-  "natureFragment": {
-    "Hardy": "{{nature}}하는 성격",
-    "Lonely": "{{nature}}을 타는 성격",
-    "Brave": "{{nature}}한 성격",
-    "Adamant": "{{nature}}스러운 성격",
-    "Naughty": "{{nature}}같은 성격",
-    "Bold": "{{nature}}한 성격",
-    "Docile": "{{nature}}한 성격",
-    "Relaxed": "{{nature}}한 성격",
-    "Impish": "{{nature}}같은 성격",
-    "Lax": "{{nature}}거리는 성격",
-    "Timid": "{{nature}}같은 성격",
-    "Hasty": "{{nature}}한 성격",
-    "Serious": "{{nature}}한 성격",
-    "Jolly": "{{nature}}한 성격",
-    "Naive": "{{nature}}한 성격",
-    "Modest": "{{nature}}스러운 성격",
-    "Mild": "{{nature}}한 성격",
-    "Quiet": "{{nature}}한 성격",
-    "Bashful": "{{nature}}을 타는 성격",
-    "Rash": "{{nature}}거리는 성격",
-    "Calm": "{{nature}}한 성격",
-    "Gentle": "{{nature}}한 성격",
-    "Sassy": "{{nature}}진 성격",
-    "Careful": "{{nature}}한 성격",
-    "Quirky": "{{nature}}스러운 성격"
+    "normal": "{{biome}}에서\n레벨 {{level}}일 때 만났다.",
+    "apparently": "{{biome}}에서\n레벨 {{level}}일 때 만난 것 같다."
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/pt_BR/bgm-name.json b/src/locales/pt_BR/bgm-name.json
index bfce77e3a69..7049ecefa9d 100644
--- a/src/locales/pt_BR/bgm-name.json
+++ b/src/locales/pt_BR/bgm-name.json
@@ -45,6 +45,7 @@
   "battle_legendary_lake_trio": "ORAS Batalha do Trio dos Lagos",
   "battle_legendary_sinnoh": "ORAS Batalha dos Lendários de Sinnoh",
   "battle_legendary_dia_pal": "ORAS Batalha do Dialga & Palkia",
+  "battle_legendary_origin_forme": "LA Origin Batalha com Dialga & Palkia",
   "battle_legendary_giratina": "ORAS Batalha do Giratina",
   "battle_legendary_arceus": "HGSS Batalha do Arceus",
   "battle_legendary_unova": "BW Batalha dos Lendários de Unova",
@@ -59,6 +60,7 @@
   "battle_legendary_zac_zam": "SWSH Batalha do Zacian & Zamazenta",
   "battle_legendary_glas_spec": "SWSH Batalha do Glastrier & Spectrier",
   "battle_legendary_calyrex": "SWSH Batalha do Calyrex",
+  "battle_legendary_riders": "SWSH Batalha com Ice & Shadow Rider Calyrex",
   "battle_legendary_birds_galar": "SWSH Batalha dos Pássaros Lendários de Galar",
   "battle_legendary_ruinous": "SV Batalha dos Lendários Ruinosos",
   "battle_legendary_kor_mir": "SV Batalha das Cavernas da Área Zero",
@@ -135,4 +137,4 @@
   "heal": "BW Centro Pokémon",
   "menu": "PMD EoS Bem-vindo ao Mundo dos Pokémon!",
   "title": "PMD EoS Menu Principal"
-}
\ No newline at end of file
+}
diff --git a/src/locales/pt_BR/pokemon-form.json b/src/locales/pt_BR/pokemon-form.json
index fd418e2ada2..aa8f32a5d36 100644
--- a/src/locales/pt_BR/pokemon-form.json
+++ b/src/locales/pt_BR/pokemon-form.json
@@ -152,10 +152,19 @@
   "tatsugiriStretchy": "Reto",
   "gimmighoulChest": "Baú",
   "gimmighoulRoaming": "Perambulante",
-  "koraidonGlidingBuild": "Gliding Build",
+  "koraidonApexBuild": "Forma Plena",
+  "koraidonLimitedBuild": "Forma Limitada",
+  "koraidonSprintingBuild": "Forma de Corrida",
+  "koraidonSwimmingBuild": "Forma de Nado",
+  "koraidonGlidingBuild": "Forma de Voo",
+  "miraidonUltimateMode": "Modo Pleno",
+  "miraidonLowPowerMode": "Modo Limitado",
+  "miraidonDriveMode": "Modo Terrestre",
+  "miraidonAquaticMode": "Modo Aquático",
+  "miraidonGlideMode": "Modo Aéreo",
   "poltchageistCounterfeit": "Imitação",
   "poltchageistArtisan": "Artesão",
   "paldeaTaurosCombat": "Combate",
   "paldeaTaurosBlaze": "Chamas",
   "paldeaTaurosAqua": "Aquático"
-}
\ No newline at end of file
+}
diff --git a/src/locales/pt_BR/pokemon-info.json b/src/locales/pt_BR/pokemon-info.json
index 3d374f62bba..a7a46b7a24e 100644
--- a/src/locales/pt_BR/pokemon-info.json
+++ b/src/locales/pt_BR/pokemon-info.json
@@ -13,7 +13,8 @@
     "SPD": "Veloc.",
     "SPDshortened": "Veloc.",
     "ACC": "Precisão",
-    "EVA": "Evasão"
+    "EVA": "Evasão",
+    "HPStat": "PS"
   },
   "Type": {
     "UNKNOWN": "Desconhecido",
@@ -37,4 +38,4 @@
     "FAIRY": "Fada",
     "STELLAR": "Estelar"
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/pt_BR/pokemon.json b/src/locales/pt_BR/pokemon.json
index 9e26dfeeb6e..f780d2accbd 100644
--- a/src/locales/pt_BR/pokemon.json
+++ b/src/locales/pt_BR/pokemon.json
@@ -1 +1,1084 @@
-{}
\ No newline at end of file
+{
+  "bulbasaur": "Bulbasaur",
+  "ivysaur": "Ivysaur",
+  "venusaur": "Venusaur",
+  "charmander": "Charmander",
+  "charmeleon": "Charmeleon",
+  "charizard": "Charizard",
+  "squirtle": "Squirtle",
+  "wartortle": "Wartortle",
+  "blastoise": "Blastoise",
+  "caterpie": "Caterpie",
+  "metapod": "Metapod",
+  "butterfree": "Butterfree",
+  "weedle": "Weedle",
+  "kakuna": "Kakuna",
+  "beedrill": "Beedrill",
+  "pidgey": "Pidgey",
+  "pidgeotto": "Pidgeotto",
+  "pidgeot": "Pidgeot",
+  "rattata": "Rattata",
+  "raticate": "Raticate",
+  "spearow": "Spearow",
+  "fearow": "Fearow",
+  "ekans": "Ekans",
+  "arbok": "Arbok",
+  "pikachu": "Pikachu",
+  "raichu": "Raichu",
+  "sandshrew": "Sandshrew",
+  "sandslash": "Sandslash",
+  "nidoran_f": "Nidoran♀",
+  "nidorina": "Nidorina",
+  "nidoqueen": "Nidoqueen",
+  "nidoran_m": "Nidoran♂",
+  "nidorino": "Nidorino",
+  "nidoking": "Nidoking",
+  "clefairy": "Clefairy",
+  "clefable": "Clefable",
+  "vulpix": "Vulpix",
+  "ninetales": "Ninetales",
+  "jigglypuff": "Jigglypuff",
+  "wigglytuff": "Wigglytuff",
+  "zubat": "Zubat",
+  "golbat": "Golbat",
+  "oddish": "Oddish",
+  "gloom": "Gloom",
+  "vileplume": "Vileplume",
+  "paras": "Paras",
+  "parasect": "Parasect",
+  "venonat": "Venonat",
+  "venomoth": "Venomoth",
+  "diglett": "Diglett",
+  "dugtrio": "Dugtrio",
+  "meowth": "Meowth",
+  "persian": "Persian",
+  "psyduck": "Psyduck",
+  "golduck": "Golduck",
+  "mankey": "Mankey",
+  "primeape": "Primeape",
+  "growlithe": "Growlithe",
+  "arcanine": "Arcanine",
+  "poliwag": "Poliwag",
+  "poliwhirl": "Poliwhirl",
+  "poliwrath": "Poliwrath",
+  "abra": "Abra",
+  "kadabra": "Kadabra",
+  "alakazam": "Alakazam",
+  "machop": "Machop",
+  "machoke": "Machoke",
+  "machamp": "Machamp",
+  "bellsprout": "Bellsprout",
+  "weepinbell": "Weepinbell",
+  "victreebel": "Victreebel",
+  "tentacool": "Tentacool",
+  "tentacruel": "Tentacruel",
+  "geodude": "Geodude",
+  "graveler": "Graveler",
+  "golem": "Golem",
+  "ponyta": "Ponyta",
+  "rapidash": "Rapidash",
+  "slowpoke": "Slowpoke",
+  "slowbro": "Slowbro",
+  "magnemite": "Magnemite",
+  "magneton": "Magneton",
+  "farfetchd": "Farfetch'd",
+  "doduo": "Doduo",
+  "dodrio": "Dodrio",
+  "seel": "Seel",
+  "dewgong": "Dewgong",
+  "grimer": "Grimer",
+  "muk": "Muk",
+  "shellder": "Shellder",
+  "cloyster": "Cloyster",
+  "gastly": "Gastly",
+  "haunter": "Haunter",
+  "gengar": "Gengar",
+  "onix": "Onix",
+  "drowzee": "Drowzee",
+  "hypno": "Hypno",
+  "krabby": "Krabby",
+  "kingler": "Kingler",
+  "voltorb": "Voltorb",
+  "electrode": "Electrode",
+  "exeggcute": "Exeggcute",
+  "exeggutor": "Exeggutor",
+  "cubone": "Cubone",
+  "marowak": "Marowak",
+  "hitmonlee": "Hitmonlee",
+  "hitmonchan": "Hitmonchan",
+  "lickitung": "Lickitung",
+  "koffing": "Koffing",
+  "weezing": "Weezing",
+  "rhyhorn": "Rhyhorn",
+  "rhydon": "Rhydon",
+  "chansey": "Chansey",
+  "tangela": "Tangela",
+  "kangaskhan": "Kangaskhan",
+  "horsea": "Horsea",
+  "seadra": "Seadra",
+  "goldeen": "Goldeen",
+  "seaking": "Seaking",
+  "staryu": "Staryu",
+  "starmie": "Starmie",
+  "mr_mime": "Mr. Mime",
+  "scyther": "Scyther",
+  "jynx": "Jynx",
+  "electabuzz": "Electabuzz",
+  "magmar": "Magmar",
+  "pinsir": "Pinsir",
+  "tauros": "Tauros",
+  "magikarp": "Magikarp",
+  "gyarados": "Gyarados",
+  "lapras": "Lapras",
+  "ditto": "Ditto",
+  "eevee": "Eevee",
+  "vaporeon": "Vaporeon",
+  "jolteon": "Jolteon",
+  "flareon": "Flareon",
+  "porygon": "Porygon",
+  "omanyte": "Omanyte",
+  "omastar": "Omastar",
+  "kabuto": "Kabuto",
+  "kabutops": "Kabutops",
+  "aerodactyl": "Aerodactyl",
+  "snorlax": "Snorlax",
+  "articuno": "Articuno",
+  "zapdos": "Zapdos",
+  "moltres": "Moltres",
+  "dratini": "Dratini",
+  "dragonair": "Dragonair",
+  "dragonite": "Dragonite",
+  "mewtwo": "Mewtwo",
+  "mew": "Mew",
+  "chikorita": "Chikorita",
+  "bayleef": "Bayleef",
+  "meganium": "Meganium",
+  "cyndaquil": "Cyndaquil",
+  "quilava": "Quilava",
+  "typhlosion": "Typhlosion",
+  "totodile": "Totodile",
+  "croconaw": "Croconaw",
+  "feraligatr": "Feraligatr",
+  "sentret": "Sentret",
+  "furret": "Furret",
+  "hoothoot": "Hoothoot",
+  "noctowl": "Noctowl",
+  "ledyba": "Ledyba",
+  "ledian": "Ledian",
+  "spinarak": "Spinarak",
+  "ariados": "Ariados",
+  "crobat": "Crobat",
+  "chinchou": "Chinchou",
+  "lanturn": "Lanturn",
+  "pichu": "Pichu",
+  "cleffa": "Cleffa",
+  "igglybuff": "Igglybuff",
+  "togepi": "Togepi",
+  "togetic": "Togetic",
+  "natu": "Natu",
+  "xatu": "Xatu",
+  "mareep": "Mareep",
+  "flaaffy": "Flaaffy",
+  "ampharos": "Ampharos",
+  "bellossom": "Bellossom",
+  "marill": "Marill",
+  "azumarill": "Azumarill",
+  "sudowoodo": "Sudowoodo",
+  "politoed": "Politoed",
+  "hoppip": "Hoppip",
+  "skiploom": "Skiploom",
+  "jumpluff": "Jumpluff",
+  "aipom": "Aipom",
+  "sunkern": "Sunkern",
+  "sunflora": "Sunflora",
+  "yanma": "Yanma",
+  "wooper": "Wooper",
+  "quagsire": "Quagsire",
+  "espeon": "Espeon",
+  "umbreon": "Umbreon",
+  "murkrow": "Murkrow",
+  "slowking": "Slowking",
+  "misdreavus": "Misdreavus",
+  "unown": "Unown",
+  "wobbuffet": "Wobbuffet",
+  "girafarig": "Girafarig",
+  "pineco": "Pineco",
+  "forretress": "Forretress",
+  "dunsparce": "Dunsparce",
+  "gligar": "Gligar",
+  "steelix": "Steelix",
+  "snubbull": "Snubbull",
+  "granbull": "Granbull",
+  "qwilfish": "Qwilfish",
+  "scizor": "Scizor",
+  "shuckle": "Shuckle",
+  "heracross": "Heracross",
+  "sneasel": "Sneasel",
+  "teddiursa": "Teddiursa",
+  "ursaring": "Ursaring",
+  "slugma": "Slugma",
+  "magcargo": "Magcargo",
+  "swinub": "Swinub",
+  "piloswine": "Piloswine",
+  "corsola": "Corsola",
+  "remoraid": "Remoraid",
+  "octillery": "Octillery",
+  "delibird": "Delibird",
+  "mantine": "Mantine",
+  "skarmory": "Skarmory",
+  "houndour": "Houndour",
+  "houndoom": "Houndoom",
+  "kingdra": "Kingdra",
+  "phanpy": "Phanpy",
+  "donphan": "Donphan",
+  "porygon2": "Porygon2",
+  "stantler": "Stantler",
+  "smeargle": "Smeargle",
+  "tyrogue": "Tyrogue",
+  "hitmontop": "Hitmontop",
+  "smoochum": "Smoochum",
+  "elekid": "Elekid",
+  "magby": "Magby",
+  "miltank": "Miltank",
+  "blissey": "Blissey",
+  "raikou": "Raikou",
+  "entei": "Entei",
+  "suicune": "Suicune",
+  "larvitar": "Larvitar",
+  "pupitar": "Pupitar",
+  "tyranitar": "Tyranitar",
+  "lugia": "Lugia",
+  "ho_oh": "Ho-Oh",
+  "celebi": "Celebi",
+  "treecko": "Treecko",
+  "grovyle": "Grovyle",
+  "sceptile": "Sceptile",
+  "torchic": "Torchic",
+  "combusken": "Combusken",
+  "blaziken": "Blaziken",
+  "mudkip": "Mudkip",
+  "marshtomp": "Marshtomp",
+  "swampert": "Swampert",
+  "poochyena": "Poochyena",
+  "mightyena": "Mightyena",
+  "zigzagoon": "Zigzagoon",
+  "linoone": "Linoone",
+  "wurmple": "Wurmple",
+  "silcoon": "Silcoon",
+  "beautifly": "Beautifly",
+  "cascoon": "Cascoon",
+  "dustox": "Dustox",
+  "lotad": "Lotad",
+  "lombre": "Lombre",
+  "ludicolo": "Ludicolo",
+  "seedot": "Seedot",
+  "nuzleaf": "Nuzleaf",
+  "shiftry": "Shiftry",
+  "taillow": "Taillow",
+  "swellow": "Swellow",
+  "wingull": "Wingull",
+  "pelipper": "Pelipper",
+  "ralts": "Ralts",
+  "kirlia": "Kirlia",
+  "gardevoir": "Gardevoir",
+  "surskit": "Surskit",
+  "masquerain": "Masquerain",
+  "shroomish": "Shroomish",
+  "breloom": "Breloom",
+  "slakoth": "Slakoth",
+  "vigoroth": "Vigoroth",
+  "slaking": "Slaking",
+  "nincada": "Nincada",
+  "ninjask": "Ninjask",
+  "shedinja": "Shedinja",
+  "whismur": "Whismur",
+  "loudred": "Loudred",
+  "exploud": "Exploud",
+  "makuhita": "Makuhita",
+  "hariyama": "Hariyama",
+  "azurill": "Azurill",
+  "nosepass": "Nosepass",
+  "skitty": "Skitty",
+  "delcatty": "Delcatty",
+  "sableye": "Sableye",
+  "mawile": "Mawile",
+  "aron": "Aron",
+  "lairon": "Lairon",
+  "aggron": "Aggron",
+  "meditite": "Meditite",
+  "medicham": "Medicham",
+  "electrike": "Electrike",
+  "manectric": "Manectric",
+  "plusle": "Plusle",
+  "minun": "Minun",
+  "volbeat": "Volbeat",
+  "illumise": "Illumise",
+  "roselia": "Roselia",
+  "gulpin": "Gulpin",
+  "swalot": "Swalot",
+  "carvanha": "Carvanha",
+  "sharpedo": "Sharpedo",
+  "wailmer": "Wailmer",
+  "wailord": "Wailord",
+  "numel": "Numel",
+  "camerupt": "Camerupt",
+  "torkoal": "Torkoal",
+  "spoink": "Spoink",
+  "grumpig": "Grumpig",
+  "spinda": "Spinda",
+  "trapinch": "Trapinch",
+  "vibrava": "Vibrava",
+  "flygon": "Flygon",
+  "cacnea": "Cacnea",
+  "cacturne": "Cacturne",
+  "swablu": "Swablu",
+  "altaria": "Altaria",
+  "zangoose": "Zangoose",
+  "seviper": "Seviper",
+  "lunatone": "Lunatone",
+  "solrock": "Solrock",
+  "barboach": "Barboach",
+  "whiscash": "Whiscash",
+  "corphish": "Corphish",
+  "crawdaunt": "Crawdaunt",
+  "baltoy": "Baltoy",
+  "claydol": "Claydol",
+  "lileep": "Lileep",
+  "cradily": "Cradily",
+  "anorith": "Anorith",
+  "armaldo": "Armaldo",
+  "feebas": "Feebas",
+  "milotic": "Milotic",
+  "castform": "Castform",
+  "kecleon": "Kecleon",
+  "shuppet": "Shuppet",
+  "banette": "Banette",
+  "duskull": "Duskull",
+  "dusclops": "Dusclops",
+  "tropius": "Tropius",
+  "chimecho": "Chimecho",
+  "absol": "Absol",
+  "wynaut": "Wynaut",
+  "snorunt": "Snorunt",
+  "glalie": "Glalie",
+  "spheal": "Spheal",
+  "sealeo": "Sealeo",
+  "walrein": "Walrein",
+  "clamperl": "Clamperl",
+  "huntail": "Huntail",
+  "gorebyss": "Gorebyss",
+  "relicanth": "Relicanth",
+  "luvdisc": "Luvdisc",
+  "bagon": "Bagon",
+  "shelgon": "Shelgon",
+  "salamence": "Salamence",
+  "beldum": "Beldum",
+  "metang": "Metang",
+  "metagross": "Metagross",
+  "regirock": "Regirock",
+  "regice": "Regice",
+  "registeel": "Registeel",
+  "latias": "Latias",
+  "latios": "Latios",
+  "kyogre": "Kyogre",
+  "groudon": "Groudon",
+  "rayquaza": "Rayquaza",
+  "jirachi": "Jirachi",
+  "deoxys": "Deoxys",
+  "turtwig": "Turtwig",
+  "grotle": "Grotle",
+  "torterra": "Torterra",
+  "chimchar": "Chimchar",
+  "monferno": "Monferno",
+  "infernape": "Infernape",
+  "piplup": "Piplup",
+  "prinplup": "Prinplup",
+  "empoleon": "Empoleon",
+  "starly": "Starly",
+  "staravia": "Staravia",
+  "staraptor": "Staraptor",
+  "bidoof": "Bidoof",
+  "bibarel": "Bibarel",
+  "kricketot": "Kricketot",
+  "kricketune": "Kricketune",
+  "shinx": "Shinx",
+  "luxio": "Luxio",
+  "luxray": "Luxray",
+  "budew": "Budew",
+  "roserade": "Roserade",
+  "cranidos": "Cranidos",
+  "rampardos": "Rampardos",
+  "shieldon": "Shieldon",
+  "bastiodon": "Bastiodon",
+  "burmy": "Burmy",
+  "wormadam": "Wormadam",
+  "mothim": "Mothim",
+  "combee": "Combee",
+  "vespiquen": "Vespiquen",
+  "pachirisu": "Pachirisu",
+  "buizel": "Buizel",
+  "floatzel": "Floatzel",
+  "cherubi": "Cherubi",
+  "cherrim": "Cherrim",
+  "shellos": "Shellos",
+  "gastrodon": "Gastrodon",
+  "ambipom": "Ambipom",
+  "drifloon": "Drifloon",
+  "drifblim": "Drifblim",
+  "buneary": "Buneary",
+  "lopunny": "Lopunny",
+  "mismagius": "Mismagius",
+  "honchkrow": "Honchkrow",
+  "glameow": "Glameow",
+  "purugly": "Purugly",
+  "chingling": "Chingling",
+  "stunky": "Stunky",
+  "skuntank": "Skuntank",
+  "bronzor": "Bronzor",
+  "bronzong": "Bronzong",
+  "bonsly": "Bonsly",
+  "mime_jr": "Mime Jr.",
+  "happiny": "Happiny",
+  "chatot": "Chatot",
+  "spiritomb": "Spiritomb",
+  "gible": "Gible",
+  "gabite": "Gabite",
+  "garchomp": "Garchomp",
+  "munchlax": "Munchlax",
+  "riolu": "Riolu",
+  "lucario": "Lucario",
+  "hippopotas": "Hippopotas",
+  "hippowdon": "Hippowdon",
+  "skorupi": "Skorupi",
+  "drapion": "Drapion",
+  "croagunk": "Croagunk",
+  "toxicroak": "Toxicroak",
+  "carnivine": "Carnivine",
+  "finneon": "Finneon",
+  "lumineon": "Lumineon",
+  "mantyke": "Mantyke",
+  "snover": "Snover",
+  "abomasnow": "Abomasnow",
+  "weavile": "Weavile",
+  "magnezone": "Magnezone",
+  "lickilicky": "Lickilicky",
+  "rhyperior": "Rhyperior",
+  "tangrowth": "Tangrowth",
+  "electivire": "Electivire",
+  "magmortar": "Magmortar",
+  "togekiss": "Togekiss",
+  "yanmega": "Yanmega",
+  "leafeon": "Leafeon",
+  "glaceon": "Glaceon",
+  "gliscor": "Gliscor",
+  "mamoswine": "Mamoswine",
+  "porygon_z": "Porygon-Z",
+  "gallade": "Gallade",
+  "probopass": "Probopass",
+  "dusknoir": "Dusknoir",
+  "froslass": "Froslass",
+  "rotom": "Rotom",
+  "uxie": "Uxie",
+  "mesprit": "Mesprit",
+  "azelf": "Azelf",
+  "dialga": "Dialga",
+  "palkia": "Palkia",
+  "heatran": "Heatran",
+  "regigigas": "Regigigas",
+  "giratina": "Giratina",
+  "cresselia": "Cresselia",
+  "phione": "Phione",
+  "manaphy": "Manaphy",
+  "darkrai": "Darkrai",
+  "shaymin": "Shaymin",
+  "arceus": "Arceus",
+  "victini": "Victini",
+  "snivy": "Snivy",
+  "servine": "Servine",
+  "serperior": "Serperior",
+  "tepig": "Tepig",
+  "pignite": "Pignite",
+  "emboar": "Emboar",
+  "oshawott": "Oshawott",
+  "dewott": "Dewott",
+  "samurott": "Samurott",
+  "patrat": "Patrat",
+  "watchog": "Watchog",
+  "lillipup": "Lillipup",
+  "herdier": "Herdier",
+  "stoutland": "Stoutland",
+  "purrloin": "Purrloin",
+  "liepard": "Liepard",
+  "pansage": "Pansage",
+  "simisage": "Simisage",
+  "pansear": "Pansear",
+  "simisear": "Simisear",
+  "panpour": "Panpour",
+  "simipour": "Simipour",
+  "munna": "Munna",
+  "musharna": "Musharna",
+  "pidove": "Pidove",
+  "tranquill": "Tranquill",
+  "unfezant": "Unfezant",
+  "blitzle": "Blitzle",
+  "zebstrika": "Zebstrika",
+  "roggenrola": "Roggenrola",
+  "boldore": "Boldore",
+  "gigalith": "Gigalith",
+  "woobat": "Woobat",
+  "swoobat": "Swoobat",
+  "drilbur": "Drilbur",
+  "excadrill": "Excadrill",
+  "audino": "Audino",
+  "timburr": "Timburr",
+  "gurdurr": "Gurdurr",
+  "conkeldurr": "Conkeldurr",
+  "tympole": "Tympole",
+  "palpitoad": "Palpitoad",
+  "seismitoad": "Seismitoad",
+  "throh": "Throh",
+  "sawk": "Sawk",
+  "sewaddle": "Sewaddle",
+  "swadloon": "Swadloon",
+  "leavanny": "Leavanny",
+  "venipede": "Venipede",
+  "whirlipede": "Whirlipede",
+  "scolipede": "Scolipede",
+  "cottonee": "Cottonee",
+  "whimsicott": "Whimsicott",
+  "petilil": "Petilil",
+  "lilligant": "Lilligant",
+  "basculin": "Basculin",
+  "sandile": "Sandile",
+  "krokorok": "Krokorok",
+  "krookodile": "Krookodile",
+  "darumaka": "Darumaka",
+  "darmanitan": "Darmanitan",
+  "maractus": "Maractus",
+  "dwebble": "Dwebble",
+  "crustle": "Crustle",
+  "scraggy": "Scraggy",
+  "scrafty": "Scrafty",
+  "sigilyph": "Sigilyph",
+  "yamask": "Yamask",
+  "cofagrigus": "Cofagrigus",
+  "tirtouga": "Tirtouga",
+  "carracosta": "Carracosta",
+  "archen": "Archen",
+  "archeops": "Archeops",
+  "trubbish": "Trubbish",
+  "garbodor": "Garbodor",
+  "zorua": "Zorua",
+  "zoroark": "Zoroark",
+  "minccino": "Minccino",
+  "cinccino": "Cinccino",
+  "gothita": "Gothita",
+  "gothorita": "Gothorita",
+  "gothitelle": "Gothitelle",
+  "solosis": "Solosis",
+  "duosion": "Duosion",
+  "reuniclus": "Reuniclus",
+  "ducklett": "Ducklett",
+  "swanna": "Swanna",
+  "vanillite": "Vanillite",
+  "vanillish": "Vanillish",
+  "vanilluxe": "Vanilluxe",
+  "deerling": "Deerling",
+  "sawsbuck": "Sawsbuck",
+  "emolga": "Emolga",
+  "karrablast": "Karrablast",
+  "escavalier": "Escavalier",
+  "foongus": "Foongus",
+  "amoonguss": "Amoonguss",
+  "frillish": "Frillish",
+  "jellicent": "Jellicent",
+  "alomomola": "Alomomola",
+  "joltik": "Joltik",
+  "galvantula": "Galvantula",
+  "ferroseed": "Ferroseed",
+  "ferrothorn": "Ferrothorn",
+  "klink": "Klink",
+  "klang": "Klang",
+  "klinklang": "Klinklang",
+  "tynamo": "Tynamo",
+  "eelektrik": "Eelektrik",
+  "eelektross": "Eelektross",
+  "elgyem": "Elgyem",
+  "beheeyem": "Beheeyem",
+  "litwick": "Litwick",
+  "lampent": "Lampent",
+  "chandelure": "Chandelure",
+  "axew": "Axew",
+  "fraxure": "Fraxure",
+  "haxorus": "Haxorus",
+  "cubchoo": "Cubchoo",
+  "beartic": "Beartic",
+  "cryogonal": "Cryogonal",
+  "shelmet": "Shelmet",
+  "accelgor": "Accelgor",
+  "stunfisk": "Stunfisk",
+  "mienfoo": "Mienfoo",
+  "mienshao": "Mienshao",
+  "druddigon": "Druddigon",
+  "golett": "Golett",
+  "golurk": "Golurk",
+  "pawniard": "Pawniard",
+  "bisharp": "Bisharp",
+  "bouffalant": "Bouffalant",
+  "rufflet": "Rufflet",
+  "braviary": "Braviary",
+  "vullaby": "Vullaby",
+  "mandibuzz": "Mandibuzz",
+  "heatmor": "Heatmor",
+  "durant": "Durant",
+  "deino": "Deino",
+  "zweilous": "Zweilous",
+  "hydreigon": "Hydreigon",
+  "larvesta": "Larvesta",
+  "volcarona": "Volcarona",
+  "cobalion": "Cobalion",
+  "terrakion": "Terrakion",
+  "virizion": "Virizion",
+  "tornadus": "Tornadus",
+  "thundurus": "Thundurus",
+  "reshiram": "Reshiram",
+  "zekrom": "Zekrom",
+  "landorus": "Landorus",
+  "kyurem": "Kyurem",
+  "keldeo": "Keldeo",
+  "meloetta": "Meloetta",
+  "genesect": "Genesect",
+  "chespin": "Chespin",
+  "quilladin": "Quilladin",
+  "chesnaught": "Chesnaught",
+  "fennekin": "Fennekin",
+  "braixen": "Braixen",
+  "delphox": "Delphox",
+  "froakie": "Froakie",
+  "frogadier": "Frogadier",
+  "greninja": "Greninja",
+  "bunnelby": "Bunnelby",
+  "diggersby": "Diggersby",
+  "fletchling": "Fletchling",
+  "fletchinder": "Fletchinder",
+  "talonflame": "Talonflame",
+  "scatterbug": "Scatterbug",
+  "spewpa": "Spewpa",
+  "vivillon": "Vivillon",
+  "litleo": "Litleo",
+  "pyroar": "Pyroar",
+  "flabebe": "Flabébé",
+  "floette": "Floette",
+  "florges": "Florges",
+  "skiddo": "Skiddo",
+  "gogoat": "Gogoat",
+  "pancham": "Pancham",
+  "pangoro": "Pangoro",
+  "furfrou": "Furfrou",
+  "espurr": "Espurr",
+  "meowstic": "Meowstic",
+  "honedge": "Honedge",
+  "doublade": "Doublade",
+  "aegislash": "Aegislash",
+  "spritzee": "Spritzee",
+  "aromatisse": "Aromatisse",
+  "swirlix": "Swirlix",
+  "slurpuff": "Slurpuff",
+  "inkay": "Inkay",
+  "malamar": "Malamar",
+  "binacle": "Binacle",
+  "barbaracle": "Barbaracle",
+  "skrelp": "Skrelp",
+  "dragalge": "Dragalge",
+  "clauncher": "Clauncher",
+  "clawitzer": "Clawitzer",
+  "helioptile": "Helioptile",
+  "heliolisk": "Heliolisk",
+  "tyrunt": "Tyrunt",
+  "tyrantrum": "Tyrantrum",
+  "amaura": "Amaura",
+  "aurorus": "Aurorus",
+  "sylveon": "Sylveon",
+  "hawlucha": "Hawlucha",
+  "dedenne": "Dedenne",
+  "carbink": "Carbink",
+  "goomy": "Goomy",
+  "sliggoo": "Sliggoo",
+  "goodra": "Goodra",
+  "klefki": "Klefki",
+  "phantump": "Phantump",
+  "trevenant": "Trevenant",
+  "pumpkaboo": "Pumpkaboo",
+  "gourgeist": "Gourgeist",
+  "bergmite": "Bergmite",
+  "avalugg": "Avalugg",
+  "noibat": "Noibat",
+  "noivern": "Noivern",
+  "xerneas": "Xerneas",
+  "yveltal": "Yveltal",
+  "zygarde": "Zygarde",
+  "diancie": "Diancie",
+  "hoopa": "Hoopa",
+  "volcanion": "Volcanion",
+  "rowlet": "Rowlet",
+  "dartrix": "Dartrix",
+  "decidueye": "Decidueye",
+  "litten": "Litten",
+  "torracat": "Torracat",
+  "incineroar": "Incineroar",
+  "popplio": "Popplio",
+  "brionne": "Brionne",
+  "primarina": "Primarina",
+  "pikipek": "Pikipek",
+  "trumbeak": "Trumbeak",
+  "toucannon": "Toucannon",
+  "yungoos": "Yungoos",
+  "gumshoos": "Gumshoos",
+  "grubbin": "Grubbin",
+  "charjabug": "Charjabug",
+  "vikavolt": "Vikavolt",
+  "crabrawler": "Crabrawler",
+  "crabominable": "Crabominable",
+  "oricorio": "Oricorio",
+  "cutiefly": "Cutiefly",
+  "ribombee": "Ribombee",
+  "rockruff": "Rockruff",
+  "lycanroc": "Lycanroc",
+  "wishiwashi": "Wishiwashi",
+  "mareanie": "Mareanie",
+  "toxapex": "Toxapex",
+  "mudbray": "Mudbray",
+  "mudsdale": "Mudsdale",
+  "dewpider": "Dewpider",
+  "araquanid": "Araquanid",
+  "fomantis": "Fomantis",
+  "lurantis": "Lurantis",
+  "morelull": "Morelull",
+  "shiinotic": "Shiinotic",
+  "salandit": "Salandit",
+  "salazzle": "Salazzle",
+  "stufful": "Stufful",
+  "bewear": "Bewear",
+  "bounsweet": "Bounsweet",
+  "steenee": "Steenee",
+  "tsareena": "Tsareena",
+  "comfey": "Comfey",
+  "oranguru": "Oranguru",
+  "passimian": "Passimian",
+  "wimpod": "Wimpod",
+  "golisopod": "Golisopod",
+  "sandygast": "Sandygast",
+  "palossand": "Palossand",
+  "pyukumuku": "Pyukumuku",
+  "type_null": "Tipo Nulo",
+  "silvally": "Silvally",
+  "minior": "Minior",
+  "komala": "Komala",
+  "turtonator": "Turtonator",
+  "togedemaru": "Togedemaru",
+  "mimikyu": "Mimikyu",
+  "bruxish": "Bruxish",
+  "drampa": "Drampa",
+  "dhelmise": "Dhelmise",
+  "jangmo_o": "Jangmo-o",
+  "hakamo_o": "Hakamo-o",
+  "kommo_o": "Kommo-o",
+  "tapu_koko": "Tapu Koko",
+  "tapu_lele": "Tapu Lele",
+  "tapu_bulu": "Tapu Bulu",
+  "tapu_fini": "Tapu Fini",
+  "cosmog": "Cosmog",
+  "cosmoem": "Cosmoem",
+  "solgaleo": "Solgaleo",
+  "lunala": "Lunala",
+  "nihilego": "Nihilego",
+  "buzzwole": "Buzzwole",
+  "pheromosa": "Pheromosa",
+  "xurkitree": "Xurkitree",
+  "celesteela": "Celesteela",
+  "kartana": "Kartana",
+  "guzzlord": "Guzzlord",
+  "necrozma": "Necrozma",
+  "magearna": "Magearna",
+  "marshadow": "Marshadow",
+  "poipole": "Poipole",
+  "naganadel": "Naganadel",
+  "stakataka": "Stakataka",
+  "blacephalon": "Blacephalon",
+  "zeraora": "Zeraora",
+  "meltan": "Meltan",
+  "melmetal": "Melmetal",
+  "grookey": "Grookey",
+  "thwackey": "Thwackey",
+  "rillaboom": "Rillaboom",
+  "scorbunny": "Scorbunny",
+  "raboot": "Raboot",
+  "cinderace": "Cinderace",
+  "sobble": "Sobble",
+  "drizzile": "Drizzile",
+  "inteleon": "Inteleon",
+  "skwovet": "Skwovet",
+  "greedent": "Greedent",
+  "rookidee": "Rookidee",
+  "corvisquire": "Corvisquire",
+  "corviknight": "Corviknight",
+  "blipbug": "Blipbug",
+  "dottler": "Dottler",
+  "orbeetle": "Orbeetle",
+  "nickit": "Nickit",
+  "thievul": "Thievul",
+  "gossifleur": "Gossifleur",
+  "eldegoss": "Eldegoss",
+  "wooloo": "Wooloo",
+  "dubwool": "Dubwool",
+  "chewtle": "Chewtle",
+  "drednaw": "Drednaw",
+  "yamper": "Yamper",
+  "boltund": "Boltund",
+  "rolycoly": "Rolycoly",
+  "carkol": "Carkol",
+  "coalossal": "Coalossal",
+  "applin": "Applin",
+  "flapple": "Flapple",
+  "appletun": "Appletun",
+  "silicobra": "Silicobra",
+  "sandaconda": "Sandaconda",
+  "cramorant": "Cramorant",
+  "arrokuda": "Arrokuda",
+  "barraskewda": "Barraskewda",
+  "toxel": "Toxel",
+  "toxtricity": "Toxtricity",
+  "sizzlipede": "Sizzlipede",
+  "centiskorch": "Centiskorch",
+  "clobbopus": "Clobbopus",
+  "grapploct": "Grapploct",
+  "sinistea": "Sinistea",
+  "polteageist": "Polteageist",
+  "hatenna": "Hatenna",
+  "hattrem": "Hattrem",
+  "hatterene": "Hatterene",
+  "impidimp": "Impidimp",
+  "morgrem": "Morgrem",
+  "grimmsnarl": "Grimmsnarl",
+  "obstagoon": "Obstagoon",
+  "perrserker": "Perrserker",
+  "cursola": "Cursola",
+  "sirfetchd": "Sirfetch'd",
+  "mr_rime": "Mr. Rime",
+  "runerigus": "Runerigus",
+  "milcery": "Milcery",
+  "alcremie": "Alcremie",
+  "falinks": "Falinks",
+  "pincurchin": "Pincurchin",
+  "snom": "Snom",
+  "frosmoth": "Frosmoth",
+  "stonjourner": "Stonjourner",
+  "eiscue": "Eiscue",
+  "indeedee": "Indeedee",
+  "morpeko": "Morpeko",
+  "cufant": "Cufant",
+  "copperajah": "Copperajah",
+  "dracozolt": "Dracozolt",
+  "arctozolt": "Arctozolt",
+  "dracovish": "Dracovish",
+  "arctovish": "Arctovish",
+  "duraludon": "Duraludon",
+  "dreepy": "Dreepy",
+  "drakloak": "Drakloak",
+  "dragapult": "Dragapult",
+  "zacian": "Zacian",
+  "zamazenta": "Zamazenta",
+  "eternatus": "Eternatus",
+  "kubfu": "Kubfu",
+  "urshifu": "Urshifu",
+  "zarude": "Zarude",
+  "regieleki": "Regieleki",
+  "regidrago": "Regidrago",
+  "glastrier": "Glastrier",
+  "spectrier": "Spectrier",
+  "calyrex": "Calyrex",
+  "wyrdeer": "Wyrdeer",
+  "kleavor": "Kleavor",
+  "ursaluna": "Ursaluna",
+  "basculegion": "Basculegion",
+  "sneasler": "Sneasler",
+  "overqwil": "Overqwil",
+  "enamorus": "Enamorus",
+  "sprigatito": "Sprigatito",
+  "floragato": "Floragato",
+  "meowscarada": "Meowscarada",
+  "fuecoco": "Fuecoco",
+  "crocalor": "Crocalor",
+  "skeledirge": "Skeledirge",
+  "quaxly": "Quaxly",
+  "quaxwell": "Quaxwell",
+  "quaquaval": "Quaquaval",
+  "lechonk": "Lechonk",
+  "oinkologne": "Oinkologne",
+  "tarountula": "Tarountula",
+  "spidops": "Spidops",
+  "nymble": "Nymble",
+  "lokix": "Lokix",
+  "pawmi": "Pawmi",
+  "pawmo": "Pawmo",
+  "pawmot": "Pawmot",
+  "tandemaus": "Tandemaus",
+  "maushold": "Maushold",
+  "fidough": "Fidough",
+  "dachsbun": "Dachsbun",
+  "smoliv": "Smoliv",
+  "dolliv": "Dolliv",
+  "arboliva": "Arboliva",
+  "squawkabilly": "Squawkabilly",
+  "nacli": "Nacli",
+  "naclstack": "Naclstack",
+  "garganacl": "Garganacl",
+  "charcadet": "Charcadet",
+  "armarouge": "Armarouge",
+  "ceruledge": "Ceruledge",
+  "tadbulb": "Tadbulb",
+  "bellibolt": "Bellibolt",
+  "wattrel": "Wattrel",
+  "kilowattrel": "Kilowattrel",
+  "maschiff": "Maschiff",
+  "mabosstiff": "Mabosstiff",
+  "shroodle": "Shroodle",
+  "grafaiai": "Grafaiai",
+  "bramblin": "Bramblin",
+  "brambleghast": "Brambleghast",
+  "toedscool": "Toedscool",
+  "toedscruel": "Toedscruel",
+  "klawf": "Klawf",
+  "capsakid": "Capsakid",
+  "scovillain": "Scovillain",
+  "rellor": "Rellor",
+  "rabsca": "Rabsca",
+  "flittle": "Flittle",
+  "espathra": "Espathra",
+  "tinkatink": "Tinkatink",
+  "tinkatuff": "Tinkatuff",
+  "tinkaton": "Tinkaton",
+  "wiglett": "Wiglett",
+  "wugtrio": "Wugtrio",
+  "bombirdier": "Bombirdier",
+  "finizen": "Finizen",
+  "palafin": "Palafin",
+  "varoom": "Varoom",
+  "revavroom": "Revavroom",
+  "cyclizar": "Cyclizar",
+  "orthworm": "Orthworm",
+  "glimmet": "Glimmet",
+  "glimmora": "Glimmora",
+  "greavard": "Greavard",
+  "houndstone": "Houndstone",
+  "flamigo": "Flamigo",
+  "cetoddle": "Cetoddle",
+  "cetitan": "Cetitan",
+  "veluza": "Veluza",
+  "dondozo": "Dondozo",
+  "tatsugiri": "Tatsugiri",
+  "annihilape": "Annihilape",
+  "clodsire": "Clodsire",
+  "farigiraf": "Farigiraf",
+  "dudunsparce": "Dudunsparce",
+  "kingambit": "Kingambit",
+  "great_tusk": "Presa Grande",
+  "scream_tail": "Cauda Brado",
+  "brute_bonnet": "Capuz Bruto",
+  "flutter_mane": "Juba Sopro",
+  "slither_wing": "Asa Rasteira",
+  "sandy_shocks": "Choque Areia",
+  "iron_treads": "Trilho Férreo",
+  "iron_bundle": "Pacote Férreo",
+  "iron_hands": "Mãos Férreas",
+  "iron_jugulis": "Jugulares Férreas",
+  "iron_moth": "Mariposa Férrea",
+  "iron_thorns": "Espinhos Férreos",
+  "frigibax": "Frigibax",
+  "arctibax": "Arctibax",
+  "baxcalibur": "Baxcalibur",
+  "gimmighoul": "Gimmighoul",
+  "gholdengo": "Gholdengo",
+  "wo_chien": "Wo-Chien",
+  "chien_pao": "Chien-Pao",
+  "ting_lu": "Ting-Lu",
+  "chi_yu": "Chi-Yu",
+  "roaring_moon": "Lua Estrondo",
+  "iron_valiant": "Valentia Férrea",
+  "koraidon": "Koraidon",
+  "miraidon": "Miraidon",
+  "walking_wake": "Onda Ando",
+  "iron_leaves": "Folhas Férreas",
+  "dipplin": "Dipplin",
+  "poltchageist": "Poltchageist",
+  "sinistcha": "Sinistcha",
+  "okidogi": "Okidogi",
+  "munkidori": "Munkidori",
+  "fezandipiti": "Fezandipiti",
+  "ogerpon": "Ogerpon",
+  "archaludon": "Archaludon",
+  "hydrapple": "Hydrapple",
+  "gouging_fire": "Fogo Corrosão",
+  "raging_bolt": "Raio Fúria",
+  "iron_boulder": "Rocha Férrea",
+  "iron_crown": "Chifres Férreos",
+  "terapagos": "Terapagos",
+  "pecharunt": "Pecharunt",
+  "alola_rattata": "Rattata",
+  "alola_raticate": "Raticate",
+  "alola_raichu": "Raichu",
+  "alola_sandshrew": "Sandshrew",
+  "alola_sandslash": "Sandslash",
+  "alola_vulpix": "Vulpix",
+  "alola_ninetales": "Ninetales",
+  "alola_diglett": "Diglett",
+  "alola_dugtrio": "Dugtrio",
+  "alola_meowth": "Meowth",
+  "alola_persian": "Persian",
+  "alola_geodude": "Geodude",
+  "alola_graveler": "Graveler",
+  "alola_golem": "Golem",
+  "alola_grimer": "Grimer",
+  "alola_muk": "Muk",
+  "alola_exeggutor": "Exeggutor",
+  "alola_marowak": "Marowak",
+  "eternal_floette": "Floette",
+  "galar_meowth": "Meowth",
+  "galar_ponyta": "Ponyta",
+  "galar_rapidash": "Rapidash",
+  "galar_slowpoke": "Slowpoke",
+  "galar_slowbro": "Slowbro",
+  "galar_farfetchd": "Farfetch'd",
+  "galar_weezing": "Weezing",
+  "galar_mr_mime": "Mr. Mime",
+  "galar_articuno": "Articuno",
+  "galar_zapdos": "Zapdos",
+  "galar_moltres": "Moltres",
+  "galar_slowking": "Slowking",
+  "galar_corsola": "Corsola",
+  "galar_zigzagoon": "Zigzagoon",
+  "galar_linoone": "Linoone",
+  "galar_darumaka": "Darumaka",
+  "galar_darmanitan": "Darmanitan",
+  "galar_yamask": "Yamask",
+  "galar_stunfisk": "Stunfisk",
+  "hisui_growlithe": "Growlithe",
+  "hisui_arcanine": "Arcanine",
+  "hisui_voltorb": "Voltorb",
+  "hisui_electrode": "Electrode",
+  "hisui_typhlosion": "Typhlosion",
+  "hisui_qwilfish": "Qwilfish",
+  "hisui_sneasel": "Sneasel",
+  "hisui_samurott": "Samurott",
+  "hisui_lilligant": "Lilligant",
+  "hisui_zorua": "Zorua",
+  "hisui_zoroark": "Zoroark",
+  "hisui_braviary": "Braviary",
+  "hisui_sliggoo": "Sliggoo",
+  "hisui_goodra": "Goodra",
+  "hisui_avalugg": "Avalugg",
+  "hisui_decidueye": "Decidueye",
+  "paldea_tauros": "Tauros",
+  "paldea_wooper": "Wooper",
+  "bloodmoon_ursaluna": "Ursaluna"
+}
\ No newline at end of file
diff --git a/src/locales/pt_BR/trainer-classes.json b/src/locales/pt_BR/trainer-classes.json
index 72742dccf82..fd1f36aae71 100644
--- a/src/locales/pt_BR/trainer-classes.json
+++ b/src/locales/pt_BR/trainer-classes.json
@@ -4,10 +4,10 @@
   "ace_duo": "Dupla Ás",
   "artist": "Artista",
   "artist_female": "Artista",
-  "backpackers": "Mochileiros",
   "backers": "Torcedores",
   "backpacker": "Mochileiro",
   "backpacker_female": "Mochileira",
+  "backpackers": "Mochileiros",
   "baker": "Padeira",
   "battle_girl": "Lutadora",
   "beauty": "Modelo",
@@ -30,8 +30,8 @@
   "doctor": "Doutor",
   "doctor_female": "Doutora",
   "firebreather": "Cospe-Fogo",
-  "fishermen": "Pescador",
-  "fishermen_female": "Pescadora",
+  "fisherman": "Pescador",
+  "fisherman_female": "Pescadora",
   "gentleman": "Cavalheiro",
   "guitarist": "Guitarrista",
   "guitarist_female": "Guitarrista",
@@ -101,8 +101,8 @@
   "workers": "Operários",
   "youngster": "Jovem",
   "rocket_grunt": "Capanga da Equipe Rocket",
-  "rocket_grunt_female": "Capanga da Equipe Rocket",
   "rocket_grunts": "Capangas da Equipe Rocket",
+  "rocket_grunt_female": "Capanga da Equipe Rocket",
   "magma_grunt": "Capanga da Equipe Magma",
   "magma_grunt_female": "Capanga da Equipe Magma",
   "magma_grunts": "Capangas da Equipe Magma",
@@ -118,4 +118,4 @@
   "flare_grunt": "Capanga da Equipe Flare",
   "flare_grunt_female": "Capanga da Equipe Flare",
   "flare_grunts": "Capangas da Equipe Flare"
-}
\ No newline at end of file
+}
diff --git a/src/system/settings/settings.ts b/src/system/settings/settings.ts
index a7ad3f6697e..7b0fea95a98 100644
--- a/src/system/settings/settings.ts
+++ b/src/system/settings/settings.ts
@@ -119,6 +119,7 @@ export const SettingKeys = {
   BGM_Volume: "BGM_VOLUME",
   Field_Volume: "FIELD_VOLUME",
   SE_Volume: "SE_VOLUME",
+  UI_Volume: "UI_SOUND_EFFECTS",
   Music_Preference: "MUSIC_PREFERENCE",
   Show_BGM_Bar: "SHOW_BGM_BAR",
   Move_Touch_Controls: "MOVE_TOUCH_CONTROLS",
@@ -556,6 +557,13 @@ export const Setting: Array<Setting> = [
     default: 10,
     type: SettingType.AUDIO
   },
+  {
+    key: SettingKeys.UI_Volume,
+    label: i18next.t("settings:uiVolume"),
+    options: VOLUME_OPTIONS,
+    default: 10,
+    type: SettingType.AUDIO
+  },
   {
     key: SettingKeys.Music_Preference,
     label: i18next.t("settings:musicPreference"),
@@ -670,6 +678,9 @@ export function setSetting(scene: BattleScene, setting: string, value: integer):
     scene.seVolume = value ? parseInt(Setting[index].options[value].value) * 0.01 : 0;
     scene.updateSoundVolume();
     break;
+  case SettingKeys.UI_Volume:
+    scene.uiVolume = value ? parseInt(Setting[index].options[value].value) * 0.01 : 0;
+    break;
   case SettingKeys.Music_Preference:
     scene.musicPreference = value;
     break;
diff --git a/src/ui/egg-gacha-ui-handler.ts b/src/ui/egg-gacha-ui-handler.ts
index a4a57e25924..9497dfe58c6 100644
--- a/src/ui/egg-gacha-ui-handler.ts
+++ b/src/ui/egg-gacha-ui-handler.ts
@@ -359,7 +359,7 @@ export default class EggGachaUiHandler extends MessageUiHandler {
         this.scene.time.delayedCall(this.getDelayValue(count ? 500 : 1250), () => {
           this.scene.playSound("se/gacha_dispense");
           this.scene.time.delayedCall(this.getDelayValue(750), () => {
-            this.scene.sound.stopByKey("gacha_running");
+            this.scene.sound.stopByKey("se/gacha_running");
             this.scene.tweens.add({
               targets: egg,
               duration: this.getDelayValue(350),
diff --git a/src/ui/settings/settings-audio-ui-handler.ts b/src/ui/settings/settings-audio-ui-handler.ts
index 27ca7e35354..4a895fc3170 100644
--- a/src/ui/settings/settings-audio-ui-handler.ts
+++ b/src/ui/settings/settings-audio-ui-handler.ts
@@ -15,6 +15,6 @@ export default class SettingsAudioUiHandler extends AbstractSettingsUiHandler {
     super(scene, SettingType.AUDIO, mode);
     this.title = "Audio";
     this.localStorageKey = "settings";
-    this.rowsToDisplay = 5;
+    this.rowsToDisplay = 6;
   }
 }
diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts
index 5c9ce61979f..f9b40dd96e6 100644
--- a/src/ui/starter-select-ui-handler.ts
+++ b/src/ui/starter-select-ui-handler.ts
@@ -1701,7 +1701,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
                     }
                   });
                   ui.setMode(Mode.STARTER_SELECT);
-                  this.scene.playSound("buy");
+                  this.scene.playSound("se/buy");
 
                   return true;
                 }
@@ -1753,7 +1753,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
             starterAttributes.shiny = starterAttributes.shiny ? !starterAttributes.shiny : true;
             this.setSpeciesDetails(this.lastSpecies, !props.shiny, undefined, undefined, props.shiny ? 0 : undefined, undefined, undefined);
             if (starterAttributes.shiny) {
-              this.scene.playSound("sparkle");
+              this.scene.playSound("se/sparkle");
               // Set the variant label to the shiny tint
               const tint = getVariantTint(newVariant);
               this.pokemonShinyIcon.setFrame(getVariantIcon(newVariant));