diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000000..ce942deba5f
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,45 @@
+# Order is important; the last matching pattern takes the most precedence.
+
+# everything (whole code-base) - Junior Devs
+* @pagefaultgames/junior-dev-team
+
+# github actions/templates etc. - Dev Leads
+/.github @pagefaultgames/dev-leads
+
+# --- Translations ---
+
+# all translations - Translation Leads
+/src/locales @pagefaultgames/translation-leads
+
+# Catalan (Spain/Spanish)
+/src/locales/ca_ES @pagefaultgames/catalan-translation-team
+
+# German
+/src/locales/de @pagefaultgames/german-translation-team
+
+# English
+/src/locales/en @pagefaultgames/english-translation-team
+
+# Spanish
+/src/locales/es @pagefaultgames/spanish-translation-team
+
+# French
+/src/locales/fr @pagefaultgames/french-translation-team
+
+# Italian
+/src/locales/it @pagefaultgames/italian-translation-team
+
+# Japenese
+/src/locales/ja @pagefaultgames/japanese-translation-team
+
+# Korean
+/src/locales/ko @pagefaultgames/korean-translation-team
+
+# Brasilian (Brasil/Portuguese)
+/src/locales/pt_BR @pagefaultgames/portuguese_br-translation-team
+
+# Chinese (simplified)
+/src/locales/zh_CN @pagefaultgames/chinese_simplified-translation-team
+
+# Chinese (traditional)
+/src/locales/zh_TW @pagefaultgames/chinese_traditional-translation-team 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 5aec86a0463..843f7feab59 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,7 +1,7 @@
 name: Feature Request
 description: Suggest an idea for this project
 title: "[Feature] "
-labels: ["enhancement"]
+labels: ["Enhancement"]
 body:
   - type: markdown
     attributes:
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index a765ed4a114..3e6b8bf6d0d 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -30,7 +30,7 @@
 - [ ] The PR is self-contained and cannot be split into smaller PRs?
 - [ ] Have I provided a clear explanation of the changes?
 - [ ] Have I considered writing automated tests for the issue?
-- [ ] If I have text, did I add placeholders for them in locales?
+- [ ] If I have text, did I add make it translatable and added a key in the English language?
 - [ ] Have I tested the changes (manually)?
     - [ ] Are all unit tests still passing? (`npm run test`)
 - [ ] Are the changes visual?
diff --git a/README.md b/README.md
index 77246fa4402..0f9ed992352 100644
--- a/README.md
+++ b/README.md
@@ -53,6 +53,7 @@ Check out [Github Issues](https://github.com/pagefaultgames/pokerogue/issues) to
   - Pokémon Sun/Moon
   - Pokémon Ultra Sun/Ultra Moon
   - Pokémon Sword/Shield
+  - Pokémon Legends: Arceus
   - Pokémon Scarlet/Violet
   - Firel (Custom Laboratory, Metropolis, Seabed, and Space biome music)
   - Lmz (Custom Jungle biome music)
diff --git a/index.css b/index.css
index 3b74867be5f..8034c1a4b38 100644
--- a/index.css
+++ b/index.css
@@ -17,6 +17,12 @@ body {
   background: #484050;
 }
 
+@media (display-mode: fullscreen) {
+  body {
+    background: #000000;
+  }
+}
+
 #links {
   width: 90%;
   text-align: center;
diff --git a/public/audio/se/battle_anims/Absorb2.m4a b/public/audio/battle_anims/Absorb2.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Absorb2.m4a
rename to public/audio/battle_anims/Absorb2.m4a
diff --git a/public/audio/se/battle_anims/Ace.m4a b/public/audio/battle_anims/Ace.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Ace.m4a
rename to public/audio/battle_anims/Ace.m4a
diff --git a/public/audio/se/battle_anims/Acupressure.mp3 b/public/audio/battle_anims/Acupressure.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Acupressure.mp3
rename to public/audio/battle_anims/Acupressure.mp3
diff --git a/public/audio/se/battle_anims/Applause.m4a b/public/audio/battle_anims/Applause.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Applause.m4a
rename to public/audio/battle_anims/Applause.m4a
diff --git a/public/audio/se/battle_anims/Battle1.m4a b/public/audio/battle_anims/Battle1.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Battle1.m4a
rename to public/audio/battle_anims/Battle1.m4a
diff --git a/public/audio/se/battle_anims/Blow1.m4a b/public/audio/battle_anims/Blow1.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Blow1.m4a
rename to public/audio/battle_anims/Blow1.m4a
diff --git a/public/audio/se/battle_anims/Blow3.m4a b/public/audio/battle_anims/Blow3.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Blow3.m4a
rename to public/audio/battle_anims/Blow3.m4a
diff --git a/public/audio/se/battle_anims/Blow4.m4a b/public/audio/battle_anims/Blow4.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Blow4.m4a
rename to public/audio/battle_anims/Blow4.m4a
diff --git a/public/audio/se/battle_anims/Blow5.m4a b/public/audio/battle_anims/Blow5.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Blow5.m4a
rename to public/audio/battle_anims/Blow5.m4a
diff --git a/public/audio/se/battle_anims/Blow6.m4a b/public/audio/battle_anims/Blow6.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Blow6.m4a
rename to public/audio/battle_anims/Blow6.m4a
diff --git a/public/audio/se/battle_anims/Blow7.m4a b/public/audio/battle_anims/Blow7.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Blow7.m4a
rename to public/audio/battle_anims/Blow7.m4a
diff --git a/public/audio/se/battle_anims/Bow1.m4a b/public/audio/battle_anims/Bow1.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Bow1.m4a
rename to public/audio/battle_anims/Bow1.m4a
diff --git a/public/audio/se/battle_anims/Collapse1.m4a b/public/audio/battle_anims/Collapse1.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Collapse1.m4a
rename to public/audio/battle_anims/Collapse1.m4a
diff --git a/public/audio/se/battle_anims/Comet Punch.mp3 b/public/audio/battle_anims/Comet Punch.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Comet Punch.mp3
rename to public/audio/battle_anims/Comet Punch.mp3
diff --git a/public/audio/se/battle_anims/Confuse.m4a b/public/audio/battle_anims/Confuse.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Confuse.m4a
rename to public/audio/battle_anims/Confuse.m4a
diff --git a/public/audio/se/battle_anims/Crash.m4a b/public/audio/battle_anims/Crash.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Crash.m4a
rename to public/audio/battle_anims/Crash.m4a
diff --git a/public/audio/se/battle_anims/Damage1.m4a b/public/audio/battle_anims/Damage1.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Damage1.m4a
rename to public/audio/battle_anims/Damage1.m4a
diff --git a/public/audio/se/battle_anims/Darkness2.m4a b/public/audio/battle_anims/Darkness2.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Darkness2.m4a
rename to public/audio/battle_anims/Darkness2.m4a
diff --git a/public/audio/se/battle_anims/Darkness6.m4a b/public/audio/battle_anims/Darkness6.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Darkness6.m4a
rename to public/audio/battle_anims/Darkness6.m4a
diff --git a/public/audio/se/battle_anims/Defense Curl.mp3 b/public/audio/battle_anims/Defense Curl.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Defense Curl.mp3
rename to public/audio/battle_anims/Defense Curl.mp3
diff --git a/public/audio/se/battle_anims/Dizzy Punch.mp3 b/public/audio/battle_anims/Dizzy Punch.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Dizzy Punch.mp3
rename to public/audio/battle_anims/Dizzy Punch.mp3
diff --git a/public/audio/se/battle_anims/Earth1.m4a b/public/audio/battle_anims/Earth1.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Earth1.m4a
rename to public/audio/battle_anims/Earth1.m4a
diff --git a/public/audio/se/battle_anims/Earth3.m4a b/public/audio/battle_anims/Earth3.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Earth3.m4a
rename to public/audio/battle_anims/Earth3.m4a
diff --git a/public/audio/se/battle_anims/Earth4.m4a b/public/audio/battle_anims/Earth4.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Earth4.m4a
rename to public/audio/battle_anims/Earth4.m4a
diff --git a/public/audio/se/battle_anims/Earth5.m4a b/public/audio/battle_anims/Earth5.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Earth5.m4a
rename to public/audio/battle_anims/Earth5.m4a
diff --git a/public/audio/se/battle_anims/Explosion.mp3 b/public/audio/battle_anims/Explosion.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Explosion.mp3
rename to public/audio/battle_anims/Explosion.mp3
diff --git a/public/audio/se/battle_anims/Explosion1.m4a b/public/audio/battle_anims/Explosion1.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Explosion1.m4a
rename to public/audio/battle_anims/Explosion1.m4a
diff --git a/public/audio/se/battle_anims/Explosion2.m4a b/public/audio/battle_anims/Explosion2.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Explosion2.m4a
rename to public/audio/battle_anims/Explosion2.m4a
diff --git a/public/audio/se/battle_anims/Explosion3.m4a b/public/audio/battle_anims/Explosion3.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Explosion3.m4a
rename to public/audio/battle_anims/Explosion3.m4a
diff --git a/public/audio/se/battle_anims/Explosion4.m4a b/public/audio/battle_anims/Explosion4.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Explosion4.m4a
rename to public/audio/battle_anims/Explosion4.m4a
diff --git a/public/audio/se/battle_anims/Explosion6.m4a b/public/audio/battle_anims/Explosion6.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Explosion6.m4a
rename to public/audio/battle_anims/Explosion6.m4a
diff --git a/public/audio/se/battle_anims/Explosion7.m4a b/public/audio/battle_anims/Explosion7.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Explosion7.m4a
rename to public/audio/battle_anims/Explosion7.m4a
diff --git a/public/audio/se/battle_anims/Fire1.m4a b/public/audio/battle_anims/Fire1.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Fire1.m4a
rename to public/audio/battle_anims/Fire1.m4a
diff --git a/public/audio/se/battle_anims/Fire2.m4a b/public/audio/battle_anims/Fire2.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Fire2.m4a
rename to public/audio/battle_anims/Fire2.m4a
diff --git a/public/audio/se/battle_anims/Fire3.m4a b/public/audio/battle_anims/Fire3.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Fire3.m4a
rename to public/audio/battle_anims/Fire3.m4a
diff --git a/public/audio/se/battle_anims/Fire4.m4a b/public/audio/battle_anims/Fire4.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Fire4.m4a
rename to public/audio/battle_anims/Fire4.m4a
diff --git a/public/audio/se/battle_anims/Fire5.m4a b/public/audio/battle_anims/Fire5.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Fire5.m4a
rename to public/audio/battle_anims/Fire5.m4a
diff --git a/public/audio/se/battle_anims/Fire6.m4a b/public/audio/battle_anims/Fire6.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Fire6.m4a
rename to public/audio/battle_anims/Fire6.m4a
diff --git a/public/audio/se/battle_anims/Flail.mp3 b/public/audio/battle_anims/Flail.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Flail.mp3
rename to public/audio/battle_anims/Flail.mp3
diff --git a/public/audio/se/battle_anims/Flash2.m4a b/public/audio/battle_anims/Flash2.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Flash2.m4a
rename to public/audio/battle_anims/Flash2.m4a
diff --git a/public/audio/se/battle_anims/Follow Me.mp3 b/public/audio/battle_anims/Follow Me.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Follow Me.mp3
rename to public/audio/battle_anims/Follow Me.mp3
diff --git a/public/audio/se/battle_anims/Fury Swipes.m4a b/public/audio/battle_anims/Fury Swipes.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Fury Swipes.m4a
rename to public/audio/battle_anims/Fury Swipes.m4a
diff --git a/public/audio/se/battle_anims/GEN8- Electricity1.wav b/public/audio/battle_anims/GEN8- Electricity1.wav
similarity index 100%
rename from public/audio/se/battle_anims/GEN8- Electricity1.wav
rename to public/audio/battle_anims/GEN8- Electricity1.wav
diff --git a/public/audio/se/battle_anims/GEN8- Exclaim.wav b/public/audio/battle_anims/GEN8- Exclaim.wav
similarity index 100%
rename from public/audio/se/battle_anims/GEN8- Exclaim.wav
rename to public/audio/battle_anims/GEN8- Exclaim.wav
diff --git a/public/audio/se/battle_anims/GEN8- Revelation Dance 1.m4a b/public/audio/battle_anims/GEN8- Revelation Dance 1.m4a
similarity index 100%
rename from public/audio/se/battle_anims/GEN8- Revelation Dance 1.m4a
rename to public/audio/battle_anims/GEN8- Revelation Dance 1.m4a
diff --git a/public/audio/se/battle_anims/GEN8- Revelation Dance 2.m4a b/public/audio/battle_anims/GEN8- Revelation Dance 2.m4a
similarity index 100%
rename from public/audio/se/battle_anims/GEN8- Revelation Dance 2.m4a
rename to public/audio/battle_anims/GEN8- Revelation Dance 2.m4a
diff --git a/public/audio/se/battle_anims/Gen8- Pyroball.wav b/public/audio/battle_anims/Gen8- Pyroball.wav
similarity index 100%
rename from public/audio/se/battle_anims/Gen8- Pyroball.wav
rename to public/audio/battle_anims/Gen8- Pyroball.wav
diff --git a/public/audio/se/battle_anims/Harden.mp3 b/public/audio/battle_anims/Harden.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Harden.mp3
rename to public/audio/battle_anims/Harden.mp3
diff --git a/public/audio/se/battle_anims/Ice2.m4a b/public/audio/battle_anims/Ice2.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Ice2.m4a
rename to public/audio/battle_anims/Ice2.m4a
diff --git a/public/audio/se/battle_anims/Ice5.m4a b/public/audio/battle_anims/Ice5.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Ice5.m4a
rename to public/audio/battle_anims/Ice5.m4a
diff --git a/public/audio/se/battle_anims/Ice8.m4a b/public/audio/battle_anims/Ice8.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Ice8.m4a
rename to public/audio/battle_anims/Ice8.m4a
diff --git a/public/audio/se/battle_anims/Knock.m4a b/public/audio/battle_anims/Knock.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Knock.m4a
rename to public/audio/battle_anims/Knock.m4a
diff --git a/public/audio/se/battle_anims/Lock On.mp3 b/public/audio/battle_anims/Lock On.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Lock On.mp3
rename to public/audio/battle_anims/Lock On.mp3
diff --git a/public/audio/se/battle_anims/Lovely Kiss.mp3 b/public/audio/battle_anims/Lovely Kiss.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Lovely Kiss.mp3
rename to public/audio/battle_anims/Lovely Kiss.mp3
diff --git a/public/audio/se/battle_anims/Lucky Chant.mp3 b/public/audio/battle_anims/Lucky Chant.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Lucky Chant.mp3
rename to public/audio/battle_anims/Lucky Chant.mp3
diff --git a/public/audio/se/battle_anims/Mega Punch.mp3 b/public/audio/battle_anims/Mega Punch.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Mega Punch.mp3
rename to public/audio/battle_anims/Mega Punch.mp3
diff --git a/public/audio/se/battle_anims/Metronome.mp3 b/public/audio/battle_anims/Metronome.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Metronome.mp3
rename to public/audio/battle_anims/Metronome.mp3
diff --git a/public/audio/se/battle_anims/MiningCollapse.mp3 b/public/audio/battle_anims/MiningCollapse.mp3
similarity index 100%
rename from public/audio/se/battle_anims/MiningCollapse.mp3
rename to public/audio/battle_anims/MiningCollapse.mp3
diff --git a/public/audio/se/battle_anims/MiningPing.mp3 b/public/audio/battle_anims/MiningPing.mp3
similarity index 100%
rename from public/audio/se/battle_anims/MiningPing.mp3
rename to public/audio/battle_anims/MiningPing.mp3
diff --git a/public/audio/se/battle_anims/Natural Gift.mp3 b/public/audio/battle_anims/Natural Gift.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Natural Gift.mp3
rename to public/audio/battle_anims/Natural Gift.mp3
diff --git a/public/audio/se/battle_anims/PRSFX- Absorb1.wav b/public/audio/battle_anims/PRSFX- Absorb1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Absorb1.wav
rename to public/audio/battle_anims/PRSFX- Absorb1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Absorb2.wav b/public/audio/battle_anims/PRSFX- Absorb2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Absorb2.wav
rename to public/audio/battle_anims/PRSFX- Absorb2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Accelerock1.wav b/public/audio/battle_anims/PRSFX- Accelerock1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Accelerock1.wav
rename to public/audio/battle_anims/PRSFX- Accelerock1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Accelerock2.wav b/public/audio/battle_anims/PRSFX- Accelerock2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Accelerock2.wav
rename to public/audio/battle_anims/PRSFX- Accelerock2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Accelerock3.wav b/public/audio/battle_anims/PRSFX- Accelerock3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Accelerock3.wav
rename to public/audio/battle_anims/PRSFX- Accelerock3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Acid Armor1.wav b/public/audio/battle_anims/PRSFX- Acid Armor1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Acid Armor1.wav
rename to public/audio/battle_anims/PRSFX- Acid Armor1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Acid Armor2.wav b/public/audio/battle_anims/PRSFX- Acid Armor2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Acid Armor2.wav
rename to public/audio/battle_anims/PRSFX- Acid Armor2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Acid Spray.wav b/public/audio/battle_anims/PRSFX- Acid Spray.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Acid Spray.wav
rename to public/audio/battle_anims/PRSFX- Acid Spray.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Acid.wav b/public/audio/battle_anims/PRSFX- Acid.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Acid.wav
rename to public/audio/battle_anims/PRSFX- Acid.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Acrobatics1.wav b/public/audio/battle_anims/PRSFX- Acrobatics1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Acrobatics1.wav
rename to public/audio/battle_anims/PRSFX- Acrobatics1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Acrobatics2.wav b/public/audio/battle_anims/PRSFX- Acrobatics2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Acrobatics2.wav
rename to public/audio/battle_anims/PRSFX- Acrobatics2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Acrobatics3.wav b/public/audio/battle_anims/PRSFX- Acrobatics3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Acrobatics3.wav
rename to public/audio/battle_anims/PRSFX- Acrobatics3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Acupressure1.wav b/public/audio/battle_anims/PRSFX- Acupressure1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Acupressure1.wav
rename to public/audio/battle_anims/PRSFX- Acupressure1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Acupressure2.wav b/public/audio/battle_anims/PRSFX- Acupressure2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Acupressure2.wav
rename to public/audio/battle_anims/PRSFX- Acupressure2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Aerial Ace.wav b/public/audio/battle_anims/PRSFX- Aerial Ace.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Aerial Ace.wav
rename to public/audio/battle_anims/PRSFX- Aerial Ace.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Aeroblast.wav b/public/audio/battle_anims/PRSFX- Aeroblast.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Aeroblast.wav
rename to public/audio/battle_anims/PRSFX- Aeroblast.wav
diff --git a/public/audio/se/battle_anims/PRSFX- After You1.wav b/public/audio/battle_anims/PRSFX- After You1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- After You1.wav
rename to public/audio/battle_anims/PRSFX- After You1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- After You2.wav b/public/audio/battle_anims/PRSFX- After You2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- After You2.wav
rename to public/audio/battle_anims/PRSFX- After You2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Agility.wav b/public/audio/battle_anims/PRSFX- Agility.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Agility.wav
rename to public/audio/battle_anims/PRSFX- Agility.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Air Cutter1.wav b/public/audio/battle_anims/PRSFX- Air Cutter1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Air Cutter1.wav
rename to public/audio/battle_anims/PRSFX- Air Cutter1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Air Cutter2.wav b/public/audio/battle_anims/PRSFX- Air Cutter2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Air Cutter2.wav
rename to public/audio/battle_anims/PRSFX- Air Cutter2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Air Slash1.wav b/public/audio/battle_anims/PRSFX- Air Slash1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Air Slash1.wav
rename to public/audio/battle_anims/PRSFX- Air Slash1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Air Slash2.wav b/public/audio/battle_anims/PRSFX- Air Slash2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Air Slash2.wav
rename to public/audio/battle_anims/PRSFX- Air Slash2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Air Slash3.wav b/public/audio/battle_anims/PRSFX- Air Slash3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Air Slash3.wav
rename to public/audio/battle_anims/PRSFX- Air Slash3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- All Out Pummeling1.wav b/public/audio/battle_anims/PRSFX- All Out Pummeling1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- All Out Pummeling1.wav
rename to public/audio/battle_anims/PRSFX- All Out Pummeling1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- All Out Pummeling2.wav b/public/audio/battle_anims/PRSFX- All Out Pummeling2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- All Out Pummeling2.wav
rename to public/audio/battle_anims/PRSFX- All Out Pummeling2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- All Out Pummeling3.wav b/public/audio/battle_anims/PRSFX- All Out Pummeling3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- All Out Pummeling3.wav
rename to public/audio/battle_anims/PRSFX- All Out Pummeling3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Ally Switch.wav b/public/audio/battle_anims/PRSFX- Ally Switch.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Ally Switch.wav
rename to public/audio/battle_anims/PRSFX- Ally Switch.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Amnesia.wav b/public/audio/battle_anims/PRSFX- Amnesia.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Amnesia.wav
rename to public/audio/battle_anims/PRSFX- Amnesia.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Anchor Shot.wav b/public/audio/battle_anims/PRSFX- Anchor Shot.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Anchor Shot.wav
rename to public/audio/battle_anims/PRSFX- Anchor Shot.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Anchor Shot1.wav b/public/audio/battle_anims/PRSFX- Anchor Shot1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Anchor Shot1.wav
rename to public/audio/battle_anims/PRSFX- Anchor Shot1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Anchor Shot2.wav b/public/audio/battle_anims/PRSFX- Anchor Shot2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Anchor Shot2.wav
rename to public/audio/battle_anims/PRSFX- Anchor Shot2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Ancient Power1.wav b/public/audio/battle_anims/PRSFX- Ancient Power1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Ancient Power1.wav
rename to public/audio/battle_anims/PRSFX- Ancient Power1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Ancient Power2.wav b/public/audio/battle_anims/PRSFX- Ancient Power2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Ancient Power2.wav
rename to public/audio/battle_anims/PRSFX- Ancient Power2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Aqua Jet.wav b/public/audio/battle_anims/PRSFX- Aqua Jet.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Aqua Jet.wav
rename to public/audio/battle_anims/PRSFX- Aqua Jet.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Aqua Ring1.wav b/public/audio/battle_anims/PRSFX- Aqua Ring1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Aqua Ring1.wav
rename to public/audio/battle_anims/PRSFX- Aqua Ring1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Aqua Ring2.wav b/public/audio/battle_anims/PRSFX- Aqua Ring2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Aqua Ring2.wav
rename to public/audio/battle_anims/PRSFX- Aqua Ring2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Aqua Tail.wav b/public/audio/battle_anims/PRSFX- Aqua Tail.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Aqua Tail.wav
rename to public/audio/battle_anims/PRSFX- Aqua Tail.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Arm Thrust.wav b/public/audio/battle_anims/PRSFX- Arm Thrust.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Arm Thrust.wav
rename to public/audio/battle_anims/PRSFX- Arm Thrust.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Aromatherapy.wav b/public/audio/battle_anims/PRSFX- Aromatherapy.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Aromatherapy.wav
rename to public/audio/battle_anims/PRSFX- Aromatherapy.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Aromatic Mist.wav b/public/audio/battle_anims/PRSFX- Aromatic Mist.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Aromatic Mist.wav
rename to public/audio/battle_anims/PRSFX- Aromatic Mist.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Assist.wav b/public/audio/battle_anims/PRSFX- Assist.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Assist.wav
rename to public/audio/battle_anims/PRSFX- Assist.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Assurance.wav b/public/audio/battle_anims/PRSFX- Assurance.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Assurance.wav
rename to public/audio/battle_anims/PRSFX- Assurance.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Astonish1.wav b/public/audio/battle_anims/PRSFX- Astonish1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Astonish1.wav
rename to public/audio/battle_anims/PRSFX- Astonish1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Astonish2.wav b/public/audio/battle_anims/PRSFX- Astonish2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Astonish2.wav
rename to public/audio/battle_anims/PRSFX- Astonish2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Attack Order1.wav b/public/audio/battle_anims/PRSFX- Attack Order1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Attack Order1.wav
rename to public/audio/battle_anims/PRSFX- Attack Order1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Attack Order2.wav b/public/audio/battle_anims/PRSFX- Attack Order2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Attack Order2.wav
rename to public/audio/battle_anims/PRSFX- Attack Order2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Attract.wav b/public/audio/battle_anims/PRSFX- Attract.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Attract.wav
rename to public/audio/battle_anims/PRSFX- Attract.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Attract1.wav b/public/audio/battle_anims/PRSFX- Attract1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Attract1.wav
rename to public/audio/battle_anims/PRSFX- Attract1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Attract2.wav b/public/audio/battle_anims/PRSFX- Attract2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Attract2.wav
rename to public/audio/battle_anims/PRSFX- Attract2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Aura Sphere1.wav b/public/audio/battle_anims/PRSFX- Aura Sphere1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Aura Sphere1.wav
rename to public/audio/battle_anims/PRSFX- Aura Sphere1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Aura Sphere2.wav b/public/audio/battle_anims/PRSFX- Aura Sphere2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Aura Sphere2.wav
rename to public/audio/battle_anims/PRSFX- Aura Sphere2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Aurora Beam.wav b/public/audio/battle_anims/PRSFX- Aurora Beam.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Aurora Beam.wav
rename to public/audio/battle_anims/PRSFX- Aurora Beam.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Aurora Veil1.wav b/public/audio/battle_anims/PRSFX- Aurora Veil1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Aurora Veil1.wav
rename to public/audio/battle_anims/PRSFX- Aurora Veil1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Aurora Veil2.wav b/public/audio/battle_anims/PRSFX- Aurora Veil2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Aurora Veil2.wav
rename to public/audio/battle_anims/PRSFX- Aurora Veil2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Aurora Veil3.wav b/public/audio/battle_anims/PRSFX- Aurora Veil3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Aurora Veil3.wav
rename to public/audio/battle_anims/PRSFX- Aurora Veil3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Aurora Veil4.wav b/public/audio/battle_anims/PRSFX- Aurora Veil4.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Aurora Veil4.wav
rename to public/audio/battle_anims/PRSFX- Aurora Veil4.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Autotomize.wav b/public/audio/battle_anims/PRSFX- Autotomize.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Autotomize.wav
rename to public/audio/battle_anims/PRSFX- Autotomize.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Autotomize1.mp3 b/public/audio/battle_anims/PRSFX- Autotomize1.mp3
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Autotomize1.mp3
rename to public/audio/battle_anims/PRSFX- Autotomize1.mp3
diff --git a/public/audio/se/battle_anims/PRSFX- Autotomize2.wav b/public/audio/battle_anims/PRSFX- Autotomize2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Autotomize2.wav
rename to public/audio/battle_anims/PRSFX- Autotomize2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Avalanche.wav b/public/audio/battle_anims/PRSFX- Avalanche.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Avalanche.wav
rename to public/audio/battle_anims/PRSFX- Avalanche.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Baby Doll Eyes.wav b/public/audio/battle_anims/PRSFX- Baby Doll Eyes.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Baby Doll Eyes.wav
rename to public/audio/battle_anims/PRSFX- Baby Doll Eyes.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Baneful Bunker1.wav b/public/audio/battle_anims/PRSFX- Baneful Bunker1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Baneful Bunker1.wav
rename to public/audio/battle_anims/PRSFX- Baneful Bunker1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Baneful Bunker2.wav b/public/audio/battle_anims/PRSFX- Baneful Bunker2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Baneful Bunker2.wav
rename to public/audio/battle_anims/PRSFX- Baneful Bunker2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Baneful Bunker3.wav b/public/audio/battle_anims/PRSFX- Baneful Bunker3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Baneful Bunker3.wav
rename to public/audio/battle_anims/PRSFX- Baneful Bunker3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Barrage1.wav b/public/audio/battle_anims/PRSFX- Barrage1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Barrage1.wav
rename to public/audio/battle_anims/PRSFX- Barrage1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Barrage2.wav b/public/audio/battle_anims/PRSFX- Barrage2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Barrage2.wav
rename to public/audio/battle_anims/PRSFX- Barrage2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Barrier.wav b/public/audio/battle_anims/PRSFX- Barrier.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Barrier.wav
rename to public/audio/battle_anims/PRSFX- Barrier.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Baton Pass1.wav b/public/audio/battle_anims/PRSFX- Baton Pass1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Baton Pass1.wav
rename to public/audio/battle_anims/PRSFX- Baton Pass1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Baton Pass2.wav b/public/audio/battle_anims/PRSFX- Baton Pass2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Baton Pass2.wav
rename to public/audio/battle_anims/PRSFX- Baton Pass2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Beak Blast1.wav b/public/audio/battle_anims/PRSFX- Beak Blast1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Beak Blast1.wav
rename to public/audio/battle_anims/PRSFX- Beak Blast1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Beak Blast2.wav b/public/audio/battle_anims/PRSFX- Beak Blast2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Beak Blast2.wav
rename to public/audio/battle_anims/PRSFX- Beak Blast2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Beak Blast3.wav b/public/audio/battle_anims/PRSFX- Beak Blast3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Beak Blast3.wav
rename to public/audio/battle_anims/PRSFX- Beak Blast3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Beak Blast4.wav b/public/audio/battle_anims/PRSFX- Beak Blast4.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Beak Blast4.wav
rename to public/audio/battle_anims/PRSFX- Beak Blast4.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Beat Up.wav b/public/audio/battle_anims/PRSFX- Beat Up.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Beat Up.wav
rename to public/audio/battle_anims/PRSFX- Beat Up.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Belch1.wav b/public/audio/battle_anims/PRSFX- Belch1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Belch1.wav
rename to public/audio/battle_anims/PRSFX- Belch1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Belch2.wav b/public/audio/battle_anims/PRSFX- Belch2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Belch2.wav
rename to public/audio/battle_anims/PRSFX- Belch2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Belch3.wav b/public/audio/battle_anims/PRSFX- Belch3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Belch3.wav
rename to public/audio/battle_anims/PRSFX- Belch3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Belly Drum.wav b/public/audio/battle_anims/PRSFX- Belly Drum.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Belly Drum.wav
rename to public/audio/battle_anims/PRSFX- Belly Drum.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Bestow1.wav b/public/audio/battle_anims/PRSFX- Bestow1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Bestow1.wav
rename to public/audio/battle_anims/PRSFX- Bestow1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Bestow2.wav b/public/audio/battle_anims/PRSFX- Bestow2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Bestow2.wav
rename to public/audio/battle_anims/PRSFX- Bestow2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Bide1.wav b/public/audio/battle_anims/PRSFX- Bide1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Bide1.wav
rename to public/audio/battle_anims/PRSFX- Bide1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Bide2.wav b/public/audio/battle_anims/PRSFX- Bide2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Bide2.wav
rename to public/audio/battle_anims/PRSFX- Bide2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Bind.wav b/public/audio/battle_anims/PRSFX- Bind.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Bind.wav
rename to public/audio/battle_anims/PRSFX- Bind.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Bite.wav b/public/audio/battle_anims/PRSFX- Bite.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Bite.wav
rename to public/audio/battle_anims/PRSFX- Bite.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Black Hole Eclipse1.wav b/public/audio/battle_anims/PRSFX- Black Hole Eclipse1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Black Hole Eclipse1.wav
rename to public/audio/battle_anims/PRSFX- Black Hole Eclipse1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Black Hole Eclipse2.wav b/public/audio/battle_anims/PRSFX- Black Hole Eclipse2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Black Hole Eclipse2.wav
rename to public/audio/battle_anims/PRSFX- Black Hole Eclipse2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Black Hole Eclipse3.wav b/public/audio/battle_anims/PRSFX- Black Hole Eclipse3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Black Hole Eclipse3.wav
rename to public/audio/battle_anims/PRSFX- Black Hole Eclipse3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Black Hole Eclipse4.wav b/public/audio/battle_anims/PRSFX- Black Hole Eclipse4.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Black Hole Eclipse4.wav
rename to public/audio/battle_anims/PRSFX- Black Hole Eclipse4.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Blast Burn.wav b/public/audio/battle_anims/PRSFX- Blast Burn.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Blast Burn.wav
rename to public/audio/battle_anims/PRSFX- Blast Burn.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Blast Burn2.wav b/public/audio/battle_anims/PRSFX- Blast Burn2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Blast Burn2.wav
rename to public/audio/battle_anims/PRSFX- Blast Burn2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Blast Burn3.wav b/public/audio/battle_anims/PRSFX- Blast Burn3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Blast Burn3.wav
rename to public/audio/battle_anims/PRSFX- Blast Burn3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Blaze Kick1.wav b/public/audio/battle_anims/PRSFX- Blaze Kick1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Blaze Kick1.wav
rename to public/audio/battle_anims/PRSFX- Blaze Kick1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Blaze Kick2.wav b/public/audio/battle_anims/PRSFX- Blaze Kick2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Blaze Kick2.wav
rename to public/audio/battle_anims/PRSFX- Blaze Kick2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Blizzard.wav b/public/audio/battle_anims/PRSFX- Blizzard.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Blizzard.wav
rename to public/audio/battle_anims/PRSFX- Blizzard.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Block.wav b/public/audio/battle_anims/PRSFX- Block.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Block.wav
rename to public/audio/battle_anims/PRSFX- Block.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Bloom Doom1.wav b/public/audio/battle_anims/PRSFX- Bloom Doom1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Bloom Doom1.wav
rename to public/audio/battle_anims/PRSFX- Bloom Doom1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Bloom Doom2.wav b/public/audio/battle_anims/PRSFX- Bloom Doom2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Bloom Doom2.wav
rename to public/audio/battle_anims/PRSFX- Bloom Doom2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Bloom Doom3.wav b/public/audio/battle_anims/PRSFX- Bloom Doom3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Bloom Doom3.wav
rename to public/audio/battle_anims/PRSFX- Bloom Doom3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Blue Flare1.wav b/public/audio/battle_anims/PRSFX- Blue Flare1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Blue Flare1.wav
rename to public/audio/battle_anims/PRSFX- Blue Flare1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Blue Flare2.wav b/public/audio/battle_anims/PRSFX- Blue Flare2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Blue Flare2.wav
rename to public/audio/battle_anims/PRSFX- Blue Flare2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Body Slam1.wav b/public/audio/battle_anims/PRSFX- Body Slam1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Body Slam1.wav
rename to public/audio/battle_anims/PRSFX- Body Slam1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Body Slam2.wav b/public/audio/battle_anims/PRSFX- Body Slam2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Body Slam2.wav
rename to public/audio/battle_anims/PRSFX- Body Slam2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Bolt Strike1.wav b/public/audio/battle_anims/PRSFX- Bolt Strike1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Bolt Strike1.wav
rename to public/audio/battle_anims/PRSFX- Bolt Strike1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Bolt Strike2.wav b/public/audio/battle_anims/PRSFX- Bolt Strike2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Bolt Strike2.wav
rename to public/audio/battle_anims/PRSFX- Bolt Strike2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Bone Club1.wav b/public/audio/battle_anims/PRSFX- Bone Club1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Bone Club1.wav
rename to public/audio/battle_anims/PRSFX- Bone Club1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Bone Club2.wav b/public/audio/battle_anims/PRSFX- Bone Club2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Bone Club2.wav
rename to public/audio/battle_anims/PRSFX- Bone Club2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Bone Rush1.wav b/public/audio/battle_anims/PRSFX- Bone Rush1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Bone Rush1.wav
rename to public/audio/battle_anims/PRSFX- Bone Rush1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Bone Rush2.wav b/public/audio/battle_anims/PRSFX- Bone Rush2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Bone Rush2.wav
rename to public/audio/battle_anims/PRSFX- Bone Rush2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Bonemerang1.wav b/public/audio/battle_anims/PRSFX- Bonemerang1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Bonemerang1.wav
rename to public/audio/battle_anims/PRSFX- Bonemerang1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Bonemerang2.wav b/public/audio/battle_anims/PRSFX- Bonemerang2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Bonemerang2.wav
rename to public/audio/battle_anims/PRSFX- Bonemerang2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Boomburst.wav b/public/audio/battle_anims/PRSFX- Boomburst.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Boomburst.wav
rename to public/audio/battle_anims/PRSFX- Boomburst.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Bounce1.wav b/public/audio/battle_anims/PRSFX- Bounce1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Bounce1.wav
rename to public/audio/battle_anims/PRSFX- Bounce1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Bounce2.wav b/public/audio/battle_anims/PRSFX- Bounce2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Bounce2.wav
rename to public/audio/battle_anims/PRSFX- Bounce2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Bounce3.wav b/public/audio/battle_anims/PRSFX- Bounce3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Bounce3.wav
rename to public/audio/battle_anims/PRSFX- Bounce3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Bounce4.wav b/public/audio/battle_anims/PRSFX- Bounce4.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Bounce4.wav
rename to public/audio/battle_anims/PRSFX- Bounce4.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Brave Bird1.wav b/public/audio/battle_anims/PRSFX- Brave Bird1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Brave Bird1.wav
rename to public/audio/battle_anims/PRSFX- Brave Bird1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Brave Bird2.wav b/public/audio/battle_anims/PRSFX- Brave Bird2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Brave Bird2.wav
rename to public/audio/battle_anims/PRSFX- Brave Bird2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Brick Break1.wav b/public/audio/battle_anims/PRSFX- Brick Break1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Brick Break1.wav
rename to public/audio/battle_anims/PRSFX- Brick Break1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Brick Break2.wav b/public/audio/battle_anims/PRSFX- Brick Break2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Brick Break2.wav
rename to public/audio/battle_anims/PRSFX- Brick Break2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Brine.wav b/public/audio/battle_anims/PRSFX- Brine.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Brine.wav
rename to public/audio/battle_anims/PRSFX- Brine.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Brutal Swing1.wav b/public/audio/battle_anims/PRSFX- Brutal Swing1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Brutal Swing1.wav
rename to public/audio/battle_anims/PRSFX- Brutal Swing1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Brutal Swing2.wav b/public/audio/battle_anims/PRSFX- Brutal Swing2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Brutal Swing2.wav
rename to public/audio/battle_anims/PRSFX- Brutal Swing2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Brutal Swing3.wav b/public/audio/battle_anims/PRSFX- Brutal Swing3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Brutal Swing3.wav
rename to public/audio/battle_anims/PRSFX- Brutal Swing3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Bubble.wav b/public/audio/battle_anims/PRSFX- Bubble.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Bubble.wav
rename to public/audio/battle_anims/PRSFX- Bubble.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Bubblebeam.wav b/public/audio/battle_anims/PRSFX- Bubblebeam.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Bubblebeam.wav
rename to public/audio/battle_anims/PRSFX- Bubblebeam.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Bug Bite.wav b/public/audio/battle_anims/PRSFX- Bug Bite.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Bug Bite.wav
rename to public/audio/battle_anims/PRSFX- Bug Bite.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Bug Buzz.wav b/public/audio/battle_anims/PRSFX- Bug Buzz.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Bug Buzz.wav
rename to public/audio/battle_anims/PRSFX- Bug Buzz.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Bulk Up1.wav b/public/audio/battle_anims/PRSFX- Bulk Up1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Bulk Up1.wav
rename to public/audio/battle_anims/PRSFX- Bulk Up1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Bulk Up2.wav b/public/audio/battle_anims/PRSFX- Bulk Up2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Bulk Up2.wav
rename to public/audio/battle_anims/PRSFX- Bulk Up2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Bulldoze.wav b/public/audio/battle_anims/PRSFX- Bulldoze.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Bulldoze.wav
rename to public/audio/battle_anims/PRSFX- Bulldoze.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Bullet Punch.wav b/public/audio/battle_anims/PRSFX- Bullet Punch.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Bullet Punch.wav
rename to public/audio/battle_anims/PRSFX- Bullet Punch.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Bullet Seed.wav b/public/audio/battle_anims/PRSFX- Bullet Seed.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Bullet Seed.wav
rename to public/audio/battle_anims/PRSFX- Bullet Seed.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Burn Up1.wav b/public/audio/battle_anims/PRSFX- Burn Up1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Burn Up1.wav
rename to public/audio/battle_anims/PRSFX- Burn Up1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Burn Up2.wav b/public/audio/battle_anims/PRSFX- Burn Up2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Burn Up2.wav
rename to public/audio/battle_anims/PRSFX- Burn Up2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Burn.wav b/public/audio/battle_anims/PRSFX- Burn.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Burn.wav
rename to public/audio/battle_anims/PRSFX- Burn.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Calm Mind.wav b/public/audio/battle_anims/PRSFX- Calm Mind.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Calm Mind.wav
rename to public/audio/battle_anims/PRSFX- Calm Mind.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Camouflage.wav b/public/audio/battle_anims/PRSFX- Camouflage.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Camouflage.wav
rename to public/audio/battle_anims/PRSFX- Camouflage.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Captivate.wav b/public/audio/battle_anims/PRSFX- Captivate.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Captivate.wav
rename to public/audio/battle_anims/PRSFX- Captivate.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Catastropika1.wav b/public/audio/battle_anims/PRSFX- Catastropika1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Catastropika1.wav
rename to public/audio/battle_anims/PRSFX- Catastropika1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Catastropika2.wav b/public/audio/battle_anims/PRSFX- Catastropika2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Catastropika2.wav
rename to public/audio/battle_anims/PRSFX- Catastropika2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Catastropika3.wav b/public/audio/battle_anims/PRSFX- Catastropika3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Catastropika3.wav
rename to public/audio/battle_anims/PRSFX- Catastropika3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Catastropika4.wav b/public/audio/battle_anims/PRSFX- Catastropika4.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Catastropika4.wav
rename to public/audio/battle_anims/PRSFX- Catastropika4.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Catastropika5.wav b/public/audio/battle_anims/PRSFX- Catastropika5.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Catastropika5.wav
rename to public/audio/battle_anims/PRSFX- Catastropika5.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Catastropika6.wav b/public/audio/battle_anims/PRSFX- Catastropika6.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Catastropika6.wav
rename to public/audio/battle_anims/PRSFX- Catastropika6.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Charge Beam.wav b/public/audio/battle_anims/PRSFX- Charge Beam.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Charge Beam.wav
rename to public/audio/battle_anims/PRSFX- Charge Beam.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Charge.wav b/public/audio/battle_anims/PRSFX- Charge.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Charge.wav
rename to public/audio/battle_anims/PRSFX- Charge.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Charm.wav b/public/audio/battle_anims/PRSFX- Charm.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Charm.wav
rename to public/audio/battle_anims/PRSFX- Charm.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Chatter.wav b/public/audio/battle_anims/PRSFX- Chatter.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Chatter.wav
rename to public/audio/battle_anims/PRSFX- Chatter.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Chip Away.wav b/public/audio/battle_anims/PRSFX- Chip Away.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Chip Away.wav
rename to public/audio/battle_anims/PRSFX- Chip Away.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Circle Throw1.wav b/public/audio/battle_anims/PRSFX- Circle Throw1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Circle Throw1.wav
rename to public/audio/battle_anims/PRSFX- Circle Throw1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Circle Throw2.wav b/public/audio/battle_anims/PRSFX- Circle Throw2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Circle Throw2.wav
rename to public/audio/battle_anims/PRSFX- Circle Throw2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Clamp1.wav b/public/audio/battle_anims/PRSFX- Clamp1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Clamp1.wav
rename to public/audio/battle_anims/PRSFX- Clamp1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Clamp2.wav b/public/audio/battle_anims/PRSFX- Clamp2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Clamp2.wav
rename to public/audio/battle_anims/PRSFX- Clamp2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Clamp3.wav b/public/audio/battle_anims/PRSFX- Clamp3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Clamp3.wav
rename to public/audio/battle_anims/PRSFX- Clamp3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Clear Smog.wav b/public/audio/battle_anims/PRSFX- Clear Smog.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Clear Smog.wav
rename to public/audio/battle_anims/PRSFX- Clear Smog.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Close Combat.wav b/public/audio/battle_anims/PRSFX- Close Combat.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Close Combat.wav
rename to public/audio/battle_anims/PRSFX- Close Combat.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Coil.wav b/public/audio/battle_anims/PRSFX- Coil.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Coil.wav
rename to public/audio/battle_anims/PRSFX- Coil.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Comet Punch.wav b/public/audio/battle_anims/PRSFX- Comet Punch.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Comet Punch.wav
rename to public/audio/battle_anims/PRSFX- Comet Punch.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Confide.wav b/public/audio/battle_anims/PRSFX- Confide.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Confide.wav
rename to public/audio/battle_anims/PRSFX- Confide.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Confuse Ray.wav b/public/audio/battle_anims/PRSFX- Confuse Ray.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Confuse Ray.wav
rename to public/audio/battle_anims/PRSFX- Confuse Ray.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Confused.wav b/public/audio/battle_anims/PRSFX- Confused.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Confused.wav
rename to public/audio/battle_anims/PRSFX- Confused.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Confusion.wav b/public/audio/battle_anims/PRSFX- Confusion.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Confusion.wav
rename to public/audio/battle_anims/PRSFX- Confusion.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Constrict.wav b/public/audio/battle_anims/PRSFX- Constrict.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Constrict.wav
rename to public/audio/battle_anims/PRSFX- Constrict.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Conversion.wav b/public/audio/battle_anims/PRSFX- Conversion.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Conversion.wav
rename to public/audio/battle_anims/PRSFX- Conversion.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Conversion2.wav b/public/audio/battle_anims/PRSFX- Conversion2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Conversion2.wav
rename to public/audio/battle_anims/PRSFX- Conversion2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Cosmic Power.wav b/public/audio/battle_anims/PRSFX- Cosmic Power.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Cosmic Power.wav
rename to public/audio/battle_anims/PRSFX- Cosmic Power.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Cotton Guard.wav b/public/audio/battle_anims/PRSFX- Cotton Guard.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Cotton Guard.wav
rename to public/audio/battle_anims/PRSFX- Cotton Guard.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Cotton Spore.wav b/public/audio/battle_anims/PRSFX- Cotton Spore.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Cotton Spore.wav
rename to public/audio/battle_anims/PRSFX- Cotton Spore.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Counter1.wav b/public/audio/battle_anims/PRSFX- Counter1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Counter1.wav
rename to public/audio/battle_anims/PRSFX- Counter1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Counter2.wav b/public/audio/battle_anims/PRSFX- Counter2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Counter2.wav
rename to public/audio/battle_anims/PRSFX- Counter2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Covet1.wav b/public/audio/battle_anims/PRSFX- Covet1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Covet1.wav
rename to public/audio/battle_anims/PRSFX- Covet1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Covet2.wav b/public/audio/battle_anims/PRSFX- Covet2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Covet2.wav
rename to public/audio/battle_anims/PRSFX- Covet2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Crabhammer.wav b/public/audio/battle_anims/PRSFX- Crabhammer.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Crabhammer.wav
rename to public/audio/battle_anims/PRSFX- Crabhammer.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Crafty Shield.wav b/public/audio/battle_anims/PRSFX- Crafty Shield.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Crafty Shield.wav
rename to public/audio/battle_anims/PRSFX- Crafty Shield.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Cross Chop1.wav b/public/audio/battle_anims/PRSFX- Cross Chop1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Cross Chop1.wav
rename to public/audio/battle_anims/PRSFX- Cross Chop1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Cross Chop2.wav b/public/audio/battle_anims/PRSFX- Cross Chop2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Cross Chop2.wav
rename to public/audio/battle_anims/PRSFX- Cross Chop2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Cross Poison1.wav b/public/audio/battle_anims/PRSFX- Cross Poison1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Cross Poison1.wav
rename to public/audio/battle_anims/PRSFX- Cross Poison1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Cross Poison2.wav b/public/audio/battle_anims/PRSFX- Cross Poison2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Cross Poison2.wav
rename to public/audio/battle_anims/PRSFX- Cross Poison2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Crunch.wav b/public/audio/battle_anims/PRSFX- Crunch.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Crunch.wav
rename to public/audio/battle_anims/PRSFX- Crunch.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Crush Claw.wav b/public/audio/battle_anims/PRSFX- Crush Claw.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Crush Claw.wav
rename to public/audio/battle_anims/PRSFX- Crush Claw.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Crush Grip1.wav b/public/audio/battle_anims/PRSFX- Crush Grip1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Crush Grip1.wav
rename to public/audio/battle_anims/PRSFX- Crush Grip1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Crush Grip2.wav b/public/audio/battle_anims/PRSFX- Crush Grip2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Crush Grip2.wav
rename to public/audio/battle_anims/PRSFX- Crush Grip2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Curse.wav b/public/audio/battle_anims/PRSFX- Curse.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Curse.wav
rename to public/audio/battle_anims/PRSFX- Curse.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Curse2.wav b/public/audio/battle_anims/PRSFX- Curse2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Curse2.wav
rename to public/audio/battle_anims/PRSFX- Curse2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Cut.wav b/public/audio/battle_anims/PRSFX- Cut.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Cut.wav
rename to public/audio/battle_anims/PRSFX- Cut.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Dark Pulse1.wav b/public/audio/battle_anims/PRSFX- Dark Pulse1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Dark Pulse1.wav
rename to public/audio/battle_anims/PRSFX- Dark Pulse1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Dark Pulse2.wav b/public/audio/battle_anims/PRSFX- Dark Pulse2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Dark Pulse2.wav
rename to public/audio/battle_anims/PRSFX- Dark Pulse2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Dark Void.wav b/public/audio/battle_anims/PRSFX- Dark Void.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Dark Void.wav
rename to public/audio/battle_anims/PRSFX- Dark Void.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Dazzling Gleam.wav b/public/audio/battle_anims/PRSFX- Dazzling Gleam.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Dazzling Gleam.wav
rename to public/audio/battle_anims/PRSFX- Dazzling Gleam.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Defend Order1.wav b/public/audio/battle_anims/PRSFX- Defend Order1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Defend Order1.wav
rename to public/audio/battle_anims/PRSFX- Defend Order1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Defend Order2.wav b/public/audio/battle_anims/PRSFX- Defend Order2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Defend Order2.wav
rename to public/audio/battle_anims/PRSFX- Defend Order2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Defense Curl1.wav b/public/audio/battle_anims/PRSFX- Defense Curl1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Defense Curl1.wav
rename to public/audio/battle_anims/PRSFX- Defense Curl1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Defense Curl2.wav b/public/audio/battle_anims/PRSFX- Defense Curl2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Defense Curl2.wav
rename to public/audio/battle_anims/PRSFX- Defense Curl2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Defog.wav b/public/audio/battle_anims/PRSFX- Defog.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Defog.wav
rename to public/audio/battle_anims/PRSFX- Defog.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Destiny Bond1.wav b/public/audio/battle_anims/PRSFX- Destiny Bond1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Destiny Bond1.wav
rename to public/audio/battle_anims/PRSFX- Destiny Bond1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Destiny Bond2.wav b/public/audio/battle_anims/PRSFX- Destiny Bond2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Destiny Bond2.wav
rename to public/audio/battle_anims/PRSFX- Destiny Bond2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Detect.wav b/public/audio/battle_anims/PRSFX- Detect.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Detect.wav
rename to public/audio/battle_anims/PRSFX- Detect.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Devastating Drake1.wav b/public/audio/battle_anims/PRSFX- Devastating Drake1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Devastating Drake1.wav
rename to public/audio/battle_anims/PRSFX- Devastating Drake1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Devastating Drake2.wav b/public/audio/battle_anims/PRSFX- Devastating Drake2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Devastating Drake2.wav
rename to public/audio/battle_anims/PRSFX- Devastating Drake2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Devastating Drake3.wav b/public/audio/battle_anims/PRSFX- Devastating Drake3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Devastating Drake3.wav
rename to public/audio/battle_anims/PRSFX- Devastating Drake3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Diamond Storm1.wav b/public/audio/battle_anims/PRSFX- Diamond Storm1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Diamond Storm1.wav
rename to public/audio/battle_anims/PRSFX- Diamond Storm1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Diamond Storm2.wav b/public/audio/battle_anims/PRSFX- Diamond Storm2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Diamond Storm2.wav
rename to public/audio/battle_anims/PRSFX- Diamond Storm2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Dig1.wav b/public/audio/battle_anims/PRSFX- Dig1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Dig1.wav
rename to public/audio/battle_anims/PRSFX- Dig1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Dig2.wav b/public/audio/battle_anims/PRSFX- Dig2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Dig2.wav
rename to public/audio/battle_anims/PRSFX- Dig2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Disable.wav b/public/audio/battle_anims/PRSFX- Disable.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Disable.wav
rename to public/audio/battle_anims/PRSFX- Disable.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Discharge.wav b/public/audio/battle_anims/PRSFX- Discharge.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Discharge.wav
rename to public/audio/battle_anims/PRSFX- Discharge.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Dive1.wav b/public/audio/battle_anims/PRSFX- Dive1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Dive1.wav
rename to public/audio/battle_anims/PRSFX- Dive1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Dive2.wav b/public/audio/battle_anims/PRSFX- Dive2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Dive2.wav
rename to public/audio/battle_anims/PRSFX- Dive2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Dive3.wav b/public/audio/battle_anims/PRSFX- Dive3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Dive3.wav
rename to public/audio/battle_anims/PRSFX- Dive3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Dizzy Punch1.wav b/public/audio/battle_anims/PRSFX- Dizzy Punch1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Dizzy Punch1.wav
rename to public/audio/battle_anims/PRSFX- Dizzy Punch1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Dizzy Punch2.wav b/public/audio/battle_anims/PRSFX- Dizzy Punch2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Dizzy Punch2.wav
rename to public/audio/battle_anims/PRSFX- Dizzy Punch2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Doom Desire1.wav b/public/audio/battle_anims/PRSFX- Doom Desire1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Doom Desire1.wav
rename to public/audio/battle_anims/PRSFX- Doom Desire1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Doom Desire2.wav b/public/audio/battle_anims/PRSFX- Doom Desire2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Doom Desire2.wav
rename to public/audio/battle_anims/PRSFX- Doom Desire2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Double Edge1.wav b/public/audio/battle_anims/PRSFX- Double Edge1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Double Edge1.wav
rename to public/audio/battle_anims/PRSFX- Double Edge1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Double Edge2.wav b/public/audio/battle_anims/PRSFX- Double Edge2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Double Edge2.wav
rename to public/audio/battle_anims/PRSFX- Double Edge2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Double Hit.wav b/public/audio/battle_anims/PRSFX- Double Hit.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Double Hit.wav
rename to public/audio/battle_anims/PRSFX- Double Hit.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Double Kick.wav b/public/audio/battle_anims/PRSFX- Double Kick.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Double Kick.wav
rename to public/audio/battle_anims/PRSFX- Double Kick.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Double Slap.wav b/public/audio/battle_anims/PRSFX- Double Slap.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Double Slap.wav
rename to public/audio/battle_anims/PRSFX- Double Slap.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Double Team.wav b/public/audio/battle_anims/PRSFX- Double Team.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Double Team.wav
rename to public/audio/battle_anims/PRSFX- Double Team.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Draco Meteor1.wav b/public/audio/battle_anims/PRSFX- Draco Meteor1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Draco Meteor1.wav
rename to public/audio/battle_anims/PRSFX- Draco Meteor1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Draco Meteor2.wav b/public/audio/battle_anims/PRSFX- Draco Meteor2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Draco Meteor2.wav
rename to public/audio/battle_anims/PRSFX- Draco Meteor2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Draco Meteor3.wav b/public/audio/battle_anims/PRSFX- Draco Meteor3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Draco Meteor3.wav
rename to public/audio/battle_anims/PRSFX- Draco Meteor3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Dragon Ascent1.wav b/public/audio/battle_anims/PRSFX- Dragon Ascent1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Dragon Ascent1.wav
rename to public/audio/battle_anims/PRSFX- Dragon Ascent1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Dragon Ascent2.wav b/public/audio/battle_anims/PRSFX- Dragon Ascent2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Dragon Ascent2.wav
rename to public/audio/battle_anims/PRSFX- Dragon Ascent2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Dragon Ascent3.wav b/public/audio/battle_anims/PRSFX- Dragon Ascent3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Dragon Ascent3.wav
rename to public/audio/battle_anims/PRSFX- Dragon Ascent3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Dragon Breath.wav b/public/audio/battle_anims/PRSFX- Dragon Breath.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Dragon Breath.wav
rename to public/audio/battle_anims/PRSFX- Dragon Breath.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Dragon Claw.wav b/public/audio/battle_anims/PRSFX- Dragon Claw.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Dragon Claw.wav
rename to public/audio/battle_anims/PRSFX- Dragon Claw.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Dragon Dance.wav b/public/audio/battle_anims/PRSFX- Dragon Dance.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Dragon Dance.wav
rename to public/audio/battle_anims/PRSFX- Dragon Dance.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Dragon Pulse.wav b/public/audio/battle_anims/PRSFX- Dragon Pulse.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Dragon Pulse.wav
rename to public/audio/battle_anims/PRSFX- Dragon Pulse.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Dragon Rage.wav b/public/audio/battle_anims/PRSFX- Dragon Rage.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Dragon Rage.wav
rename to public/audio/battle_anims/PRSFX- Dragon Rage.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Dragon Rush1.wav b/public/audio/battle_anims/PRSFX- Dragon Rush1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Dragon Rush1.wav
rename to public/audio/battle_anims/PRSFX- Dragon Rush1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Dragon Rush2.wav b/public/audio/battle_anims/PRSFX- Dragon Rush2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Dragon Rush2.wav
rename to public/audio/battle_anims/PRSFX- Dragon Rush2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Dragon Tail.wav b/public/audio/battle_anims/PRSFX- Dragon Tail.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Dragon Tail.wav
rename to public/audio/battle_anims/PRSFX- Dragon Tail.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Drain Punch1.wav b/public/audio/battle_anims/PRSFX- Drain Punch1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Drain Punch1.wav
rename to public/audio/battle_anims/PRSFX- Drain Punch1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Drain Punch2.wav b/public/audio/battle_anims/PRSFX- Drain Punch2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Drain Punch2.wav
rename to public/audio/battle_anims/PRSFX- Drain Punch2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Draining Kiss1.wav b/public/audio/battle_anims/PRSFX- Draining Kiss1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Draining Kiss1.wav
rename to public/audio/battle_anims/PRSFX- Draining Kiss1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Draining Kiss2.wav b/public/audio/battle_anims/PRSFX- Draining Kiss2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Draining Kiss2.wav
rename to public/audio/battle_anims/PRSFX- Draining Kiss2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Dream Eater1.wav b/public/audio/battle_anims/PRSFX- Dream Eater1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Dream Eater1.wav
rename to public/audio/battle_anims/PRSFX- Dream Eater1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Dream Eater2.wav b/public/audio/battle_anims/PRSFX- Dream Eater2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Dream Eater2.wav
rename to public/audio/battle_anims/PRSFX- Dream Eater2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Dream Eater3.wav b/public/audio/battle_anims/PRSFX- Dream Eater3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Dream Eater3.wav
rename to public/audio/battle_anims/PRSFX- Dream Eater3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Drill Peck.wav b/public/audio/battle_anims/PRSFX- Drill Peck.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Drill Peck.wav
rename to public/audio/battle_anims/PRSFX- Drill Peck.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Drill Run.wav b/public/audio/battle_anims/PRSFX- Drill Run.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Drill Run.wav
rename to public/audio/battle_anims/PRSFX- Drill Run.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Dual Chop.wav b/public/audio/battle_anims/PRSFX- Dual Chop.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Dual Chop.wav
rename to public/audio/battle_anims/PRSFX- Dual Chop.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Dynamic Punch1.wav b/public/audio/battle_anims/PRSFX- Dynamic Punch1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Dynamic Punch1.wav
rename to public/audio/battle_anims/PRSFX- Dynamic Punch1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Dynamic Punch2.wav b/public/audio/battle_anims/PRSFX- Dynamic Punch2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Dynamic Punch2.wav
rename to public/audio/battle_anims/PRSFX- Dynamic Punch2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Earth Power.wav b/public/audio/battle_anims/PRSFX- Earth Power.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Earth Power.wav
rename to public/audio/battle_anims/PRSFX- Earth Power.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Earthquake.wav b/public/audio/battle_anims/PRSFX- Earthquake.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Earthquake.wav
rename to public/audio/battle_anims/PRSFX- Earthquake.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Earthquake1.wav b/public/audio/battle_anims/PRSFX- Earthquake1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Earthquake1.wav
rename to public/audio/battle_anims/PRSFX- Earthquake1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Earthquake2.wav b/public/audio/battle_anims/PRSFX- Earthquake2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Earthquake2.wav
rename to public/audio/battle_anims/PRSFX- Earthquake2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Echoed Voice.wav b/public/audio/battle_anims/PRSFX- Echoed Voice.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Echoed Voice.wav
rename to public/audio/battle_anims/PRSFX- Echoed Voice.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Eerie Impulse.wav b/public/audio/battle_anims/PRSFX- Eerie Impulse.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Eerie Impulse.wav
rename to public/audio/battle_anims/PRSFX- Eerie Impulse.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Egg Bomb1.wav b/public/audio/battle_anims/PRSFX- Egg Bomb1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Egg Bomb1.wav
rename to public/audio/battle_anims/PRSFX- Egg Bomb1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Egg Bomb2.wav b/public/audio/battle_anims/PRSFX- Egg Bomb2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Egg Bomb2.wav
rename to public/audio/battle_anims/PRSFX- Egg Bomb2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Electric Terrain.wav b/public/audio/battle_anims/PRSFX- Electric Terrain.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Electric Terrain.wav
rename to public/audio/battle_anims/PRSFX- Electric Terrain.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Electric Terrain2.wav b/public/audio/battle_anims/PRSFX- Electric Terrain2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Electric Terrain2.wav
rename to public/audio/battle_anims/PRSFX- Electric Terrain2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Electrify.wav b/public/audio/battle_anims/PRSFX- Electrify.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Electrify.wav
rename to public/audio/battle_anims/PRSFX- Electrify.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Electro Ball1.wav b/public/audio/battle_anims/PRSFX- Electro Ball1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Electro Ball1.wav
rename to public/audio/battle_anims/PRSFX- Electro Ball1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Electro Ball2.wav b/public/audio/battle_anims/PRSFX- Electro Ball2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Electro Ball2.wav
rename to public/audio/battle_anims/PRSFX- Electro Ball2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Electroweb1.wav b/public/audio/battle_anims/PRSFX- Electroweb1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Electroweb1.wav
rename to public/audio/battle_anims/PRSFX- Electroweb1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Electroweb2.wav b/public/audio/battle_anims/PRSFX- Electroweb2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Electroweb2.wav
rename to public/audio/battle_anims/PRSFX- Electroweb2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Embargo.wav b/public/audio/battle_anims/PRSFX- Embargo.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Embargo.wav
rename to public/audio/battle_anims/PRSFX- Embargo.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Ember.wav b/public/audio/battle_anims/PRSFX- Ember.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Ember.wav
rename to public/audio/battle_anims/PRSFX- Ember.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Encore.wav b/public/audio/battle_anims/PRSFX- Encore.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Encore.wav
rename to public/audio/battle_anims/PRSFX- Encore.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Endeavor1.wav b/public/audio/battle_anims/PRSFX- Endeavor1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Endeavor1.wav
rename to public/audio/battle_anims/PRSFX- Endeavor1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Endeavor2.wav b/public/audio/battle_anims/PRSFX- Endeavor2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Endeavor2.wav
rename to public/audio/battle_anims/PRSFX- Endeavor2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Endure.wav b/public/audio/battle_anims/PRSFX- Endure.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Endure.wav
rename to public/audio/battle_anims/PRSFX- Endure.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Energy Ball1.wav b/public/audio/battle_anims/PRSFX- Energy Ball1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Energy Ball1.wav
rename to public/audio/battle_anims/PRSFX- Energy Ball1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Energy Ball2.wav b/public/audio/battle_anims/PRSFX- Energy Ball2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Energy Ball2.wav
rename to public/audio/battle_anims/PRSFX- Energy Ball2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Entrainment.wav b/public/audio/battle_anims/PRSFX- Entrainment.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Entrainment.wav
rename to public/audio/battle_anims/PRSFX- Entrainment.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Eruption1.wav b/public/audio/battle_anims/PRSFX- Eruption1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Eruption1.wav
rename to public/audio/battle_anims/PRSFX- Eruption1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Eruption2.wav b/public/audio/battle_anims/PRSFX- Eruption2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Eruption2.wav
rename to public/audio/battle_anims/PRSFX- Eruption2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Explosion.wav b/public/audio/battle_anims/PRSFX- Explosion.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Explosion.wav
rename to public/audio/battle_anims/PRSFX- Explosion.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Explosion2.wav b/public/audio/battle_anims/PRSFX- Explosion2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Explosion2.wav
rename to public/audio/battle_anims/PRSFX- Explosion2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Extrasensory.wav b/public/audio/battle_anims/PRSFX- Extrasensory.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Extrasensory.wav
rename to public/audio/battle_anims/PRSFX- Extrasensory.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Extreme Evoboost1.wav b/public/audio/battle_anims/PRSFX- Extreme Evoboost1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Extreme Evoboost1.wav
rename to public/audio/battle_anims/PRSFX- Extreme Evoboost1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Extreme Evoboost2.wav b/public/audio/battle_anims/PRSFX- Extreme Evoboost2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Extreme Evoboost2.wav
rename to public/audio/battle_anims/PRSFX- Extreme Evoboost2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Extreme Evoboost3.wav b/public/audio/battle_anims/PRSFX- Extreme Evoboost3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Extreme Evoboost3.wav
rename to public/audio/battle_anims/PRSFX- Extreme Evoboost3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Extremespeed1.wav b/public/audio/battle_anims/PRSFX- Extremespeed1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Extremespeed1.wav
rename to public/audio/battle_anims/PRSFX- Extremespeed1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Extremespeed2.wav b/public/audio/battle_anims/PRSFX- Extremespeed2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Extremespeed2.wav
rename to public/audio/battle_anims/PRSFX- Extremespeed2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Facade1.wav b/public/audio/battle_anims/PRSFX- Facade1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Facade1.wav
rename to public/audio/battle_anims/PRSFX- Facade1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Facade2.wav b/public/audio/battle_anims/PRSFX- Facade2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Facade2.wav
rename to public/audio/battle_anims/PRSFX- Facade2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fairy Lock.wav b/public/audio/battle_anims/PRSFX- Fairy Lock.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fairy Lock.wav
rename to public/audio/battle_anims/PRSFX- Fairy Lock.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fairy Wind.wav b/public/audio/battle_anims/PRSFX- Fairy Wind.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fairy Wind.wav
rename to public/audio/battle_anims/PRSFX- Fairy Wind.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fake Out1.wav b/public/audio/battle_anims/PRSFX- Fake Out1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fake Out1.wav
rename to public/audio/battle_anims/PRSFX- Fake Out1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fake Out2.wav b/public/audio/battle_anims/PRSFX- Fake Out2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fake Out2.wav
rename to public/audio/battle_anims/PRSFX- Fake Out2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fake Tears.wav b/public/audio/battle_anims/PRSFX- Fake Tears.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fake Tears.wav
rename to public/audio/battle_anims/PRSFX- Fake Tears.wav
diff --git a/public/audio/se/battle_anims/PRSFX- False Swipe.wav b/public/audio/battle_anims/PRSFX- False Swipe.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- False Swipe.wav
rename to public/audio/battle_anims/PRSFX- False Swipe.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Featherdance1.wav b/public/audio/battle_anims/PRSFX- Featherdance1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Featherdance1.wav
rename to public/audio/battle_anims/PRSFX- Featherdance1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Featherdance2.wav b/public/audio/battle_anims/PRSFX- Featherdance2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Featherdance2.wav
rename to public/audio/battle_anims/PRSFX- Featherdance2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Feint Attack1.wav b/public/audio/battle_anims/PRSFX- Feint Attack1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Feint Attack1.wav
rename to public/audio/battle_anims/PRSFX- Feint Attack1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Feint Attack2.wav b/public/audio/battle_anims/PRSFX- Feint Attack2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Feint Attack2.wav
rename to public/audio/battle_anims/PRSFX- Feint Attack2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Feint1.wav b/public/audio/battle_anims/PRSFX- Feint1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Feint1.wav
rename to public/audio/battle_anims/PRSFX- Feint1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Feint2.wav b/public/audio/battle_anims/PRSFX- Feint2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Feint2.wav
rename to public/audio/battle_anims/PRSFX- Feint2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fell Stinger1.wav b/public/audio/battle_anims/PRSFX- Fell Stinger1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fell Stinger1.wav
rename to public/audio/battle_anims/PRSFX- Fell Stinger1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fell Stinger2.wav b/public/audio/battle_anims/PRSFX- Fell Stinger2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fell Stinger2.wav
rename to public/audio/battle_anims/PRSFX- Fell Stinger2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fell Stinger3.wav b/public/audio/battle_anims/PRSFX- Fell Stinger3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fell Stinger3.wav
rename to public/audio/battle_anims/PRSFX- Fell Stinger3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fiery Dance1.wav b/public/audio/battle_anims/PRSFX- Fiery Dance1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fiery Dance1.wav
rename to public/audio/battle_anims/PRSFX- Fiery Dance1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fiery Dance2.wav b/public/audio/battle_anims/PRSFX- Fiery Dance2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fiery Dance2.wav
rename to public/audio/battle_anims/PRSFX- Fiery Dance2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Final Gambit1.wav b/public/audio/battle_anims/PRSFX- Final Gambit1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Final Gambit1.wav
rename to public/audio/battle_anims/PRSFX- Final Gambit1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Final Gambit2.wav b/public/audio/battle_anims/PRSFX- Final Gambit2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Final Gambit2.wav
rename to public/audio/battle_anims/PRSFX- Final Gambit2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fire Blast.wav b/public/audio/battle_anims/PRSFX- Fire Blast.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fire Blast.wav
rename to public/audio/battle_anims/PRSFX- Fire Blast.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fire Fang1.wav b/public/audio/battle_anims/PRSFX- Fire Fang1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fire Fang1.wav
rename to public/audio/battle_anims/PRSFX- Fire Fang1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fire Fang2.wav b/public/audio/battle_anims/PRSFX- Fire Fang2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fire Fang2.wav
rename to public/audio/battle_anims/PRSFX- Fire Fang2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fire Lash1.wav b/public/audio/battle_anims/PRSFX- Fire Lash1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fire Lash1.wav
rename to public/audio/battle_anims/PRSFX- Fire Lash1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fire Lash2.wav b/public/audio/battle_anims/PRSFX- Fire Lash2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fire Lash2.wav
rename to public/audio/battle_anims/PRSFX- Fire Lash2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fire Lash3.wav b/public/audio/battle_anims/PRSFX- Fire Lash3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fire Lash3.wav
rename to public/audio/battle_anims/PRSFX- Fire Lash3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fire Lash4.wav b/public/audio/battle_anims/PRSFX- Fire Lash4.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fire Lash4.wav
rename to public/audio/battle_anims/PRSFX- Fire Lash4.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fire Pledge.wav b/public/audio/battle_anims/PRSFX- Fire Pledge.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fire Pledge.wav
rename to public/audio/battle_anims/PRSFX- Fire Pledge.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fire Punch1.wav b/public/audio/battle_anims/PRSFX- Fire Punch1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fire Punch1.wav
rename to public/audio/battle_anims/PRSFX- Fire Punch1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fire Punch2.wav b/public/audio/battle_anims/PRSFX- Fire Punch2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fire Punch2.wav
rename to public/audio/battle_anims/PRSFX- Fire Punch2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fire Punch3.wav b/public/audio/battle_anims/PRSFX- Fire Punch3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fire Punch3.wav
rename to public/audio/battle_anims/PRSFX- Fire Punch3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fire Spin.wav b/public/audio/battle_anims/PRSFX- Fire Spin.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fire Spin.wav
rename to public/audio/battle_anims/PRSFX- Fire Spin.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fissure.wav b/public/audio/battle_anims/PRSFX- Fissure.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fissure.wav
rename to public/audio/battle_anims/PRSFX- Fissure.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Flail.wav b/public/audio/battle_anims/PRSFX- Flail.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Flail.wav
rename to public/audio/battle_anims/PRSFX- Flail.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Flame Burst.wav b/public/audio/battle_anims/PRSFX- Flame Burst.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Flame Burst.wav
rename to public/audio/battle_anims/PRSFX- Flame Burst.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Flame Charge1.wav b/public/audio/battle_anims/PRSFX- Flame Charge1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Flame Charge1.wav
rename to public/audio/battle_anims/PRSFX- Flame Charge1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Flame Charge2.wav b/public/audio/battle_anims/PRSFX- Flame Charge2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Flame Charge2.wav
rename to public/audio/battle_anims/PRSFX- Flame Charge2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Flame Wheel1.wav b/public/audio/battle_anims/PRSFX- Flame Wheel1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Flame Wheel1.wav
rename to public/audio/battle_anims/PRSFX- Flame Wheel1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Flame Wheel2.wav b/public/audio/battle_anims/PRSFX- Flame Wheel2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Flame Wheel2.wav
rename to public/audio/battle_anims/PRSFX- Flame Wheel2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Flamethrower.wav b/public/audio/battle_anims/PRSFX- Flamethrower.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Flamethrower.wav
rename to public/audio/battle_anims/PRSFX- Flamethrower.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Flare Blitz1.wav b/public/audio/battle_anims/PRSFX- Flare Blitz1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Flare Blitz1.wav
rename to public/audio/battle_anims/PRSFX- Flare Blitz1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Flare Blitz2.wav b/public/audio/battle_anims/PRSFX- Flare Blitz2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Flare Blitz2.wav
rename to public/audio/battle_anims/PRSFX- Flare Blitz2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Flare Blitz3.wav b/public/audio/battle_anims/PRSFX- Flare Blitz3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Flare Blitz3.wav
rename to public/audio/battle_anims/PRSFX- Flare Blitz3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Flash Cannon.wav b/public/audio/battle_anims/PRSFX- Flash Cannon.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Flash Cannon.wav
rename to public/audio/battle_anims/PRSFX- Flash Cannon.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Flash.wav b/public/audio/battle_anims/PRSFX- Flash.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Flash.wav
rename to public/audio/battle_anims/PRSFX- Flash.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Flatter.wav b/public/audio/battle_anims/PRSFX- Flatter.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Flatter.wav
rename to public/audio/battle_anims/PRSFX- Flatter.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fling1.wav b/public/audio/battle_anims/PRSFX- Fling1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fling1.wav
rename to public/audio/battle_anims/PRSFX- Fling1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fling2.wav b/public/audio/battle_anims/PRSFX- Fling2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fling2.wav
rename to public/audio/battle_anims/PRSFX- Fling2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Floral Healing1.wav b/public/audio/battle_anims/PRSFX- Floral Healing1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Floral Healing1.wav
rename to public/audio/battle_anims/PRSFX- Floral Healing1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Floral Healing2.wav b/public/audio/battle_anims/PRSFX- Floral Healing2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Floral Healing2.wav
rename to public/audio/battle_anims/PRSFX- Floral Healing2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Flower Shield.wav b/public/audio/battle_anims/PRSFX- Flower Shield.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Flower Shield.wav
rename to public/audio/battle_anims/PRSFX- Flower Shield.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fly1.wav b/public/audio/battle_anims/PRSFX- Fly1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fly1.wav
rename to public/audio/battle_anims/PRSFX- Fly1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fly2.wav b/public/audio/battle_anims/PRSFX- Fly2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fly2.wav
rename to public/audio/battle_anims/PRSFX- Fly2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Flying Press1.wav b/public/audio/battle_anims/PRSFX- Flying Press1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Flying Press1.wav
rename to public/audio/battle_anims/PRSFX- Flying Press1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Flying Press2.wav b/public/audio/battle_anims/PRSFX- Flying Press2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Flying Press2.wav
rename to public/audio/battle_anims/PRSFX- Flying Press2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Flying Press3.wav b/public/audio/battle_anims/PRSFX- Flying Press3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Flying Press3.wav
rename to public/audio/battle_anims/PRSFX- Flying Press3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Focus Blast1.wav b/public/audio/battle_anims/PRSFX- Focus Blast1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Focus Blast1.wav
rename to public/audio/battle_anims/PRSFX- Focus Blast1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Focus Blast2.wav b/public/audio/battle_anims/PRSFX- Focus Blast2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Focus Blast2.wav
rename to public/audio/battle_anims/PRSFX- Focus Blast2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Focus Blast3.wav b/public/audio/battle_anims/PRSFX- Focus Blast3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Focus Blast3.wav
rename to public/audio/battle_anims/PRSFX- Focus Blast3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Focus Energy.wav b/public/audio/battle_anims/PRSFX- Focus Energy.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Focus Energy.wav
rename to public/audio/battle_anims/PRSFX- Focus Energy.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Focus Punch1.wav b/public/audio/battle_anims/PRSFX- Focus Punch1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Focus Punch1.wav
rename to public/audio/battle_anims/PRSFX- Focus Punch1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Focus Punch2.wav b/public/audio/battle_anims/PRSFX- Focus Punch2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Focus Punch2.wav
rename to public/audio/battle_anims/PRSFX- Focus Punch2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Focus Punch3.wav b/public/audio/battle_anims/PRSFX- Focus Punch3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Focus Punch3.wav
rename to public/audio/battle_anims/PRSFX- Focus Punch3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Follow Me.wav b/public/audio/battle_anims/PRSFX- Follow Me.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Follow Me.wav
rename to public/audio/battle_anims/PRSFX- Follow Me.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Force Palm1.wav b/public/audio/battle_anims/PRSFX- Force Palm1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Force Palm1.wav
rename to public/audio/battle_anims/PRSFX- Force Palm1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Force Palm2.wav b/public/audio/battle_anims/PRSFX- Force Palm2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Force Palm2.wav
rename to public/audio/battle_anims/PRSFX- Force Palm2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Foresight1.wav b/public/audio/battle_anims/PRSFX- Foresight1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Foresight1.wav
rename to public/audio/battle_anims/PRSFX- Foresight1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Foresight2.wav b/public/audio/battle_anims/PRSFX- Foresight2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Foresight2.wav
rename to public/audio/battle_anims/PRSFX- Foresight2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Forests Curse.wav b/public/audio/battle_anims/PRSFX- Forests Curse.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Forests Curse.wav
rename to public/audio/battle_anims/PRSFX- Forests Curse.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Foul Play1.wav b/public/audio/battle_anims/PRSFX- Foul Play1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Foul Play1.wav
rename to public/audio/battle_anims/PRSFX- Foul Play1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Foul Play2.wav b/public/audio/battle_anims/PRSFX- Foul Play2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Foul Play2.wav
rename to public/audio/battle_anims/PRSFX- Foul Play2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Freeze Dry1.wav b/public/audio/battle_anims/PRSFX- Freeze Dry1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Freeze Dry1.wav
rename to public/audio/battle_anims/PRSFX- Freeze Dry1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Freeze Dry2.wav b/public/audio/battle_anims/PRSFX- Freeze Dry2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Freeze Dry2.wav
rename to public/audio/battle_anims/PRSFX- Freeze Dry2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Freeze Dry3.wav b/public/audio/battle_anims/PRSFX- Freeze Dry3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Freeze Dry3.wav
rename to public/audio/battle_anims/PRSFX- Freeze Dry3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Freeze Shock1.wav b/public/audio/battle_anims/PRSFX- Freeze Shock1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Freeze Shock1.wav
rename to public/audio/battle_anims/PRSFX- Freeze Shock1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Freeze Shock2.wav b/public/audio/battle_anims/PRSFX- Freeze Shock2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Freeze Shock2.wav
rename to public/audio/battle_anims/PRSFX- Freeze Shock2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Freeze Shock3.wav b/public/audio/battle_anims/PRSFX- Freeze Shock3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Freeze Shock3.wav
rename to public/audio/battle_anims/PRSFX- Freeze Shock3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Frenzy Plant1.wav b/public/audio/battle_anims/PRSFX- Frenzy Plant1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Frenzy Plant1.wav
rename to public/audio/battle_anims/PRSFX- Frenzy Plant1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Frenzy Plant2.wav b/public/audio/battle_anims/PRSFX- Frenzy Plant2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Frenzy Plant2.wav
rename to public/audio/battle_anims/PRSFX- Frenzy Plant2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Frost Breath1.wav b/public/audio/battle_anims/PRSFX- Frost Breath1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Frost Breath1.wav
rename to public/audio/battle_anims/PRSFX- Frost Breath1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Frost Breath2.wav b/public/audio/battle_anims/PRSFX- Frost Breath2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Frost Breath2.wav
rename to public/audio/battle_anims/PRSFX- Frost Breath2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Frozen.wav b/public/audio/battle_anims/PRSFX- Frozen.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Frozen.wav
rename to public/audio/battle_anims/PRSFX- Frozen.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Frustration1.wav b/public/audio/battle_anims/PRSFX- Frustration1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Frustration1.wav
rename to public/audio/battle_anims/PRSFX- Frustration1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Frustration2.wav b/public/audio/battle_anims/PRSFX- Frustration2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Frustration2.wav
rename to public/audio/battle_anims/PRSFX- Frustration2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fury Attack.wav b/public/audio/battle_anims/PRSFX- Fury Attack.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fury Attack.wav
rename to public/audio/battle_anims/PRSFX- Fury Attack.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fury Cutter.wav b/public/audio/battle_anims/PRSFX- Fury Cutter.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fury Cutter.wav
rename to public/audio/battle_anims/PRSFX- Fury Cutter.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fury Swipes.wav b/public/audio/battle_anims/PRSFX- Fury Swipes.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fury Swipes.wav
rename to public/audio/battle_anims/PRSFX- Fury Swipes.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fusion Bolt1.wav b/public/audio/battle_anims/PRSFX- Fusion Bolt1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fusion Bolt1.wav
rename to public/audio/battle_anims/PRSFX- Fusion Bolt1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fusion Bolt2.wav b/public/audio/battle_anims/PRSFX- Fusion Bolt2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fusion Bolt2.wav
rename to public/audio/battle_anims/PRSFX- Fusion Bolt2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fusion Flare1.wav b/public/audio/battle_anims/PRSFX- Fusion Flare1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fusion Flare1.wav
rename to public/audio/battle_anims/PRSFX- Fusion Flare1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fusion Flare2.wav b/public/audio/battle_anims/PRSFX- Fusion Flare2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fusion Flare2.wav
rename to public/audio/battle_anims/PRSFX- Fusion Flare2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Fusion Flare3.wav b/public/audio/battle_anims/PRSFX- Fusion Flare3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Fusion Flare3.wav
rename to public/audio/battle_anims/PRSFX- Fusion Flare3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- FusionFlare3.wav b/public/audio/battle_anims/PRSFX- FusionFlare3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- FusionFlare3.wav
rename to public/audio/battle_anims/PRSFX- FusionFlare3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Future Sight1.wav b/public/audio/battle_anims/PRSFX- Future Sight1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Future Sight1.wav
rename to public/audio/battle_anims/PRSFX- Future Sight1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Future Sight2.wav b/public/audio/battle_anims/PRSFX- Future Sight2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Future Sight2.wav
rename to public/audio/battle_anims/PRSFX- Future Sight2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Gastro Acid.wav b/public/audio/battle_anims/PRSFX- Gastro Acid.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Gastro Acid.wav
rename to public/audio/battle_anims/PRSFX- Gastro Acid.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Gear Grind.wav b/public/audio/battle_anims/PRSFX- Gear Grind.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Gear Grind.wav
rename to public/audio/battle_anims/PRSFX- Gear Grind.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Gear Up1.wav b/public/audio/battle_anims/PRSFX- Gear Up1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Gear Up1.wav
rename to public/audio/battle_anims/PRSFX- Gear Up1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Gear Up2.wav b/public/audio/battle_anims/PRSFX- Gear Up2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Gear Up2.wav
rename to public/audio/battle_anims/PRSFX- Gear Up2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Gear Up3.wav b/public/audio/battle_anims/PRSFX- Gear Up3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Gear Up3.wav
rename to public/audio/battle_anims/PRSFX- Gear Up3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Gear Up4.wav b/public/audio/battle_anims/PRSFX- Gear Up4.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Gear Up4.wav
rename to public/audio/battle_anims/PRSFX- Gear Up4.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Gear Up5.wav b/public/audio/battle_anims/PRSFX- Gear Up5.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Gear Up5.wav
rename to public/audio/battle_anims/PRSFX- Gear Up5.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Gear Up6.wav b/public/audio/battle_anims/PRSFX- Gear Up6.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Gear Up6.wav
rename to public/audio/battle_anims/PRSFX- Gear Up6.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Geomancy.wav b/public/audio/battle_anims/PRSFX- Geomancy.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Geomancy.wav
rename to public/audio/battle_anims/PRSFX- Geomancy.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Giga Drain1.wav b/public/audio/battle_anims/PRSFX- Giga Drain1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Giga Drain1.wav
rename to public/audio/battle_anims/PRSFX- Giga Drain1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Giga Drain2.wav b/public/audio/battle_anims/PRSFX- Giga Drain2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Giga Drain2.wav
rename to public/audio/battle_anims/PRSFX- Giga Drain2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Giga Impact1.wav b/public/audio/battle_anims/PRSFX- Giga Impact1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Giga Impact1.wav
rename to public/audio/battle_anims/PRSFX- Giga Impact1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Giga Impact2.wav b/public/audio/battle_anims/PRSFX- Giga Impact2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Giga Impact2.wav
rename to public/audio/battle_anims/PRSFX- Giga Impact2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Gigavolt Havoc1.wav b/public/audio/battle_anims/PRSFX- Gigavolt Havoc1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Gigavolt Havoc1.wav
rename to public/audio/battle_anims/PRSFX- Gigavolt Havoc1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Gigavolt Havoc2.wav b/public/audio/battle_anims/PRSFX- Gigavolt Havoc2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Gigavolt Havoc2.wav
rename to public/audio/battle_anims/PRSFX- Gigavolt Havoc2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Gigavolt Havoc3.wav b/public/audio/battle_anims/PRSFX- Gigavolt Havoc3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Gigavolt Havoc3.wav
rename to public/audio/battle_anims/PRSFX- Gigavolt Havoc3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Glaciate1.wav b/public/audio/battle_anims/PRSFX- Glaciate1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Glaciate1.wav
rename to public/audio/battle_anims/PRSFX- Glaciate1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Glaciate2.wav b/public/audio/battle_anims/PRSFX- Glaciate2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Glaciate2.wav
rename to public/audio/battle_anims/PRSFX- Glaciate2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Glare.wav b/public/audio/battle_anims/PRSFX- Glare.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Glare.wav
rename to public/audio/battle_anims/PRSFX- Glare.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Glitch1.wav b/public/audio/battle_anims/PRSFX- Glitch1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Glitch1.wav
rename to public/audio/battle_anims/PRSFX- Glitch1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Glitch2.wav b/public/audio/battle_anims/PRSFX- Glitch2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Glitch2.wav
rename to public/audio/battle_anims/PRSFX- Glitch2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Grass Knot1.wav b/public/audio/battle_anims/PRSFX- Grass Knot1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Grass Knot1.wav
rename to public/audio/battle_anims/PRSFX- Grass Knot1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Grass Knot2.wav b/public/audio/battle_anims/PRSFX- Grass Knot2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Grass Knot2.wav
rename to public/audio/battle_anims/PRSFX- Grass Knot2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Grass Pledge1.wav b/public/audio/battle_anims/PRSFX- Grass Pledge1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Grass Pledge1.wav
rename to public/audio/battle_anims/PRSFX- Grass Pledge1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Grass Pledge2.wav b/public/audio/battle_anims/PRSFX- Grass Pledge2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Grass Pledge2.wav
rename to public/audio/battle_anims/PRSFX- Grass Pledge2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Grass Whistle.wav b/public/audio/battle_anims/PRSFX- Grass Whistle.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Grass Whistle.wav
rename to public/audio/battle_anims/PRSFX- Grass Whistle.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Grassy Terrain.wav b/public/audio/battle_anims/PRSFX- Grassy Terrain.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Grassy Terrain.wav
rename to public/audio/battle_anims/PRSFX- Grassy Terrain.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Gravity.wav b/public/audio/battle_anims/PRSFX- Gravity.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Gravity.wav
rename to public/audio/battle_anims/PRSFX- Gravity.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Growth.wav b/public/audio/battle_anims/PRSFX- Growth.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Growth.wav
rename to public/audio/battle_anims/PRSFX- Growth.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Grudge.wav b/public/audio/battle_anims/PRSFX- Grudge.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Grudge.wav
rename to public/audio/battle_anims/PRSFX- Grudge.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Guard Split.wav b/public/audio/battle_anims/PRSFX- Guard Split.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Guard Split.wav
rename to public/audio/battle_anims/PRSFX- Guard Split.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Guard Swap.wav b/public/audio/battle_anims/PRSFX- Guard Swap.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Guard Swap.wav
rename to public/audio/battle_anims/PRSFX- Guard Swap.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Guillotine1.wav b/public/audio/battle_anims/PRSFX- Guillotine1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Guillotine1.wav
rename to public/audio/battle_anims/PRSFX- Guillotine1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Guillotine2.wav b/public/audio/battle_anims/PRSFX- Guillotine2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Guillotine2.wav
rename to public/audio/battle_anims/PRSFX- Guillotine2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Gunk Shot.wav b/public/audio/battle_anims/PRSFX- Gunk Shot.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Gunk Shot.wav
rename to public/audio/battle_anims/PRSFX- Gunk Shot.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Gust.wav b/public/audio/battle_anims/PRSFX- Gust.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Gust.wav
rename to public/audio/battle_anims/PRSFX- Gust.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Gyro Ball1.wav b/public/audio/battle_anims/PRSFX- Gyro Ball1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Gyro Ball1.wav
rename to public/audio/battle_anims/PRSFX- Gyro Ball1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Gyro Ball2.wav b/public/audio/battle_anims/PRSFX- Gyro Ball2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Gyro Ball2.wav
rename to public/audio/battle_anims/PRSFX- Gyro Ball2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Hail.wav b/public/audio/battle_anims/PRSFX- Hail.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Hail.wav
rename to public/audio/battle_anims/PRSFX- Hail.wav
diff --git a/public/audio/se/battle_anims/PRSFX- HailMove.wav b/public/audio/battle_anims/PRSFX- HailMove.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- HailMove.wav
rename to public/audio/battle_anims/PRSFX- HailMove.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Hammer Arm1.wav b/public/audio/battle_anims/PRSFX- Hammer Arm1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Hammer Arm1.wav
rename to public/audio/battle_anims/PRSFX- Hammer Arm1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Hammer Arm2.wav b/public/audio/battle_anims/PRSFX- Hammer Arm2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Hammer Arm2.wav
rename to public/audio/battle_anims/PRSFX- Hammer Arm2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Harden.wav b/public/audio/battle_anims/PRSFX- Harden.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Harden.wav
rename to public/audio/battle_anims/PRSFX- Harden.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Haze.wav b/public/audio/battle_anims/PRSFX- Haze.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Haze.wav
rename to public/audio/battle_anims/PRSFX- Haze.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Head Charge.wav b/public/audio/battle_anims/PRSFX- Head Charge.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Head Charge.wav
rename to public/audio/battle_anims/PRSFX- Head Charge.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Head Smash.wav b/public/audio/battle_anims/PRSFX- Head Smash.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Head Smash.wav
rename to public/audio/battle_anims/PRSFX- Head Smash.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Headbutt1.wav b/public/audio/battle_anims/PRSFX- Headbutt1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Headbutt1.wav
rename to public/audio/battle_anims/PRSFX- Headbutt1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Headbutt2.wav b/public/audio/battle_anims/PRSFX- Headbutt2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Headbutt2.wav
rename to public/audio/battle_anims/PRSFX- Headbutt2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Heal Bell.wav b/public/audio/battle_anims/PRSFX- Heal Bell.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Heal Bell.wav
rename to public/audio/battle_anims/PRSFX- Heal Bell.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Heal Block.wav b/public/audio/battle_anims/PRSFX- Heal Block.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Heal Block.wav
rename to public/audio/battle_anims/PRSFX- Heal Block.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Heal Order1.wav b/public/audio/battle_anims/PRSFX- Heal Order1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Heal Order1.wav
rename to public/audio/battle_anims/PRSFX- Heal Order1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Heal Order2.wav b/public/audio/battle_anims/PRSFX- Heal Order2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Heal Order2.wav
rename to public/audio/battle_anims/PRSFX- Heal Order2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Healing Pulse.wav b/public/audio/battle_anims/PRSFX- Healing Pulse.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Healing Pulse.wav
rename to public/audio/battle_anims/PRSFX- Healing Pulse.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Healing Wish.wav b/public/audio/battle_anims/PRSFX- Healing Wish.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Healing Wish.wav
rename to public/audio/battle_anims/PRSFX- Healing Wish.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Health Down.wav b/public/audio/battle_anims/PRSFX- Health Down.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Health Down.wav
rename to public/audio/battle_anims/PRSFX- Health Down.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Health Up.wav b/public/audio/battle_anims/PRSFX- Health Up.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Health Up.wav
rename to public/audio/battle_anims/PRSFX- Health Up.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Heart Stamp1.wav b/public/audio/battle_anims/PRSFX- Heart Stamp1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Heart Stamp1.wav
rename to public/audio/battle_anims/PRSFX- Heart Stamp1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Heart Stamp2.wav b/public/audio/battle_anims/PRSFX- Heart Stamp2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Heart Stamp2.wav
rename to public/audio/battle_anims/PRSFX- Heart Stamp2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Heart Swap.wav b/public/audio/battle_anims/PRSFX- Heart Swap.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Heart Swap.wav
rename to public/audio/battle_anims/PRSFX- Heart Swap.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Heat Crash.wav b/public/audio/battle_anims/PRSFX- Heat Crash.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Heat Crash.wav
rename to public/audio/battle_anims/PRSFX- Heat Crash.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Heat Wave.wav b/public/audio/battle_anims/PRSFX- Heat Wave.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Heat Wave.wav
rename to public/audio/battle_anims/PRSFX- Heat Wave.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Heavy Slam1.wav b/public/audio/battle_anims/PRSFX- Heavy Slam1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Heavy Slam1.wav
rename to public/audio/battle_anims/PRSFX- Heavy Slam1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Heavy Slam2.wav b/public/audio/battle_anims/PRSFX- Heavy Slam2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Heavy Slam2.wav
rename to public/audio/battle_anims/PRSFX- Heavy Slam2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Helping Hand.wav b/public/audio/battle_anims/PRSFX- Helping Hand.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Helping Hand.wav
rename to public/audio/battle_anims/PRSFX- Helping Hand.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Hex.wav b/public/audio/battle_anims/PRSFX- Hex.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Hex.wav
rename to public/audio/battle_anims/PRSFX- Hex.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Hi Jump Kick1.wav b/public/audio/battle_anims/PRSFX- Hi Jump Kick1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Hi Jump Kick1.wav
rename to public/audio/battle_anims/PRSFX- Hi Jump Kick1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Hi Jump Kick2.wav b/public/audio/battle_anims/PRSFX- Hi Jump Kick2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Hi Jump Kick2.wav
rename to public/audio/battle_anims/PRSFX- Hi Jump Kick2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Hidden Power1.wav b/public/audio/battle_anims/PRSFX- Hidden Power1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Hidden Power1.wav
rename to public/audio/battle_anims/PRSFX- Hidden Power1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Hidden Power2.wav b/public/audio/battle_anims/PRSFX- Hidden Power2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Hidden Power2.wav
rename to public/audio/battle_anims/PRSFX- Hidden Power2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- High Horse Power1.wav b/public/audio/battle_anims/PRSFX- High Horse Power1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- High Horse Power1.wav
rename to public/audio/battle_anims/PRSFX- High Horse Power1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- High Horse Power2.wav b/public/audio/battle_anims/PRSFX- High Horse Power2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- High Horse Power2.wav
rename to public/audio/battle_anims/PRSFX- High Horse Power2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Hone Claws.wav b/public/audio/battle_anims/PRSFX- Hone Claws.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Hone Claws.wav
rename to public/audio/battle_anims/PRSFX- Hone Claws.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Horn Attack.wav b/public/audio/battle_anims/PRSFX- Horn Attack.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Horn Attack.wav
rename to public/audio/battle_anims/PRSFX- Horn Attack.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Horn Drill1.wav b/public/audio/battle_anims/PRSFX- Horn Drill1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Horn Drill1.wav
rename to public/audio/battle_anims/PRSFX- Horn Drill1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Horn Drill2.wav b/public/audio/battle_anims/PRSFX- Horn Drill2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Horn Drill2.wav
rename to public/audio/battle_anims/PRSFX- Horn Drill2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Horn Drill3.wav b/public/audio/battle_anims/PRSFX- Horn Drill3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Horn Drill3.wav
rename to public/audio/battle_anims/PRSFX- Horn Drill3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Horn Drill3_1.mp3 b/public/audio/battle_anims/PRSFX- Horn Drill3_1.mp3
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Horn Drill3_1.mp3
rename to public/audio/battle_anims/PRSFX- Horn Drill3_1.mp3
diff --git a/public/audio/se/battle_anims/PRSFX- Horn Leech1.wav b/public/audio/battle_anims/PRSFX- Horn Leech1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Horn Leech1.wav
rename to public/audio/battle_anims/PRSFX- Horn Leech1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Horn Leech2.wav b/public/audio/battle_anims/PRSFX- Horn Leech2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Horn Leech2.wav
rename to public/audio/battle_anims/PRSFX- Horn Leech2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Hurricane.wav b/public/audio/battle_anims/PRSFX- Hurricane.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Hurricane.wav
rename to public/audio/battle_anims/PRSFX- Hurricane.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Hydro Cannon.wav b/public/audio/battle_anims/PRSFX- Hydro Cannon.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Hydro Cannon.wav
rename to public/audio/battle_anims/PRSFX- Hydro Cannon.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Hydro Cannon1.wav b/public/audio/battle_anims/PRSFX- Hydro Cannon1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Hydro Cannon1.wav
rename to public/audio/battle_anims/PRSFX- Hydro Cannon1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Hydro Cannon2.wav b/public/audio/battle_anims/PRSFX- Hydro Cannon2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Hydro Cannon2.wav
rename to public/audio/battle_anims/PRSFX- Hydro Cannon2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Hydro Pump.wav b/public/audio/battle_anims/PRSFX- Hydro Pump.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Hydro Pump.wav
rename to public/audio/battle_anims/PRSFX- Hydro Pump.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Hydro Vortex1.wav b/public/audio/battle_anims/PRSFX- Hydro Vortex1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Hydro Vortex1.wav
rename to public/audio/battle_anims/PRSFX- Hydro Vortex1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Hydro Vortex2.wav b/public/audio/battle_anims/PRSFX- Hydro Vortex2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Hydro Vortex2.wav
rename to public/audio/battle_anims/PRSFX- Hydro Vortex2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Hydro Vortex3.wav b/public/audio/battle_anims/PRSFX- Hydro Vortex3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Hydro Vortex3.wav
rename to public/audio/battle_anims/PRSFX- Hydro Vortex3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Hyper Beam.wav b/public/audio/battle_anims/PRSFX- Hyper Beam.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Hyper Beam.wav
rename to public/audio/battle_anims/PRSFX- Hyper Beam.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Hyper Fang.wav b/public/audio/battle_anims/PRSFX- Hyper Fang.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Hyper Fang.wav
rename to public/audio/battle_anims/PRSFX- Hyper Fang.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Hyperspace Fury1.wav b/public/audio/battle_anims/PRSFX- Hyperspace Fury1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Hyperspace Fury1.wav
rename to public/audio/battle_anims/PRSFX- Hyperspace Fury1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Hyperspace Fury2.wav b/public/audio/battle_anims/PRSFX- Hyperspace Fury2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Hyperspace Fury2.wav
rename to public/audio/battle_anims/PRSFX- Hyperspace Fury2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Hyperspace Hole1.wav b/public/audio/battle_anims/PRSFX- Hyperspace Hole1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Hyperspace Hole1.wav
rename to public/audio/battle_anims/PRSFX- Hyperspace Hole1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Hyperspace Hole2.wav b/public/audio/battle_anims/PRSFX- Hyperspace Hole2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Hyperspace Hole2.wav
rename to public/audio/battle_anims/PRSFX- Hyperspace Hole2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Hypnosis.wav b/public/audio/battle_anims/PRSFX- Hypnosis.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Hypnosis.wav
rename to public/audio/battle_anims/PRSFX- Hypnosis.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Ice Ball1.wav b/public/audio/battle_anims/PRSFX- Ice Ball1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Ice Ball1.wav
rename to public/audio/battle_anims/PRSFX- Ice Ball1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Ice Ball2.wav b/public/audio/battle_anims/PRSFX- Ice Ball2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Ice Ball2.wav
rename to public/audio/battle_anims/PRSFX- Ice Ball2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Ice Beam.wav b/public/audio/battle_anims/PRSFX- Ice Beam.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Ice Beam.wav
rename to public/audio/battle_anims/PRSFX- Ice Beam.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Ice Burn1.wav b/public/audio/battle_anims/PRSFX- Ice Burn1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Ice Burn1.wav
rename to public/audio/battle_anims/PRSFX- Ice Burn1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Ice Burn2.wav b/public/audio/battle_anims/PRSFX- Ice Burn2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Ice Burn2.wav
rename to public/audio/battle_anims/PRSFX- Ice Burn2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Ice Burn3.wav b/public/audio/battle_anims/PRSFX- Ice Burn3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Ice Burn3.wav
rename to public/audio/battle_anims/PRSFX- Ice Burn3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Ice Burn4.wav b/public/audio/battle_anims/PRSFX- Ice Burn4.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Ice Burn4.wav
rename to public/audio/battle_anims/PRSFX- Ice Burn4.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Ice Fang1.wav b/public/audio/battle_anims/PRSFX- Ice Fang1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Ice Fang1.wav
rename to public/audio/battle_anims/PRSFX- Ice Fang1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Ice Fang2.wav b/public/audio/battle_anims/PRSFX- Ice Fang2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Ice Fang2.wav
rename to public/audio/battle_anims/PRSFX- Ice Fang2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Ice Hammer1.wav b/public/audio/battle_anims/PRSFX- Ice Hammer1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Ice Hammer1.wav
rename to public/audio/battle_anims/PRSFX- Ice Hammer1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Ice Hammer2.wav b/public/audio/battle_anims/PRSFX- Ice Hammer2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Ice Hammer2.wav
rename to public/audio/battle_anims/PRSFX- Ice Hammer2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Ice Punch1.wav b/public/audio/battle_anims/PRSFX- Ice Punch1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Ice Punch1.wav
rename to public/audio/battle_anims/PRSFX- Ice Punch1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Ice Punch2.wav b/public/audio/battle_anims/PRSFX- Ice Punch2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Ice Punch2.wav
rename to public/audio/battle_anims/PRSFX- Ice Punch2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Ice Shard.wav b/public/audio/battle_anims/PRSFX- Ice Shard.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Ice Shard.wav
rename to public/audio/battle_anims/PRSFX- Ice Shard.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Icicle Crash1.wav b/public/audio/battle_anims/PRSFX- Icicle Crash1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Icicle Crash1.wav
rename to public/audio/battle_anims/PRSFX- Icicle Crash1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Icicle Crash2.wav b/public/audio/battle_anims/PRSFX- Icicle Crash2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Icicle Crash2.wav
rename to public/audio/battle_anims/PRSFX- Icicle Crash2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Icicle Spear.wav b/public/audio/battle_anims/PRSFX- Icicle Spear.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Icicle Spear.wav
rename to public/audio/battle_anims/PRSFX- Icicle Spear.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Icy Wind1.wav b/public/audio/battle_anims/PRSFX- Icy Wind1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Icy Wind1.wav
rename to public/audio/battle_anims/PRSFX- Icy Wind1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Icy Wind2.wav b/public/audio/battle_anims/PRSFX- Icy Wind2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Icy Wind2.wav
rename to public/audio/battle_anims/PRSFX- Icy Wind2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Imprison1.wav b/public/audio/battle_anims/PRSFX- Imprison1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Imprison1.wav
rename to public/audio/battle_anims/PRSFX- Imprison1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Imprison2.wav b/public/audio/battle_anims/PRSFX- Imprison2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Imprison2.wav
rename to public/audio/battle_anims/PRSFX- Imprison2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Incinerate1.wav b/public/audio/battle_anims/PRSFX- Incinerate1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Incinerate1.wav
rename to public/audio/battle_anims/PRSFX- Incinerate1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Incinerate2.wav b/public/audio/battle_anims/PRSFX- Incinerate2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Incinerate2.wav
rename to public/audio/battle_anims/PRSFX- Incinerate2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Inferno Overdrive1.wav b/public/audio/battle_anims/PRSFX- Inferno Overdrive1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Inferno Overdrive1.wav
rename to public/audio/battle_anims/PRSFX- Inferno Overdrive1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Inferno Overdrive2.wav b/public/audio/battle_anims/PRSFX- Inferno Overdrive2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Inferno Overdrive2.wav
rename to public/audio/battle_anims/PRSFX- Inferno Overdrive2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Inferno Overdrive3.wav b/public/audio/battle_anims/PRSFX- Inferno Overdrive3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Inferno Overdrive3.wav
rename to public/audio/battle_anims/PRSFX- Inferno Overdrive3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Inferno Overdrive4.wav b/public/audio/battle_anims/PRSFX- Inferno Overdrive4.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Inferno Overdrive4.wav
rename to public/audio/battle_anims/PRSFX- Inferno Overdrive4.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Inferno Overdrive5.wav b/public/audio/battle_anims/PRSFX- Inferno Overdrive5.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Inferno Overdrive5.wav
rename to public/audio/battle_anims/PRSFX- Inferno Overdrive5.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Inferno.wav b/public/audio/battle_anims/PRSFX- Inferno.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Inferno.wav
rename to public/audio/battle_anims/PRSFX- Inferno.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Infestation.wav b/public/audio/battle_anims/PRSFX- Infestation.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Infestation.wav
rename to public/audio/battle_anims/PRSFX- Infestation.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Ingrain1.wav b/public/audio/battle_anims/PRSFX- Ingrain1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Ingrain1.wav
rename to public/audio/battle_anims/PRSFX- Ingrain1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Ingrain2.wav b/public/audio/battle_anims/PRSFX- Ingrain2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Ingrain2.wav
rename to public/audio/battle_anims/PRSFX- Ingrain2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Instruct1.wav b/public/audio/battle_anims/PRSFX- Instruct1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Instruct1.wav
rename to public/audio/battle_anims/PRSFX- Instruct1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Instruct2.wav b/public/audio/battle_anims/PRSFX- Instruct2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Instruct2.wav
rename to public/audio/battle_anims/PRSFX- Instruct2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Ion Deluge.wav b/public/audio/battle_anims/PRSFX- Ion Deluge.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Ion Deluge.wav
rename to public/audio/battle_anims/PRSFX- Ion Deluge.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Iron Defense.wav b/public/audio/battle_anims/PRSFX- Iron Defense.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Iron Defense.wav
rename to public/audio/battle_anims/PRSFX- Iron Defense.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Iron Head.wav b/public/audio/battle_anims/PRSFX- Iron Head.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Iron Head.wav
rename to public/audio/battle_anims/PRSFX- Iron Head.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Iron Tail1.wav b/public/audio/battle_anims/PRSFX- Iron Tail1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Iron Tail1.wav
rename to public/audio/battle_anims/PRSFX- Iron Tail1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Iron Tail2.wav b/public/audio/battle_anims/PRSFX- Iron Tail2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Iron Tail2.wav
rename to public/audio/battle_anims/PRSFX- Iron Tail2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Judgment.wav b/public/audio/battle_anims/PRSFX- Judgment.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Judgment.wav
rename to public/audio/battle_anims/PRSFX- Judgment.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Jump Kick1.wav b/public/audio/battle_anims/PRSFX- Jump Kick1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Jump Kick1.wav
rename to public/audio/battle_anims/PRSFX- Jump Kick1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Jump Kick2.wav b/public/audio/battle_anims/PRSFX- Jump Kick2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Jump Kick2.wav
rename to public/audio/battle_anims/PRSFX- Jump Kick2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Karate Chop1.wav b/public/audio/battle_anims/PRSFX- Karate Chop1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Karate Chop1.wav
rename to public/audio/battle_anims/PRSFX- Karate Chop1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Karate Chop2.wav b/public/audio/battle_anims/PRSFX- Karate Chop2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Karate Chop2.wav
rename to public/audio/battle_anims/PRSFX- Karate Chop2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Kinesis.wav b/public/audio/battle_anims/PRSFX- Kinesis.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Kinesis.wav
rename to public/audio/battle_anims/PRSFX- Kinesis.wav
diff --git a/public/audio/se/battle_anims/PRSFX- King's Shield1.wav b/public/audio/battle_anims/PRSFX- King's Shield1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- King's Shield1.wav
rename to public/audio/battle_anims/PRSFX- King's Shield1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- King's Shield2.wav b/public/audio/battle_anims/PRSFX- King's Shield2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- King's Shield2.wav
rename to public/audio/battle_anims/PRSFX- King's Shield2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Knock Off.wav b/public/audio/battle_anims/PRSFX- Knock Off.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Knock Off.wav
rename to public/audio/battle_anims/PRSFX- Knock Off.wav
diff --git a/public/audio/se/battle_anims/PRSFX- LTBTS1.wav b/public/audio/battle_anims/PRSFX- LTBTS1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- LTBTS1.wav
rename to public/audio/battle_anims/PRSFX- LTBTS1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- LTBTS2.wav b/public/audio/battle_anims/PRSFX- LTBTS2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- LTBTS2.wav
rename to public/audio/battle_anims/PRSFX- LTBTS2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- LTBTS3.wav b/public/audio/battle_anims/PRSFX- LTBTS3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- LTBTS3.wav
rename to public/audio/battle_anims/PRSFX- LTBTS3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- LTBTS4.wav b/public/audio/battle_anims/PRSFX- LTBTS4.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- LTBTS4.wav
rename to public/audio/battle_anims/PRSFX- LTBTS4.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Lands Wrath1.wav b/public/audio/battle_anims/PRSFX- Lands Wrath1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Lands Wrath1.wav
rename to public/audio/battle_anims/PRSFX- Lands Wrath1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Lands Wrath2.wav b/public/audio/battle_anims/PRSFX- Lands Wrath2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Lands Wrath2.wav
rename to public/audio/battle_anims/PRSFX- Lands Wrath2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Laser Focus1.wav b/public/audio/battle_anims/PRSFX- Laser Focus1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Laser Focus1.wav
rename to public/audio/battle_anims/PRSFX- Laser Focus1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Laser Focus2.wav b/public/audio/battle_anims/PRSFX- Laser Focus2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Laser Focus2.wav
rename to public/audio/battle_anims/PRSFX- Laser Focus2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Last Resort1.wav b/public/audio/battle_anims/PRSFX- Last Resort1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Last Resort1.wav
rename to public/audio/battle_anims/PRSFX- Last Resort1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Last Resort2.wav b/public/audio/battle_anims/PRSFX- Last Resort2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Last Resort2.wav
rename to public/audio/battle_anims/PRSFX- Last Resort2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Lava Plume.wav b/public/audio/battle_anims/PRSFX- Lava Plume.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Lava Plume.wav
rename to public/audio/battle_anims/PRSFX- Lava Plume.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Leaf Blade.wav b/public/audio/battle_anims/PRSFX- Leaf Blade.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Leaf Blade.wav
rename to public/audio/battle_anims/PRSFX- Leaf Blade.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Leaf Storm1.wav b/public/audio/battle_anims/PRSFX- Leaf Storm1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Leaf Storm1.wav
rename to public/audio/battle_anims/PRSFX- Leaf Storm1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Leaf Storm2.wav b/public/audio/battle_anims/PRSFX- Leaf Storm2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Leaf Storm2.wav
rename to public/audio/battle_anims/PRSFX- Leaf Storm2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Leaf Tornado1.wav b/public/audio/battle_anims/PRSFX- Leaf Tornado1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Leaf Tornado1.wav
rename to public/audio/battle_anims/PRSFX- Leaf Tornado1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Leaf Tornado2.wav b/public/audio/battle_anims/PRSFX- Leaf Tornado2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Leaf Tornado2.wav
rename to public/audio/battle_anims/PRSFX- Leaf Tornado2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Leafage 1.wav b/public/audio/battle_anims/PRSFX- Leafage 1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Leafage 1.wav
rename to public/audio/battle_anims/PRSFX- Leafage 1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Leafage 2.wav b/public/audio/battle_anims/PRSFX- Leafage 2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Leafage 2.wav
rename to public/audio/battle_anims/PRSFX- Leafage 2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Leech Life1.wav b/public/audio/battle_anims/PRSFX- Leech Life1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Leech Life1.wav
rename to public/audio/battle_anims/PRSFX- Leech Life1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Leech Life2.wav b/public/audio/battle_anims/PRSFX- Leech Life2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Leech Life2.wav
rename to public/audio/battle_anims/PRSFX- Leech Life2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Leech Seed1.wav b/public/audio/battle_anims/PRSFX- Leech Seed1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Leech Seed1.wav
rename to public/audio/battle_anims/PRSFX- Leech Seed1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Leech Seed2.wav b/public/audio/battle_anims/PRSFX- Leech Seed2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Leech Seed2.wav
rename to public/audio/battle_anims/PRSFX- Leech Seed2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Leech Seed3.wav b/public/audio/battle_anims/PRSFX- Leech Seed3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Leech Seed3.wav
rename to public/audio/battle_anims/PRSFX- Leech Seed3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Leer.wav b/public/audio/battle_anims/PRSFX- Leer.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Leer.wav
rename to public/audio/battle_anims/PRSFX- Leer.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Lick.wav b/public/audio/battle_anims/PRSFX- Lick.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Lick.wav
rename to public/audio/battle_anims/PRSFX- Lick.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Light Screen.wav b/public/audio/battle_anims/PRSFX- Light Screen.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Light Screen.wav
rename to public/audio/battle_anims/PRSFX- Light Screen.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Liquidation1.wav b/public/audio/battle_anims/PRSFX- Liquidation1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Liquidation1.wav
rename to public/audio/battle_anims/PRSFX- Liquidation1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Liquidation2.wav b/public/audio/battle_anims/PRSFX- Liquidation2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Liquidation2.wav
rename to public/audio/battle_anims/PRSFX- Liquidation2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Liquidation3.wav b/public/audio/battle_anims/PRSFX- Liquidation3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Liquidation3.wav
rename to public/audio/battle_anims/PRSFX- Liquidation3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Liquidation4.wav b/public/audio/battle_anims/PRSFX- Liquidation4.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Liquidation4.wav
rename to public/audio/battle_anims/PRSFX- Liquidation4.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Lock On.wav b/public/audio/battle_anims/PRSFX- Lock On.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Lock On.wav
rename to public/audio/battle_anims/PRSFX- Lock On.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Lovely Kiss.wav b/public/audio/battle_anims/PRSFX- Lovely Kiss.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Lovely Kiss.wav
rename to public/audio/battle_anims/PRSFX- Lovely Kiss.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Low Kick.wav b/public/audio/battle_anims/PRSFX- Low Kick.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Low Kick.wav
rename to public/audio/battle_anims/PRSFX- Low Kick.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Low Sweep.wav b/public/audio/battle_anims/PRSFX- Low Sweep.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Low Sweep.wav
rename to public/audio/battle_anims/PRSFX- Low Sweep.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Lucky Chant.wav b/public/audio/battle_anims/PRSFX- Lucky Chant.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Lucky Chant.wav
rename to public/audio/battle_anims/PRSFX- Lucky Chant.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Lunar Dance.wav b/public/audio/battle_anims/PRSFX- Lunar Dance.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Lunar Dance.wav
rename to public/audio/battle_anims/PRSFX- Lunar Dance.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Luster Purge1.wav b/public/audio/battle_anims/PRSFX- Luster Purge1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Luster Purge1.wav
rename to public/audio/battle_anims/PRSFX- Luster Purge1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Luster Purge2.wav b/public/audio/battle_anims/PRSFX- Luster Purge2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Luster Purge2.wav
rename to public/audio/battle_anims/PRSFX- Luster Purge2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Luster Purge3.wav b/public/audio/battle_anims/PRSFX- Luster Purge3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Luster Purge3.wav
rename to public/audio/battle_anims/PRSFX- Luster Purge3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Mach Punch.wav b/public/audio/battle_anims/PRSFX- Mach Punch.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Mach Punch.wav
rename to public/audio/battle_anims/PRSFX- Mach Punch.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Magic Coat.wav b/public/audio/battle_anims/PRSFX- Magic Coat.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Magic Coat.wav
rename to public/audio/battle_anims/PRSFX- Magic Coat.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Magic Room.wav b/public/audio/battle_anims/PRSFX- Magic Room.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Magic Room.wav
rename to public/audio/battle_anims/PRSFX- Magic Room.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Magical Leaf1.wav b/public/audio/battle_anims/PRSFX- Magical Leaf1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Magical Leaf1.wav
rename to public/audio/battle_anims/PRSFX- Magical Leaf1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Magical Leaf2.wav b/public/audio/battle_anims/PRSFX- Magical Leaf2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Magical Leaf2.wav
rename to public/audio/battle_anims/PRSFX- Magical Leaf2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Magma Storm1.wav b/public/audio/battle_anims/PRSFX- Magma Storm1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Magma Storm1.wav
rename to public/audio/battle_anims/PRSFX- Magma Storm1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Magma Storm2.wav b/public/audio/battle_anims/PRSFX- Magma Storm2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Magma Storm2.wav
rename to public/audio/battle_anims/PRSFX- Magma Storm2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Magnet Bomb1.wav b/public/audio/battle_anims/PRSFX- Magnet Bomb1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Magnet Bomb1.wav
rename to public/audio/battle_anims/PRSFX- Magnet Bomb1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Magnet Bomb2.wav b/public/audio/battle_anims/PRSFX- Magnet Bomb2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Magnet Bomb2.wav
rename to public/audio/battle_anims/PRSFX- Magnet Bomb2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Magnet Rise.wav b/public/audio/battle_anims/PRSFX- Magnet Rise.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Magnet Rise.wav
rename to public/audio/battle_anims/PRSFX- Magnet Rise.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Magnetic Flux.wav b/public/audio/battle_anims/PRSFX- Magnetic Flux.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Magnetic Flux.wav
rename to public/audio/battle_anims/PRSFX- Magnetic Flux.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Magnitude.wav b/public/audio/battle_anims/PRSFX- Magnitude.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Magnitude.wav
rename to public/audio/battle_anims/PRSFX- Magnitude.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Mat Block.wav b/public/audio/battle_anims/PRSFX- Mat Block.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Mat Block.wav
rename to public/audio/battle_anims/PRSFX- Mat Block.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Me First1.wav b/public/audio/battle_anims/PRSFX- Me First1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Me First1.wav
rename to public/audio/battle_anims/PRSFX- Me First1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Me First2.wav b/public/audio/battle_anims/PRSFX- Me First2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Me First2.wav
rename to public/audio/battle_anims/PRSFX- Me First2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Me First3.wav b/public/audio/battle_anims/PRSFX- Me First3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Me First3.wav
rename to public/audio/battle_anims/PRSFX- Me First3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Mean Look.wav b/public/audio/battle_anims/PRSFX- Mean Look.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Mean Look.wav
rename to public/audio/battle_anims/PRSFX- Mean Look.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Meditate.wav b/public/audio/battle_anims/PRSFX- Meditate.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Meditate.wav
rename to public/audio/battle_anims/PRSFX- Meditate.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Mega Drain1.wav b/public/audio/battle_anims/PRSFX- Mega Drain1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Mega Drain1.wav
rename to public/audio/battle_anims/PRSFX- Mega Drain1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Mega Drain2.wav b/public/audio/battle_anims/PRSFX- Mega Drain2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Mega Drain2.wav
rename to public/audio/battle_anims/PRSFX- Mega Drain2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Mega Evolution1.wav b/public/audio/battle_anims/PRSFX- Mega Evolution1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Mega Evolution1.wav
rename to public/audio/battle_anims/PRSFX- Mega Evolution1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Mega Evolution2.wav b/public/audio/battle_anims/PRSFX- Mega Evolution2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Mega Evolution2.wav
rename to public/audio/battle_anims/PRSFX- Mega Evolution2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Mega Punch1.wav b/public/audio/battle_anims/PRSFX- Mega Punch1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Mega Punch1.wav
rename to public/audio/battle_anims/PRSFX- Mega Punch1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Mega Punch2.wav b/public/audio/battle_anims/PRSFX- Mega Punch2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Mega Punch2.wav
rename to public/audio/battle_anims/PRSFX- Mega Punch2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Megahorn1.wav b/public/audio/battle_anims/PRSFX- Megahorn1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Megahorn1.wav
rename to public/audio/battle_anims/PRSFX- Megahorn1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Megahorn2.wav b/public/audio/battle_anims/PRSFX- Megahorn2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Megahorn2.wav
rename to public/audio/battle_anims/PRSFX- Megahorn2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Megakick.wav b/public/audio/battle_anims/PRSFX- Megakick.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Megakick.wav
rename to public/audio/battle_anims/PRSFX- Megakick.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Memento1.wav b/public/audio/battle_anims/PRSFX- Memento1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Memento1.wav
rename to public/audio/battle_anims/PRSFX- Memento1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Memento2.wav b/public/audio/battle_anims/PRSFX- Memento2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Memento2.wav
rename to public/audio/battle_anims/PRSFX- Memento2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Metal Burst1.wav b/public/audio/battle_anims/PRSFX- Metal Burst1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Metal Burst1.wav
rename to public/audio/battle_anims/PRSFX- Metal Burst1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Metal Burst2.wav b/public/audio/battle_anims/PRSFX- Metal Burst2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Metal Burst2.wav
rename to public/audio/battle_anims/PRSFX- Metal Burst2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Metal Claw1.wav b/public/audio/battle_anims/PRSFX- Metal Claw1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Metal Claw1.wav
rename to public/audio/battle_anims/PRSFX- Metal Claw1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Metal Claw2.wav b/public/audio/battle_anims/PRSFX- Metal Claw2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Metal Claw2.wav
rename to public/audio/battle_anims/PRSFX- Metal Claw2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Metal Sound.wav b/public/audio/battle_anims/PRSFX- Metal Sound.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Metal Sound.wav
rename to public/audio/battle_anims/PRSFX- Metal Sound.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Meteor Mash1.wav b/public/audio/battle_anims/PRSFX- Meteor Mash1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Meteor Mash1.wav
rename to public/audio/battle_anims/PRSFX- Meteor Mash1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Meteor Mash2.wav b/public/audio/battle_anims/PRSFX- Meteor Mash2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Meteor Mash2.wav
rename to public/audio/battle_anims/PRSFX- Meteor Mash2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Metronome.wav b/public/audio/battle_anims/PRSFX- Metronome.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Metronome.wav
rename to public/audio/battle_anims/PRSFX- Metronome.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Milk Drink.wav b/public/audio/battle_anims/PRSFX- Milk Drink.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Milk Drink.wav
rename to public/audio/battle_anims/PRSFX- Milk Drink.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Mimic1.wav b/public/audio/battle_anims/PRSFX- Mimic1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Mimic1.wav
rename to public/audio/battle_anims/PRSFX- Mimic1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Mimic2.wav b/public/audio/battle_anims/PRSFX- Mimic2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Mimic2.wav
rename to public/audio/battle_anims/PRSFX- Mimic2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Mind Blow1.wav b/public/audio/battle_anims/PRSFX- Mind Blow1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Mind Blow1.wav
rename to public/audio/battle_anims/PRSFX- Mind Blow1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Mind Blow2.wav b/public/audio/battle_anims/PRSFX- Mind Blow2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Mind Blow2.wav
rename to public/audio/battle_anims/PRSFX- Mind Blow2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Mind Blow3.wav b/public/audio/battle_anims/PRSFX- Mind Blow3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Mind Blow3.wav
rename to public/audio/battle_anims/PRSFX- Mind Blow3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Mind Blow4.wav b/public/audio/battle_anims/PRSFX- Mind Blow4.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Mind Blow4.wav
rename to public/audio/battle_anims/PRSFX- Mind Blow4.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Mind Reader.wav b/public/audio/battle_anims/PRSFX- Mind Reader.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Mind Reader.wav
rename to public/audio/battle_anims/PRSFX- Mind Reader.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Minimize1.wav b/public/audio/battle_anims/PRSFX- Minimize1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Minimize1.wav
rename to public/audio/battle_anims/PRSFX- Minimize1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Minimize2.wav b/public/audio/battle_anims/PRSFX- Minimize2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Minimize2.wav
rename to public/audio/battle_anims/PRSFX- Minimize2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Minimize3.wav b/public/audio/battle_anims/PRSFX- Minimize3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Minimize3.wav
rename to public/audio/battle_anims/PRSFX- Minimize3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Miracle Eye.wav b/public/audio/battle_anims/PRSFX- Miracle Eye.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Miracle Eye.wav
rename to public/audio/battle_anims/PRSFX- Miracle Eye.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Mirror Coat.wav b/public/audio/battle_anims/PRSFX- Mirror Coat.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Mirror Coat.wav
rename to public/audio/battle_anims/PRSFX- Mirror Coat.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Mirror Shatter.wav b/public/audio/battle_anims/PRSFX- Mirror Shatter.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Mirror Shatter.wav
rename to public/audio/battle_anims/PRSFX- Mirror Shatter.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Mirror Shot.wav b/public/audio/battle_anims/PRSFX- Mirror Shot.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Mirror Shot.wav
rename to public/audio/battle_anims/PRSFX- Mirror Shot.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Mist Ball1.wav b/public/audio/battle_anims/PRSFX- Mist Ball1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Mist Ball1.wav
rename to public/audio/battle_anims/PRSFX- Mist Ball1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Mist Ball2.wav b/public/audio/battle_anims/PRSFX- Mist Ball2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Mist Ball2.wav
rename to public/audio/battle_anims/PRSFX- Mist Ball2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Mist.wav b/public/audio/battle_anims/PRSFX- Mist.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Mist.wav
rename to public/audio/battle_anims/PRSFX- Mist.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Misty Terrain.wav b/public/audio/battle_anims/PRSFX- Misty Terrain.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Misty Terrain.wav
rename to public/audio/battle_anims/PRSFX- Misty Terrain.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Moonblast1.wav b/public/audio/battle_anims/PRSFX- Moonblast1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Moonblast1.wav
rename to public/audio/battle_anims/PRSFX- Moonblast1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Moonblast2.wav b/public/audio/battle_anims/PRSFX- Moonblast2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Moonblast2.wav
rename to public/audio/battle_anims/PRSFX- Moonblast2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Moonlight.wav b/public/audio/battle_anims/PRSFX- Moonlight.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Moonlight.wav
rename to public/audio/battle_anims/PRSFX- Moonlight.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Morning Sun.wav b/public/audio/battle_anims/PRSFX- Morning Sun.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Morning Sun.wav
rename to public/audio/battle_anims/PRSFX- Morning Sun.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Mud Bomb1.wav b/public/audio/battle_anims/PRSFX- Mud Bomb1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Mud Bomb1.wav
rename to public/audio/battle_anims/PRSFX- Mud Bomb1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Mud Bomb2.wav b/public/audio/battle_anims/PRSFX- Mud Bomb2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Mud Bomb2.wav
rename to public/audio/battle_anims/PRSFX- Mud Bomb2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Mud Shot.wav b/public/audio/battle_anims/PRSFX- Mud Shot.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Mud Shot.wav
rename to public/audio/battle_anims/PRSFX- Mud Shot.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Mud Slap.wav b/public/audio/battle_anims/PRSFX- Mud Slap.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Mud Slap.wav
rename to public/audio/battle_anims/PRSFX- Mud Slap.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Mud Sport1.wav b/public/audio/battle_anims/PRSFX- Mud Sport1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Mud Sport1.wav
rename to public/audio/battle_anims/PRSFX- Mud Sport1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Mud Sport2.wav b/public/audio/battle_anims/PRSFX- Mud Sport2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Mud Sport2.wav
rename to public/audio/battle_anims/PRSFX- Mud Sport2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Muddy Water.wav b/public/audio/battle_anims/PRSFX- Muddy Water.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Muddy Water.wav
rename to public/audio/battle_anims/PRSFX- Muddy Water.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Multi Attack1.wav b/public/audio/battle_anims/PRSFX- Multi Attack1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Multi Attack1.wav
rename to public/audio/battle_anims/PRSFX- Multi Attack1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Multi Attack2.wav b/public/audio/battle_anims/PRSFX- Multi Attack2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Multi Attack2.wav
rename to public/audio/battle_anims/PRSFX- Multi Attack2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Multi Attack3.wav b/public/audio/battle_anims/PRSFX- Multi Attack3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Multi Attack3.wav
rename to public/audio/battle_anims/PRSFX- Multi Attack3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Multi Attack4.wav b/public/audio/battle_anims/PRSFX- Multi Attack4.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Multi Attack4.wav
rename to public/audio/battle_anims/PRSFX- Multi Attack4.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Multi Attack5.wav b/public/audio/battle_anims/PRSFX- Multi Attack5.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Multi Attack5.wav
rename to public/audio/battle_anims/PRSFX- Multi Attack5.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Mystical Fire1.wav b/public/audio/battle_anims/PRSFX- Mystical Fire1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Mystical Fire1.wav
rename to public/audio/battle_anims/PRSFX- Mystical Fire1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Mystical Fire2.wav b/public/audio/battle_anims/PRSFX- Mystical Fire2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Mystical Fire2.wav
rename to public/audio/battle_anims/PRSFX- Mystical Fire2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Nasty Plot.wav b/public/audio/battle_anims/PRSFX- Nasty Plot.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Nasty Plot.wav
rename to public/audio/battle_anims/PRSFX- Nasty Plot.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Natural Gift1.wav b/public/audio/battle_anims/PRSFX- Natural Gift1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Natural Gift1.wav
rename to public/audio/battle_anims/PRSFX- Natural Gift1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Natural Gift2.wav b/public/audio/battle_anims/PRSFX- Natural Gift2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Natural Gift2.wav
rename to public/audio/battle_anims/PRSFX- Natural Gift2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Natures Madness1.wav b/public/audio/battle_anims/PRSFX- Natures Madness1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Natures Madness1.wav
rename to public/audio/battle_anims/PRSFX- Natures Madness1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Natures Madness2.wav b/public/audio/battle_anims/PRSFX- Natures Madness2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Natures Madness2.wav
rename to public/audio/battle_anims/PRSFX- Natures Madness2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Needle Arm1.wav b/public/audio/battle_anims/PRSFX- Needle Arm1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Needle Arm1.wav
rename to public/audio/battle_anims/PRSFX- Needle Arm1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Needle Arm2.wav b/public/audio/battle_anims/PRSFX- Needle Arm2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Needle Arm2.wav
rename to public/audio/battle_anims/PRSFX- Needle Arm2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- NeverEndingNightmare1.wav b/public/audio/battle_anims/PRSFX- NeverEndingNightmare1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- NeverEndingNightmare1.wav
rename to public/audio/battle_anims/PRSFX- NeverEndingNightmare1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- NeverEndingNightmare2.wav b/public/audio/battle_anims/PRSFX- NeverEndingNightmare2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- NeverEndingNightmare2.wav
rename to public/audio/battle_anims/PRSFX- NeverEndingNightmare2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- NeverEndingNightmare3.wav b/public/audio/battle_anims/PRSFX- NeverEndingNightmare3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- NeverEndingNightmare3.wav
rename to public/audio/battle_anims/PRSFX- NeverEndingNightmare3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- NeverEndingNightmare4.wav b/public/audio/battle_anims/PRSFX- NeverEndingNightmare4.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- NeverEndingNightmare4.wav
rename to public/audio/battle_anims/PRSFX- NeverEndingNightmare4.wav
diff --git a/public/audio/se/battle_anims/PRSFX- NeverEndingNightmare5.wav b/public/audio/battle_anims/PRSFX- NeverEndingNightmare5.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- NeverEndingNightmare5.wav
rename to public/audio/battle_anims/PRSFX- NeverEndingNightmare5.wav
diff --git a/public/audio/se/battle_anims/PRSFX- NeverEndingNightmare6.wav b/public/audio/battle_anims/PRSFX- NeverEndingNightmare6.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- NeverEndingNightmare6.wav
rename to public/audio/battle_anims/PRSFX- NeverEndingNightmare6.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Night Daze1.wav b/public/audio/battle_anims/PRSFX- Night Daze1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Night Daze1.wav
rename to public/audio/battle_anims/PRSFX- Night Daze1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Night Daze2.wav b/public/audio/battle_anims/PRSFX- Night Daze2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Night Daze2.wav
rename to public/audio/battle_anims/PRSFX- Night Daze2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Night Shade.wav b/public/audio/battle_anims/PRSFX- Night Shade.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Night Shade.wav
rename to public/audio/battle_anims/PRSFX- Night Shade.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Night Slash1.wav b/public/audio/battle_anims/PRSFX- Night Slash1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Night Slash1.wav
rename to public/audio/battle_anims/PRSFX- Night Slash1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Night Slash2.wav b/public/audio/battle_anims/PRSFX- Night Slash2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Night Slash2.wav
rename to public/audio/battle_anims/PRSFX- Night Slash2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Nightmare.wav b/public/audio/battle_anims/PRSFX- Nightmare.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Nightmare.wav
rename to public/audio/battle_anims/PRSFX- Nightmare.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Noble Roar1.wav b/public/audio/battle_anims/PRSFX- Noble Roar1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Noble Roar1.wav
rename to public/audio/battle_anims/PRSFX- Noble Roar1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Noble Roar2.wav b/public/audio/battle_anims/PRSFX- Noble Roar2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Noble Roar2.wav
rename to public/audio/battle_anims/PRSFX- Noble Roar2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Nuzzle1.wav b/public/audio/battle_anims/PRSFX- Nuzzle1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Nuzzle1.wav
rename to public/audio/battle_anims/PRSFX- Nuzzle1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Nuzzle2.wav b/public/audio/battle_anims/PRSFX- Nuzzle2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Nuzzle2.wav
rename to public/audio/battle_anims/PRSFX- Nuzzle2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Oblivion Wing1.wav b/public/audio/battle_anims/PRSFX- Oblivion Wing1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Oblivion Wing1.wav
rename to public/audio/battle_anims/PRSFX- Oblivion Wing1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Oblivion Wing2.wav b/public/audio/battle_anims/PRSFX- Oblivion Wing2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Oblivion Wing2.wav
rename to public/audio/battle_anims/PRSFX- Oblivion Wing2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Oceanic Operetta1.wav b/public/audio/battle_anims/PRSFX- Oceanic Operetta1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Oceanic Operetta1.wav
rename to public/audio/battle_anims/PRSFX- Oceanic Operetta1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Oceanic Operetta2.wav b/public/audio/battle_anims/PRSFX- Oceanic Operetta2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Oceanic Operetta2.wav
rename to public/audio/battle_anims/PRSFX- Oceanic Operetta2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Oceanic Operetta3.wav b/public/audio/battle_anims/PRSFX- Oceanic Operetta3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Oceanic Operetta3.wav
rename to public/audio/battle_anims/PRSFX- Oceanic Operetta3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Oceanic Operetta4.wav b/public/audio/battle_anims/PRSFX- Oceanic Operetta4.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Oceanic Operetta4.wav
rename to public/audio/battle_anims/PRSFX- Oceanic Operetta4.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Octazooka.wav b/public/audio/battle_anims/PRSFX- Octazooka.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Octazooka.wav
rename to public/audio/battle_anims/PRSFX- Octazooka.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Odor Sleuth1.wav b/public/audio/battle_anims/PRSFX- Odor Sleuth1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Odor Sleuth1.wav
rename to public/audio/battle_anims/PRSFX- Odor Sleuth1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Odor Sleuth2.wav b/public/audio/battle_anims/PRSFX- Odor Sleuth2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Odor Sleuth2.wav
rename to public/audio/battle_anims/PRSFX- Odor Sleuth2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Ominous Wind.wav b/public/audio/battle_anims/PRSFX- Ominous Wind.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Ominous Wind.wav
rename to public/audio/battle_anims/PRSFX- Ominous Wind.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Origin Pulse.wav b/public/audio/battle_anims/PRSFX- Origin Pulse.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Origin Pulse.wav
rename to public/audio/battle_anims/PRSFX- Origin Pulse.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Origin Pulse1.wav b/public/audio/battle_anims/PRSFX- Origin Pulse1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Origin Pulse1.wav
rename to public/audio/battle_anims/PRSFX- Origin Pulse1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Origin Pulse2.wav b/public/audio/battle_anims/PRSFX- Origin Pulse2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Origin Pulse2.wav
rename to public/audio/battle_anims/PRSFX- Origin Pulse2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Origin Pulse3.wav b/public/audio/battle_anims/PRSFX- Origin Pulse3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Origin Pulse3.wav
rename to public/audio/battle_anims/PRSFX- Origin Pulse3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Outrage1.wav b/public/audio/battle_anims/PRSFX- Outrage1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Outrage1.wav
rename to public/audio/battle_anims/PRSFX- Outrage1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Outrage2.wav b/public/audio/battle_anims/PRSFX- Outrage2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Outrage2.wav
rename to public/audio/battle_anims/PRSFX- Outrage2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Overheat1.wav b/public/audio/battle_anims/PRSFX- Overheat1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Overheat1.wav
rename to public/audio/battle_anims/PRSFX- Overheat1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Overheat2.wav b/public/audio/battle_anims/PRSFX- Overheat2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Overheat2.wav
rename to public/audio/battle_anims/PRSFX- Overheat2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Pain Split.wav b/public/audio/battle_anims/PRSFX- Pain Split.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Pain Split.wav
rename to public/audio/battle_anims/PRSFX- Pain Split.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Parabolic Charge.wav b/public/audio/battle_anims/PRSFX- Parabolic Charge.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Parabolic Charge.wav
rename to public/audio/battle_anims/PRSFX- Parabolic Charge.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Paralysis.wav b/public/audio/battle_anims/PRSFX- Paralysis.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Paralysis.wav
rename to public/audio/battle_anims/PRSFX- Paralysis.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Parting Shot.wav b/public/audio/battle_anims/PRSFX- Parting Shot.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Parting Shot.wav
rename to public/audio/battle_anims/PRSFX- Parting Shot.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Pay Day1.wav b/public/audio/battle_anims/PRSFX- Pay Day1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Pay Day1.wav
rename to public/audio/battle_anims/PRSFX- Pay Day1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Pay Day2.wav b/public/audio/battle_anims/PRSFX- Pay Day2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Pay Day2.wav
rename to public/audio/battle_anims/PRSFX- Pay Day2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Payback1.wav b/public/audio/battle_anims/PRSFX- Payback1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Payback1.wav
rename to public/audio/battle_anims/PRSFX- Payback1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Payback2.wav b/public/audio/battle_anims/PRSFX- Payback2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Payback2.wav
rename to public/audio/battle_anims/PRSFX- Payback2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Peck.wav b/public/audio/battle_anims/PRSFX- Peck.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Peck.wav
rename to public/audio/battle_anims/PRSFX- Peck.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Perish Song.wav b/public/audio/battle_anims/PRSFX- Perish Song.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Perish Song.wav
rename to public/audio/battle_anims/PRSFX- Perish Song.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Petal Blizzard1.wav b/public/audio/battle_anims/PRSFX- Petal Blizzard1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Petal Blizzard1.wav
rename to public/audio/battle_anims/PRSFX- Petal Blizzard1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Petal Blizzard2.wav b/public/audio/battle_anims/PRSFX- Petal Blizzard2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Petal Blizzard2.wav
rename to public/audio/battle_anims/PRSFX- Petal Blizzard2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Petal Dance.wav b/public/audio/battle_anims/PRSFX- Petal Dance.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Petal Dance.wav
rename to public/audio/battle_anims/PRSFX- Petal Dance.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Phantom Force1.wav b/public/audio/battle_anims/PRSFX- Phantom Force1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Phantom Force1.wav
rename to public/audio/battle_anims/PRSFX- Phantom Force1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Phantom Force2.wav b/public/audio/battle_anims/PRSFX- Phantom Force2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Phantom Force2.wav
rename to public/audio/battle_anims/PRSFX- Phantom Force2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Photon Guyser1.wav b/public/audio/battle_anims/PRSFX- Photon Guyser1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Photon Guyser1.wav
rename to public/audio/battle_anims/PRSFX- Photon Guyser1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Photon Guyser2.wav b/public/audio/battle_anims/PRSFX- Photon Guyser2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Photon Guyser2.wav
rename to public/audio/battle_anims/PRSFX- Photon Guyser2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Photon Guyser3.wav b/public/audio/battle_anims/PRSFX- Photon Guyser3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Photon Guyser3.wav
rename to public/audio/battle_anims/PRSFX- Photon Guyser3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Pin Missile.wav b/public/audio/battle_anims/PRSFX- Pin Missile.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Pin Missile.wav
rename to public/audio/battle_anims/PRSFX- Pin Missile.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Plasma Fist1.wav b/public/audio/battle_anims/PRSFX- Plasma Fist1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Plasma Fist1.wav
rename to public/audio/battle_anims/PRSFX- Plasma Fist1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Plasma Fist2.wav b/public/audio/battle_anims/PRSFX- Plasma Fist2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Plasma Fist2.wav
rename to public/audio/battle_anims/PRSFX- Plasma Fist2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Plasma Fist3.wav b/public/audio/battle_anims/PRSFX- Plasma Fist3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Plasma Fist3.wav
rename to public/audio/battle_anims/PRSFX- Plasma Fist3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Play Nice1.wav b/public/audio/battle_anims/PRSFX- Play Nice1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Play Nice1.wav
rename to public/audio/battle_anims/PRSFX- Play Nice1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Play Nice2.wav b/public/audio/battle_anims/PRSFX- Play Nice2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Play Nice2.wav
rename to public/audio/battle_anims/PRSFX- Play Nice2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Play Rough1.wav b/public/audio/battle_anims/PRSFX- Play Rough1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Play Rough1.wav
rename to public/audio/battle_anims/PRSFX- Play Rough1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Play Rough2.wav b/public/audio/battle_anims/PRSFX- Play Rough2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Play Rough2.wav
rename to public/audio/battle_anims/PRSFX- Play Rough2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Play Rough3.wav b/public/audio/battle_anims/PRSFX- Play Rough3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Play Rough3.wav
rename to public/audio/battle_anims/PRSFX- Play Rough3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Play Rough4.wav b/public/audio/battle_anims/PRSFX- Play Rough4.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Play Rough4.wav
rename to public/audio/battle_anims/PRSFX- Play Rough4.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Pluck1.wav b/public/audio/battle_anims/PRSFX- Pluck1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Pluck1.wav
rename to public/audio/battle_anims/PRSFX- Pluck1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Pluck2.wav b/public/audio/battle_anims/PRSFX- Pluck2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Pluck2.wav
rename to public/audio/battle_anims/PRSFX- Pluck2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Poison Fang1.wav b/public/audio/battle_anims/PRSFX- Poison Fang1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Poison Fang1.wav
rename to public/audio/battle_anims/PRSFX- Poison Fang1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Poison Fang2.wav b/public/audio/battle_anims/PRSFX- Poison Fang2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Poison Fang2.wav
rename to public/audio/battle_anims/PRSFX- Poison Fang2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Poison Gas.wav b/public/audio/battle_anims/PRSFX- Poison Gas.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Poison Gas.wav
rename to public/audio/battle_anims/PRSFX- Poison Gas.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Poison Jab1.wav b/public/audio/battle_anims/PRSFX- Poison Jab1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Poison Jab1.wav
rename to public/audio/battle_anims/PRSFX- Poison Jab1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Poison Jab2.wav b/public/audio/battle_anims/PRSFX- Poison Jab2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Poison Jab2.wav
rename to public/audio/battle_anims/PRSFX- Poison Jab2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Poison Powder.wav b/public/audio/battle_anims/PRSFX- Poison Powder.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Poison Powder.wav
rename to public/audio/battle_anims/PRSFX- Poison Powder.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Poison Sting.wav b/public/audio/battle_anims/PRSFX- Poison Sting.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Poison Sting.wav
rename to public/audio/battle_anims/PRSFX- Poison Sting.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Poison Tail1.wav b/public/audio/battle_anims/PRSFX- Poison Tail1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Poison Tail1.wav
rename to public/audio/battle_anims/PRSFX- Poison Tail1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Poison Tail2.wav b/public/audio/battle_anims/PRSFX- Poison Tail2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Poison Tail2.wav
rename to public/audio/battle_anims/PRSFX- Poison Tail2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Poison.wav b/public/audio/battle_anims/PRSFX- Poison.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Poison.wav
rename to public/audio/battle_anims/PRSFX- Poison.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Pollen Puff1.wav b/public/audio/battle_anims/PRSFX- Pollen Puff1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Pollen Puff1.wav
rename to public/audio/battle_anims/PRSFX- Pollen Puff1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Pollen Puff2.wav b/public/audio/battle_anims/PRSFX- Pollen Puff2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Pollen Puff2.wav
rename to public/audio/battle_anims/PRSFX- Pollen Puff2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Pollen Puff3.wav b/public/audio/battle_anims/PRSFX- Pollen Puff3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Pollen Puff3.wav
rename to public/audio/battle_anims/PRSFX- Pollen Puff3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Pollen Puff4.wav b/public/audio/battle_anims/PRSFX- Pollen Puff4.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Pollen Puff4.wav
rename to public/audio/battle_anims/PRSFX- Pollen Puff4.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Pollen Puff5.wav b/public/audio/battle_anims/PRSFX- Pollen Puff5.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Pollen Puff5.wav
rename to public/audio/battle_anims/PRSFX- Pollen Puff5.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Pollen Puff6.wav b/public/audio/battle_anims/PRSFX- Pollen Puff6.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Pollen Puff6.wav
rename to public/audio/battle_anims/PRSFX- Pollen Puff6.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Pound.wav b/public/audio/battle_anims/PRSFX- Pound.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Pound.wav
rename to public/audio/battle_anims/PRSFX- Pound.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Powder 1.wav b/public/audio/battle_anims/PRSFX- Powder 1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Powder 1.wav
rename to public/audio/battle_anims/PRSFX- Powder 1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Powder 2.wav b/public/audio/battle_anims/PRSFX- Powder 2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Powder 2.wav
rename to public/audio/battle_anims/PRSFX- Powder 2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Powder Snow1.wav b/public/audio/battle_anims/PRSFX- Powder Snow1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Powder Snow1.wav
rename to public/audio/battle_anims/PRSFX- Powder Snow1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Powder Snow2.wav b/public/audio/battle_anims/PRSFX- Powder Snow2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Powder Snow2.wav
rename to public/audio/battle_anims/PRSFX- Powder Snow2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Powder common1.wav b/public/audio/battle_anims/PRSFX- Powder common1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Powder common1.wav
rename to public/audio/battle_anims/PRSFX- Powder common1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Powder common2.wav b/public/audio/battle_anims/PRSFX- Powder common2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Powder common2.wav
rename to public/audio/battle_anims/PRSFX- Powder common2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Power Gem1.wav b/public/audio/battle_anims/PRSFX- Power Gem1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Power Gem1.wav
rename to public/audio/battle_anims/PRSFX- Power Gem1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Power Split.wav b/public/audio/battle_anims/PRSFX- Power Split.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Power Split.wav
rename to public/audio/battle_anims/PRSFX- Power Split.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Power Swap.wav b/public/audio/battle_anims/PRSFX- Power Swap.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Power Swap.wav
rename to public/audio/battle_anims/PRSFX- Power Swap.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Power Trick.wav b/public/audio/battle_anims/PRSFX- Power Trick.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Power Trick.wav
rename to public/audio/battle_anims/PRSFX- Power Trick.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Power Trip1.wav b/public/audio/battle_anims/PRSFX- Power Trip1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Power Trip1.wav
rename to public/audio/battle_anims/PRSFX- Power Trip1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Power Trip2.wav b/public/audio/battle_anims/PRSFX- Power Trip2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Power Trip2.wav
rename to public/audio/battle_anims/PRSFX- Power Trip2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Power Trip3.wav b/public/audio/battle_anims/PRSFX- Power Trip3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Power Trip3.wav
rename to public/audio/battle_anims/PRSFX- Power Trip3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Power Trip4.wav b/public/audio/battle_anims/PRSFX- Power Trip4.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Power Trip4.wav
rename to public/audio/battle_anims/PRSFX- Power Trip4.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Power Trip5.wav b/public/audio/battle_anims/PRSFX- Power Trip5.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Power Trip5.wav
rename to public/audio/battle_anims/PRSFX- Power Trip5.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Power Up Punch1.wav b/public/audio/battle_anims/PRSFX- Power Up Punch1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Power Up Punch1.wav
rename to public/audio/battle_anims/PRSFX- Power Up Punch1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Power Up Punch2.wav b/public/audio/battle_anims/PRSFX- Power Up Punch2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Power Up Punch2.wav
rename to public/audio/battle_anims/PRSFX- Power Up Punch2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Power Whip.wav b/public/audio/battle_anims/PRSFX- Power Whip.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Power Whip.wav
rename to public/audio/battle_anims/PRSFX- Power Whip.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Precipice Blades.wav b/public/audio/battle_anims/PRSFX- Precipice Blades.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Precipice Blades.wav
rename to public/audio/battle_anims/PRSFX- Precipice Blades.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Present1.wav b/public/audio/battle_anims/PRSFX- Present1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Present1.wav
rename to public/audio/battle_anims/PRSFX- Present1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Present2.wav b/public/audio/battle_anims/PRSFX- Present2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Present2.wav
rename to public/audio/battle_anims/PRSFX- Present2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Prismatic Laser1.wav b/public/audio/battle_anims/PRSFX- Prismatic Laser1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Prismatic Laser1.wav
rename to public/audio/battle_anims/PRSFX- Prismatic Laser1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Prismatic Laser2.wav b/public/audio/battle_anims/PRSFX- Prismatic Laser2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Prismatic Laser2.wav
rename to public/audio/battle_anims/PRSFX- Prismatic Laser2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Prismatic Laser3.wav b/public/audio/battle_anims/PRSFX- Prismatic Laser3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Prismatic Laser3.wav
rename to public/audio/battle_anims/PRSFX- Prismatic Laser3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Protect.wav b/public/audio/battle_anims/PRSFX- Protect.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Protect.wav
rename to public/audio/battle_anims/PRSFX- Protect.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Psybeam.wav b/public/audio/battle_anims/PRSFX- Psybeam.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Psybeam.wav
rename to public/audio/battle_anims/PRSFX- Psybeam.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Psych Up.wav b/public/audio/battle_anims/PRSFX- Psych Up.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Psych Up.wav
rename to public/audio/battle_anims/PRSFX- Psych Up.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Psychic Terrain1.wav b/public/audio/battle_anims/PRSFX- Psychic Terrain1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Psychic Terrain1.wav
rename to public/audio/battle_anims/PRSFX- Psychic Terrain1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Psychic Terrain2.wav b/public/audio/battle_anims/PRSFX- Psychic Terrain2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Psychic Terrain2.wav
rename to public/audio/battle_anims/PRSFX- Psychic Terrain2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Psychic Terrain3.wav b/public/audio/battle_anims/PRSFX- Psychic Terrain3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Psychic Terrain3.wav
rename to public/audio/battle_anims/PRSFX- Psychic Terrain3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Psychic.wav b/public/audio/battle_anims/PRSFX- Psychic.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Psychic.wav
rename to public/audio/battle_anims/PRSFX- Psychic.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Psycho Boost1.wav b/public/audio/battle_anims/PRSFX- Psycho Boost1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Psycho Boost1.wav
rename to public/audio/battle_anims/PRSFX- Psycho Boost1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Psycho Boost2.wav b/public/audio/battle_anims/PRSFX- Psycho Boost2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Psycho Boost2.wav
rename to public/audio/battle_anims/PRSFX- Psycho Boost2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Psycho Cut.wav b/public/audio/battle_anims/PRSFX- Psycho Cut.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Psycho Cut.wav
rename to public/audio/battle_anims/PRSFX- Psycho Cut.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Psycho Shift.wav b/public/audio/battle_anims/PRSFX- Psycho Shift.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Psycho Shift.wav
rename to public/audio/battle_anims/PRSFX- Psycho Shift.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Psyshock1.wav b/public/audio/battle_anims/PRSFX- Psyshock1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Psyshock1.wav
rename to public/audio/battle_anims/PRSFX- Psyshock1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Psyshock2.wav b/public/audio/battle_anims/PRSFX- Psyshock2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Psyshock2.wav
rename to public/audio/battle_anims/PRSFX- Psyshock2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Psystrike1.wav b/public/audio/battle_anims/PRSFX- Psystrike1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Psystrike1.wav
rename to public/audio/battle_anims/PRSFX- Psystrike1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Psystrike2.wav b/public/audio/battle_anims/PRSFX- Psystrike2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Psystrike2.wav
rename to public/audio/battle_anims/PRSFX- Psystrike2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Psystrike3.wav b/public/audio/battle_anims/PRSFX- Psystrike3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Psystrike3.wav
rename to public/audio/battle_anims/PRSFX- Psystrike3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Psywave.wav b/public/audio/battle_anims/PRSFX- Psywave.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Psywave.wav
rename to public/audio/battle_anims/PRSFX- Psywave.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Pulse Evolution1.wav b/public/audio/battle_anims/PRSFX- Pulse Evolution1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Pulse Evolution1.wav
rename to public/audio/battle_anims/PRSFX- Pulse Evolution1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Pulse Evolution2.wav b/public/audio/battle_anims/PRSFX- Pulse Evolution2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Pulse Evolution2.wav
rename to public/audio/battle_anims/PRSFX- Pulse Evolution2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Pulverizing Pancake1.wav b/public/audio/battle_anims/PRSFX- Pulverizing Pancake1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Pulverizing Pancake1.wav
rename to public/audio/battle_anims/PRSFX- Pulverizing Pancake1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Pulverizing Pancake2.wav b/public/audio/battle_anims/PRSFX- Pulverizing Pancake2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Pulverizing Pancake2.wav
rename to public/audio/battle_anims/PRSFX- Pulverizing Pancake2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Pulverizing Pancake3.wav b/public/audio/battle_anims/PRSFX- Pulverizing Pancake3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Pulverizing Pancake3.wav
rename to public/audio/battle_anims/PRSFX- Pulverizing Pancake3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Pulverizing Pancake4.wav b/public/audio/battle_anims/PRSFX- Pulverizing Pancake4.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Pulverizing Pancake4.wav
rename to public/audio/battle_anims/PRSFX- Pulverizing Pancake4.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Pulverizing Pancake5.wav b/public/audio/battle_anims/PRSFX- Pulverizing Pancake5.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Pulverizing Pancake5.wav
rename to public/audio/battle_anims/PRSFX- Pulverizing Pancake5.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Punishment1.wav b/public/audio/battle_anims/PRSFX- Punishment1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Punishment1.wav
rename to public/audio/battle_anims/PRSFX- Punishment1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Punishment2.wav b/public/audio/battle_anims/PRSFX- Punishment2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Punishment2.wav
rename to public/audio/battle_anims/PRSFX- Punishment2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Purify1.wav b/public/audio/battle_anims/PRSFX- Purify1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Purify1.wav
rename to public/audio/battle_anims/PRSFX- Purify1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Purify2.wav b/public/audio/battle_anims/PRSFX- Purify2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Purify2.wav
rename to public/audio/battle_anims/PRSFX- Purify2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Purify3.wav b/public/audio/battle_anims/PRSFX- Purify3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Purify3.wav
rename to public/audio/battle_anims/PRSFX- Purify3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Pursuit1.wav b/public/audio/battle_anims/PRSFX- Pursuit1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Pursuit1.wav
rename to public/audio/battle_anims/PRSFX- Pursuit1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Pursuit2.wav b/public/audio/battle_anims/PRSFX- Pursuit2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Pursuit2.wav
rename to public/audio/battle_anims/PRSFX- Pursuit2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Quash.wav b/public/audio/battle_anims/PRSFX- Quash.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Quash.wav
rename to public/audio/battle_anims/PRSFX- Quash.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Quick Attack.wav b/public/audio/battle_anims/PRSFX- Quick Attack.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Quick Attack.wav
rename to public/audio/battle_anims/PRSFX- Quick Attack.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Quick Guard.wav b/public/audio/battle_anims/PRSFX- Quick Guard.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Quick Guard.wav
rename to public/audio/battle_anims/PRSFX- Quick Guard.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Quiver Dance.wav b/public/audio/battle_anims/PRSFX- Quiver Dance.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Quiver Dance.wav
rename to public/audio/battle_anims/PRSFX- Quiver Dance.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Rage Powder.wav b/public/audio/battle_anims/PRSFX- Rage Powder.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Rage Powder.wav
rename to public/audio/battle_anims/PRSFX- Rage Powder.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Rage1.wav b/public/audio/battle_anims/PRSFX- Rage1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Rage1.wav
rename to public/audio/battle_anims/PRSFX- Rage1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Rage2.wav b/public/audio/battle_anims/PRSFX- Rage2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Rage2.wav
rename to public/audio/battle_anims/PRSFX- Rage2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Rain Dance.wav b/public/audio/battle_anims/PRSFX- Rain Dance.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Rain Dance.wav
rename to public/audio/battle_anims/PRSFX- Rain Dance.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Rain.wav b/public/audio/battle_anims/PRSFX- Rain.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Rain.wav
rename to public/audio/battle_anims/PRSFX- Rain.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Rainbow Field.wav b/public/audio/battle_anims/PRSFX- Rainbow Field.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Rainbow Field.wav
rename to public/audio/battle_anims/PRSFX- Rainbow Field.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Rapid Spin.wav b/public/audio/battle_anims/PRSFX- Rapid Spin.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Rapid Spin.wav
rename to public/audio/battle_anims/PRSFX- Rapid Spin.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Razor Leaf1.wav b/public/audio/battle_anims/PRSFX- Razor Leaf1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Razor Leaf1.wav
rename to public/audio/battle_anims/PRSFX- Razor Leaf1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Razor Leaf2.wav b/public/audio/battle_anims/PRSFX- Razor Leaf2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Razor Leaf2.wav
rename to public/audio/battle_anims/PRSFX- Razor Leaf2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Razor Shell.wav b/public/audio/battle_anims/PRSFX- Razor Shell.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Razor Shell.wav
rename to public/audio/battle_anims/PRSFX- Razor Shell.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Razor Wind1.wav b/public/audio/battle_anims/PRSFX- Razor Wind1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Razor Wind1.wav
rename to public/audio/battle_anims/PRSFX- Razor Wind1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Razor Wind2.wav b/public/audio/battle_anims/PRSFX- Razor Wind2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Razor Wind2.wav
rename to public/audio/battle_anims/PRSFX- Razor Wind2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Recover.wav b/public/audio/battle_anims/PRSFX- Recover.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Recover.wav
rename to public/audio/battle_anims/PRSFX- Recover.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Recycle.wav b/public/audio/battle_anims/PRSFX- Recycle.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Recycle.wav
rename to public/audio/battle_anims/PRSFX- Recycle.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Reflect Type.wav b/public/audio/battle_anims/PRSFX- Reflect Type.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Reflect Type.wav
rename to public/audio/battle_anims/PRSFX- Reflect Type.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Reflect.wav b/public/audio/battle_anims/PRSFX- Reflect.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Reflect.wav
rename to public/audio/battle_anims/PRSFX- Reflect.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Refresh.wav b/public/audio/battle_anims/PRSFX- Refresh.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Refresh.wav
rename to public/audio/battle_anims/PRSFX- Refresh.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Relic Song1.wav b/public/audio/battle_anims/PRSFX- Relic Song1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Relic Song1.wav
rename to public/audio/battle_anims/PRSFX- Relic Song1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Relic Song2.wav b/public/audio/battle_anims/PRSFX- Relic Song2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Relic Song2.wav
rename to public/audio/battle_anims/PRSFX- Relic Song2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Retaliate1.wav b/public/audio/battle_anims/PRSFX- Retaliate1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Retaliate1.wav
rename to public/audio/battle_anims/PRSFX- Retaliate1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Retaliate2.wav b/public/audio/battle_anims/PRSFX- Retaliate2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Retaliate2.wav
rename to public/audio/battle_anims/PRSFX- Retaliate2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Return1.wav b/public/audio/battle_anims/PRSFX- Return1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Return1.wav
rename to public/audio/battle_anims/PRSFX- Return1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Return2.wav b/public/audio/battle_anims/PRSFX- Return2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Return2.wav
rename to public/audio/battle_anims/PRSFX- Return2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Revenge1.wav b/public/audio/battle_anims/PRSFX- Revenge1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Revenge1.wav
rename to public/audio/battle_anims/PRSFX- Revenge1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Revenge2.wav b/public/audio/battle_anims/PRSFX- Revenge2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Revenge2.wav
rename to public/audio/battle_anims/PRSFX- Revenge2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Reversal1.wav b/public/audio/battle_anims/PRSFX- Reversal1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Reversal1.wav
rename to public/audio/battle_anims/PRSFX- Reversal1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Reversal2.wav b/public/audio/battle_anims/PRSFX- Reversal2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Reversal2.wav
rename to public/audio/battle_anims/PRSFX- Reversal2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Roar of Time.wav b/public/audio/battle_anims/PRSFX- Roar of Time.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Roar of Time.wav
rename to public/audio/battle_anims/PRSFX- Roar of Time.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Roar.wav b/public/audio/battle_anims/PRSFX- Roar.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Roar.wav
rename to public/audio/battle_anims/PRSFX- Roar.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Rock Blast.wav b/public/audio/battle_anims/PRSFX- Rock Blast.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Rock Blast.wav
rename to public/audio/battle_anims/PRSFX- Rock Blast.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Rock Climb.wav b/public/audio/battle_anims/PRSFX- Rock Climb.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Rock Climb.wav
rename to public/audio/battle_anims/PRSFX- Rock Climb.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Rock Polish.wav b/public/audio/battle_anims/PRSFX- Rock Polish.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Rock Polish.wav
rename to public/audio/battle_anims/PRSFX- Rock Polish.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Rock Slide.wav b/public/audio/battle_anims/PRSFX- Rock Slide.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Rock Slide.wav
rename to public/audio/battle_anims/PRSFX- Rock Slide.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Rock Smash.wav b/public/audio/battle_anims/PRSFX- Rock Smash.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Rock Smash.wav
rename to public/audio/battle_anims/PRSFX- Rock Smash.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Rock Throw1.wav b/public/audio/battle_anims/PRSFX- Rock Throw1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Rock Throw1.wav
rename to public/audio/battle_anims/PRSFX- Rock Throw1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Rock Throw2.wav b/public/audio/battle_anims/PRSFX- Rock Throw2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Rock Throw2.wav
rename to public/audio/battle_anims/PRSFX- Rock Throw2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Rock Tomb.wav b/public/audio/battle_anims/PRSFX- Rock Tomb.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Rock Tomb.wav
rename to public/audio/battle_anims/PRSFX- Rock Tomb.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Rock Wrecker1.wav b/public/audio/battle_anims/PRSFX- Rock Wrecker1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Rock Wrecker1.wav
rename to public/audio/battle_anims/PRSFX- Rock Wrecker1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Rock Wrecker2.wav b/public/audio/battle_anims/PRSFX- Rock Wrecker2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Rock Wrecker2.wav
rename to public/audio/battle_anims/PRSFX- Rock Wrecker2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Roleplay.wav b/public/audio/battle_anims/PRSFX- Roleplay.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Roleplay.wav
rename to public/audio/battle_anims/PRSFX- Roleplay.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Rolling Kick.wav b/public/audio/battle_anims/PRSFX- Rolling Kick.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Rolling Kick.wav
rename to public/audio/battle_anims/PRSFX- Rolling Kick.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Rollout1.wav b/public/audio/battle_anims/PRSFX- Rollout1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Rollout1.wav
rename to public/audio/battle_anims/PRSFX- Rollout1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Rollout2.wav b/public/audio/battle_anims/PRSFX- Rollout2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Rollout2.wav
rename to public/audio/battle_anims/PRSFX- Rollout2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Roost1.wav b/public/audio/battle_anims/PRSFX- Roost1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Roost1.wav
rename to public/audio/battle_anims/PRSFX- Roost1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Roost2.wav b/public/audio/battle_anims/PRSFX- Roost2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Roost2.wav
rename to public/audio/battle_anims/PRSFX- Roost2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Rototiller.wav b/public/audio/battle_anims/PRSFX- Rototiller.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Rototiller.wav
rename to public/audio/battle_anims/PRSFX- Rototiller.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Round.wav b/public/audio/battle_anims/PRSFX- Round.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Round.wav
rename to public/audio/battle_anims/PRSFX- Round.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sacred Fire1.wav b/public/audio/battle_anims/PRSFX- Sacred Fire1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sacred Fire1.wav
rename to public/audio/battle_anims/PRSFX- Sacred Fire1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sacred Fire2.wav b/public/audio/battle_anims/PRSFX- Sacred Fire2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sacred Fire2.wav
rename to public/audio/battle_anims/PRSFX- Sacred Fire2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sacred Sword1.wav b/public/audio/battle_anims/PRSFX- Sacred Sword1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sacred Sword1.wav
rename to public/audio/battle_anims/PRSFX- Sacred Sword1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sacred Sword2.wav b/public/audio/battle_anims/PRSFX- Sacred Sword2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sacred Sword2.wav
rename to public/audio/battle_anims/PRSFX- Sacred Sword2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Safeguard.wav b/public/audio/battle_anims/PRSFX- Safeguard.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Safeguard.wav
rename to public/audio/battle_anims/PRSFX- Safeguard.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sand Attack.wav b/public/audio/battle_anims/PRSFX- Sand Attack.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sand Attack.wav
rename to public/audio/battle_anims/PRSFX- Sand Attack.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sand Tomb.wav b/public/audio/battle_anims/PRSFX- Sand Tomb.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sand Tomb.wav
rename to public/audio/battle_anims/PRSFX- Sand Tomb.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sand.wav b/public/audio/battle_anims/PRSFX- Sand.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sand.wav
rename to public/audio/battle_anims/PRSFX- Sand.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sandstorm.wav b/public/audio/battle_anims/PRSFX- Sandstorm.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sandstorm.wav
rename to public/audio/battle_anims/PRSFX- Sandstorm.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Scald1.wav b/public/audio/battle_anims/PRSFX- Scald1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Scald1.wav
rename to public/audio/battle_anims/PRSFX- Scald1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Scald2.wav b/public/audio/battle_anims/PRSFX- Scald2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Scald2.wav
rename to public/audio/battle_anims/PRSFX- Scald2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Scary Face.wav b/public/audio/battle_anims/PRSFX- Scary Face.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Scary Face.wav
rename to public/audio/battle_anims/PRSFX- Scary Face.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Scratch.wav b/public/audio/battle_anims/PRSFX- Scratch.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Scratch.wav
rename to public/audio/battle_anims/PRSFX- Scratch.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Screech.wav b/public/audio/battle_anims/PRSFX- Screech.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Screech.wav
rename to public/audio/battle_anims/PRSFX- Screech.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Searing Shot1.wav b/public/audio/battle_anims/PRSFX- Searing Shot1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Searing Shot1.wav
rename to public/audio/battle_anims/PRSFX- Searing Shot1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Searing Shot2.wav b/public/audio/battle_anims/PRSFX- Searing Shot2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Searing Shot2.wav
rename to public/audio/battle_anims/PRSFX- Searing Shot2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Searing Shot3.wav b/public/audio/battle_anims/PRSFX- Searing Shot3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Searing Shot3.wav
rename to public/audio/battle_anims/PRSFX- Searing Shot3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Secret Sword1.wav b/public/audio/battle_anims/PRSFX- Secret Sword1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Secret Sword1.wav
rename to public/audio/battle_anims/PRSFX- Secret Sword1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Secret Sword2.wav b/public/audio/battle_anims/PRSFX- Secret Sword2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Secret Sword2.wav
rename to public/audio/battle_anims/PRSFX- Secret Sword2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Secret Sword3.wav b/public/audio/battle_anims/PRSFX- Secret Sword3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Secret Sword3.wav
rename to public/audio/battle_anims/PRSFX- Secret Sword3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Seed Bomb1.wav b/public/audio/battle_anims/PRSFX- Seed Bomb1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Seed Bomb1.wav
rename to public/audio/battle_anims/PRSFX- Seed Bomb1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Seed Bomb2.wav b/public/audio/battle_anims/PRSFX- Seed Bomb2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Seed Bomb2.wav
rename to public/audio/battle_anims/PRSFX- Seed Bomb2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Seed Flare1.wav b/public/audio/battle_anims/PRSFX- Seed Flare1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Seed Flare1.wav
rename to public/audio/battle_anims/PRSFX- Seed Flare1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Seed Flare2.wav b/public/audio/battle_anims/PRSFX- Seed Flare2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Seed Flare2.wav
rename to public/audio/battle_anims/PRSFX- Seed Flare2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Seed Flare3.wav b/public/audio/battle_anims/PRSFX- Seed Flare3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Seed Flare3.wav
rename to public/audio/battle_anims/PRSFX- Seed Flare3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Seismic Toss1.wav b/public/audio/battle_anims/PRSFX- Seismic Toss1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Seismic Toss1.wav
rename to public/audio/battle_anims/PRSFX- Seismic Toss1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Seismic Toss2.wav b/public/audio/battle_anims/PRSFX- Seismic Toss2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Seismic Toss2.wav
rename to public/audio/battle_anims/PRSFX- Seismic Toss2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Seismic Toss3.wav b/public/audio/battle_anims/PRSFX- Seismic Toss3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Seismic Toss3.wav
rename to public/audio/battle_anims/PRSFX- Seismic Toss3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Seismic Toss4.wav b/public/audio/battle_anims/PRSFX- Seismic Toss4.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Seismic Toss4.wav
rename to public/audio/battle_anims/PRSFX- Seismic Toss4.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Seismic Toss5.wav b/public/audio/battle_anims/PRSFX- Seismic Toss5.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Seismic Toss5.wav
rename to public/audio/battle_anims/PRSFX- Seismic Toss5.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Selfdestruct1.wav b/public/audio/battle_anims/PRSFX- Selfdestruct1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Selfdestruct1.wav
rename to public/audio/battle_anims/PRSFX- Selfdestruct1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Selfedestruct2.wav b/public/audio/battle_anims/PRSFX- Selfedestruct2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Selfedestruct2.wav
rename to public/audio/battle_anims/PRSFX- Selfedestruct2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Shadow Ball1.wav b/public/audio/battle_anims/PRSFX- Shadow Ball1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Shadow Ball1.wav
rename to public/audio/battle_anims/PRSFX- Shadow Ball1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Shadow Ball2.wav b/public/audio/battle_anims/PRSFX- Shadow Ball2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Shadow Ball2.wav
rename to public/audio/battle_anims/PRSFX- Shadow Ball2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Shadow Claw1.wav b/public/audio/battle_anims/PRSFX- Shadow Claw1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Shadow Claw1.wav
rename to public/audio/battle_anims/PRSFX- Shadow Claw1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Shadow Claw2.wav b/public/audio/battle_anims/PRSFX- Shadow Claw2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Shadow Claw2.wav
rename to public/audio/battle_anims/PRSFX- Shadow Claw2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Shadow Force1.wav b/public/audio/battle_anims/PRSFX- Shadow Force1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Shadow Force1.wav
rename to public/audio/battle_anims/PRSFX- Shadow Force1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Shadow Force2.wav b/public/audio/battle_anims/PRSFX- Shadow Force2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Shadow Force2.wav
rename to public/audio/battle_anims/PRSFX- Shadow Force2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Shadow Punch1.wav b/public/audio/battle_anims/PRSFX- Shadow Punch1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Shadow Punch1.wav
rename to public/audio/battle_anims/PRSFX- Shadow Punch1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Shadow Punch2.wav b/public/audio/battle_anims/PRSFX- Shadow Punch2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Shadow Punch2.wav
rename to public/audio/battle_anims/PRSFX- Shadow Punch2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Shadow Sneak1.wav b/public/audio/battle_anims/PRSFX- Shadow Sneak1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Shadow Sneak1.wav
rename to public/audio/battle_anims/PRSFX- Shadow Sneak1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Shadow Sneak2.wav b/public/audio/battle_anims/PRSFX- Shadow Sneak2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Shadow Sneak2.wav
rename to public/audio/battle_anims/PRSFX- Shadow Sneak2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- ShadowBone1.wav b/public/audio/battle_anims/PRSFX- ShadowBone1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- ShadowBone1.wav
rename to public/audio/battle_anims/PRSFX- ShadowBone1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- ShadowBone2.wav b/public/audio/battle_anims/PRSFX- ShadowBone2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- ShadowBone2.wav
rename to public/audio/battle_anims/PRSFX- ShadowBone2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sharpen.wav b/public/audio/battle_anims/PRSFX- Sharpen.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sharpen.wav
rename to public/audio/battle_anims/PRSFX- Sharpen.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Shattered Psyche1.wav b/public/audio/battle_anims/PRSFX- Shattered Psyche1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Shattered Psyche1.wav
rename to public/audio/battle_anims/PRSFX- Shattered Psyche1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Shattered Psyche2.wav b/public/audio/battle_anims/PRSFX- Shattered Psyche2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Shattered Psyche2.wav
rename to public/audio/battle_anims/PRSFX- Shattered Psyche2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Shattered Psyche3.wav b/public/audio/battle_anims/PRSFX- Shattered Psyche3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Shattered Psyche3.wav
rename to public/audio/battle_anims/PRSFX- Shattered Psyche3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sheer Cold.wav b/public/audio/battle_anims/PRSFX- Sheer Cold.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sheer Cold.wav
rename to public/audio/battle_anims/PRSFX- Sheer Cold.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Shell Smash1.wav b/public/audio/battle_anims/PRSFX- Shell Smash1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Shell Smash1.wav
rename to public/audio/battle_anims/PRSFX- Shell Smash1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Shell Smash2.wav b/public/audio/battle_anims/PRSFX- Shell Smash2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Shell Smash2.wav
rename to public/audio/battle_anims/PRSFX- Shell Smash2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Shell Trap1.wav b/public/audio/battle_anims/PRSFX- Shell Trap1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Shell Trap1.wav
rename to public/audio/battle_anims/PRSFX- Shell Trap1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Shell Trap2.wav b/public/audio/battle_anims/PRSFX- Shell Trap2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Shell Trap2.wav
rename to public/audio/battle_anims/PRSFX- Shell Trap2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Shell Trap3.wav b/public/audio/battle_anims/PRSFX- Shell Trap3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Shell Trap3.wav
rename to public/audio/battle_anims/PRSFX- Shell Trap3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Shift Gear.wav b/public/audio/battle_anims/PRSFX- Shift Gear.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Shift Gear.wav
rename to public/audio/battle_anims/PRSFX- Shift Gear.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Shiny.wav b/public/audio/battle_anims/PRSFX- Shiny.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Shiny.wav
rename to public/audio/battle_anims/PRSFX- Shiny.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Shockwave.wav b/public/audio/battle_anims/PRSFX- Shockwave.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Shockwave.wav
rename to public/audio/battle_anims/PRSFX- Shockwave.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Shore Up.wav b/public/audio/battle_anims/PRSFX- Shore Up.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Shore Up.wav
rename to public/audio/battle_anims/PRSFX- Shore Up.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Signal Beam.wav b/public/audio/battle_anims/PRSFX- Signal Beam.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Signal Beam.wav
rename to public/audio/battle_anims/PRSFX- Signal Beam.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Silver Wind.wav b/public/audio/battle_anims/PRSFX- Silver Wind.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Silver Wind.wav
rename to public/audio/battle_anims/PRSFX- Silver Wind.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Simple Beam.wav b/public/audio/battle_anims/PRSFX- Simple Beam.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Simple Beam.wav
rename to public/audio/battle_anims/PRSFX- Simple Beam.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sing.wav b/public/audio/battle_anims/PRSFX- Sing.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sing.wav
rename to public/audio/battle_anims/PRSFX- Sing.wav
diff --git a/public/audio/se/battle_anims/PRSFX- SinisterArrowRaid1.wav b/public/audio/battle_anims/PRSFX- SinisterArrowRaid1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- SinisterArrowRaid1.wav
rename to public/audio/battle_anims/PRSFX- SinisterArrowRaid1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- SinisterArrowRaid2.wav b/public/audio/battle_anims/PRSFX- SinisterArrowRaid2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- SinisterArrowRaid2.wav
rename to public/audio/battle_anims/PRSFX- SinisterArrowRaid2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- SinisterArrowRaid3.wav b/public/audio/battle_anims/PRSFX- SinisterArrowRaid3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- SinisterArrowRaid3.wav
rename to public/audio/battle_anims/PRSFX- SinisterArrowRaid3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- SinisterArrowRaid4.wav b/public/audio/battle_anims/PRSFX- SinisterArrowRaid4.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- SinisterArrowRaid4.wav
rename to public/audio/battle_anims/PRSFX- SinisterArrowRaid4.wav
diff --git a/public/audio/se/battle_anims/PRSFX- SinisterArrowRaid5.wav b/public/audio/battle_anims/PRSFX- SinisterArrowRaid5.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- SinisterArrowRaid5.wav
rename to public/audio/battle_anims/PRSFX- SinisterArrowRaid5.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sketch.wav b/public/audio/battle_anims/PRSFX- Sketch.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sketch.wav
rename to public/audio/battle_anims/PRSFX- Sketch.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Skill Swap.wav b/public/audio/battle_anims/PRSFX- Skill Swap.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Skill Swap.wav
rename to public/audio/battle_anims/PRSFX- Skill Swap.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Skull Bash1.wav b/public/audio/battle_anims/PRSFX- Skull Bash1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Skull Bash1.wav
rename to public/audio/battle_anims/PRSFX- Skull Bash1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Skull Bash2.wav b/public/audio/battle_anims/PRSFX- Skull Bash2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Skull Bash2.wav
rename to public/audio/battle_anims/PRSFX- Skull Bash2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sky Attack1.wav b/public/audio/battle_anims/PRSFX- Sky Attack1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sky Attack1.wav
rename to public/audio/battle_anims/PRSFX- Sky Attack1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sky Attack2.wav b/public/audio/battle_anims/PRSFX- Sky Attack2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sky Attack2.wav
rename to public/audio/battle_anims/PRSFX- Sky Attack2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sky Attack3.wav b/public/audio/battle_anims/PRSFX- Sky Attack3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sky Attack3.wav
rename to public/audio/battle_anims/PRSFX- Sky Attack3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sky Drop1.wav b/public/audio/battle_anims/PRSFX- Sky Drop1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sky Drop1.wav
rename to public/audio/battle_anims/PRSFX- Sky Drop1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sky Drop2.wav b/public/audio/battle_anims/PRSFX- Sky Drop2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sky Drop2.wav
rename to public/audio/battle_anims/PRSFX- Sky Drop2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sky Drop3.wav b/public/audio/battle_anims/PRSFX- Sky Drop3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sky Drop3.wav
rename to public/audio/battle_anims/PRSFX- Sky Drop3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sky Uppercut1.wav b/public/audio/battle_anims/PRSFX- Sky Uppercut1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sky Uppercut1.wav
rename to public/audio/battle_anims/PRSFX- Sky Uppercut1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sky Uppercut2.wav b/public/audio/battle_anims/PRSFX- Sky Uppercut2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sky Uppercut2.wav
rename to public/audio/battle_anims/PRSFX- Sky Uppercut2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Slack Off.wav b/public/audio/battle_anims/PRSFX- Slack Off.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Slack Off.wav
rename to public/audio/battle_anims/PRSFX- Slack Off.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Slam.wav b/public/audio/battle_anims/PRSFX- Slam.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Slam.wav
rename to public/audio/battle_anims/PRSFX- Slam.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Slash.wav b/public/audio/battle_anims/PRSFX- Slash.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Slash.wav
rename to public/audio/battle_anims/PRSFX- Slash.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sleep Powder.wav b/public/audio/battle_anims/PRSFX- Sleep Powder.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sleep Powder.wav
rename to public/audio/battle_anims/PRSFX- Sleep Powder.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sleep Talk.wav b/public/audio/battle_anims/PRSFX- Sleep Talk.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sleep Talk.wav
rename to public/audio/battle_anims/PRSFX- Sleep Talk.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sleep.wav b/public/audio/battle_anims/PRSFX- Sleep.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sleep.wav
rename to public/audio/battle_anims/PRSFX- Sleep.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sludge Bomb1.wav b/public/audio/battle_anims/PRSFX- Sludge Bomb1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sludge Bomb1.wav
rename to public/audio/battle_anims/PRSFX- Sludge Bomb1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sludge Bomb2.wav b/public/audio/battle_anims/PRSFX- Sludge Bomb2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sludge Bomb2.wav
rename to public/audio/battle_anims/PRSFX- Sludge Bomb2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sludge Wave.wav b/public/audio/battle_anims/PRSFX- Sludge Wave.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sludge Wave.wav
rename to public/audio/battle_anims/PRSFX- Sludge Wave.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sludge.wav b/public/audio/battle_anims/PRSFX- Sludge.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sludge.wav
rename to public/audio/battle_anims/PRSFX- Sludge.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Smack Down1.wav b/public/audio/battle_anims/PRSFX- Smack Down1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Smack Down1.wav
rename to public/audio/battle_anims/PRSFX- Smack Down1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Smack Down2.wav b/public/audio/battle_anims/PRSFX- Smack Down2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Smack Down2.wav
rename to public/audio/battle_anims/PRSFX- Smack Down2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Smack Down3.wav b/public/audio/battle_anims/PRSFX- Smack Down3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Smack Down3.wav
rename to public/audio/battle_anims/PRSFX- Smack Down3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Smart Strike1.wav b/public/audio/battle_anims/PRSFX- Smart Strike1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Smart Strike1.wav
rename to public/audio/battle_anims/PRSFX- Smart Strike1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Smart Strike2.wav b/public/audio/battle_anims/PRSFX- Smart Strike2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Smart Strike2.wav
rename to public/audio/battle_anims/PRSFX- Smart Strike2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Smart Strike3.wav b/public/audio/battle_anims/PRSFX- Smart Strike3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Smart Strike3.wav
rename to public/audio/battle_anims/PRSFX- Smart Strike3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Smart Strike4.wav b/public/audio/battle_anims/PRSFX- Smart Strike4.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Smart Strike4.wav
rename to public/audio/battle_anims/PRSFX- Smart Strike4.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Smellingsalts.wav b/public/audio/battle_anims/PRSFX- Smellingsalts.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Smellingsalts.wav
rename to public/audio/battle_anims/PRSFX- Smellingsalts.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Smog.wav b/public/audio/battle_anims/PRSFX- Smog.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Smog.wav
rename to public/audio/battle_anims/PRSFX- Smog.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Smokescreen.wav b/public/audio/battle_anims/PRSFX- Smokescreen.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Smokescreen.wav
rename to public/audio/battle_anims/PRSFX- Smokescreen.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Snarl.wav b/public/audio/battle_anims/PRSFX- Snarl.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Snarl.wav
rename to public/audio/battle_anims/PRSFX- Snarl.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Snatch.wav b/public/audio/battle_anims/PRSFX- Snatch.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Snatch.wav
rename to public/audio/battle_anims/PRSFX- Snatch.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Snore.wav b/public/audio/battle_anims/PRSFX- Snore.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Snore.wav
rename to public/audio/battle_anims/PRSFX- Snore.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Soak.wav b/public/audio/battle_anims/PRSFX- Soak.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Soak.wav
rename to public/audio/battle_anims/PRSFX- Soak.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Softboiled1.wav b/public/audio/battle_anims/PRSFX- Softboiled1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Softboiled1.wav
rename to public/audio/battle_anims/PRSFX- Softboiled1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Softboiled2.wav b/public/audio/battle_anims/PRSFX- Softboiled2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Softboiled2.wav
rename to public/audio/battle_anims/PRSFX- Softboiled2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Softboiled3.wav b/public/audio/battle_anims/PRSFX- Softboiled3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Softboiled3.wav
rename to public/audio/battle_anims/PRSFX- Softboiled3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Solar Beam1.wav b/public/audio/battle_anims/PRSFX- Solar Beam1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Solar Beam1.wav
rename to public/audio/battle_anims/PRSFX- Solar Beam1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Solar Beam2.wav b/public/audio/battle_anims/PRSFX- Solar Beam2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Solar Beam2.wav
rename to public/audio/battle_anims/PRSFX- Solar Beam2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sonic Boom1.wav b/public/audio/battle_anims/PRSFX- Sonic Boom1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sonic Boom1.wav
rename to public/audio/battle_anims/PRSFX- Sonic Boom1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sonic Boom2.wav b/public/audio/battle_anims/PRSFX- Sonic Boom2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sonic Boom2.wav
rename to public/audio/battle_anims/PRSFX- Sonic Boom2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Spacial Rend.wav b/public/audio/battle_anims/PRSFX- Spacial Rend.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Spacial Rend.wav
rename to public/audio/battle_anims/PRSFX- Spacial Rend.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Spark1.wav b/public/audio/battle_anims/PRSFX- Spark1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Spark1.wav
rename to public/audio/battle_anims/PRSFX- Spark1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Spark2.wav b/public/audio/battle_anims/PRSFX- Spark2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Spark2.wav
rename to public/audio/battle_anims/PRSFX- Spark2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sparkling Aria1.wav b/public/audio/battle_anims/PRSFX- Sparkling Aria1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sparkling Aria1.wav
rename to public/audio/battle_anims/PRSFX- Sparkling Aria1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sparkling Aria2.wav b/public/audio/battle_anims/PRSFX- Sparkling Aria2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sparkling Aria2.wav
rename to public/audio/battle_anims/PRSFX- Sparkling Aria2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sparkling Aria3.wav b/public/audio/battle_anims/PRSFX- Sparkling Aria3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sparkling Aria3.wav
rename to public/audio/battle_anims/PRSFX- Sparkling Aria3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Spectral Thief1.wav b/public/audio/battle_anims/PRSFX- Spectral Thief1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Spectral Thief1.wav
rename to public/audio/battle_anims/PRSFX- Spectral Thief1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Spectral Thief2.wav b/public/audio/battle_anims/PRSFX- Spectral Thief2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Spectral Thief2.wav
rename to public/audio/battle_anims/PRSFX- Spectral Thief2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Spectral Thief3.wav b/public/audio/battle_anims/PRSFX- Spectral Thief3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Spectral Thief3.wav
rename to public/audio/battle_anims/PRSFX- Spectral Thief3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Spectral Thief4.wav b/public/audio/battle_anims/PRSFX- Spectral Thief4.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Spectral Thief4.wav
rename to public/audio/battle_anims/PRSFX- Spectral Thief4.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Speed Swap.wav b/public/audio/battle_anims/PRSFX- Speed Swap.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Speed Swap.wav
rename to public/audio/battle_anims/PRSFX- Speed Swap.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Spider Web1.wav b/public/audio/battle_anims/PRSFX- Spider Web1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Spider Web1.wav
rename to public/audio/battle_anims/PRSFX- Spider Web1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Spider Web2.wav b/public/audio/battle_anims/PRSFX- Spider Web2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Spider Web2.wav
rename to public/audio/battle_anims/PRSFX- Spider Web2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Spike Cannon.wav b/public/audio/battle_anims/PRSFX- Spike Cannon.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Spike Cannon.wav
rename to public/audio/battle_anims/PRSFX- Spike Cannon.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Spikes1.wav b/public/audio/battle_anims/PRSFX- Spikes1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Spikes1.wav
rename to public/audio/battle_anims/PRSFX- Spikes1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Spikes2.wav b/public/audio/battle_anims/PRSFX- Spikes2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Spikes2.wav
rename to public/audio/battle_anims/PRSFX- Spikes2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Spiky Shield1.wav b/public/audio/battle_anims/PRSFX- Spiky Shield1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Spiky Shield1.wav
rename to public/audio/battle_anims/PRSFX- Spiky Shield1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Spiky Shield2.wav b/public/audio/battle_anims/PRSFX- Spiky Shield2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Spiky Shield2.wav
rename to public/audio/battle_anims/PRSFX- Spiky Shield2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Spirit Shackle1.wav b/public/audio/battle_anims/PRSFX- Spirit Shackle1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Spirit Shackle1.wav
rename to public/audio/battle_anims/PRSFX- Spirit Shackle1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Spirit Shackle2.wav b/public/audio/battle_anims/PRSFX- Spirit Shackle2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Spirit Shackle2.wav
rename to public/audio/battle_anims/PRSFX- Spirit Shackle2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Spirit Shackle3.wav b/public/audio/battle_anims/PRSFX- Spirit Shackle3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Spirit Shackle3.wav
rename to public/audio/battle_anims/PRSFX- Spirit Shackle3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Spirit Shackle4.wav b/public/audio/battle_anims/PRSFX- Spirit Shackle4.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Spirit Shackle4.wav
rename to public/audio/battle_anims/PRSFX- Spirit Shackle4.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Spit Up.wav b/public/audio/battle_anims/PRSFX- Spit Up.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Spit Up.wav
rename to public/audio/battle_anims/PRSFX- Spit Up.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Spite1.wav b/public/audio/battle_anims/PRSFX- Spite1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Spite1.wav
rename to public/audio/battle_anims/PRSFX- Spite1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Spite2.wav b/public/audio/battle_anims/PRSFX- Spite2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Spite2.wav
rename to public/audio/battle_anims/PRSFX- Spite2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Splash.wav b/public/audio/battle_anims/PRSFX- Splash.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Splash.wav
rename to public/audio/battle_anims/PRSFX- Splash.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Spore.wav b/public/audio/battle_anims/PRSFX- Spore.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Spore.wav
rename to public/audio/battle_anims/PRSFX- Spore.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Spotlight1.wav b/public/audio/battle_anims/PRSFX- Spotlight1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Spotlight1.wav
rename to public/audio/battle_anims/PRSFX- Spotlight1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Spotlight2.wav b/public/audio/battle_anims/PRSFX- Spotlight2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Spotlight2.wav
rename to public/audio/battle_anims/PRSFX- Spotlight2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Spotlight3.wav b/public/audio/battle_anims/PRSFX- Spotlight3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Spotlight3.wav
rename to public/audio/battle_anims/PRSFX- Spotlight3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Spotlight4.wav b/public/audio/battle_anims/PRSFX- Spotlight4.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Spotlight4.wav
rename to public/audio/battle_anims/PRSFX- Spotlight4.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Spotlight5.wav b/public/audio/battle_anims/PRSFX- Spotlight5.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Spotlight5.wav
rename to public/audio/battle_anims/PRSFX- Spotlight5.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Stat Down.wav b/public/audio/battle_anims/PRSFX- Stat Down.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Stat Down.wav
rename to public/audio/battle_anims/PRSFX- Stat Down.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Stat Up.wav b/public/audio/battle_anims/PRSFX- Stat Up.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Stat Up.wav
rename to public/audio/battle_anims/PRSFX- Stat Up.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Stealth Rocks.wav b/public/audio/battle_anims/PRSFX- Stealth Rocks.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Stealth Rocks.wav
rename to public/audio/battle_anims/PRSFX- Stealth Rocks.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Steam Eruption1.wav b/public/audio/battle_anims/PRSFX- Steam Eruption1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Steam Eruption1.wav
rename to public/audio/battle_anims/PRSFX- Steam Eruption1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Steam Eruption2.wav b/public/audio/battle_anims/PRSFX- Steam Eruption2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Steam Eruption2.wav
rename to public/audio/battle_anims/PRSFX- Steam Eruption2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Steamroller1.wav b/public/audio/battle_anims/PRSFX- Steamroller1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Steamroller1.wav
rename to public/audio/battle_anims/PRSFX- Steamroller1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Steamroller2.wav b/public/audio/battle_anims/PRSFX- Steamroller2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Steamroller2.wav
rename to public/audio/battle_anims/PRSFX- Steamroller2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Steel Wing.wav b/public/audio/battle_anims/PRSFX- Steel Wing.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Steel Wing.wav
rename to public/audio/battle_anims/PRSFX- Steel Wing.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sticky Web.wav b/public/audio/battle_anims/PRSFX- Sticky Web.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sticky Web.wav
rename to public/audio/battle_anims/PRSFX- Sticky Web.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Stockpile.wav b/public/audio/battle_anims/PRSFX- Stockpile.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Stockpile.wav
rename to public/audio/battle_anims/PRSFX- Stockpile.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Stomp.wav b/public/audio/battle_anims/PRSFX- Stomp.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Stomp.wav
rename to public/audio/battle_anims/PRSFX- Stomp.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Stomping Tantrum.wav b/public/audio/battle_anims/PRSFX- Stomping Tantrum.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Stomping Tantrum.wav
rename to public/audio/battle_anims/PRSFX- Stomping Tantrum.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Stone Edge.wav b/public/audio/battle_anims/PRSFX- Stone Edge.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Stone Edge.wav
rename to public/audio/battle_anims/PRSFX- Stone Edge.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Stored Power1.wav b/public/audio/battle_anims/PRSFX- Stored Power1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Stored Power1.wav
rename to public/audio/battle_anims/PRSFX- Stored Power1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Stored Power2.wav b/public/audio/battle_anims/PRSFX- Stored Power2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Stored Power2.wav
rename to public/audio/battle_anims/PRSFX- Stored Power2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Storm Throw1.wav b/public/audio/battle_anims/PRSFX- Storm Throw1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Storm Throw1.wav
rename to public/audio/battle_anims/PRSFX- Storm Throw1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Storm Throw2.wav b/public/audio/battle_anims/PRSFX- Storm Throw2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Storm Throw2.wav
rename to public/audio/battle_anims/PRSFX- Storm Throw2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Strength Sap1.wav b/public/audio/battle_anims/PRSFX- Strength Sap1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Strength Sap1.wav
rename to public/audio/battle_anims/PRSFX- Strength Sap1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Strength Sap2.wav b/public/audio/battle_anims/PRSFX- Strength Sap2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Strength Sap2.wav
rename to public/audio/battle_anims/PRSFX- Strength Sap2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Strength Sap3.wav b/public/audio/battle_anims/PRSFX- Strength Sap3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Strength Sap3.wav
rename to public/audio/battle_anims/PRSFX- Strength Sap3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Strength.wav b/public/audio/battle_anims/PRSFX- Strength.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Strength.wav
rename to public/audio/battle_anims/PRSFX- Strength.wav
diff --git a/public/audio/se/battle_anims/PRSFX- String Shot1.wav b/public/audio/battle_anims/PRSFX- String Shot1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- String Shot1.wav
rename to public/audio/battle_anims/PRSFX- String Shot1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- String Shot2.wav b/public/audio/battle_anims/PRSFX- String Shot2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- String Shot2.wav
rename to public/audio/battle_anims/PRSFX- String Shot2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Struggle Bug.wav b/public/audio/battle_anims/PRSFX- Struggle Bug.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Struggle Bug.wav
rename to public/audio/battle_anims/PRSFX- Struggle Bug.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Struggle.wav b/public/audio/battle_anims/PRSFX- Struggle.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Struggle.wav
rename to public/audio/battle_anims/PRSFX- Struggle.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Stun Spore.wav b/public/audio/battle_anims/PRSFX- Stun Spore.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Stun Spore.wav
rename to public/audio/battle_anims/PRSFX- Stun Spore.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Submission.wav b/public/audio/battle_anims/PRSFX- Submission.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Submission.wav
rename to public/audio/battle_anims/PRSFX- Submission.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Substitute1.wav b/public/audio/battle_anims/PRSFX- Substitute1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Substitute1.wav
rename to public/audio/battle_anims/PRSFX- Substitute1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Substitute2.wav b/public/audio/battle_anims/PRSFX- Substitute2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Substitute2.wav
rename to public/audio/battle_anims/PRSFX- Substitute2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Subzero Slammer1.wav b/public/audio/battle_anims/PRSFX- Subzero Slammer1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Subzero Slammer1.wav
rename to public/audio/battle_anims/PRSFX- Subzero Slammer1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Subzero Slammer2.wav b/public/audio/battle_anims/PRSFX- Subzero Slammer2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Subzero Slammer2.wav
rename to public/audio/battle_anims/PRSFX- Subzero Slammer2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Subzero Slammer3.wav b/public/audio/battle_anims/PRSFX- Subzero Slammer3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Subzero Slammer3.wav
rename to public/audio/battle_anims/PRSFX- Subzero Slammer3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Subzero Slammer4.wav b/public/audio/battle_anims/PRSFX- Subzero Slammer4.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Subzero Slammer4.wav
rename to public/audio/battle_anims/PRSFX- Subzero Slammer4.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sucker Punch1.wav b/public/audio/battle_anims/PRSFX- Sucker Punch1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sucker Punch1.wav
rename to public/audio/battle_anims/PRSFX- Sucker Punch1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sucker Punch2.wav b/public/audio/battle_anims/PRSFX- Sucker Punch2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sucker Punch2.wav
rename to public/audio/battle_anims/PRSFX- Sucker Punch2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sunny Day.wav b/public/audio/battle_anims/PRSFX- Sunny Day.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sunny Day.wav
rename to public/audio/battle_anims/PRSFX- Sunny Day.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sunny.wav b/public/audio/battle_anims/PRSFX- Sunny.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sunny.wav
rename to public/audio/battle_anims/PRSFX- Sunny.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Super Fang1.wav b/public/audio/battle_anims/PRSFX- Super Fang1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Super Fang1.wav
rename to public/audio/battle_anims/PRSFX- Super Fang1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Super Fang2.wav b/public/audio/battle_anims/PRSFX- Super Fang2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Super Fang2.wav
rename to public/audio/battle_anims/PRSFX- Super Fang2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Superpower1.wav b/public/audio/battle_anims/PRSFX- Superpower1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Superpower1.wav
rename to public/audio/battle_anims/PRSFX- Superpower1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Superpower2.wav b/public/audio/battle_anims/PRSFX- Superpower2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Superpower2.wav
rename to public/audio/battle_anims/PRSFX- Superpower2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Supersonic.wav b/public/audio/battle_anims/PRSFX- Supersonic.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Supersonic.wav
rename to public/audio/battle_anims/PRSFX- Supersonic.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Surf.wav b/public/audio/battle_anims/PRSFX- Surf.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Surf.wav
rename to public/audio/battle_anims/PRSFX- Surf.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Swagger1.wav b/public/audio/battle_anims/PRSFX- Swagger1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Swagger1.wav
rename to public/audio/battle_anims/PRSFX- Swagger1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Swagger2.wav b/public/audio/battle_anims/PRSFX- Swagger2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Swagger2.wav
rename to public/audio/battle_anims/PRSFX- Swagger2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Swallow.wav b/public/audio/battle_anims/PRSFX- Swallow.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Swallow.wav
rename to public/audio/battle_anims/PRSFX- Swallow.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sweet Kiss1.wav b/public/audio/battle_anims/PRSFX- Sweet Kiss1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sweet Kiss1.wav
rename to public/audio/battle_anims/PRSFX- Sweet Kiss1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sweet Kiss2.wav b/public/audio/battle_anims/PRSFX- Sweet Kiss2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sweet Kiss2.wav
rename to public/audio/battle_anims/PRSFX- Sweet Kiss2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Sweet Scent.wav b/public/audio/battle_anims/PRSFX- Sweet Scent.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Sweet Scent.wav
rename to public/audio/battle_anims/PRSFX- Sweet Scent.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Swift1.wav b/public/audio/battle_anims/PRSFX- Swift1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Swift1.wav
rename to public/audio/battle_anims/PRSFX- Swift1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Swift2.wav b/public/audio/battle_anims/PRSFX- Swift2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Swift2.wav
rename to public/audio/battle_anims/PRSFX- Swift2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Switcheroo.wav b/public/audio/battle_anims/PRSFX- Switcheroo.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Switcheroo.wav
rename to public/audio/battle_anims/PRSFX- Switcheroo.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Swords Dance1.wav b/public/audio/battle_anims/PRSFX- Swords Dance1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Swords Dance1.wav
rename to public/audio/battle_anims/PRSFX- Swords Dance1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Swords Dance2.wav b/public/audio/battle_anims/PRSFX- Swords Dance2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Swords Dance2.wav
rename to public/audio/battle_anims/PRSFX- Swords Dance2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Synchronoise.wav b/public/audio/battle_anims/PRSFX- Synchronoise.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Synchronoise.wav
rename to public/audio/battle_anims/PRSFX- Synchronoise.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Synthesis.wav b/public/audio/battle_anims/PRSFX- Synthesis.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Synthesis.wav
rename to public/audio/battle_anims/PRSFX- Synthesis.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Tackle.wav b/public/audio/battle_anims/PRSFX- Tackle.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Tackle.wav
rename to public/audio/battle_anims/PRSFX- Tackle.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Tail Glow.wav b/public/audio/battle_anims/PRSFX- Tail Glow.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Tail Glow.wav
rename to public/audio/battle_anims/PRSFX- Tail Glow.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Tail Slap.wav b/public/audio/battle_anims/PRSFX- Tail Slap.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Tail Slap.wav
rename to public/audio/battle_anims/PRSFX- Tail Slap.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Tail Whip.wav b/public/audio/battle_anims/PRSFX- Tail Whip.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Tail Whip.wav
rename to public/audio/battle_anims/PRSFX- Tail Whip.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Tailwind.wav b/public/audio/battle_anims/PRSFX- Tailwind.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Tailwind.wav
rename to public/audio/battle_anims/PRSFX- Tailwind.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Take Down1.wav b/public/audio/battle_anims/PRSFX- Take Down1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Take Down1.wav
rename to public/audio/battle_anims/PRSFX- Take Down1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Take Down2.wav b/public/audio/battle_anims/PRSFX- Take Down2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Take Down2.wav
rename to public/audio/battle_anims/PRSFX- Take Down2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Taunt1.wav b/public/audio/battle_anims/PRSFX- Taunt1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Taunt1.wav
rename to public/audio/battle_anims/PRSFX- Taunt1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Taunt2.wav b/public/audio/battle_anims/PRSFX- Taunt2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Taunt2.wav
rename to public/audio/battle_anims/PRSFX- Taunt2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Taunt3.wav b/public/audio/battle_anims/PRSFX- Taunt3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Taunt3.wav
rename to public/audio/battle_anims/PRSFX- Taunt3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Tearful Look1.wav b/public/audio/battle_anims/PRSFX- Tearful Look1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Tearful Look1.wav
rename to public/audio/battle_anims/PRSFX- Tearful Look1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Tearful Look2.wav b/public/audio/battle_anims/PRSFX- Tearful Look2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Tearful Look2.wav
rename to public/audio/battle_anims/PRSFX- Tearful Look2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Tearful Look3.wav b/public/audio/battle_anims/PRSFX- Tearful Look3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Tearful Look3.wav
rename to public/audio/battle_anims/PRSFX- Tearful Look3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Techno Blast 1.wav b/public/audio/battle_anims/PRSFX- Techno Blast 1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Techno Blast 1.wav
rename to public/audio/battle_anims/PRSFX- Techno Blast 1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Techno Blast 2.wav b/public/audio/battle_anims/PRSFX- Techno Blast 2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Techno Blast 2.wav
rename to public/audio/battle_anims/PRSFX- Techno Blast 2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Techno Blast 3.wav b/public/audio/battle_anims/PRSFX- Techno Blast 3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Techno Blast 3.wav
rename to public/audio/battle_anims/PRSFX- Techno Blast 3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Teeter Dance.wav b/public/audio/battle_anims/PRSFX- Teeter Dance.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Teeter Dance.wav
rename to public/audio/battle_anims/PRSFX- Teeter Dance.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Telekinesis.wav b/public/audio/battle_anims/PRSFX- Telekinesis.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Telekinesis.wav
rename to public/audio/battle_anims/PRSFX- Telekinesis.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Teleport.wav b/public/audio/battle_anims/PRSFX- Teleport.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Teleport.wav
rename to public/audio/battle_anims/PRSFX- Teleport.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Theif1.wav b/public/audio/battle_anims/PRSFX- Theif1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Theif1.wav
rename to public/audio/battle_anims/PRSFX- Theif1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Theif2.wav b/public/audio/battle_anims/PRSFX- Theif2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Theif2.wav
rename to public/audio/battle_anims/PRSFX- Theif2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Thousand Arrows1.wav b/public/audio/battle_anims/PRSFX- Thousand Arrows1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Thousand Arrows1.wav
rename to public/audio/battle_anims/PRSFX- Thousand Arrows1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Thousand Arrows2.wav b/public/audio/battle_anims/PRSFX- Thousand Arrows2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Thousand Arrows2.wav
rename to public/audio/battle_anims/PRSFX- Thousand Arrows2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Thousand Waves1.wav b/public/audio/battle_anims/PRSFX- Thousand Waves1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Thousand Waves1.wav
rename to public/audio/battle_anims/PRSFX- Thousand Waves1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Thousand Waves2.wav b/public/audio/battle_anims/PRSFX- Thousand Waves2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Thousand Waves2.wav
rename to public/audio/battle_anims/PRSFX- Thousand Waves2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Thrash.wav b/public/audio/battle_anims/PRSFX- Thrash.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Thrash.wav
rename to public/audio/battle_anims/PRSFX- Thrash.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Thrash2.wav b/public/audio/battle_anims/PRSFX- Thrash2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Thrash2.wav
rename to public/audio/battle_anims/PRSFX- Thrash2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Throat Chop1.wav b/public/audio/battle_anims/PRSFX- Throat Chop1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Throat Chop1.wav
rename to public/audio/battle_anims/PRSFX- Throat Chop1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Throat Chop2.wav b/public/audio/battle_anims/PRSFX- Throat Chop2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Throat Chop2.wav
rename to public/audio/battle_anims/PRSFX- Throat Chop2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Throat Chop3.wav b/public/audio/battle_anims/PRSFX- Throat Chop3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Throat Chop3.wav
rename to public/audio/battle_anims/PRSFX- Throat Chop3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Throat Chop4.wav b/public/audio/battle_anims/PRSFX- Throat Chop4.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Throat Chop4.wav
rename to public/audio/battle_anims/PRSFX- Throat Chop4.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Throat Chop5.wav b/public/audio/battle_anims/PRSFX- Throat Chop5.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Throat Chop5.wav
rename to public/audio/battle_anims/PRSFX- Throat Chop5.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Thunder Fang.wav b/public/audio/battle_anims/PRSFX- Thunder Fang.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Thunder Fang.wav
rename to public/audio/battle_anims/PRSFX- Thunder Fang.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Thunder Punch1.wav b/public/audio/battle_anims/PRSFX- Thunder Punch1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Thunder Punch1.wav
rename to public/audio/battle_anims/PRSFX- Thunder Punch1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Thunder Punch2.wav b/public/audio/battle_anims/PRSFX- Thunder Punch2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Thunder Punch2.wav
rename to public/audio/battle_anims/PRSFX- Thunder Punch2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Thunder Wave.wav b/public/audio/battle_anims/PRSFX- Thunder Wave.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Thunder Wave.wav
rename to public/audio/battle_anims/PRSFX- Thunder Wave.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Thunder.wav b/public/audio/battle_anims/PRSFX- Thunder.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Thunder.wav
rename to public/audio/battle_anims/PRSFX- Thunder.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Thunderbolt1.wav b/public/audio/battle_anims/PRSFX- Thunderbolt1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Thunderbolt1.wav
rename to public/audio/battle_anims/PRSFX- Thunderbolt1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Thunderbolt2.wav b/public/audio/battle_anims/PRSFX- Thunderbolt2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Thunderbolt2.wav
rename to public/audio/battle_anims/PRSFX- Thunderbolt2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Thundershock.wav b/public/audio/battle_anims/PRSFX- Thundershock.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Thundershock.wav
rename to public/audio/battle_anims/PRSFX- Thundershock.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Tickle.wav b/public/audio/battle_anims/PRSFX- Tickle.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Tickle.wav
rename to public/audio/battle_anims/PRSFX- Tickle.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Topsy Turvy.wav b/public/audio/battle_anims/PRSFX- Topsy Turvy.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Topsy Turvy.wav
rename to public/audio/battle_anims/PRSFX- Topsy Turvy.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Torment1.wav b/public/audio/battle_anims/PRSFX- Torment1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Torment1.wav
rename to public/audio/battle_anims/PRSFX- Torment1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Torment2.wav b/public/audio/battle_anims/PRSFX- Torment2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Torment2.wav
rename to public/audio/battle_anims/PRSFX- Torment2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Toxic Spikes1.wav b/public/audio/battle_anims/PRSFX- Toxic Spikes1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Toxic Spikes1.wav
rename to public/audio/battle_anims/PRSFX- Toxic Spikes1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Toxic Spikes2.wav b/public/audio/battle_anims/PRSFX- Toxic Spikes2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Toxic Spikes2.wav
rename to public/audio/battle_anims/PRSFX- Toxic Spikes2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Toxic Thread1.wav b/public/audio/battle_anims/PRSFX- Toxic Thread1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Toxic Thread1.wav
rename to public/audio/battle_anims/PRSFX- Toxic Thread1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Toxic Thread2.wav b/public/audio/battle_anims/PRSFX- Toxic Thread2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Toxic Thread2.wav
rename to public/audio/battle_anims/PRSFX- Toxic Thread2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Toxic Thread3.wav b/public/audio/battle_anims/PRSFX- Toxic Thread3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Toxic Thread3.wav
rename to public/audio/battle_anims/PRSFX- Toxic Thread3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Toxic1.wav b/public/audio/battle_anims/PRSFX- Toxic1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Toxic1.wav
rename to public/audio/battle_anims/PRSFX- Toxic1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Toxic2.wav b/public/audio/battle_anims/PRSFX- Toxic2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Toxic2.wav
rename to public/audio/battle_anims/PRSFX- Toxic2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Trainer.wav b/public/audio/battle_anims/PRSFX- Trainer.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Trainer.wav
rename to public/audio/battle_anims/PRSFX- Trainer.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Transform.wav b/public/audio/battle_anims/PRSFX- Transform.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Transform.wav
rename to public/audio/battle_anims/PRSFX- Transform.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Tri Attack.wav b/public/audio/battle_anims/PRSFX- Tri Attack.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Tri Attack.wav
rename to public/audio/battle_anims/PRSFX- Tri Attack.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Trick Room.wav b/public/audio/battle_anims/PRSFX- Trick Room.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Trick Room.wav
rename to public/audio/battle_anims/PRSFX- Trick Room.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Trick or Treat.wav b/public/audio/battle_anims/PRSFX- Trick or Treat.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Trick or Treat.wav
rename to public/audio/battle_anims/PRSFX- Trick or Treat.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Trick.wav b/public/audio/battle_anims/PRSFX- Trick.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Trick.wav
rename to public/audio/battle_anims/PRSFX- Trick.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Triple Kick.wav b/public/audio/battle_anims/PRSFX- Triple Kick.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Triple Kick.wav
rename to public/audio/battle_anims/PRSFX- Triple Kick.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Trop Kick1.wav b/public/audio/battle_anims/PRSFX- Trop Kick1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Trop Kick1.wav
rename to public/audio/battle_anims/PRSFX- Trop Kick1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Trop Kick2.wav b/public/audio/battle_anims/PRSFX- Trop Kick2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Trop Kick2.wav
rename to public/audio/battle_anims/PRSFX- Trop Kick2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Trop Kick3.wav b/public/audio/battle_anims/PRSFX- Trop Kick3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Trop Kick3.wav
rename to public/audio/battle_anims/PRSFX- Trop Kick3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Trump Card1.wav b/public/audio/battle_anims/PRSFX- Trump Card1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Trump Card1.wav
rename to public/audio/battle_anims/PRSFX- Trump Card1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Trump Card2.wav b/public/audio/battle_anims/PRSFX- Trump Card2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Trump Card2.wav
rename to public/audio/battle_anims/PRSFX- Trump Card2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Twineedle1.wav b/public/audio/battle_anims/PRSFX- Twineedle1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Twineedle1.wav
rename to public/audio/battle_anims/PRSFX- Twineedle1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Twineedle2.wav b/public/audio/battle_anims/PRSFX- Twineedle2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Twineedle2.wav
rename to public/audio/battle_anims/PRSFX- Twineedle2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Twinkle Tackle1.wav b/public/audio/battle_anims/PRSFX- Twinkle Tackle1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Twinkle Tackle1.wav
rename to public/audio/battle_anims/PRSFX- Twinkle Tackle1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Twinkle Tackle2.wav b/public/audio/battle_anims/PRSFX- Twinkle Tackle2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Twinkle Tackle2.wav
rename to public/audio/battle_anims/PRSFX- Twinkle Tackle2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Twinkle Tackle3.wav b/public/audio/battle_anims/PRSFX- Twinkle Tackle3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Twinkle Tackle3.wav
rename to public/audio/battle_anims/PRSFX- Twinkle Tackle3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Twister.wav b/public/audio/battle_anims/PRSFX- Twister.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Twister.wav
rename to public/audio/battle_anims/PRSFX- Twister.wav
diff --git a/public/audio/se/battle_anims/PRSFX- U-Turn.wav b/public/audio/battle_anims/PRSFX- U-Turn.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- U-Turn.wav
rename to public/audio/battle_anims/PRSFX- U-Turn.wav
diff --git a/public/audio/se/battle_anims/PRSFX- U-Turn2.wav b/public/audio/battle_anims/PRSFX- U-Turn2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- U-Turn2.wav
rename to public/audio/battle_anims/PRSFX- U-Turn2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Uproar1.wav b/public/audio/battle_anims/PRSFX- Uproar1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Uproar1.wav
rename to public/audio/battle_anims/PRSFX- Uproar1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Uproar2.wav b/public/audio/battle_anims/PRSFX- Uproar2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Uproar2.wav
rename to public/audio/battle_anims/PRSFX- Uproar2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- V-Create1.wav b/public/audio/battle_anims/PRSFX- V-Create1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- V-Create1.wav
rename to public/audio/battle_anims/PRSFX- V-Create1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- V-Create2.wav b/public/audio/battle_anims/PRSFX- V-Create2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- V-Create2.wav
rename to public/audio/battle_anims/PRSFX- V-Create2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Vacuum Wave1.wav b/public/audio/battle_anims/PRSFX- Vacuum Wave1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Vacuum Wave1.wav
rename to public/audio/battle_anims/PRSFX- Vacuum Wave1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Vacuum Wave2.wav b/public/audio/battle_anims/PRSFX- Vacuum Wave2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Vacuum Wave2.wav
rename to public/audio/battle_anims/PRSFX- Vacuum Wave2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Venom Drench.wav b/public/audio/battle_anims/PRSFX- Venom Drench.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Venom Drench.wav
rename to public/audio/battle_anims/PRSFX- Venom Drench.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Venoshock1.wav b/public/audio/battle_anims/PRSFX- Venoshock1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Venoshock1.wav
rename to public/audio/battle_anims/PRSFX- Venoshock1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Venoshock2.wav b/public/audio/battle_anims/PRSFX- Venoshock2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Venoshock2.wav
rename to public/audio/battle_anims/PRSFX- Venoshock2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Vice Grip.wav b/public/audio/battle_anims/PRSFX- Vice Grip.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Vice Grip.wav
rename to public/audio/battle_anims/PRSFX- Vice Grip.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Vine Whip.wav b/public/audio/battle_anims/PRSFX- Vine Whip.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Vine Whip.wav
rename to public/audio/battle_anims/PRSFX- Vine Whip.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Vital Throw1.wav b/public/audio/battle_anims/PRSFX- Vital Throw1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Vital Throw1.wav
rename to public/audio/battle_anims/PRSFX- Vital Throw1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Vital Throw2.wav b/public/audio/battle_anims/PRSFX- Vital Throw2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Vital Throw2.wav
rename to public/audio/battle_anims/PRSFX- Vital Throw2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Volt Switch1.wav b/public/audio/battle_anims/PRSFX- Volt Switch1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Volt Switch1.wav
rename to public/audio/battle_anims/PRSFX- Volt Switch1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Volt Switch2.wav b/public/audio/battle_anims/PRSFX- Volt Switch2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Volt Switch2.wav
rename to public/audio/battle_anims/PRSFX- Volt Switch2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Volt Tackle1.wav b/public/audio/battle_anims/PRSFX- Volt Tackle1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Volt Tackle1.wav
rename to public/audio/battle_anims/PRSFX- Volt Tackle1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Volt Tackle2.wav b/public/audio/battle_anims/PRSFX- Volt Tackle2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Volt Tackle2.wav
rename to public/audio/battle_anims/PRSFX- Volt Tackle2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Wake Up Slap.wav b/public/audio/battle_anims/PRSFX- Wake Up Slap.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Wake Up Slap.wav
rename to public/audio/battle_anims/PRSFX- Wake Up Slap.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Water Gun.wav b/public/audio/battle_anims/PRSFX- Water Gun.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Water Gun.wav
rename to public/audio/battle_anims/PRSFX- Water Gun.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Water Pledge1.wav b/public/audio/battle_anims/PRSFX- Water Pledge1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Water Pledge1.wav
rename to public/audio/battle_anims/PRSFX- Water Pledge1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Water Pledge2.wav b/public/audio/battle_anims/PRSFX- Water Pledge2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Water Pledge2.wav
rename to public/audio/battle_anims/PRSFX- Water Pledge2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Water Pulse.wav b/public/audio/battle_anims/PRSFX- Water Pulse.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Water Pulse.wav
rename to public/audio/battle_anims/PRSFX- Water Pulse.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Water Pulse2.wav b/public/audio/battle_anims/PRSFX- Water Pulse2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Water Pulse2.wav
rename to public/audio/battle_anims/PRSFX- Water Pulse2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Water Shurkein.wav b/public/audio/battle_anims/PRSFX- Water Shurkein.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Water Shurkein.wav
rename to public/audio/battle_anims/PRSFX- Water Shurkein.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Water Sport.wav b/public/audio/battle_anims/PRSFX- Water Sport.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Water Sport.wav
rename to public/audio/battle_anims/PRSFX- Water Sport.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Water Spout1.wav b/public/audio/battle_anims/PRSFX- Water Spout1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Water Spout1.wav
rename to public/audio/battle_anims/PRSFX- Water Spout1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Water Spout2.wav b/public/audio/battle_anims/PRSFX- Water Spout2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Water Spout2.wav
rename to public/audio/battle_anims/PRSFX- Water Spout2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Waterfall1.wav b/public/audio/battle_anims/PRSFX- Waterfall1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Waterfall1.wav
rename to public/audio/battle_anims/PRSFX- Waterfall1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Waterfall2.wav b/public/audio/battle_anims/PRSFX- Waterfall2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Waterfall2.wav
rename to public/audio/battle_anims/PRSFX- Waterfall2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Weather Ball1.wav b/public/audio/battle_anims/PRSFX- Weather Ball1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Weather Ball1.wav
rename to public/audio/battle_anims/PRSFX- Weather Ball1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Weather Ball2.wav b/public/audio/battle_anims/PRSFX- Weather Ball2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Weather Ball2.wav
rename to public/audio/battle_anims/PRSFX- Weather Ball2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Weather Ball3.wav b/public/audio/battle_anims/PRSFX- Weather Ball3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Weather Ball3.wav
rename to public/audio/battle_anims/PRSFX- Weather Ball3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Weather Ball4.wav b/public/audio/battle_anims/PRSFX- Weather Ball4.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Weather Ball4.wav
rename to public/audio/battle_anims/PRSFX- Weather Ball4.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Weather Ball5.wav b/public/audio/battle_anims/PRSFX- Weather Ball5.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Weather Ball5.wav
rename to public/audio/battle_anims/PRSFX- Weather Ball5.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Weather Ball6.wav b/public/audio/battle_anims/PRSFX- Weather Ball6.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Weather Ball6.wav
rename to public/audio/battle_anims/PRSFX- Weather Ball6.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Whirlpool.wav b/public/audio/battle_anims/PRSFX- Whirlpool.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Whirlpool.wav
rename to public/audio/battle_anims/PRSFX- Whirlpool.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Whirlpool2.wav b/public/audio/battle_anims/PRSFX- Whirlpool2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Whirlpool2.wav
rename to public/audio/battle_anims/PRSFX- Whirlpool2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Whirlwind.wav b/public/audio/battle_anims/PRSFX- Whirlwind.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Whirlwind.wav
rename to public/audio/battle_anims/PRSFX- Whirlwind.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Wide Guard.wav b/public/audio/battle_anims/PRSFX- Wide Guard.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Wide Guard.wav
rename to public/audio/battle_anims/PRSFX- Wide Guard.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Wild Charge1.wav b/public/audio/battle_anims/PRSFX- Wild Charge1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Wild Charge1.wav
rename to public/audio/battle_anims/PRSFX- Wild Charge1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Wild Charge2.wav b/public/audio/battle_anims/PRSFX- Wild Charge2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Wild Charge2.wav
rename to public/audio/battle_anims/PRSFX- Wild Charge2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Will O Wisp1.wav b/public/audio/battle_anims/PRSFX- Will O Wisp1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Will O Wisp1.wav
rename to public/audio/battle_anims/PRSFX- Will O Wisp1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Will O Wisp2.wav b/public/audio/battle_anims/PRSFX- Will O Wisp2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Will O Wisp2.wav
rename to public/audio/battle_anims/PRSFX- Will O Wisp2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Wind.wav b/public/audio/battle_anims/PRSFX- Wind.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Wind.wav
rename to public/audio/battle_anims/PRSFX- Wind.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Wing Attack1.wav b/public/audio/battle_anims/PRSFX- Wing Attack1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Wing Attack1.wav
rename to public/audio/battle_anims/PRSFX- Wing Attack1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Wing Attack2.wav b/public/audio/battle_anims/PRSFX- Wing Attack2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Wing Attack2.wav
rename to public/audio/battle_anims/PRSFX- Wing Attack2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Wish.wav b/public/audio/battle_anims/PRSFX- Wish.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Wish.wav
rename to public/audio/battle_anims/PRSFX- Wish.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Wish2.wav b/public/audio/battle_anims/PRSFX- Wish2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Wish2.wav
rename to public/audio/battle_anims/PRSFX- Wish2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Withdraw.wav b/public/audio/battle_anims/PRSFX- Withdraw.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Withdraw.wav
rename to public/audio/battle_anims/PRSFX- Withdraw.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Wonder Room.wav b/public/audio/battle_anims/PRSFX- Wonder Room.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Wonder Room.wav
rename to public/audio/battle_anims/PRSFX- Wonder Room.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Wood Hammer.wav b/public/audio/battle_anims/PRSFX- Wood Hammer.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Wood Hammer.wav
rename to public/audio/battle_anims/PRSFX- Wood Hammer.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Work Up.wav b/public/audio/battle_anims/PRSFX- Work Up.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Work Up.wav
rename to public/audio/battle_anims/PRSFX- Work Up.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Worry Seed1.wav b/public/audio/battle_anims/PRSFX- Worry Seed1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Worry Seed1.wav
rename to public/audio/battle_anims/PRSFX- Worry Seed1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Worry Seed2.wav b/public/audio/battle_anims/PRSFX- Worry Seed2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Worry Seed2.wav
rename to public/audio/battle_anims/PRSFX- Worry Seed2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Wrap.wav b/public/audio/battle_anims/PRSFX- Wrap.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Wrap.wav
rename to public/audio/battle_anims/PRSFX- Wrap.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Wring Out1.wav b/public/audio/battle_anims/PRSFX- Wring Out1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Wring Out1.wav
rename to public/audio/battle_anims/PRSFX- Wring Out1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Wring Out2.wav b/public/audio/battle_anims/PRSFX- Wring Out2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Wring Out2.wav
rename to public/audio/battle_anims/PRSFX- Wring Out2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- X Scissor.wav b/public/audio/battle_anims/PRSFX- X Scissor.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- X Scissor.wav
rename to public/audio/battle_anims/PRSFX- X Scissor.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Yawn.wav b/public/audio/battle_anims/PRSFX- Yawn.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Yawn.wav
rename to public/audio/battle_anims/PRSFX- Yawn.wav
diff --git a/public/audio/se/battle_anims/PRSFX- ZPower2.wav b/public/audio/battle_anims/PRSFX- ZPower2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- ZPower2.wav
rename to public/audio/battle_anims/PRSFX- ZPower2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- ZPower3.wav b/public/audio/battle_anims/PRSFX- ZPower3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- ZPower3.wav
rename to public/audio/battle_anims/PRSFX- ZPower3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Zap Cannon1.wav b/public/audio/battle_anims/PRSFX- Zap Cannon1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Zap Cannon1.wav
rename to public/audio/battle_anims/PRSFX- Zap Cannon1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Zap Cannon2.wav b/public/audio/battle_anims/PRSFX- Zap Cannon2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Zap Cannon2.wav
rename to public/audio/battle_anims/PRSFX- Zap Cannon2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Zap Cannon3.wav b/public/audio/battle_anims/PRSFX- Zap Cannon3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Zap Cannon3.wav
rename to public/audio/battle_anims/PRSFX- Zap Cannon3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Zen Headbutt1.wav b/public/audio/battle_anims/PRSFX- Zen Headbutt1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Zen Headbutt1.wav
rename to public/audio/battle_anims/PRSFX- Zen Headbutt1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Zen Headbutt2.wav b/public/audio/battle_anims/PRSFX- Zen Headbutt2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Zen Headbutt2.wav
rename to public/audio/battle_anims/PRSFX- Zen Headbutt2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Zing Zap1.wav b/public/audio/battle_anims/PRSFX- Zing Zap1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Zing Zap1.wav
rename to public/audio/battle_anims/PRSFX- Zing Zap1.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Zing Zap2.wav b/public/audio/battle_anims/PRSFX- Zing Zap2.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Zing Zap2.wav
rename to public/audio/battle_anims/PRSFX- Zing Zap2.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Zing Zap3.wav b/public/audio/battle_anims/PRSFX- Zing Zap3.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Zing Zap3.wav
rename to public/audio/battle_anims/PRSFX- Zing Zap3.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Zing Zap4.wav b/public/audio/battle_anims/PRSFX- Zing Zap4.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Zing Zap4.wav
rename to public/audio/battle_anims/PRSFX- Zing Zap4.wav
diff --git a/public/audio/se/battle_anims/PRSFX- Zpower1.wav b/public/audio/battle_anims/PRSFX- Zpower1.wav
similarity index 100%
rename from public/audio/se/battle_anims/PRSFX- Zpower1.wav
rename to public/audio/battle_anims/PRSFX- Zpower1.wav
diff --git a/public/audio/se/battle_anims/Paralyze1.m4a b/public/audio/battle_anims/Paralyze1.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Paralyze1.m4a
rename to public/audio/battle_anims/Paralyze1.m4a
diff --git a/public/audio/se/battle_anims/Paralyze3.m4a b/public/audio/battle_anims/Paralyze3.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Paralyze3.m4a
rename to public/audio/battle_anims/Paralyze3.m4a
diff --git a/public/audio/se/battle_anims/Poison.m4a b/public/audio/battle_anims/Poison.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Poison.m4a
rename to public/audio/battle_anims/Poison.m4a
diff --git a/public/audio/se/battle_anims/Pollen.m4a b/public/audio/battle_anims/Pollen.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Pollen.m4a
rename to public/audio/battle_anims/Pollen.m4a
diff --git a/public/audio/se/battle_anims/Present - Heal.mp3 b/public/audio/battle_anims/Present - Heal.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Present - Heal.mp3
rename to public/audio/battle_anims/Present - Heal.mp3
diff --git a/public/audio/se/battle_anims/Psych Up.mp3 b/public/audio/battle_anims/Psych Up.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Psych Up.mp3
rename to public/audio/battle_anims/Psych Up.mp3
diff --git a/public/audio/se/battle_anims/Psycho Cut.wav b/public/audio/battle_anims/Psycho Cut.wav
similarity index 100%
rename from public/audio/se/battle_anims/Psycho Cut.wav
rename to public/audio/battle_anims/Psycho Cut.wav
diff --git a/public/audio/se/battle_anims/Recovery.m4a b/public/audio/battle_anims/Recovery.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Recovery.m4a
rename to public/audio/battle_anims/Recovery.m4a
diff --git a/public/audio/se/battle_anims/Refresh.mp3 b/public/audio/battle_anims/Refresh.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Refresh.mp3
rename to public/audio/battle_anims/Refresh.mp3
diff --git a/public/audio/se/battle_anims/RockFall1.wav b/public/audio/battle_anims/RockFall1.wav
similarity index 100%
rename from public/audio/se/battle_anims/RockFall1.wav
rename to public/audio/battle_anims/RockFall1.wav
diff --git a/public/audio/se/battle_anims/Saint1.m4a b/public/audio/battle_anims/Saint1.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Saint1.m4a
rename to public/audio/battle_anims/Saint1.m4a
diff --git a/public/audio/se/battle_anims/Saint3.m4a b/public/audio/battle_anims/Saint3.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Saint3.m4a
rename to public/audio/battle_anims/Saint3.m4a
diff --git a/public/audio/se/battle_anims/Saint4.m4a b/public/audio/battle_anims/Saint4.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Saint4.m4a
rename to public/audio/battle_anims/Saint4.m4a
diff --git a/public/audio/se/battle_anims/Saint6.m4a b/public/audio/battle_anims/Saint6.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Saint6.m4a
rename to public/audio/battle_anims/Saint6.m4a
diff --git a/public/audio/se/battle_anims/Saint7.m4a b/public/audio/battle_anims/Saint7.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Saint7.m4a
rename to public/audio/battle_anims/Saint7.m4a
diff --git a/public/audio/se/battle_anims/Saint8.m4a b/public/audio/battle_anims/Saint8.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Saint8.m4a
rename to public/audio/battle_anims/Saint8.m4a
diff --git a/public/audio/se/battle_anims/Saint9.m4a b/public/audio/battle_anims/Saint9.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Saint9.m4a
rename to public/audio/battle_anims/Saint9.m4a
diff --git a/public/audio/se/battle_anims/Sand.m4a b/public/audio/battle_anims/Sand.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Sand.m4a
rename to public/audio/battle_anims/Sand.m4a
diff --git a/public/audio/se/battle_anims/Scary Face.mp3 b/public/audio/battle_anims/Scary Face.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Scary Face.mp3
rename to public/audio/battle_anims/Scary Face.mp3
diff --git a/public/audio/se/battle_anims/Select.WAV b/public/audio/battle_anims/Select.WAV
similarity index 100%
rename from public/audio/se/battle_anims/Select.WAV
rename to public/audio/battle_anims/Select.WAV
diff --git a/public/audio/se/battle_anims/Shell Smash.mp3 b/public/audio/battle_anims/Shell Smash.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Shell Smash.mp3
rename to public/audio/battle_anims/Shell Smash.mp3
diff --git a/public/audio/se/battle_anims/Shiny sparkle.m4a b/public/audio/battle_anims/Shiny sparkle.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Shiny sparkle.m4a
rename to public/audio/battle_anims/Shiny sparkle.m4a
diff --git a/public/audio/se/battle_anims/Sing.m4a b/public/audio/battle_anims/Sing.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Sing.m4a
rename to public/audio/battle_anims/Sing.m4a
diff --git a/public/audio/se/battle_anims/Slam.mp3 b/public/audio/battle_anims/Slam.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Slam.mp3
rename to public/audio/battle_anims/Slam.mp3
diff --git a/public/audio/se/battle_anims/Slash.mp3 b/public/audio/battle_anims/Slash.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Slash.mp3
rename to public/audio/battle_anims/Slash.mp3
diff --git a/public/audio/se/battle_anims/Slash1.m4a b/public/audio/battle_anims/Slash1.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Slash1.m4a
rename to public/audio/battle_anims/Slash1.m4a
diff --git a/public/audio/se/battle_anims/Slash10.m4a b/public/audio/battle_anims/Slash10.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Slash10.m4a
rename to public/audio/battle_anims/Slash10.m4a
diff --git a/public/audio/se/battle_anims/Slash11.m4a b/public/audio/battle_anims/Slash11.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Slash11.m4a
rename to public/audio/battle_anims/Slash11.m4a
diff --git a/public/audio/se/battle_anims/Slash2.m4a b/public/audio/battle_anims/Slash2.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Slash2.m4a
rename to public/audio/battle_anims/Slash2.m4a
diff --git a/public/audio/se/battle_anims/Slash3.m4a b/public/audio/battle_anims/Slash3.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Slash3.m4a
rename to public/audio/battle_anims/Slash3.m4a
diff --git a/public/audio/se/battle_anims/Slash6.m4a b/public/audio/battle_anims/Slash6.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Slash6.m4a
rename to public/audio/battle_anims/Slash6.m4a
diff --git a/public/audio/se/battle_anims/Slash8.m4a b/public/audio/battle_anims/Slash8.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Slash8.m4a
rename to public/audio/battle_anims/Slash8.m4a
diff --git a/public/audio/se/battle_anims/Slash9.m4a b/public/audio/battle_anims/Slash9.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Slash9.m4a
rename to public/audio/battle_anims/Slash9.m4a
diff --git a/public/audio/se/battle_anims/Sleep.m4a b/public/audio/battle_anims/Sleep.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Sleep.m4a
rename to public/audio/battle_anims/Sleep.m4a
diff --git a/public/audio/se/battle_anims/Smokescreen.mp3 b/public/audio/battle_anims/Smokescreen.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Smokescreen.mp3
rename to public/audio/battle_anims/Smokescreen.mp3
diff --git a/public/audio/se/battle_anims/Snore.mp3 b/public/audio/battle_anims/Snore.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Snore.mp3
rename to public/audio/battle_anims/Snore.mp3
diff --git a/public/audio/se/battle_anims/Sound2.m4a b/public/audio/battle_anims/Sound2.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Sound2.m4a
rename to public/audio/battle_anims/Sound2.m4a
diff --git a/public/audio/se/battle_anims/Stare.m4a b/public/audio/battle_anims/Stare.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Stare.m4a
rename to public/audio/battle_anims/Stare.m4a
diff --git a/public/audio/se/battle_anims/Stone Axe 1.m4a b/public/audio/battle_anims/Stone Axe 1.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Stone Axe 1.m4a
rename to public/audio/battle_anims/Stone Axe 1.m4a
diff --git a/public/audio/se/battle_anims/Stone Axe 2.wav b/public/audio/battle_anims/Stone Axe 2.wav
similarity index 100%
rename from public/audio/se/battle_anims/Stone Axe 2.wav
rename to public/audio/battle_anims/Stone Axe 2.wav
diff --git a/public/audio/se/battle_anims/Substitute.mp3 b/public/audio/battle_anims/Substitute.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Substitute.mp3
rename to public/audio/battle_anims/Substitute.mp3
diff --git a/public/audio/se/battle_anims/Super Fang.mp3 b/public/audio/battle_anims/Super Fang.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Super Fang.mp3
rename to public/audio/battle_anims/Super Fang.mp3
diff --git a/public/audio/se/battle_anims/Swagger.mp3 b/public/audio/battle_anims/Swagger.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Swagger.mp3
rename to public/audio/battle_anims/Swagger.mp3
diff --git a/public/audio/se/battle_anims/Sweet Scent.m4a b/public/audio/battle_anims/Sweet Scent.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Sweet Scent.m4a
rename to public/audio/battle_anims/Sweet Scent.m4a
diff --git a/public/audio/se/battle_anims/Sword1.m4a b/public/audio/battle_anims/Sword1.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Sword1.m4a
rename to public/audio/battle_anims/Sword1.m4a
diff --git a/public/audio/se/battle_anims/Sword2.m4a b/public/audio/battle_anims/Sword2.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Sword2.m4a
rename to public/audio/battle_anims/Sword2.m4a
diff --git a/public/audio/se/battle_anims/Swords Dance.mp3 b/public/audio/battle_anims/Swords Dance.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Swords Dance.mp3
rename to public/audio/battle_anims/Swords Dance.mp3
diff --git a/public/audio/se/battle_anims/Take Down.mp3 b/public/audio/battle_anims/Take Down.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Take Down.mp3
rename to public/audio/battle_anims/Take Down.mp3
diff --git a/public/audio/se/battle_anims/Teleport.m4a b/public/audio/battle_anims/Teleport.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Teleport.m4a
rename to public/audio/battle_anims/Teleport.m4a
diff --git a/public/audio/se/battle_anims/Thunder1.m4a b/public/audio/battle_anims/Thunder1.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Thunder1.m4a
rename to public/audio/battle_anims/Thunder1.m4a
diff --git a/public/audio/se/battle_anims/Thunder3.m4a b/public/audio/battle_anims/Thunder3.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Thunder3.m4a
rename to public/audio/battle_anims/Thunder3.m4a
diff --git a/public/audio/se/battle_anims/Thunder4.m4a b/public/audio/battle_anims/Thunder4.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Thunder4.m4a
rename to public/audio/battle_anims/Thunder4.m4a
diff --git a/public/audio/se/battle_anims/Thunder9.m4a b/public/audio/battle_anims/Thunder9.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Thunder9.m4a
rename to public/audio/battle_anims/Thunder9.m4a
diff --git a/public/audio/se/battle_anims/Trump Card.mp3 b/public/audio/battle_anims/Trump Card.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Trump Card.mp3
rename to public/audio/battle_anims/Trump Card.mp3
diff --git a/public/audio/se/battle_anims/Twine.m4a b/public/audio/battle_anims/Twine.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Twine.m4a
rename to public/audio/battle_anims/Twine.m4a
diff --git a/public/audio/se/battle_anims/Up.m4a b/public/audio/battle_anims/Up.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Up.m4a
rename to public/audio/battle_anims/Up.m4a
diff --git a/public/audio/se/battle_anims/Uproar.mp3 b/public/audio/battle_anims/Uproar.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Uproar.mp3
rename to public/audio/battle_anims/Uproar.mp3
diff --git a/public/audio/se/battle_anims/Vice Grip.mp3 b/public/audio/battle_anims/Vice Grip.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Vice Grip.mp3
rename to public/audio/battle_anims/Vice Grip.mp3
diff --git a/public/audio/se/battle_anims/Voltorb Flip Explosion.mp3 b/public/audio/battle_anims/Voltorb Flip Explosion.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Voltorb Flip Explosion.mp3
rename to public/audio/battle_anims/Voltorb Flip Explosion.mp3
diff --git a/public/audio/se/battle_anims/Voltorb Flip Mark.wav b/public/audio/battle_anims/Voltorb Flip Mark.wav
similarity index 100%
rename from public/audio/se/battle_anims/Voltorb Flip Mark.wav
rename to public/audio/battle_anims/Voltorb Flip Mark.wav
diff --git a/public/audio/se/battle_anims/Water1.m4a b/public/audio/battle_anims/Water1.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Water1.m4a
rename to public/audio/battle_anims/Water1.m4a
diff --git a/public/audio/se/battle_anims/Water2.m4a b/public/audio/battle_anims/Water2.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Water2.m4a
rename to public/audio/battle_anims/Water2.m4a
diff --git a/public/audio/se/battle_anims/Water3.m4a b/public/audio/battle_anims/Water3.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Water3.m4a
rename to public/audio/battle_anims/Water3.m4a
diff --git a/public/audio/se/battle_anims/Water5.m4a b/public/audio/battle_anims/Water5.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Water5.m4a
rename to public/audio/battle_anims/Water5.m4a
diff --git a/public/audio/se/battle_anims/Weatherball.mp3 b/public/audio/battle_anims/Weatherball.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Weatherball.mp3
rename to public/audio/battle_anims/Weatherball.mp3
diff --git a/public/audio/se/battle_anims/Whirlwind.mp3 b/public/audio/battle_anims/Whirlwind.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Whirlwind.mp3
rename to public/audio/battle_anims/Whirlwind.mp3
diff --git a/public/audio/se/battle_anims/Wind1.m4a b/public/audio/battle_anims/Wind1.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Wind1.m4a
rename to public/audio/battle_anims/Wind1.m4a
diff --git a/public/audio/se/battle_anims/Wind5.m4a b/public/audio/battle_anims/Wind5.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Wind5.m4a
rename to public/audio/battle_anims/Wind5.m4a
diff --git a/public/audio/se/battle_anims/Wind7.m4a b/public/audio/battle_anims/Wind7.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Wind7.m4a
rename to public/audio/battle_anims/Wind7.m4a
diff --git a/public/audio/se/battle_anims/Wind8.m4a b/public/audio/battle_anims/Wind8.m4a
similarity index 100%
rename from public/audio/se/battle_anims/Wind8.m4a
rename to public/audio/battle_anims/Wind8.m4a
diff --git a/public/audio/se/battle_anims/Work Up.mp3 b/public/audio/battle_anims/Work Up.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Work Up.mp3
rename to public/audio/battle_anims/Work Up.mp3
diff --git a/public/audio/se/battle_anims/Wring Out.mp3 b/public/audio/battle_anims/Wring Out.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Wring Out.mp3
rename to public/audio/battle_anims/Wring Out.mp3
diff --git a/public/audio/se/battle_anims/Yawn.mp3 b/public/audio/battle_anims/Yawn.mp3
similarity index 100%
rename from public/audio/se/battle_anims/Yawn.mp3
rename to public/audio/battle_anims/Yawn.mp3
diff --git a/public/audio/se/battle_anims/buzzer.wav b/public/audio/battle_anims/buzzer.wav
similarity index 100%
rename from public/audio/se/battle_anims/buzzer.wav
rename to public/audio/battle_anims/buzzer.wav
diff --git a/public/audio/se/battle_anims/decrease.m4a b/public/audio/battle_anims/decrease.m4a
similarity index 100%
rename from public/audio/se/battle_anims/decrease.m4a
rename to public/audio/battle_anims/decrease.m4a
diff --git a/public/audio/se/battle_anims/fog2.mp3 b/public/audio/battle_anims/fog2.mp3
similarity index 100%
rename from public/audio/se/battle_anims/fog2.mp3
rename to public/audio/battle_anims/fog2.mp3
diff --git a/public/audio/se/battle_anims/gust.mp3 b/public/audio/battle_anims/gust.mp3
similarity index 100%
rename from public/audio/se/battle_anims/gust.mp3
rename to public/audio/battle_anims/gust.mp3
diff --git a/public/audio/se/battle_anims/hit.wav b/public/audio/battle_anims/hit.wav
similarity index 100%
rename from public/audio/se/battle_anims/hit.wav
rename to public/audio/battle_anims/hit.wav
diff --git a/public/audio/se/battle_anims/increase.m4a b/public/audio/battle_anims/increase.m4a
similarity index 100%
rename from public/audio/se/battle_anims/increase.m4a
rename to public/audio/battle_anims/increase.m4a
diff --git a/public/audio/se/battle_anims/infatuated.mp3 b/public/audio/battle_anims/infatuated.mp3
similarity index 100%
rename from public/audio/se/battle_anims/infatuated.mp3
rename to public/audio/battle_anims/infatuated.mp3
diff --git a/public/audio/se/battle_anims/metal.m4a b/public/audio/battle_anims/metal.m4a
similarity index 100%
rename from public/audio/se/battle_anims/metal.m4a
rename to public/audio/battle_anims/metal.m4a
diff --git a/public/audio/se/battle_anims/normaldamage.m4a b/public/audio/battle_anims/normaldamage.m4a
similarity index 100%
rename from public/audio/se/battle_anims/normaldamage.m4a
rename to public/audio/battle_anims/normaldamage.m4a
diff --git a/public/audio/se/battle_anims/punch5.wav b/public/audio/battle_anims/punch5.wav
similarity index 100%
rename from public/audio/se/battle_anims/punch5.wav
rename to public/audio/battle_anims/punch5.wav
diff --git a/public/audio/se/battle_anims/superdamage.m4a b/public/audio/battle_anims/superdamage.m4a
similarity index 100%
rename from public/audio/se/battle_anims/superdamage.m4a
rename to public/audio/battle_anims/superdamage.m4a
diff --git a/public/audio/se/battle_anims/throw.m4a b/public/audio/battle_anims/throw.m4a
similarity index 100%
rename from public/audio/se/battle_anims/throw.m4a
rename to public/audio/battle_anims/throw.m4a
diff --git a/public/audio/bgm/battle_aether_boss.mp3 b/public/audio/bgm/battle_aether_boss.mp3
new file mode 100644
index 00000000000..7b776976777
Binary files /dev/null and b/public/audio/bgm/battle_aether_boss.mp3 differ
diff --git a/public/audio/bgm/battle_aether_grunt.mp3 b/public/audio/bgm/battle_aether_grunt.mp3
new file mode 100644
index 00000000000..ede518c8c3f
Binary files /dev/null and b/public/audio/bgm/battle_aether_grunt.mp3 differ
diff --git a/public/audio/bgm/battle_galactic_admin.mp3 b/public/audio/bgm/battle_galactic_admin.mp3
new file mode 100644
index 00000000000..69b6ea918dd
Binary files /dev/null and b/public/audio/bgm/battle_galactic_admin.mp3 differ
diff --git a/public/audio/bgm/battle_legendary_origin_forme.mp3 b/public/audio/bgm/battle_legendary_origin_forme.mp3
new file mode 100644
index 00000000000..830eeff2f84
Binary files /dev/null and b/public/audio/bgm/battle_legendary_origin_forme.mp3 differ
diff --git a/public/audio/bgm/battle_legendary_riders.mp3 b/public/audio/bgm/battle_legendary_riders.mp3
new file mode 100644
index 00000000000..8e9e5f47312
Binary files /dev/null and b/public/audio/bgm/battle_legendary_riders.mp3 differ
diff --git a/public/audio/bgm/battle_macro_boss.mp3 b/public/audio/bgm/battle_macro_boss.mp3
new file mode 100644
index 00000000000..b72d5238b4d
Binary files /dev/null and b/public/audio/bgm/battle_macro_boss.mp3 differ
diff --git a/public/audio/bgm/battle_macro_grunt.mp3 b/public/audio/bgm/battle_macro_grunt.mp3
new file mode 100644
index 00000000000..8a80bfb553b
Binary files /dev/null and b/public/audio/bgm/battle_macro_grunt.mp3 differ
diff --git a/public/audio/bgm/battle_oleana.mp3 b/public/audio/bgm/battle_oleana.mp3
new file mode 100644
index 00000000000..b75bdcb337e
Binary files /dev/null and b/public/audio/bgm/battle_oleana.mp3 differ
diff --git a/public/audio/bgm/battle_skull_admin.mp3 b/public/audio/bgm/battle_skull_admin.mp3
new file mode 100644
index 00000000000..a6ac5cf1bf7
Binary files /dev/null and b/public/audio/bgm/battle_skull_admin.mp3 differ
diff --git a/public/audio/bgm/battle_skull_boss.mp3 b/public/audio/bgm/battle_skull_boss.mp3
new file mode 100644
index 00000000000..2fde7a5524a
Binary files /dev/null and b/public/audio/bgm/battle_skull_boss.mp3 differ
diff --git a/public/audio/bgm/battle_skull_grunt.mp3 b/public/audio/bgm/battle_skull_grunt.mp3
new file mode 100644
index 00000000000..b6f575fc2ad
Binary files /dev/null and b/public/audio/bgm/battle_skull_grunt.mp3 differ
diff --git a/public/audio/se/error.wav b/public/audio/ui/error.wav
similarity index 100%
rename from public/audio/se/error.wav
rename to public/audio/ui/error.wav
diff --git a/public/audio/se/menu_open.wav b/public/audio/ui/menu_open.wav
similarity index 100%
rename from public/audio/se/menu_open.wav
rename to public/audio/ui/menu_open.wav
diff --git a/public/audio/se/select.wav b/public/audio/ui/select.wav
similarity index 100%
rename from public/audio/se/select.wav
rename to public/audio/ui/select.wav
diff --git a/public/images/items.json b/public/images/items.json
index c347790b92f..bb86b46aa4d 100644
--- a/public/images/items.json
+++ b/public/images/items.json
@@ -4,8 +4,8 @@
 			"image": "items.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 425,
-				"h": 425
+				"w": 426,
+				"h": 426
 			},
 			"scale": 1,
 			"frames": [
@@ -240,6 +240,27 @@
 						"h": 31
 					}
 				},
+				{
+					"filename": "inverse",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 1,
+						"w": 22,
+						"h": 30
+					},
+					"frame": {
+						"x": 0,
+						"y": 241,
+						"w": 22,
+						"h": 30
+					}
+				},
 				{
 					"filename": "ribbon_gen3",
 					"rotated": false,
@@ -256,7 +277,7 @@
 					},
 					"frame": {
 						"x": 0,
-						"y": 241,
+						"y": 271,
 						"w": 22,
 						"h": 29
 					}
@@ -277,7 +298,7 @@
 					},
 					"frame": {
 						"x": 0,
-						"y": 270,
+						"y": 300,
 						"w": 22,
 						"h": 29
 					}
@@ -298,7 +319,7 @@
 					},
 					"frame": {
 						"x": 0,
-						"y": 299,
+						"y": 329,
 						"w": 22,
 						"h": 29
 					}
@@ -340,7 +361,7 @@
 					},
 					"frame": {
 						"x": 0,
-						"y": 328,
+						"y": 358,
 						"w": 22,
 						"h": 28
 					}
@@ -361,28 +382,7 @@
 					},
 					"frame": {
 						"x": 0,
-						"y": 356,
-						"w": 22,
-						"h": 28
-					}
-				},
-				{
-					"filename": "ribbon_gen6",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 2,
-						"w": 22,
-						"h": 28
-					},
-					"frame": {
-						"x": 0,
-						"y": 384,
+						"y": 386,
 						"w": 22,
 						"h": 28
 					}
@@ -619,7 +619,7 @@
 					}
 				},
 				{
-					"filename": "elixir",
+					"filename": "lock_capsule",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -628,15 +628,15 @@
 					},
 					"spriteSourceSize": {
 						"x": 7,
-						"y": 4,
-						"w": 18,
-						"h": 24
+						"y": 5,
+						"w": 19,
+						"h": 22
 					},
 					"frame": {
 						"x": 407,
 						"y": 0,
-						"w": 18,
-						"h": 24
+						"w": 19,
+						"h": 22
 					}
 				},
 				{
@@ -724,7 +724,7 @@
 					}
 				},
 				{
-					"filename": "ribbon_gen8",
+					"filename": "ribbon_gen6",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -744,6 +744,27 @@
 						"h": 28
 					}
 				},
+				{
+					"filename": "ribbon_gen8",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 2,
+						"w": 22,
+						"h": 28
+					},
+					"frame": {
+						"x": 22,
+						"y": 237,
+						"w": 22,
+						"h": 28
+					}
+				},
 				{
 					"filename": "black_augurite",
 					"rotated": false,
@@ -760,7 +781,7 @@
 					},
 					"frame": {
 						"x": 22,
-						"y": 237,
+						"y": 265,
 						"w": 22,
 						"h": 25
 					}
@@ -781,7 +802,7 @@
 					},
 					"frame": {
 						"x": 22,
-						"y": 262,
+						"y": 290,
 						"w": 23,
 						"h": 24
 					}
@@ -802,7 +823,7 @@
 					},
 					"frame": {
 						"x": 22,
-						"y": 286,
+						"y": 314,
 						"w": 24,
 						"h": 24
 					}
@@ -823,7 +844,7 @@
 					},
 					"frame": {
 						"x": 22,
-						"y": 310,
+						"y": 338,
 						"w": 24,
 						"h": 24
 					}
@@ -844,7 +865,7 @@
 					},
 					"frame": {
 						"x": 22,
-						"y": 334,
+						"y": 362,
 						"w": 24,
 						"h": 24
 					}
@@ -865,13 +886,13 @@
 					},
 					"frame": {
 						"x": 22,
-						"y": 358,
+						"y": 386,
 						"w": 24,
 						"h": 24
 					}
 				},
 				{
-					"filename": "earth_plate",
+					"filename": "mega_bracelet",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -879,20 +900,20 @@
 						"h": 32
 					},
 					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
+						"x": 6,
+						"y": 8,
+						"w": 20,
+						"h": 16
 					},
 					"frame": {
 						"x": 22,
-						"y": 382,
-						"w": 24,
-						"h": 24
+						"y": 410,
+						"w": 20,
+						"h": 16
 					}
 				},
 				{
-					"filename": "coupon",
+					"filename": "relic_band",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -900,37 +921,16 @@
 						"h": 32
 					},
 					"spriteSourceSize": {
-						"x": 4,
-						"y": 7,
-						"w": 23,
-						"h": 19
+						"x": 7,
+						"y": 9,
+						"w": 17,
+						"h": 16
 					},
 					"frame": {
-						"x": 22,
-						"y": 406,
-						"w": 23,
-						"h": 19
-					}
-				},
-				{
-					"filename": "golden_mystic_ticket",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 7,
-						"w": 23,
-						"h": 19
-					},
-					"frame": {
-						"x": 45,
-						"y": 406,
-						"w": 23,
-						"h": 19
+						"x": 42,
+						"y": 410,
+						"w": 17,
+						"h": 16
 					}
 				},
 				{
@@ -955,7 +955,7 @@
 					}
 				},
 				{
-					"filename": "mega_bracelet",
+					"filename": "abomasite",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -963,20 +963,20 @@
 						"h": 32
 					},
 					"spriteSourceSize": {
-						"x": 6,
+						"x": 8,
 						"y": 8,
-						"w": 20,
+						"w": 16,
 						"h": 16
 					},
 					"frame": {
 						"x": 28,
 						"y": 70,
-						"w": 20,
+						"w": 16,
 						"h": 16
 					}
 				},
 				{
-					"filename": "calcium",
+					"filename": "absolite",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -985,36 +985,15 @@
 					},
 					"spriteSourceSize": {
 						"x": 8,
-						"y": 4,
+						"y": 8,
 						"w": 16,
-						"h": 24
+						"h": 16
 					},
 					"frame": {
-						"x": 39,
-						"y": 86,
+						"x": 44,
+						"y": 70,
 						"w": 16,
-						"h": 24
-					}
-				},
-				{
-					"filename": "carbos",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 16,
-						"h": 24
-					},
-					"frame": {
-						"x": 39,
-						"y": 110,
-						"w": 16,
-						"h": 24
+						"h": 16
 					}
 				},
 				{
@@ -1033,11 +1012,32 @@
 					},
 					"frame": {
 						"x": 39,
-						"y": 134,
+						"y": 86,
 						"w": 21,
 						"h": 24
 					}
 				},
+				{
+					"filename": "earth_plate",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 39,
+						"y": 110,
+						"w": 24,
+						"h": 24
+					}
+				},
 				{
 					"filename": "fist_plate",
 					"rotated": false,
@@ -1054,7 +1054,7 @@
 					},
 					"frame": {
 						"x": 39,
-						"y": 158,
+						"y": 134,
 						"w": 24,
 						"h": 24
 					}
@@ -1075,7 +1075,7 @@
 					},
 					"frame": {
 						"x": 39,
-						"y": 182,
+						"y": 158,
 						"w": 24,
 						"h": 24
 					}
@@ -1095,8 +1095,8 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 44,
-						"y": 206,
+						"x": 39,
+						"y": 182,
 						"w": 24,
 						"h": 24
 					}
@@ -1117,7 +1117,7 @@
 					},
 					"frame": {
 						"x": 44,
-						"y": 230,
+						"y": 206,
 						"w": 24,
 						"h": 24
 					}
@@ -1137,8 +1137,8 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 45,
-						"y": 254,
+						"x": 44,
+						"y": 230,
 						"w": 24,
 						"h": 24
 					}
@@ -1158,8 +1158,8 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 46,
-						"y": 278,
+						"x": 44,
+						"y": 254,
 						"w": 24,
 						"h": 24
 					}
@@ -1179,8 +1179,8 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 46,
-						"y": 302,
+						"x": 45,
+						"y": 278,
 						"w": 24,
 						"h": 24
 					}
@@ -1201,7 +1201,7 @@
 					},
 					"frame": {
 						"x": 46,
-						"y": 326,
+						"y": 302,
 						"w": 24,
 						"h": 24
 					}
@@ -1222,7 +1222,7 @@
 					},
 					"frame": {
 						"x": 46,
-						"y": 350,
+						"y": 326,
 						"w": 24,
 						"h": 24
 					}
@@ -1243,137 +1243,11 @@
 					},
 					"frame": {
 						"x": 46,
-						"y": 374,
+						"y": 350,
 						"w": 24,
 						"h": 24
 					}
 				},
-				{
-					"filename": "abomasite",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 16,
-						"h": 16
-					},
-					"frame": {
-						"x": 48,
-						"y": 70,
-						"w": 16,
-						"h": 16
-					}
-				},
-				{
-					"filename": "ether",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 18,
-						"h": 24
-					},
-					"frame": {
-						"x": 55,
-						"y": 86,
-						"w": 18,
-						"h": 24
-					}
-				},
-				{
-					"filename": "full_restore",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 18,
-						"h": 24
-					},
-					"frame": {
-						"x": 55,
-						"y": 110,
-						"w": 18,
-						"h": 24
-					}
-				},
-				{
-					"filename": "hp_up",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 16,
-						"h": 24
-					},
-					"frame": {
-						"x": 60,
-						"y": 134,
-						"w": 16,
-						"h": 24
-					}
-				},
-				{
-					"filename": "iron",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 16,
-						"h": 24
-					},
-					"frame": {
-						"x": 63,
-						"y": 158,
-						"w": 16,
-						"h": 24
-					}
-				},
-				{
-					"filename": "kings_rock",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 4,
-						"w": 23,
-						"h": 24
-					},
-					"frame": {
-						"x": 63,
-						"y": 182,
-						"w": 23,
-						"h": 24
-					}
-				},
 				{
 					"filename": "lucky_punch_great",
 					"rotated": false,
@@ -1389,180 +1263,12 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 68,
-						"y": 206,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "lucky_punch_master",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 68,
-						"y": 230,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "lucky_punch_ultra",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 69,
-						"y": 254,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "lustrous_globe",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 70,
-						"y": 278,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "meadow_plate",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 70,
-						"y": 302,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "mind_plate",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 70,
-						"y": 326,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "muscle_band",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 70,
-						"y": 350,
-						"w": 24,
-						"h": 24
-					}
-				},
-				{
-					"filename": "pixie_plate",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 70,
+						"x": 46,
 						"y": 374,
 						"w": 24,
 						"h": 24
 					}
 				},
-				{
-					"filename": "salac_berry",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 24,
-						"h": 24
-					},
-					"frame": {
-						"x": 68,
-						"y": 398,
-						"w": 24,
-						"h": 24
-					}
-				},
 				{
 					"filename": "ability_capsule",
 					"rotated": false,
@@ -1585,7 +1291,7 @@
 					}
 				},
 				{
-					"filename": "lure",
+					"filename": "calcium",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -1595,39 +1301,18 @@
 					"spriteSourceSize": {
 						"x": 8,
 						"y": 4,
-						"w": 17,
-						"h": 24
-					},
-					"frame": {
-						"x": 92,
-						"y": 398,
-						"w": 17,
-						"h": 24
-					}
-				},
-				{
-					"filename": "max_elixir",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 18,
+						"w": 16,
 						"h": 24
 					},
 					"frame": {
 						"x": 59,
 						"y": 27,
-						"w": 18,
+						"w": 16,
 						"h": 24
 					}
 				},
 				{
-					"filename": "scanner",
+					"filename": "lucky_punch_master",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -1641,14 +1326,14 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 77,
+						"x": 75,
 						"y": 26,
 						"w": 24,
 						"h": 24
 					}
 				},
 				{
-					"filename": "silk_scarf",
+					"filename": "lucky_punch_ultra",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -1662,12 +1347,33 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 101,
+						"x": 99,
 						"y": 26,
 						"w": 24,
 						"h": 24
 					}
 				},
+				{
+					"filename": "revive",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 10,
+						"y": 8,
+						"w": 12,
+						"h": 17
+					},
+					"frame": {
+						"x": 123,
+						"y": 26,
+						"w": 12,
+						"h": 17
+					}
+				},
 				{
 					"filename": "big_mushroom",
 					"rotated": false,
@@ -1710,6 +1416,69 @@
 						"h": 23
 					}
 				},
+				{
+					"filename": "elixir",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 4,
+						"w": 18,
+						"h": 24
+					},
+					"frame": {
+						"x": 60,
+						"y": 70,
+						"w": 18,
+						"h": 24
+					}
+				},
+				{
+					"filename": "coin_case",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 24,
+						"h": 23
+					},
+					"frame": {
+						"x": 78,
+						"y": 73,
+						"w": 24,
+						"h": 23
+					}
+				},
+				{
+					"filename": "kings_rock",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 4,
+						"w": 23,
+						"h": 24
+					},
+					"frame": {
+						"x": 102,
+						"y": 50,
+						"w": 23,
+						"h": 24
+					}
+				},
 				{
 					"filename": "berry_pouch",
 					"rotated": false,
@@ -1726,11 +1495,284 @@
 					},
 					"frame": {
 						"x": 102,
-						"y": 50,
+						"y": 74,
 						"w": 23,
 						"h": 23
 					}
 				},
+				{
+					"filename": "aerodactylite",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 16,
+						"h": 16
+					},
+					"frame": {
+						"x": 60,
+						"y": 94,
+						"w": 16,
+						"h": 16
+					}
+				},
+				{
+					"filename": "carbos",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 16,
+						"h": 24
+					},
+					"frame": {
+						"x": 63,
+						"y": 110,
+						"w": 16,
+						"h": 24
+					}
+				},
+				{
+					"filename": "ether",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 4,
+						"w": 18,
+						"h": 24
+					},
+					"frame": {
+						"x": 63,
+						"y": 134,
+						"w": 18,
+						"h": 24
+					}
+				},
+				{
+					"filename": "full_restore",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 4,
+						"w": 18,
+						"h": 24
+					},
+					"frame": {
+						"x": 63,
+						"y": 158,
+						"w": 18,
+						"h": 24
+					}
+				},
+				{
+					"filename": "lustrous_globe",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 63,
+						"y": 182,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "max_revive",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 4,
+						"w": 22,
+						"h": 24
+					},
+					"frame": {
+						"x": 68,
+						"y": 206,
+						"w": 22,
+						"h": 24
+					}
+				},
+				{
+					"filename": "meadow_plate",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 68,
+						"y": 230,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "mind_plate",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 68,
+						"y": 254,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "muscle_band",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 69,
+						"y": 278,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "pixie_plate",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 70,
+						"y": 302,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "salac_berry",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 70,
+						"y": 326,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "scanner",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 70,
+						"y": 350,
+						"w": 24,
+						"h": 24
+					}
+				},
+				{
+					"filename": "silk_scarf",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 24,
+						"h": 24
+					},
+					"frame": {
+						"x": 70,
+						"y": 374,
+						"w": 24,
+						"h": 24
+					}
+				},
 				{
 					"filename": "sky_plate",
 					"rotated": false,
@@ -1746,14 +1788,14 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 125,
-						"y": 36,
+						"x": 59,
+						"y": 398,
 						"w": 24,
 						"h": 24
 					}
 				},
 				{
-					"filename": "choice_specs",
+					"filename": "hp_up",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -1761,41 +1803,20 @@
 						"h": 32
 					},
 					"spriteSourceSize": {
-						"x": 4,
-						"y": 8,
-						"w": 24,
-						"h": 18
-					},
-					"frame": {
-						"x": 125,
-						"y": 60,
-						"w": 24,
-						"h": 18
-					}
-				},
-				{
-					"filename": "max_ether",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
+						"x": 8,
 						"y": 4,
-						"w": 18,
+						"w": 16,
 						"h": 24
 					},
 					"frame": {
-						"x": 149,
-						"y": 36,
-						"w": 18,
+						"x": 83,
+						"y": 398,
+						"w": 16,
 						"h": 24
 					}
 				},
 				{
-					"filename": "adamant_crystal",
+					"filename": "reveal_glass",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -1804,15 +1825,36 @@
 					},
 					"spriteSourceSize": {
 						"x": 4,
-						"y": 6,
+						"y": 4,
 						"w": 23,
-						"h": 21
+						"h": 24
 					},
 					"frame": {
-						"x": 149,
-						"y": 60,
+						"x": 79,
+						"y": 96,
 						"w": 23,
-						"h": 21
+						"h": 24
+					}
+				},
+				{
+					"filename": "dynamax_band",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 4,
+						"w": 23,
+						"h": 23
+					},
+					"frame": {
+						"x": 102,
+						"y": 97,
+						"w": 23,
+						"h": 23
 					}
 				},
 				{
@@ -1830,8 +1872,8 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 167,
-						"y": 21,
+						"x": 81,
+						"y": 120,
 						"w": 24,
 						"h": 24
 					}
@@ -1851,12 +1893,54 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 191,
-						"y": 21,
+						"x": 81,
+						"y": 144,
 						"w": 24,
 						"h": 24
 					}
 				},
+				{
+					"filename": "oval_charm",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 21,
+						"h": 24
+					},
+					"frame": {
+						"x": 105,
+						"y": 120,
+						"w": 21,
+						"h": 24
+					}
+				},
+				{
+					"filename": "shiny_charm",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 21,
+						"h": 24
+					},
+					"frame": {
+						"x": 105,
+						"y": 144,
+						"w": 21,
+						"h": 24
+					}
+				},
 				{
 					"filename": "stone_plate",
 					"rotated": false,
@@ -1872,12 +1956,33 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 215,
-						"y": 21,
+						"x": 87,
+						"y": 168,
 						"w": 24,
 						"h": 24
 					}
 				},
+				{
+					"filename": "iron",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 16,
+						"h": 24
+					},
+					"frame": {
+						"x": 111,
+						"y": 168,
+						"w": 16,
+						"h": 24
+					}
+				},
 				{
 					"filename": "sun_stone",
 					"rotated": false,
@@ -1893,12 +1998,33 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 239,
-						"y": 21,
+						"x": 90,
+						"y": 192,
 						"w": 24,
 						"h": 24
 					}
 				},
+				{
+					"filename": "lure",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 17,
+						"h": 24
+					},
+					"frame": {
+						"x": 114,
+						"y": 192,
+						"w": 17,
+						"h": 24
+					}
+				},
 				{
 					"filename": "toxic_plate",
 					"rotated": false,
@@ -1914,8 +2040,8 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 263,
-						"y": 21,
+						"x": 92,
+						"y": 216,
 						"w": 24,
 						"h": 24
 					}
@@ -1935,14 +2061,14 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 287,
-						"y": 21,
+						"x": 92,
+						"y": 240,
 						"w": 24,
 						"h": 24
 					}
 				},
 				{
-					"filename": "silver_powder",
+					"filename": "max_elixir",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -1950,41 +2076,20 @@
 						"h": 32
 					},
 					"spriteSourceSize": {
-						"x": 4,
-						"y": 11,
-						"w": 24,
-						"h": 15
-					},
-					"frame": {
-						"x": 167,
-						"y": 45,
-						"w": 24,
-						"h": 15
-					}
-				},
-				{
-					"filename": "max_revive",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
+						"x": 7,
 						"y": 4,
-						"w": 22,
+						"w": 18,
 						"h": 24
 					},
 					"frame": {
-						"x": 311,
-						"y": 21,
-						"w": 22,
+						"x": 116,
+						"y": 216,
+						"w": 18,
 						"h": 24
 					}
 				},
 				{
-					"filename": "coin_case",
+					"filename": "max_ether",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -1992,16 +2097,16 @@
 						"h": 32
 					},
 					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 24,
-						"h": 23
+						"x": 7,
+						"y": 4,
+						"w": 18,
+						"h": 24
 					},
 					"frame": {
-						"x": 333,
-						"y": 20,
-						"w": 24,
-						"h": 23
+						"x": 116,
+						"y": 240,
+						"w": 18,
+						"h": 24
 					}
 				},
 				{
@@ -2019,12 +2124,75 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 357,
-						"y": 20,
+						"x": 93,
+						"y": 264,
 						"w": 24,
 						"h": 23
 					}
 				},
+				{
+					"filename": "black_belt",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 117,
+						"y": 264,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "silver_powder",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 11,
+						"w": 24,
+						"h": 15
+					},
+					"frame": {
+						"x": 93,
+						"y": 287,
+						"w": 24,
+						"h": 15
+					}
+				},
+				{
+					"filename": "griseous_core",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 23,
+						"h": 23
+					},
+					"frame": {
+						"x": 94,
+						"y": 302,
+						"w": 23,
+						"h": 23
+					}
+				},
 				{
 					"filename": "hearthflame_mask",
 					"rotated": false,
@@ -2040,138 +2208,12 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 381,
-						"y": 20,
+						"x": 94,
+						"y": 325,
 						"w": 24,
 						"h": 23
 					}
 				},
-				{
-					"filename": "red_orb",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 20,
-						"h": 24
-					},
-					"frame": {
-						"x": 405,
-						"y": 24,
-						"w": 20,
-						"h": 24
-					}
-				},
-				{
-					"filename": "amulet_coin",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
-						"w": 23,
-						"h": 21
-					},
-					"frame": {
-						"x": 172,
-						"y": 60,
-						"w": 23,
-						"h": 21
-					}
-				},
-				{
-					"filename": "candy_overlay",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 12,
-						"w": 16,
-						"h": 15
-					},
-					"frame": {
-						"x": 191,
-						"y": 45,
-						"w": 16,
-						"h": 15
-					}
-				},
-				{
-					"filename": "dragon_scale",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 8,
-						"w": 24,
-						"h": 18
-					},
-					"frame": {
-						"x": 207,
-						"y": 45,
-						"w": 24,
-						"h": 18
-					}
-				},
-				{
-					"filename": "exp_balance",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 24,
-						"h": 22
-					},
-					"frame": {
-						"x": 231,
-						"y": 45,
-						"w": 24,
-						"h": 22
-					}
-				},
-				{
-					"filename": "exp_share",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 24,
-						"h": 22
-					},
-					"frame": {
-						"x": 255,
-						"y": 45,
-						"w": 24,
-						"h": 22
-					}
-				},
 				{
 					"filename": "leppa_berry",
 					"rotated": false,
@@ -2187,8 +2229,8 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 279,
-						"y": 45,
+						"x": 94,
+						"y": 348,
 						"w": 24,
 						"h": 23
 					}
@@ -2208,264 +2250,12 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 303,
-						"y": 45,
+						"x": 94,
+						"y": 371,
 						"w": 24,
 						"h": 23
 					}
 				},
-				{
-					"filename": "revive",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 8,
-						"w": 12,
-						"h": 17
-					},
-					"frame": {
-						"x": 195,
-						"y": 60,
-						"w": 12,
-						"h": 17
-					}
-				},
-				{
-					"filename": "icy_reins_of_unity",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 7,
-						"w": 24,
-						"h": 20
-					},
-					"frame": {
-						"x": 207,
-						"y": 63,
-						"w": 24,
-						"h": 20
-					}
-				},
-				{
-					"filename": "metal_powder",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 6,
-						"w": 24,
-						"h": 20
-					},
-					"frame": {
-						"x": 231,
-						"y": 67,
-						"w": 24,
-						"h": 20
-					}
-				},
-				{
-					"filename": "peat_block",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 24,
-						"h": 22
-					},
-					"frame": {
-						"x": 255,
-						"y": 67,
-						"w": 24,
-						"h": 22
-					}
-				},
-				{
-					"filename": "twisted_spoon",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 24,
-						"h": 23
-					},
-					"frame": {
-						"x": 279,
-						"y": 68,
-						"w": 24,
-						"h": 23
-					}
-				},
-				{
-					"filename": "dynamax_band",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 23,
-						"h": 23
-					},
-					"frame": {
-						"x": 303,
-						"y": 68,
-						"w": 23,
-						"h": 23
-					}
-				},
-				{
-					"filename": "black_belt",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 327,
-						"y": 45,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "griseous_core",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 23,
-						"h": 23
-					},
-					"frame": {
-						"x": 326,
-						"y": 68,
-						"w": 23,
-						"h": 23
-					}
-				},
-				{
-					"filename": "reveal_glass",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 4,
-						"w": 23,
-						"h": 24
-					},
-					"frame": {
-						"x": 349,
-						"y": 43,
-						"w": 23,
-						"h": 24
-					}
-				},
-				{
-					"filename": "leek",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 23,
-						"h": 23
-					},
-					"frame": {
-						"x": 372,
-						"y": 43,
-						"w": 23,
-						"h": 23
-					}
-				},
-				{
-					"filename": "rare_candy",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 23,
-						"h": 23
-					},
-					"frame": {
-						"x": 349,
-						"y": 67,
-						"w": 23,
-						"h": 23
-					}
-				},
-				{
-					"filename": "rarer_candy",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 23,
-						"h": 23
-					},
-					"frame": {
-						"x": 372,
-						"y": 66,
-						"w": 23,
-						"h": 23
-					}
-				},
 				{
 					"filename": "bug_tera_shard",
 					"rotated": false,
@@ -2481,14 +2271,98 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 395,
-						"y": 48,
+						"x": 117,
+						"y": 287,
 						"w": 22,
 						"h": 23
 					}
 				},
 				{
-					"filename": "auspicious_armor",
+					"filename": "red_orb",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 20,
+						"h": 24
+					},
+					"frame": {
+						"x": 99,
+						"y": 394,
+						"w": 20,
+						"h": 24
+					}
+				},
+				{
+					"filename": "candy_overlay",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 12,
+						"w": 16,
+						"h": 15
+					},
+					"frame": {
+						"x": 117,
+						"y": 310,
+						"w": 16,
+						"h": 15
+					}
+				},
+				{
+					"filename": "max_lure",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 17,
+						"h": 24
+					},
+					"frame": {
+						"x": 118,
+						"y": 325,
+						"w": 17,
+						"h": 24
+					}
+				},
+				{
+					"filename": "max_potion",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 4,
+						"w": 18,
+						"h": 24
+					},
+					"frame": {
+						"x": 118,
+						"y": 349,
+						"w": 18,
+						"h": 24
+					}
+				},
+				{
+					"filename": "adamant_crystal",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -2497,78 +2371,15 @@
 					},
 					"spriteSourceSize": {
 						"x": 4,
-						"y": 5,
-						"w": 23,
-						"h": 21
-					},
-					"frame": {
-						"x": 395,
-						"y": 71,
-						"w": 23,
-						"h": 21
-					}
-				},
-				{
-					"filename": "binding_band",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
 						"y": 6,
 						"w": 23,
-						"h": 20
+						"h": 21
 					},
 					"frame": {
-						"x": 372,
-						"y": 89,
+						"x": 118,
+						"y": 373,
 						"w": 23,
-						"h": 20
-					}
-				},
-				{
-					"filename": "healing_charm",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 23,
-						"h": 22
-					},
-					"frame": {
-						"x": 349,
-						"y": 90,
-						"w": 23,
-						"h": 22
-					}
-				},
-				{
-					"filename": "black_glasses",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 8,
-						"w": 23,
-						"h": 17
-					},
-					"frame": {
-						"x": 395,
-						"y": 92,
-						"w": 23,
-						"h": 17
+						"h": 21
 					}
 				},
 				{
@@ -2586,12 +2397,96 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 73,
-						"y": 73,
+						"x": 119,
+						"y": 394,
 						"w": 22,
 						"h": 23
 					}
 				},
+				{
+					"filename": "choice_specs",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 8,
+						"w": 24,
+						"h": 18
+					},
+					"frame": {
+						"x": 135,
+						"y": 36,
+						"w": 24,
+						"h": 18
+					}
+				},
+				{
+					"filename": "twisted_spoon",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 24,
+						"h": 23
+					},
+					"frame": {
+						"x": 125,
+						"y": 54,
+						"w": 24,
+						"h": 23
+					}
+				},
+				{
+					"filename": "exp_balance",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 24,
+						"h": 22
+					},
+					"frame": {
+						"x": 125,
+						"y": 77,
+						"w": 24,
+						"h": 22
+					}
+				},
+				{
+					"filename": "amulet_coin",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 5,
+						"w": 23,
+						"h": 21
+					},
+					"frame": {
+						"x": 125,
+						"y": 99,
+						"w": 23,
+						"h": 21
+					}
+				},
 				{
 					"filename": "dragon_tera_shard",
 					"rotated": false,
@@ -2607,8 +2502,8 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 95,
-						"y": 73,
+						"x": 126,
+						"y": 120,
 						"w": 22,
 						"h": 23
 					}
@@ -2628,56 +2523,14 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 73,
-						"y": 96,
+						"x": 126,
+						"y": 143,
 						"w": 22,
 						"h": 23
 					}
 				},
 				{
-					"filename": "fairy_tera_shard",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 95,
-						"y": 96,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "fighting_tera_shard",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 117,
-						"y": 78,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "blank_memory",
+					"filename": "dragon_fang",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -2687,102 +2540,18 @@
 					"spriteSourceSize": {
 						"x": 5,
 						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 117,
-						"y": 101,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "fire_stone",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
+						"w": 21,
 						"h": 23
 					},
 					"frame": {
-						"x": 139,
-						"y": 81,
-						"w": 22,
+						"x": 127,
+						"y": 166,
+						"w": 21,
 						"h": 23
 					}
 				},
 				{
-					"filename": "fire_tera_shard",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 161,
-						"y": 81,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "quick_powder",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 6,
-						"w": 24,
-						"h": 20
-					},
-					"frame": {
-						"x": 139,
-						"y": 104,
-						"w": 24,
-						"h": 20
-					}
-				},
-				{
-					"filename": "big_nugget",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 6,
-						"w": 20,
-						"h": 20
-					},
-					"frame": {
-						"x": 163,
-						"y": 104,
-						"w": 20,
-						"h": 20
-					}
-				},
-				{
-					"filename": "max_lure",
+					"filename": "super_lure",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -2796,348 +2565,12 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 183,
-						"y": 81,
+						"x": 131,
+						"y": 189,
 						"w": 17,
 						"h": 24
 					}
 				},
-				{
-					"filename": "rusted_sword",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 23,
-						"h": 22
-					},
-					"frame": {
-						"x": 200,
-						"y": 83,
-						"w": 23,
-						"h": 22
-					}
-				},
-				{
-					"filename": "rusted_shield",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 6,
-						"w": 24,
-						"h": 20
-					},
-					"frame": {
-						"x": 183,
-						"y": 105,
-						"w": 24,
-						"h": 20
-					}
-				},
-				{
-					"filename": "apicot_berry",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 6,
-						"w": 19,
-						"h": 20
-					},
-					"frame": {
-						"x": 207,
-						"y": 105,
-						"w": 19,
-						"h": 20
-					}
-				},
-				{
-					"filename": "relic_crown",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 7,
-						"w": 23,
-						"h": 18
-					},
-					"frame": {
-						"x": 223,
-						"y": 87,
-						"w": 23,
-						"h": 18
-					}
-				},
-				{
-					"filename": "blue_orb",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 6,
-						"w": 20,
-						"h": 20
-					},
-					"frame": {
-						"x": 226,
-						"y": 105,
-						"w": 20,
-						"h": 20
-					}
-				},
-				{
-					"filename": "flying_tera_shard",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 246,
-						"y": 89,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "blunder_policy",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 6,
-						"w": 22,
-						"h": 19
-					},
-					"frame": {
-						"x": 246,
-						"y": 112,
-						"w": 22,
-						"h": 19
-					}
-				},
-				{
-					"filename": "focus_sash",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 268,
-						"y": 91,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "ghost_tera_shard",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 290,
-						"y": 91,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "grass_tera_shard",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 312,
-						"y": 91,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "full_heal",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 4,
-						"w": 15,
-						"h": 23
-					},
-					"frame": {
-						"x": 334,
-						"y": 91,
-						"w": 15,
-						"h": 23
-					}
-				},
-				{
-					"filename": "sacred_ash",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 7,
-						"w": 24,
-						"h": 20
-					},
-					"frame": {
-						"x": 268,
-						"y": 114,
-						"w": 24,
-						"h": 20
-					}
-				},
-				{
-					"filename": "shadow_reins_of_unity",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 7,
-						"w": 24,
-						"h": 20
-					},
-					"frame": {
-						"x": 292,
-						"y": 114,
-						"w": 24,
-						"h": 20
-					}
-				},
-				{
-					"filename": "soft_sand",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 7,
-						"w": 24,
-						"h": 20
-					},
-					"frame": {
-						"x": 316,
-						"y": 114,
-						"w": 24,
-						"h": 20
-					}
-				},
-				{
-					"filename": "eviolite",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 15,
-						"h": 15
-					},
-					"frame": {
-						"x": 73,
-						"y": 119,
-						"w": 15,
-						"h": 15
-					}
-				},
-				{
-					"filename": "max_potion",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 4,
-						"w": 18,
-						"h": 24
-					},
-					"frame": {
-						"x": 76,
-						"y": 134,
-						"w": 18,
-						"h": 24
-					}
-				},
 				{
 					"filename": "max_repel",
 					"rotated": false,
@@ -3153,33 +2586,12 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 79,
-						"y": 158,
+						"x": 134,
+						"y": 213,
 						"w": 16,
 						"h": 24
 					}
 				},
-				{
-					"filename": "oval_charm",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 21,
-						"h": 24
-					},
-					"frame": {
-						"x": 86,
-						"y": 182,
-						"w": 21,
-						"h": 24
-					}
-				},
 				{
 					"filename": "pp_max",
 					"rotated": false,
@@ -3195,8 +2607,8 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 92,
-						"y": 206,
+						"x": 134,
+						"y": 237,
 						"w": 16,
 						"h": 24
 					}
@@ -3216,12 +2628,180 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 92,
-						"y": 230,
+						"x": 149,
+						"y": 54,
 						"w": 16,
 						"h": 24
 					}
 				},
+				{
+					"filename": "auspicious_armor",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 23,
+						"h": 21
+					},
+					"frame": {
+						"x": 149,
+						"y": 78,
+						"w": 23,
+						"h": 21
+					}
+				},
+				{
+					"filename": "exp_share",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 24,
+						"h": 22
+					},
+					"frame": {
+						"x": 148,
+						"y": 99,
+						"w": 24,
+						"h": 22
+					}
+				},
+				{
+					"filename": "leek",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 23,
+						"h": 23
+					},
+					"frame": {
+						"x": 148,
+						"y": 121,
+						"w": 23,
+						"h": 23
+					}
+				},
+				{
+					"filename": "rare_candy",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 23,
+						"h": 23
+					},
+					"frame": {
+						"x": 148,
+						"y": 144,
+						"w": 23,
+						"h": 23
+					}
+				},
+				{
+					"filename": "rarer_candy",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 23,
+						"h": 23
+					},
+					"frame": {
+						"x": 148,
+						"y": 167,
+						"w": 23,
+						"h": 23
+					}
+				},
+				{
+					"filename": "fairy_tera_shard",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 148,
+						"y": 190,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "fighting_tera_shard",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 150,
+						"y": 213,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "fire_stone",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 150,
+						"y": 236,
+						"w": 22,
+						"h": 23
+					}
+				},
 				{
 					"filename": "protein",
 					"rotated": false,
@@ -3237,8 +2817,8 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 93,
-						"y": 254,
+						"x": 139,
+						"y": 261,
 						"w": 16,
 						"h": 24
 					}
@@ -3258,56 +2838,14 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 94,
-						"y": 278,
+						"x": 139,
+						"y": 285,
 						"w": 16,
 						"h": 24
 					}
 				},
 				{
-					"filename": "shiny_charm",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 21,
-						"h": 24
-					},
-					"frame": {
-						"x": 94,
-						"y": 302,
-						"w": 21,
-						"h": 24
-					}
-				},
-				{
-					"filename": "dragon_fang",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 21,
-						"h": 23
-					},
-					"frame": {
-						"x": 94,
-						"y": 326,
-						"w": 21,
-						"h": 23
-					}
-				},
-				{
-					"filename": "ground_tera_shard",
+					"filename": "fire_tera_shard",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -3321,14 +2859,14 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 94,
-						"y": 349,
+						"x": 155,
+						"y": 259,
 						"w": 22,
 						"h": 23
 					}
 				},
 				{
-					"filename": "ice_tera_shard",
+					"filename": "flying_tera_shard",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -3342,54 +2880,12 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 94,
-						"y": 372,
+						"x": 155,
+						"y": 282,
 						"w": 22,
 						"h": 23
 					}
 				},
-				{
-					"filename": "prism_scale",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 8,
-						"w": 15,
-						"h": 15
-					},
-					"frame": {
-						"x": 88,
-						"y": 119,
-						"w": 15,
-						"h": 15
-					}
-				},
-				{
-					"filename": "super_lure",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 17,
-						"h": 24
-					},
-					"frame": {
-						"x": 94,
-						"y": 134,
-						"w": 17,
-						"h": 24
-					}
-				},
 				{
 					"filename": "super_repel",
 					"rotated": false,
@@ -3405,14 +2901,14 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 95,
-						"y": 158,
+						"x": 159,
+						"y": 22,
 						"w": 16,
 						"h": 24
 					}
 				},
 				{
-					"filename": "berry_pot",
+					"filename": "peat_block",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -3420,20 +2916,20 @@
 						"h": 32
 					},
 					"spriteSourceSize": {
-						"x": 7,
+						"x": 4,
 						"y": 5,
-						"w": 18,
+						"w": 24,
 						"h": 22
 					},
 					"frame": {
-						"x": 340,
-						"y": 114,
-						"w": 18,
+						"x": 175,
+						"y": 21,
+						"w": 24,
 						"h": 22
 					}
 				},
 				{
-					"filename": "unknown",
+					"filename": "healing_charm",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -3441,20 +2937,41 @@
 						"h": 32
 					},
 					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 16,
-						"h": 24
+						"x": 5,
+						"y": 5,
+						"w": 23,
+						"h": 22
 					},
 					"frame": {
-						"x": 358,
-						"y": 112,
-						"w": 16,
-						"h": 24
+						"x": 199,
+						"y": 21,
+						"w": 23,
+						"h": 22
 					}
 				},
 				{
-					"filename": "never_melt_ice",
+					"filename": "rusted_sword",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 23,
+						"h": 22
+					},
+					"frame": {
+						"x": 222,
+						"y": 21,
+						"w": 23,
+						"h": 22
+					}
+				},
+				{
+					"filename": "blank_memory",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -3465,307 +2982,13 @@
 						"x": 5,
 						"y": 5,
 						"w": 22,
-						"h": 23
+						"h": 22
 					},
 					"frame": {
-						"x": 374,
-						"y": 109,
+						"x": 245,
+						"y": 21,
 						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "normal_tera_shard",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 396,
-						"y": 109,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "zinc",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 4,
-						"w": 16,
-						"h": 24
-					},
-					"frame": {
-						"x": 107,
-						"y": 182,
-						"w": 16,
-						"h": 24
-					}
-				},
-				{
-					"filename": "hyper_potion",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 17,
-						"h": 23
-					},
-					"frame": {
-						"x": 108,
-						"y": 206,
-						"w": 17,
-						"h": 23
-					}
-				},
-				{
-					"filename": "lansat_berry",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 4,
-						"w": 21,
-						"h": 23
-					},
-					"frame": {
-						"x": 108,
-						"y": 229,
-						"w": 21,
-						"h": 23
-					}
-				},
-				{
-					"filename": "leaf_stone",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 21,
-						"h": 23
-					},
-					"frame": {
-						"x": 109,
-						"y": 252,
-						"w": 21,
-						"h": 23
-					}
-				},
-				{
-					"filename": "mystic_water",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
-						"w": 20,
-						"h": 23
-					},
-					"frame": {
-						"x": 110,
-						"y": 275,
-						"w": 20,
-						"h": 23
-					}
-				},
-				{
-					"filename": "petaya_berry",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 115,
-						"y": 298,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "poison_tera_shard",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 115,
-						"y": 321,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "psychic_tera_shard",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 116,
-						"y": 344,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "reaper_cloth",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 116,
-						"y": 367,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "rock_tera_shard",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 111,
-						"y": 123,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "steel_tera_shard",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 111,
-						"y": 146,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "stellar_tera_shard",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 133,
-						"y": 124,
-						"w": 22,
-						"h": 23
-					}
-				},
-				{
-					"filename": "water_tera_shard",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 155,
-						"y": 124,
-						"w": 22,
-						"h": 23
+						"h": 22
 					}
 				},
 				{
@@ -3783,8 +3006,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 133,
-						"y": 147,
+						"x": 267,
+						"y": 21,
 						"w": 22,
 						"h": 22
 					}
@@ -3804,33 +3027,12 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 155,
-						"y": 147,
+						"x": 289,
+						"y": 21,
 						"w": 22,
 						"h": 22
 					}
 				},
-				{
-					"filename": "wide_lens",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 4,
-						"w": 22,
-						"h": 23
-					},
-					"frame": {
-						"x": 177,
-						"y": 125,
-						"w": 22,
-						"h": 23
-					}
-				},
 				{
 					"filename": "dark_memory",
 					"rotated": false,
@@ -3846,14 +3048,14 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 199,
-						"y": 125,
+						"x": 311,
+						"y": 21,
 						"w": 22,
 						"h": 22
 					}
 				},
 				{
-					"filename": "dire_hit",
+					"filename": "focus_sash",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -3862,19 +3064,229 @@
 					},
 					"spriteSourceSize": {
 						"x": 5,
-						"y": 5,
+						"y": 4,
 						"w": 22,
-						"h": 22
+						"h": 23
 					},
 					"frame": {
-						"x": 221,
-						"y": 125,
+						"x": 333,
+						"y": 20,
 						"w": 22,
-						"h": 22
+						"h": 23
 					}
 				},
 				{
-					"filename": "deep_sea_tooth",
+					"filename": "ghost_tera_shard",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 355,
+						"y": 20,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "grass_tera_shard",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 377,
+						"y": 20,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "icy_reins_of_unity",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 7,
+						"w": 24,
+						"h": 20
+					},
+					"frame": {
+						"x": 399,
+						"y": 22,
+						"w": 24,
+						"h": 20
+					}
+				},
+				{
+					"filename": "dragon_scale",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 8,
+						"w": 24,
+						"h": 18
+					},
+					"frame": {
+						"x": 175,
+						"y": 43,
+						"w": 24,
+						"h": 18
+					}
+				},
+				{
+					"filename": "metal_powder",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 6,
+						"w": 24,
+						"h": 20
+					},
+					"frame": {
+						"x": 199,
+						"y": 43,
+						"w": 24,
+						"h": 20
+					}
+				},
+				{
+					"filename": "quick_powder",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 6,
+						"w": 24,
+						"h": 20
+					},
+					"frame": {
+						"x": 223,
+						"y": 43,
+						"w": 24,
+						"h": 20
+					}
+				},
+				{
+					"filename": "rusted_shield",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 6,
+						"w": 24,
+						"h": 20
+					},
+					"frame": {
+						"x": 247,
+						"y": 43,
+						"w": 24,
+						"h": 20
+					}
+				},
+				{
+					"filename": "sacred_ash",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 7,
+						"w": 24,
+						"h": 20
+					},
+					"frame": {
+						"x": 271,
+						"y": 43,
+						"w": 24,
+						"h": 20
+					}
+				},
+				{
+					"filename": "shadow_reins_of_unity",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 7,
+						"w": 24,
+						"h": 20
+					},
+					"frame": {
+						"x": 295,
+						"y": 43,
+						"w": 24,
+						"h": 20
+					}
+				},
+				{
+					"filename": "soft_sand",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 7,
+						"w": 24,
+						"h": 20
+					},
+					"frame": {
+						"x": 319,
+						"y": 43,
+						"w": 24,
+						"h": 20
+					}
+				},
+				{
+					"filename": "binding_band",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -3884,77 +3296,14 @@
 					"spriteSourceSize": {
 						"x": 5,
 						"y": 6,
-						"w": 22,
-						"h": 21
+						"w": 23,
+						"h": 20
 					},
 					"frame": {
-						"x": 177,
-						"y": 148,
-						"w": 22,
-						"h": 21
-					}
-				},
-				{
-					"filename": "dna_splicers",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 199,
-						"y": 147,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "dragon_memory",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 221,
-						"y": 147,
-						"w": 22,
-						"h": 22
-					}
-				},
-				{
-					"filename": "electirizer",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 22,
-						"h": 22
-					},
-					"frame": {
-						"x": 243,
-						"y": 131,
-						"w": 22,
-						"h": 22
+						"x": 343,
+						"y": 43,
+						"w": 23,
+						"h": 20
 					}
 				},
 				{
@@ -3972,12 +3321,558 @@
 						"h": 21
 					},
 					"frame": {
-						"x": 265,
-						"y": 134,
+						"x": 366,
+						"y": 43,
 						"w": 23,
 						"h": 21
 					}
 				},
+				{
+					"filename": "black_glasses",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 8,
+						"w": 23,
+						"h": 17
+					},
+					"frame": {
+						"x": 165,
+						"y": 61,
+						"w": 23,
+						"h": 17
+					}
+				},
+				{
+					"filename": "unknown",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 16,
+						"h": 24
+					},
+					"frame": {
+						"x": 172,
+						"y": 78,
+						"w": 16,
+						"h": 24
+					}
+				},
+				{
+					"filename": "apicot_berry",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 6,
+						"w": 19,
+						"h": 20
+					},
+					"frame": {
+						"x": 172,
+						"y": 102,
+						"w": 19,
+						"h": 20
+					}
+				},
+				{
+					"filename": "ground_tera_shard",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 171,
+						"y": 122,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "ice_tera_shard",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 171,
+						"y": 145,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "dire_hit",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 171,
+						"y": 168,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "never_melt_ice",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 170,
+						"y": 190,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "lansat_berry",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 4,
+						"w": 21,
+						"h": 23
+					},
+					"frame": {
+						"x": 172,
+						"y": 213,
+						"w": 21,
+						"h": 23
+					}
+				},
+				{
+					"filename": "leaf_stone",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 21,
+						"h": 23
+					},
+					"frame": {
+						"x": 172,
+						"y": 236,
+						"w": 21,
+						"h": 23
+					}
+				},
+				{
+					"filename": "zinc",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 4,
+						"w": 16,
+						"h": 24
+					},
+					"frame": {
+						"x": 177,
+						"y": 259,
+						"w": 16,
+						"h": 24
+					}
+				},
+				{
+					"filename": "berry_pot",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 5,
+						"w": 18,
+						"h": 22
+					},
+					"frame": {
+						"x": 177,
+						"y": 283,
+						"w": 18,
+						"h": 22
+					}
+				},
+				{
+					"filename": "normal_tera_shard",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 188,
+						"y": 63,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "petaya_berry",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 210,
+						"y": 63,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "poison_tera_shard",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 232,
+						"y": 63,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "psychic_tera_shard",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 254,
+						"y": 63,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "reaper_cloth",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 276,
+						"y": 63,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "rock_tera_shard",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 298,
+						"y": 63,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "steel_tera_shard",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 320,
+						"y": 63,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "stellar_tera_shard",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 342,
+						"y": 63,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "dna_splicers",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 364,
+						"y": 64,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "aggronite",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 16,
+						"h": 16
+					},
+					"frame": {
+						"x": 188,
+						"y": 86,
+						"w": 16,
+						"h": 16
+					}
+				},
+				{
+					"filename": "burn_drive",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 8,
+						"w": 23,
+						"h": 17
+					},
+					"frame": {
+						"x": 204,
+						"y": 86,
+						"w": 23,
+						"h": 17
+					}
+				},
+				{
+					"filename": "chill_drive",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 8,
+						"w": 23,
+						"h": 17
+					},
+					"frame": {
+						"x": 227,
+						"y": 86,
+						"w": 23,
+						"h": 17
+					}
+				},
+				{
+					"filename": "coupon",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 7,
+						"w": 23,
+						"h": 19
+					},
+					"frame": {
+						"x": 250,
+						"y": 86,
+						"w": 23,
+						"h": 19
+					}
+				},
+				{
+					"filename": "golden_mystic_ticket",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 7,
+						"w": 23,
+						"h": 19
+					},
+					"frame": {
+						"x": 273,
+						"y": 86,
+						"w": 23,
+						"h": 19
+					}
+				},
+				{
+					"filename": "mystic_ticket",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 7,
+						"w": 23,
+						"h": 19
+					},
+					"frame": {
+						"x": 296,
+						"y": 86,
+						"w": 23,
+						"h": 19
+					}
+				},
 				{
 					"filename": "n_lunarizer",
 					"rotated": false,
@@ -3993,8 +3888,8 @@
 						"h": 21
 					},
 					"frame": {
-						"x": 288,
-						"y": 134,
+						"x": 319,
+						"y": 86,
 						"w": 23,
 						"h": 21
 					}
@@ -4014,14 +3909,14 @@
 						"h": 21
 					},
 					"frame": {
-						"x": 311,
-						"y": 134,
+						"x": 342,
+						"y": 86,
 						"w": 23,
 						"h": 21
 					}
 				},
 				{
-					"filename": "deep_sea_scale",
+					"filename": "deep_sea_tooth",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -4032,17 +3927,17 @@
 						"x": 5,
 						"y": 6,
 						"w": 22,
-						"h": 20
+						"h": 21
 					},
 					"frame": {
-						"x": 243,
-						"y": 153,
+						"x": 365,
+						"y": 86,
 						"w": 22,
-						"h": 20
+						"h": 21
 					}
 				},
 				{
-					"filename": "mystic_ticket",
+					"filename": "dawn_stone",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -4050,16 +3945,121 @@
 						"h": 32
 					},
 					"spriteSourceSize": {
-						"x": 4,
-						"y": 7,
-						"w": 23,
-						"h": 19
+						"x": 6,
+						"y": 6,
+						"w": 20,
+						"h": 21
 					},
 					"frame": {
-						"x": 265,
-						"y": 155,
-						"w": 23,
-						"h": 19
+						"x": 389,
+						"y": 43,
+						"w": 20,
+						"h": 21
+					}
+				},
+				{
+					"filename": "hyper_potion",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 5,
+						"w": 17,
+						"h": 23
+					},
+					"frame": {
+						"x": 409,
+						"y": 42,
+						"w": 17,
+						"h": 23
+					}
+				},
+				{
+					"filename": "dragon_memory",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 386,
+						"y": 64,
+						"w": 22,
+						"h": 22
+					}
+				},
+				{
+					"filename": "sachet",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 18,
+						"h": 23
+					},
+					"frame": {
+						"x": 408,
+						"y": 65,
+						"w": 18,
+						"h": 23
+					}
+				},
+				{
+					"filename": "dusk_stone",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 6,
+						"w": 21,
+						"h": 21
+					},
+					"frame": {
+						"x": 387,
+						"y": 86,
+						"w": 21,
+						"h": 21
+					}
+				},
+				{
+					"filename": "razor_fang",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 6,
+						"w": 18,
+						"h": 20
+					},
+					"frame": {
+						"x": 408,
+						"y": 88,
+						"w": 18,
+						"h": 20
 					}
 				},
 				{
@@ -4077,14 +4077,14 @@
 						"h": 19
 					},
 					"frame": {
-						"x": 288,
-						"y": 155,
+						"x": 191,
+						"y": 103,
 						"w": 23,
 						"h": 19
 					}
 				},
 				{
-					"filename": "reviver_seed",
+					"filename": "sharp_beak",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -4093,15 +4093,99 @@
 					},
 					"spriteSourceSize": {
 						"x": 5,
-						"y": 8,
-						"w": 23,
-						"h": 20
+						"y": 5,
+						"w": 21,
+						"h": 23
 					},
 					"frame": {
-						"x": 311,
-						"y": 155,
-						"w": 23,
-						"h": 20
+						"x": 193,
+						"y": 122,
+						"w": 21,
+						"h": 23
+					}
+				},
+				{
+					"filename": "water_tera_shard",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 214,
+						"y": 103,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "whipped_dream",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 4,
+						"w": 21,
+						"h": 23
+					},
+					"frame": {
+						"x": 193,
+						"y": 145,
+						"w": 21,
+						"h": 23
+					}
+				},
+				{
+					"filename": "wide_lens",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 4,
+						"w": 22,
+						"h": 23
+					},
+					"frame": {
+						"x": 214,
+						"y": 126,
+						"w": 22,
+						"h": 23
+					}
+				},
+				{
+					"filename": "electirizer",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 5,
+						"w": 22,
+						"h": 22
+					},
+					"frame": {
+						"x": 193,
+						"y": 168,
+						"w": 22,
+						"h": 22
 					}
 				},
 				{
@@ -4119,12 +4203,33 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 334,
-						"y": 136,
+						"x": 192,
+						"y": 190,
 						"w": 22,
 						"h": 22
 					}
 				},
+				{
+					"filename": "blunder_policy",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 6,
+						"w": 22,
+						"h": 19
+					},
+					"frame": {
+						"x": 214,
+						"y": 149,
+						"w": 22,
+						"h": 19
+					}
+				},
 				{
 					"filename": "enigma_berry",
 					"rotated": false,
@@ -4140,33 +4245,12 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 356,
-						"y": 136,
+						"x": 215,
+						"y": 168,
 						"w": 22,
 						"h": 22
 					}
 				},
-				{
-					"filename": "burn_drive",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 8,
-						"w": 23,
-						"h": 17
-					},
-					"frame": {
-						"x": 334,
-						"y": 158,
-						"w": 23,
-						"h": 17
-					}
-				},
 				{
 					"filename": "fairy_memory",
 					"rotated": false,
@@ -4182,8 +4266,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 378,
-						"y": 132,
+						"x": 214,
+						"y": 190,
 						"w": 22,
 						"h": 22
 					}
@@ -4203,54 +4287,12 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 400,
-						"y": 132,
+						"x": 193,
+						"y": 212,
 						"w": 22,
 						"h": 22
 					}
 				},
-				{
-					"filename": "chill_drive",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 8,
-						"w": 23,
-						"h": 17
-					},
-					"frame": {
-						"x": 357,
-						"y": 158,
-						"w": 23,
-						"h": 17
-					}
-				},
-				{
-					"filename": "wellspring_mask",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 5,
-						"w": 23,
-						"h": 21
-					},
-					"frame": {
-						"x": 380,
-						"y": 154,
-						"w": 23,
-						"h": 21
-					}
-				},
 				{
 					"filename": "fire_memory",
 					"rotated": false,
@@ -4266,8 +4308,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 403,
-						"y": 154,
+						"x": 193,
+						"y": 234,
 						"w": 22,
 						"h": 22
 					}
@@ -4287,8 +4329,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 123,
-						"y": 169,
+						"x": 193,
+						"y": 256,
 						"w": 22,
 						"h": 22
 					}
@@ -4308,8 +4350,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 145,
-						"y": 169,
+						"x": 215,
+						"y": 212,
 						"w": 22,
 						"h": 22
 					}
@@ -4329,8 +4371,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 167,
-						"y": 169,
+						"x": 215,
+						"y": 234,
 						"w": 22,
 						"h": 22
 					}
@@ -4350,8 +4392,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 189,
-						"y": 169,
+						"x": 215,
+						"y": 256,
 						"w": 22,
 						"h": 22
 					}
@@ -4371,75 +4413,12 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 211,
-						"y": 169,
+						"x": 195,
+						"y": 278,
 						"w": 22,
 						"h": 22
 					}
 				},
-				{
-					"filename": "shell_bell",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 7,
-						"w": 23,
-						"h": 20
-					},
-					"frame": {
-						"x": 233,
-						"y": 173,
-						"w": 23,
-						"h": 20
-					}
-				},
-				{
-					"filename": "dubious_disc",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 7,
-						"w": 22,
-						"h": 19
-					},
-					"frame": {
-						"x": 256,
-						"y": 174,
-						"w": 22,
-						"h": 19
-					}
-				},
-				{
-					"filename": "fairy_feather",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 7,
-						"w": 22,
-						"h": 20
-					},
-					"frame": {
-						"x": 278,
-						"y": 174,
-						"w": 22,
-						"h": 20
-					}
-				},
 				{
 					"filename": "guard_spec",
 					"rotated": false,
@@ -4455,8 +4434,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 300,
-						"y": 175,
+						"x": 217,
+						"y": 278,
 						"w": 22,
 						"h": 22
 					}
@@ -4476,8 +4455,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 322,
-						"y": 175,
+						"x": 236,
+						"y": 105,
 						"w": 22,
 						"h": 22
 					}
@@ -4497,8 +4476,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 344,
-						"y": 175,
+						"x": 236,
+						"y": 127,
 						"w": 22,
 						"h": 22
 					}
@@ -4518,33 +4497,12 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 366,
-						"y": 175,
+						"x": 258,
+						"y": 105,
 						"w": 22,
 						"h": 22
 					}
 				},
-				{
-					"filename": "leftovers",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 15,
-						"h": 22
-					},
-					"frame": {
-						"x": 388,
-						"y": 175,
-						"w": 15,
-						"h": 22
-					}
-				},
 				{
 					"filename": "mini_black_hole",
 					"rotated": false,
@@ -4560,8 +4518,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 403,
-						"y": 176,
+						"x": 280,
+						"y": 105,
 						"w": 22,
 						"h": 22
 					}
@@ -4581,8 +4539,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 125,
-						"y": 191,
+						"x": 258,
+						"y": 127,
 						"w": 22,
 						"h": 22
 					}
@@ -4602,12 +4560,33 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 147,
-						"y": 191,
+						"x": 280,
+						"y": 127,
 						"w": 22,
 						"h": 22
 					}
 				},
+				{
+					"filename": "dubious_disc",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 7,
+						"w": 22,
+						"h": 19
+					},
+					"frame": {
+						"x": 236,
+						"y": 149,
+						"w": 22,
+						"h": 19
+					}
+				},
 				{
 					"filename": "psychic_memory",
 					"rotated": false,
@@ -4623,8 +4602,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 169,
-						"y": 191,
+						"x": 237,
+						"y": 168,
 						"w": 22,
 						"h": 22
 					}
@@ -4644,12 +4623,33 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 191,
-						"y": 191,
+						"x": 236,
+						"y": 190,
 						"w": 22,
 						"h": 22
 					}
 				},
+				{
+					"filename": "mystic_water",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 5,
+						"w": 20,
+						"h": 23
+					},
+					"frame": {
+						"x": 237,
+						"y": 212,
+						"w": 20,
+						"h": 23
+					}
+				},
 				{
 					"filename": "hard_meteorite",
 					"rotated": false,
@@ -4665,8 +4665,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 213,
-						"y": 191,
+						"x": 237,
+						"y": 235,
 						"w": 20,
 						"h": 22
 					}
@@ -4686,12 +4686,75 @@
 						"h": 21
 					},
 					"frame": {
-						"x": 233,
-						"y": 193,
+						"x": 237,
+						"y": 257,
 						"w": 22,
 						"h": 21
 					}
 				},
+				{
+					"filename": "potion",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 5,
+						"w": 17,
+						"h": 23
+					},
+					"frame": {
+						"x": 302,
+						"y": 105,
+						"w": 17,
+						"h": 23
+					}
+				},
+				{
+					"filename": "wellspring_mask",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 5,
+						"w": 23,
+						"h": 21
+					},
+					"frame": {
+						"x": 319,
+						"y": 107,
+						"w": 23,
+						"h": 21
+					}
+				},
+				{
+					"filename": "reviver_seed",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 8,
+						"w": 23,
+						"h": 20
+					},
+					"frame": {
+						"x": 302,
+						"y": 128,
+						"w": 23,
+						"h": 20
+					}
+				},
 				{
 					"filename": "scroll_of_darkness",
 					"rotated": false,
@@ -4707,117 +4770,12 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 255,
-						"y": 193,
+						"x": 342,
+						"y": 107,
 						"w": 22,
 						"h": 22
 					}
 				},
-				{
-					"filename": "douse_drive",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 8,
-						"w": 23,
-						"h": 17
-					},
-					"frame": {
-						"x": 277,
-						"y": 194,
-						"w": 23,
-						"h": 17
-					}
-				},
-				{
-					"filename": "relic_band",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 9,
-						"w": 17,
-						"h": 16
-					},
-					"frame": {
-						"x": 125,
-						"y": 213,
-						"w": 17,
-						"h": 16
-					}
-				},
-				{
-					"filename": "shock_drive",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 8,
-						"w": 23,
-						"h": 17
-					},
-					"frame": {
-						"x": 142,
-						"y": 213,
-						"w": 23,
-						"h": 17
-					}
-				},
-				{
-					"filename": "wise_glasses",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 8,
-						"w": 23,
-						"h": 17
-					},
-					"frame": {
-						"x": 165,
-						"y": 213,
-						"w": 23,
-						"h": 17
-					}
-				},
-				{
-					"filename": "malicious_armor",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 6,
-						"w": 22,
-						"h": 20
-					},
-					"frame": {
-						"x": 188,
-						"y": 213,
-						"w": 22,
-						"h": 20
-					}
-				},
 				{
 					"filename": "scroll_of_waters",
 					"rotated": false,
@@ -4833,8 +4791,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 210,
-						"y": 213,
+						"x": 364,
+						"y": 107,
 						"w": 22,
 						"h": 22
 					}
@@ -4854,12 +4812,75 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 232,
-						"y": 214,
+						"x": 386,
+						"y": 107,
 						"w": 22,
 						"h": 22
 					}
 				},
+				{
+					"filename": "oval_stone",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 7,
+						"w": 18,
+						"h": 19
+					},
+					"frame": {
+						"x": 408,
+						"y": 108,
+						"w": 18,
+						"h": 19
+					}
+				},
+				{
+					"filename": "sitrus_berry",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 5,
+						"w": 20,
+						"h": 22
+					},
+					"frame": {
+						"x": 239,
+						"y": 278,
+						"w": 20,
+						"h": 22
+					}
+				},
+				{
+					"filename": "upgrade",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 7,
+						"w": 22,
+						"h": 19
+					},
+					"frame": {
+						"x": 258,
+						"y": 149,
+						"w": 22,
+						"h": 19
+					}
+				},
 				{
 					"filename": "starf_berry",
 					"rotated": false,
@@ -4875,8 +4896,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 254,
-						"y": 215,
+						"x": 259,
+						"y": 168,
 						"w": 22,
 						"h": 22
 					}
@@ -4896,8 +4917,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 300,
-						"y": 197,
+						"x": 258,
+						"y": 190,
 						"w": 22,
 						"h": 22
 					}
@@ -4917,8 +4938,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 322,
-						"y": 197,
+						"x": 257,
+						"y": 212,
 						"w": 22,
 						"h": 22
 					}
@@ -4938,12 +4959,33 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 344,
-						"y": 197,
+						"x": 257,
+						"y": 234,
 						"w": 22,
 						"h": 22
 					}
 				},
+				{
+					"filename": "metal_alloy",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 7,
+						"w": 21,
+						"h": 19
+					},
+					"frame": {
+						"x": 280,
+						"y": 149,
+						"w": 21,
+						"h": 19
+					}
+				},
 				{
 					"filename": "tm_bug",
 					"rotated": false,
@@ -4959,8 +5001,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 366,
-						"y": 197,
+						"x": 281,
+						"y": 168,
 						"w": 22,
 						"h": 22
 					}
@@ -4980,54 +5022,12 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 129,
-						"y": 230,
+						"x": 280,
+						"y": 190,
 						"w": 22,
 						"h": 22
 					}
 				},
-				{
-					"filename": "sharp_beak",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 5,
-						"w": 21,
-						"h": 23
-					},
-					"frame": {
-						"x": 130,
-						"y": 252,
-						"w": 21,
-						"h": 23
-					}
-				},
-				{
-					"filename": "whipped_dream",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 4,
-						"w": 21,
-						"h": 23
-					},
-					"frame": {
-						"x": 130,
-						"y": 275,
-						"w": 21,
-						"h": 23
-					}
-				},
 				{
 					"filename": "tm_dragon",
 					"rotated": false,
@@ -5043,8 +5043,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 151,
-						"y": 230,
+						"x": 279,
+						"y": 212,
 						"w": 22,
 						"h": 22
 					}
@@ -5064,8 +5064,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 151,
-						"y": 252,
+						"x": 279,
+						"y": 234,
 						"w": 22,
 						"h": 22
 					}
@@ -5085,138 +5085,12 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 151,
-						"y": 274,
+						"x": 259,
+						"y": 256,
 						"w": 22,
 						"h": 22
 					}
 				},
-				{
-					"filename": "potion",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 17,
-						"h": 23
-					},
-					"frame": {
-						"x": 137,
-						"y": 298,
-						"w": 17,
-						"h": 23
-					}
-				},
-				{
-					"filename": "sachet",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 18,
-						"h": 23
-					},
-					"frame": {
-						"x": 137,
-						"y": 321,
-						"w": 18,
-						"h": 23
-					}
-				},
-				{
-					"filename": "super_potion",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 17,
-						"h": 23
-					},
-					"frame": {
-						"x": 138,
-						"y": 344,
-						"w": 17,
-						"h": 23
-					}
-				},
-				{
-					"filename": "lock_capsule",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 19,
-						"h": 22
-					},
-					"frame": {
-						"x": 154,
-						"y": 296,
-						"w": 19,
-						"h": 22
-					}
-				},
-				{
-					"filename": "metal_coat",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
-						"w": 19,
-						"h": 22
-					},
-					"frame": {
-						"x": 138,
-						"y": 367,
-						"w": 19,
-						"h": 22
-					}
-				},
-				{
-					"filename": "sitrus_berry",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 5,
-						"w": 20,
-						"h": 22
-					},
-					"frame": {
-						"x": 155,
-						"y": 318,
-						"w": 20,
-						"h": 22
-					}
-				},
 				{
 					"filename": "tm_fighting",
 					"rotated": false,
@@ -5232,8 +5106,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 155,
-						"y": 340,
+						"x": 259,
+						"y": 278,
 						"w": 22,
 						"h": 22
 					}
@@ -5253,75 +5127,12 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 157,
-						"y": 362,
+						"x": 281,
+						"y": 256,
 						"w": 22,
 						"h": 22
 					}
 				},
-				{
-					"filename": "relic_gold",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 11,
-						"w": 15,
-						"h": 11
-					},
-					"frame": {
-						"x": 173,
-						"y": 230,
-						"w": 15,
-						"h": 11
-					}
-				},
-				{
-					"filename": "metronome",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 5,
-						"w": 17,
-						"h": 22
-					},
-					"frame": {
-						"x": 173,
-						"y": 241,
-						"w": 17,
-						"h": 22
-					}
-				},
-				{
-					"filename": "soothe_bell",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 5,
-						"w": 17,
-						"h": 22
-					},
-					"frame": {
-						"x": 173,
-						"y": 263,
-						"w": 17,
-						"h": 22
-					}
-				},
 				{
 					"filename": "tm_flying",
 					"rotated": false,
@@ -5337,14 +5148,224 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 173,
-						"y": 285,
+						"x": 281,
+						"y": 278,
 						"w": 22,
 						"h": 22
 					}
 				},
 				{
-					"filename": "dawn_stone",
+					"filename": "baton",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 7,
+						"w": 18,
+						"h": 18
+					},
+					"frame": {
+						"x": 408,
+						"y": 127,
+						"w": 18,
+						"h": 18
+					}
+				},
+				{
+					"filename": "golden_egg",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 6,
+						"w": 17,
+						"h": 20
+					},
+					"frame": {
+						"x": 325,
+						"y": 128,
+						"w": 17,
+						"h": 20
+					}
+				},
+				{
+					"filename": "shell_bell",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 7,
+						"w": 23,
+						"h": 20
+					},
+					"frame": {
+						"x": 342,
+						"y": 129,
+						"w": 23,
+						"h": 20
+					}
+				},
+				{
+					"filename": "deep_sea_scale",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 6,
+						"w": 22,
+						"h": 20
+					},
+					"frame": {
+						"x": 365,
+						"y": 129,
+						"w": 22,
+						"h": 20
+					}
+				},
+				{
+					"filename": "poison_barb",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 6,
+						"w": 21,
+						"h": 21
+					},
+					"frame": {
+						"x": 387,
+						"y": 129,
+						"w": 21,
+						"h": 21
+					}
+				},
+				{
+					"filename": "candy",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 11,
+						"w": 18,
+						"h": 18
+					},
+					"frame": {
+						"x": 408,
+						"y": 145,
+						"w": 18,
+						"h": 18
+					}
+				},
+				{
+					"filename": "douse_drive",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 8,
+						"w": 23,
+						"h": 17
+					},
+					"frame": {
+						"x": 195,
+						"y": 300,
+						"w": 23,
+						"h": 17
+					}
+				},
+				{
+					"filename": "relic_crown",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 7,
+						"w": 23,
+						"h": 18
+					},
+					"frame": {
+						"x": 218,
+						"y": 300,
+						"w": 23,
+						"h": 18
+					}
+				},
+				{
+					"filename": "fairy_feather",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 7,
+						"w": 22,
+						"h": 20
+					},
+					"frame": {
+						"x": 241,
+						"y": 300,
+						"w": 22,
+						"h": 20
+					}
+				},
+				{
+					"filename": "malicious_armor",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 6,
+						"w": 22,
+						"h": 20
+					},
+					"frame": {
+						"x": 263,
+						"y": 300,
+						"w": 22,
+						"h": 20
+					}
+				},
+				{
+					"filename": "big_nugget",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5355,13 +5376,76 @@
 						"x": 6,
 						"y": 6,
 						"w": 20,
-						"h": 21
+						"h": 20
 					},
 					"frame": {
-						"x": 190,
-						"y": 233,
+						"x": 285,
+						"y": 300,
 						"w": 20,
-						"h": 21
+						"h": 20
+					}
+				},
+				{
+					"filename": "shock_drive",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 8,
+						"w": 23,
+						"h": 17
+					},
+					"frame": {
+						"x": 155,
+						"y": 305,
+						"w": 23,
+						"h": 17
+					}
+				},
+				{
+					"filename": "lucky_egg",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 6,
+						"w": 17,
+						"h": 20
+					},
+					"frame": {
+						"x": 178,
+						"y": 305,
+						"w": 17,
+						"h": 20
+					}
+				},
+				{
+					"filename": "wise_glasses",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 8,
+						"w": 23,
+						"h": 17
+					},
+					"frame": {
+						"x": 195,
+						"y": 317,
+						"w": 23,
+						"h": 17
 					}
 				},
 				{
@@ -5379,8 +5463,8 @@
 						"h": 21
 					},
 					"frame": {
-						"x": 210,
-						"y": 235,
+						"x": 218,
+						"y": 318,
 						"w": 22,
 						"h": 21
 					}
@@ -5400,33 +5484,12 @@
 						"h": 21
 					},
 					"frame": {
-						"x": 232,
-						"y": 236,
+						"x": 240,
+						"y": 320,
 						"w": 22,
 						"h": 21
 					}
 				},
-				{
-					"filename": "gb",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 6,
-						"w": 20,
-						"h": 20
-					},
-					"frame": {
-						"x": 190,
-						"y": 254,
-						"w": 20,
-						"h": 20
-					}
-				},
 				{
 					"filename": "tart_apple",
 					"rotated": false,
@@ -5442,14 +5505,14 @@
 						"h": 21
 					},
 					"frame": {
-						"x": 254,
-						"y": 237,
+						"x": 262,
+						"y": 320,
 						"w": 22,
 						"h": 21
 					}
 				},
 				{
-					"filename": "tera_orb",
+					"filename": "shiny_stone",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5459,14 +5522,35 @@
 					"spriteSourceSize": {
 						"x": 5,
 						"y": 6,
-						"w": 22,
-						"h": 20
+						"w": 21,
+						"h": 21
 					},
 					"frame": {
-						"x": 210,
-						"y": 256,
-						"w": 22,
-						"h": 20
+						"x": 284,
+						"y": 320,
+						"w": 21,
+						"h": 21
+					}
+				},
+				{
+					"filename": "alakazite",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 16,
+						"h": 16
+					},
+					"frame": {
+						"x": 139,
+						"y": 309,
+						"w": 16,
+						"h": 16
 					}
 				},
 				{
@@ -5484,12 +5568,54 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 232,
-						"y": 257,
+						"x": 135,
+						"y": 325,
 						"w": 22,
 						"h": 22
 					}
 				},
+				{
+					"filename": "zoom_lens",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 6,
+						"w": 21,
+						"h": 21
+					},
+					"frame": {
+						"x": 157,
+						"y": 322,
+						"w": 21,
+						"h": 21
+					}
+				},
+				{
+					"filename": "metronome",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 5,
+						"w": 17,
+						"h": 22
+					},
+					"frame": {
+						"x": 178,
+						"y": 325,
+						"w": 17,
+						"h": 22
+					}
+				},
 				{
 					"filename": "tm_grass",
 					"rotated": false,
@@ -5505,12 +5631,54 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 254,
-						"y": 258,
+						"x": 136,
+						"y": 347,
 						"w": 22,
 						"h": 22
 					}
 				},
+				{
+					"filename": "blue_orb",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 6,
+						"w": 20,
+						"h": 20
+					},
+					"frame": {
+						"x": 158,
+						"y": 343,
+						"w": 20,
+						"h": 20
+					}
+				},
+				{
+					"filename": "super_potion",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 5,
+						"w": 17,
+						"h": 23
+					},
+					"frame": {
+						"x": 141,
+						"y": 369,
+						"w": 17,
+						"h": 23
+					}
+				},
 				{
 					"filename": "tm_ground",
 					"rotated": false,
@@ -5526,12 +5694,54 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 175,
-						"y": 307,
+						"x": 158,
+						"y": 363,
 						"w": 22,
 						"h": 22
 					}
 				},
+				{
+					"filename": "metal_coat",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 5,
+						"w": 19,
+						"h": 22
+					},
+					"frame": {
+						"x": 141,
+						"y": 392,
+						"w": 19,
+						"h": 22
+					}
+				},
+				{
+					"filename": "tera_orb",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 6,
+						"w": 22,
+						"h": 20
+					},
+					"frame": {
+						"x": 195,
+						"y": 334,
+						"w": 22,
+						"h": 20
+					}
+				},
 				{
 					"filename": "tm_ice",
 					"rotated": false,
@@ -5547,8 +5757,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 177,
-						"y": 329,
+						"x": 217,
+						"y": 339,
 						"w": 22,
 						"h": 22
 					}
@@ -5568,8 +5778,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 179,
-						"y": 351,
+						"x": 239,
+						"y": 341,
 						"w": 22,
 						"h": 22
 					}
@@ -5589,8 +5799,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 179,
-						"y": 373,
+						"x": 261,
+						"y": 341,
 						"w": 22,
 						"h": 22
 					}
@@ -5610,14 +5820,14 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 157,
-						"y": 384,
+						"x": 283,
+						"y": 341,
 						"w": 22,
 						"h": 22
 					}
 				},
 				{
-					"filename": "upgrade",
+					"filename": "tm_rock",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5626,36 +5836,15 @@
 					},
 					"spriteSourceSize": {
 						"x": 5,
-						"y": 7,
+						"y": 5,
 						"w": 22,
-						"h": 19
+						"h": 22
 					},
 					"frame": {
-						"x": 109,
-						"y": 406,
+						"x": 160,
+						"y": 385,
 						"w": 22,
-						"h": 19
-					}
-				},
-				{
-					"filename": "metal_alloy",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 7,
-						"w": 21,
-						"h": 19
-					},
-					"frame": {
-						"x": 131,
-						"y": 406,
-						"w": 21,
-						"h": 19
+						"h": 22
 					}
 				},
 				{
@@ -5673,8 +5862,8 @@
 						"h": 19
 					},
 					"frame": {
-						"x": 152,
-						"y": 406,
+						"x": 160,
+						"y": 407,
 						"w": 20,
 						"h": 19
 					}
@@ -5694,14 +5883,14 @@
 						"h": 19
 					},
 					"frame": {
-						"x": 172,
-						"y": 406,
+						"x": 180,
+						"y": 407,
 						"w": 20,
 						"h": 19
 					}
 				},
 				{
-					"filename": "absolite",
+					"filename": "altarianite",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5715,14 +5904,14 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 116,
-						"y": 390,
+						"x": 178,
+						"y": 347,
 						"w": 16,
 						"h": 16
 					}
 				},
 				{
-					"filename": "aerodactylite",
+					"filename": "leftovers",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -5731,35 +5920,14 @@
 					},
 					"spriteSourceSize": {
 						"x": 8,
-						"y": 8,
-						"w": 16,
-						"h": 16
-					},
-					"frame": {
-						"x": 132,
-						"y": 390,
-						"w": 16,
-						"h": 16
-					}
-				},
-				{
-					"filename": "tm_rock",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
 						"y": 5,
-						"w": 22,
+						"w": 15,
 						"h": 22
 					},
 					"frame": {
-						"x": 388,
-						"y": 198,
-						"w": 22,
+						"x": 180,
+						"y": 363,
+						"w": 15,
 						"h": 22
 					}
 				},
@@ -5778,12 +5946,33 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 277,
-						"y": 211,
+						"x": 182,
+						"y": 385,
 						"w": 22,
 						"h": 22
 					}
 				},
+				{
+					"filename": "razor_claw",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 7,
+						"w": 20,
+						"h": 19
+					},
+					"frame": {
+						"x": 200,
+						"y": 407,
+						"w": 20,
+						"h": 19
+					}
+				},
 				{
 					"filename": "tm_water",
 					"rotated": false,
@@ -5799,8 +5988,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 276,
-						"y": 233,
+						"x": 195,
+						"y": 354,
 						"w": 22,
 						"h": 22
 					}
@@ -5820,8 +6009,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 276,
-						"y": 255,
+						"x": 217,
+						"y": 361,
 						"w": 22,
 						"h": 22
 					}
@@ -5841,8 +6030,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 299,
-						"y": 219,
+						"x": 239,
+						"y": 363,
 						"w": 22,
 						"h": 22
 					}
@@ -5862,8 +6051,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 321,
-						"y": 219,
+						"x": 261,
+						"y": 363,
 						"w": 22,
 						"h": 22
 					}
@@ -5883,12 +6072,54 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 343,
-						"y": 219,
+						"x": 283,
+						"y": 363,
 						"w": 22,
 						"h": 22
 					}
 				},
+				{
+					"filename": "soothe_bell",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 5,
+						"w": 17,
+						"h": 22
+					},
+					"frame": {
+						"x": 204,
+						"y": 385,
+						"w": 17,
+						"h": 22
+					}
+				},
+				{
+					"filename": "white_herb",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 7,
+						"w": 20,
+						"h": 19
+					},
+					"frame": {
+						"x": 220,
+						"y": 407,
+						"w": 20,
+						"h": 19
+					}
+				},
 				{
 					"filename": "x_defense",
 					"rotated": false,
@@ -5904,8 +6135,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 365,
-						"y": 219,
+						"x": 221,
+						"y": 385,
 						"w": 22,
 						"h": 22
 					}
@@ -5925,12 +6156,33 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 298,
-						"y": 241,
+						"x": 243,
+						"y": 385,
 						"w": 22,
 						"h": 22
 					}
 				},
+				{
+					"filename": "miracle_seed",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 7,
+						"w": 19,
+						"h": 19
+					},
+					"frame": {
+						"x": 240,
+						"y": 407,
+						"w": 19,
+						"h": 19
+					}
+				},
 				{
 					"filename": "x_sp_def",
 					"rotated": false,
@@ -5946,8 +6198,8 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 320,
-						"y": 241,
+						"x": 265,
+						"y": 385,
 						"w": 22,
 						"h": 22
 					}
@@ -5967,117 +6219,12 @@
 						"h": 22
 					},
 					"frame": {
-						"x": 342,
-						"y": 241,
+						"x": 287,
+						"y": 385,
 						"w": 22,
 						"h": 22
 					}
 				},
-				{
-					"filename": "dusk_stone",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 6,
-						"w": 21,
-						"h": 21
-					},
-					"frame": {
-						"x": 364,
-						"y": 241,
-						"w": 21,
-						"h": 21
-					}
-				},
-				{
-					"filename": "poison_barb",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 6,
-						"w": 21,
-						"h": 21
-					},
-					"frame": {
-						"x": 387,
-						"y": 220,
-						"w": 21,
-						"h": 21
-					}
-				},
-				{
-					"filename": "golden_egg",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 6,
-						"w": 17,
-						"h": 20
-					},
-					"frame": {
-						"x": 408,
-						"y": 220,
-						"w": 17,
-						"h": 20
-					}
-				},
-				{
-					"filename": "shiny_stone",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 5,
-						"y": 6,
-						"w": 21,
-						"h": 21
-					},
-					"frame": {
-						"x": 385,
-						"y": 241,
-						"w": 21,
-						"h": 21
-					}
-				},
-				{
-					"filename": "quick_claw",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 6,
-						"w": 19,
-						"h": 21
-					},
-					"frame": {
-						"x": 406,
-						"y": 241,
-						"w": 19,
-						"h": 21
-					}
-				},
 				{
 					"filename": "masterpiece_teacup",
 					"rotated": false,
@@ -6093,8 +6240,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 298,
-						"y": 263,
+						"x": 259,
+						"y": 407,
 						"w": 21,
 						"h": 18
 					}
@@ -6114,14 +6261,14 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 319,
-						"y": 263,
+						"x": 280,
+						"y": 407,
 						"w": 21,
 						"h": 18
 					}
 				},
 				{
-					"filename": "unremarkable_teacup",
+					"filename": "dark_stone",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -6129,20 +6276,20 @@
 						"h": 32
 					},
 					"spriteSourceSize": {
-						"x": 5,
+						"x": 7,
 						"y": 7,
-						"w": 21,
+						"w": 18,
 						"h": 18
 					},
 					"frame": {
-						"x": 340,
-						"y": 263,
-						"w": 21,
+						"x": 301,
+						"y": 407,
+						"w": 18,
 						"h": 18
 					}
 				},
 				{
-					"filename": "zoom_lens",
+					"filename": "relic_gold",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -6150,20 +6297,41 @@
 						"h": 32
 					},
 					"spriteSourceSize": {
-						"x": 5,
-						"y": 6,
-						"w": 21,
-						"h": 21
+						"x": 9,
+						"y": 11,
+						"w": 15,
+						"h": 11
 					},
 					"frame": {
-						"x": 276,
-						"y": 277,
-						"w": 21,
-						"h": 21
+						"x": 0,
+						"y": 414,
+						"w": 15,
+						"h": 11
 					}
 				},
 				{
-					"filename": "everstone",
+					"filename": "full_heal",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 4,
+						"w": 15,
+						"h": 23
+					},
+					"frame": {
+						"x": 301,
+						"y": 212,
+						"w": 15,
+						"h": 23
+					}
+				},
+				{
+					"filename": "quick_claw",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -6172,15 +6340,78 @@
 					},
 					"spriteSourceSize": {
 						"x": 6,
-						"y": 8,
-						"w": 20,
-						"h": 17
+						"y": 6,
+						"w": 19,
+						"h": 21
 					},
 					"frame": {
-						"x": 297,
-						"y": 281,
+						"x": 301,
+						"y": 235,
+						"w": 19,
+						"h": 21
+					}
+				},
+				{
+					"filename": "spell_tag",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 6,
+						"w": 19,
+						"h": 21
+					},
+					"frame": {
+						"x": 303,
+						"y": 256,
+						"w": 19,
+						"h": 21
+					}
+				},
+				{
+					"filename": "candy_jar",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 6,
+						"w": 19,
+						"h": 20
+					},
+					"frame": {
+						"x": 303,
+						"y": 277,
+						"w": 19,
+						"h": 20
+					}
+				},
+				{
+					"filename": "gb",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 6,
 						"w": 20,
-						"h": 17
+						"h": 20
+					},
+					"frame": {
+						"x": 305,
+						"y": 297,
+						"w": 20,
+						"h": 20
 					}
 				},
 				{
@@ -6198,8 +6429,8 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 317,
-						"y": 281,
+						"x": 305,
+						"y": 317,
 						"w": 20,
 						"h": 20
 					}
@@ -6219,54 +6450,12 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 337,
-						"y": 281,
+						"x": 305,
+						"y": 337,
 						"w": 20,
 						"h": 20
 					}
 				},
-				{
-					"filename": "candy_jar",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 6,
-						"w": 19,
-						"h": 20
-					},
-					"frame": {
-						"x": 357,
-						"y": 281,
-						"w": 19,
-						"h": 20
-					}
-				},
-				{
-					"filename": "baton",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 7,
-						"w": 18,
-						"h": 18
-					},
-					"frame": {
-						"x": 361,
-						"y": 263,
-						"w": 18,
-						"h": 18
-					}
-				},
 				{
 					"filename": "pb",
 					"rotated": false,
@@ -6282,12 +6471,33 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 379,
-						"y": 262,
+						"x": 305,
+						"y": 357,
 						"w": 20,
 						"h": 20
 					}
 				},
+				{
+					"filename": "hard_stone",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 6,
+						"w": 19,
+						"h": 20
+					},
+					"frame": {
+						"x": 309,
+						"y": 377,
+						"w": 19,
+						"h": 20
+					}
+				},
 				{
 					"filename": "pb_gold",
 					"rotated": false,
@@ -6303,33 +6513,12 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 399,
-						"y": 262,
+						"x": 302,
+						"y": 148,
 						"w": 20,
 						"h": 20
 					}
 				},
-				{
-					"filename": "razor_claw",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 7,
-						"w": 20,
-						"h": 19
-					},
-					"frame": {
-						"x": 376,
-						"y": 282,
-						"w": 20,
-						"h": 19
-					}
-				},
 				{
 					"filename": "rb",
 					"rotated": false,
@@ -6345,33 +6534,12 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 396,
-						"y": 282,
+						"x": 322,
+						"y": 148,
 						"w": 20,
 						"h": 20
 					}
 				},
-				{
-					"filename": "spell_tag",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 6,
-						"w": 19,
-						"h": 21
-					},
-					"frame": {
-						"x": 192,
-						"y": 395,
-						"w": 19,
-						"h": 21
-					}
-				},
 				{
 					"filename": "smooth_meteorite",
 					"rotated": false,
@@ -6387,8 +6555,8 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 211,
-						"y": 276,
+						"x": 303,
+						"y": 168,
 						"w": 20,
 						"h": 20
 					}
@@ -6408,8 +6576,8 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 231,
-						"y": 279,
+						"x": 342,
+						"y": 149,
 						"w": 20,
 						"h": 20
 					}
@@ -6429,14 +6597,14 @@
 						"h": 20
 					},
 					"frame": {
-						"x": 251,
-						"y": 280,
+						"x": 362,
+						"y": 149,
 						"w": 20,
 						"h": 20
 					}
 				},
 				{
-					"filename": "mystery_egg",
+					"filename": "flame_orb",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -6444,20 +6612,20 @@
 						"h": 32
 					},
 					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 16,
+						"x": 7,
+						"y": 7,
+						"w": 18,
 						"h": 18
 					},
 					"frame": {
-						"x": 195,
-						"y": 276,
-						"w": 16,
+						"x": 323,
+						"y": 168,
+						"w": 18,
 						"h": 18
 					}
 				},
 				{
-					"filename": "white_herb",
+					"filename": "unremarkable_teacup",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -6465,16 +6633,16 @@
 						"h": 32
 					},
 					"spriteSourceSize": {
-						"x": 6,
+						"x": 5,
 						"y": 7,
-						"w": 20,
-						"h": 19
+						"w": 21,
+						"h": 18
 					},
 					"frame": {
-						"x": 211,
-						"y": 296,
-						"w": 20,
-						"h": 19
+						"x": 341,
+						"y": 169,
+						"w": 21,
+						"h": 18
 					}
 				},
 				{
@@ -6492,8 +6660,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 231,
-						"y": 299,
+						"x": 362,
+						"y": 169,
 						"w": 20,
 						"h": 18
 					}
@@ -6513,54 +6681,12 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 251,
-						"y": 300,
+						"x": 382,
+						"y": 150,
 						"w": 20,
 						"h": 18
 					}
 				},
-				{
-					"filename": "hard_stone",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 6,
-						"w": 19,
-						"h": 20
-					},
-					"frame": {
-						"x": 271,
-						"y": 298,
-						"w": 19,
-						"h": 20
-					}
-				},
-				{
-					"filename": "miracle_seed",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 7,
-						"w": 19,
-						"h": 19
-					},
-					"frame": {
-						"x": 290,
-						"y": 298,
-						"w": 19,
-						"h": 19
-					}
-				},
 				{
 					"filename": "wl_awakening",
 					"rotated": false,
@@ -6576,8 +6702,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 309,
-						"y": 301,
+						"x": 382,
+						"y": 168,
 						"w": 20,
 						"h": 18
 					}
@@ -6597,12 +6723,33 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 329,
-						"y": 301,
+						"x": 402,
+						"y": 163,
 						"w": 20,
 						"h": 18
 					}
 				},
+				{
+					"filename": "everstone",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 6,
+						"y": 8,
+						"w": 20,
+						"h": 17
+					},
+					"frame": {
+						"x": 402,
+						"y": 181,
+						"w": 20,
+						"h": 17
+					}
+				},
 				{
 					"filename": "wl_custom_spliced",
 					"rotated": false,
@@ -6618,8 +6765,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 349,
-						"y": 301,
+						"x": 382,
+						"y": 186,
 						"w": 20,
 						"h": 18
 					}
@@ -6639,8 +6786,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 369,
-						"y": 301,
+						"x": 402,
+						"y": 198,
 						"w": 20,
 						"h": 18
 					}
@@ -6660,14 +6807,14 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 389,
-						"y": 302,
+						"x": 303,
+						"y": 188,
 						"w": 20,
 						"h": 18
 					}
 				},
 				{
-					"filename": "aggronite",
+					"filename": "light_ball",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -6675,37 +6822,16 @@
 						"h": 32
 					},
 					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 16,
-						"h": 16
+						"x": 7,
+						"y": 7,
+						"w": 18,
+						"h": 18
 					},
 					"frame": {
-						"x": 409,
-						"y": 302,
-						"w": 16,
-						"h": 16
-					}
-				},
-				{
-					"filename": "alakazite",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 16,
-						"h": 16
-					},
-					"frame": {
-						"x": 409,
-						"y": 318,
-						"w": 16,
-						"h": 16
+						"x": 323,
+						"y": 186,
+						"w": 18,
+						"h": 18
 					}
 				},
 				{
@@ -6723,8 +6849,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 211,
-						"y": 315,
+						"x": 341,
+						"y": 187,
 						"w": 20,
 						"h": 18
 					}
@@ -6744,12 +6870,33 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 231,
-						"y": 317,
+						"x": 361,
+						"y": 187,
 						"w": 20,
 						"h": 18
 					}
 				},
+				{
+					"filename": "light_stone",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 7,
+						"w": 18,
+						"h": 18
+					},
+					"frame": {
+						"x": 323,
+						"y": 204,
+						"w": 18,
+						"h": 18
+					}
+				},
 				{
 					"filename": "wl_full_restore",
 					"rotated": false,
@@ -6765,8 +6912,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 251,
-						"y": 318,
+						"x": 341,
+						"y": 205,
 						"w": 20,
 						"h": 18
 					}
@@ -6786,33 +6933,12 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 271,
-						"y": 318,
+						"x": 361,
+						"y": 205,
 						"w": 20,
 						"h": 18
 					}
 				},
-				{
-					"filename": "oval_stone",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 7,
-						"w": 18,
-						"h": 19
-					},
-					"frame": {
-						"x": 291,
-						"y": 317,
-						"w": 18,
-						"h": 19
-					}
-				},
 				{
 					"filename": "wl_hyper_potion",
 					"rotated": false,
@@ -6828,8 +6954,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 309,
-						"y": 319,
+						"x": 381,
+						"y": 204,
 						"w": 20,
 						"h": 18
 					}
@@ -6849,8 +6975,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 329,
-						"y": 319,
+						"x": 401,
+						"y": 216,
 						"w": 20,
 						"h": 18
 					}
@@ -6870,8 +6996,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 349,
-						"y": 319,
+						"x": 381,
+						"y": 222,
 						"w": 20,
 						"h": 18
 					}
@@ -6891,8 +7017,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 369,
-						"y": 319,
+						"x": 401,
+						"y": 234,
 						"w": 20,
 						"h": 18
 					}
@@ -6912,33 +7038,12 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 389,
-						"y": 320,
+						"x": 320,
+						"y": 222,
 						"w": 20,
 						"h": 18
 					}
 				},
-				{
-					"filename": "altarianite",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 16,
-						"h": 16
-					},
-					"frame": {
-						"x": 409,
-						"y": 334,
-						"w": 16,
-						"h": 16
-					}
-				},
 				{
 					"filename": "wl_max_ether",
 					"rotated": false,
@@ -6954,54 +7059,12 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 199,
-						"y": 333,
+						"x": 340,
+						"y": 223,
 						"w": 20,
 						"h": 18
 					}
 				},
-				{
-					"filename": "razor_fang",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 6,
-						"w": 18,
-						"h": 20
-					},
-					"frame": {
-						"x": 201,
-						"y": 351,
-						"w": 18,
-						"h": 20
-					}
-				},
-				{
-					"filename": "lucky_egg",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 6,
-						"w": 17,
-						"h": 20
-					},
-					"frame": {
-						"x": 201,
-						"y": 371,
-						"w": 17,
-						"h": 20
-					}
-				},
 				{
 					"filename": "wl_max_potion",
 					"rotated": false,
@@ -7017,12 +7080,96 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 219,
-						"y": 335,
+						"x": 360,
+						"y": 223,
 						"w": 20,
 						"h": 18
 					}
 				},
+				{
+					"filename": "ampharosite",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 16,
+						"h": 16
+					},
+					"frame": {
+						"x": 320,
+						"y": 240,
+						"w": 16,
+						"h": 16
+					}
+				},
+				{
+					"filename": "mystery_egg",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 16,
+						"h": 18
+					},
+					"frame": {
+						"x": 322,
+						"y": 256,
+						"w": 16,
+						"h": 18
+					}
+				},
+				{
+					"filename": "toxic_orb",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 7,
+						"w": 18,
+						"h": 18
+					},
+					"frame": {
+						"x": 322,
+						"y": 274,
+						"w": 18,
+						"h": 18
+					}
+				},
+				{
+					"filename": "eviolite",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 15,
+						"h": 15
+					},
+					"frame": {
+						"x": 336,
+						"y": 241,
+						"w": 15,
+						"h": 15
+					}
+				},
 				{
 					"filename": "wl_max_revive",
 					"rotated": false,
@@ -7038,8 +7185,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 219,
-						"y": 353,
+						"x": 351,
+						"y": 241,
 						"w": 20,
 						"h": 18
 					}
@@ -7059,8 +7206,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 218,
-						"y": 371,
+						"x": 325,
+						"y": 292,
 						"w": 20,
 						"h": 18
 					}
@@ -7080,8 +7227,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 239,
-						"y": 336,
+						"x": 325,
+						"y": 310,
 						"w": 20,
 						"h": 18
 					}
@@ -7101,8 +7248,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 259,
-						"y": 336,
+						"x": 325,
+						"y": 328,
 						"w": 20,
 						"h": 18
 					}
@@ -7122,8 +7269,8 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 279,
-						"y": 336,
+						"x": 325,
+						"y": 346,
 						"w": 20,
 						"h": 18
 					}
@@ -7143,159 +7290,12 @@
 						"h": 18
 					},
 					"frame": {
-						"x": 239,
-						"y": 354,
+						"x": 371,
+						"y": 241,
 						"w": 20,
 						"h": 18
 					}
 				},
-				{
-					"filename": "candy",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 11,
-						"w": 18,
-						"h": 18
-					},
-					"frame": {
-						"x": 259,
-						"y": 354,
-						"w": 18,
-						"h": 18
-					}
-				},
-				{
-					"filename": "dark_stone",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 7,
-						"w": 18,
-						"h": 18
-					},
-					"frame": {
-						"x": 277,
-						"y": 354,
-						"w": 18,
-						"h": 18
-					}
-				},
-				{
-					"filename": "flame_orb",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 7,
-						"w": 18,
-						"h": 18
-					},
-					"frame": {
-						"x": 238,
-						"y": 372,
-						"w": 18,
-						"h": 18
-					}
-				},
-				{
-					"filename": "light_ball",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 7,
-						"w": 18,
-						"h": 18
-					},
-					"frame": {
-						"x": 256,
-						"y": 372,
-						"w": 18,
-						"h": 18
-					}
-				},
-				{
-					"filename": "light_stone",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 7,
-						"w": 18,
-						"h": 18
-					},
-					"frame": {
-						"x": 274,
-						"y": 372,
-						"w": 18,
-						"h": 18
-					}
-				},
-				{
-					"filename": "toxic_orb",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 7,
-						"y": 7,
-						"w": 18,
-						"h": 18
-					},
-					"frame": {
-						"x": 299,
-						"y": 337,
-						"w": 18,
-						"h": 18
-					}
-				},
-				{
-					"filename": "ampharosite",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 32
-					},
-					"spriteSourceSize": {
-						"x": 8,
-						"y": 8,
-						"w": 16,
-						"h": 16
-					},
-					"frame": {
-						"x": 317,
-						"y": 337,
-						"w": 16,
-						"h": 16
-					}
-				},
 				{
 					"filename": "audinite",
 					"rotated": false,
@@ -7311,8 +7311,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 333,
-						"y": 337,
+						"x": 328,
+						"y": 364,
 						"w": 16,
 						"h": 16
 					}
@@ -7332,12 +7332,33 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 349,
-						"y": 337,
+						"x": 328,
+						"y": 380,
 						"w": 16,
 						"h": 16
 					}
 				},
+				{
+					"filename": "prism_scale",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 32,
+						"h": 32
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 8,
+						"w": 15,
+						"h": 15
+					},
+					"frame": {
+						"x": 338,
+						"y": 259,
+						"w": 15,
+						"h": 15
+					}
+				},
 				{
 					"filename": "beedrillite",
 					"rotated": false,
@@ -7353,8 +7374,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 365,
-						"y": 337,
+						"x": 353,
+						"y": 259,
 						"w": 16,
 						"h": 16
 					}
@@ -7374,8 +7395,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 295,
-						"y": 355,
+						"x": 369,
+						"y": 259,
 						"w": 16,
 						"h": 16
 					}
@@ -7395,8 +7416,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 381,
-						"y": 338,
+						"x": 385,
+						"y": 259,
 						"w": 16,
 						"h": 16
 					}
@@ -7416,8 +7437,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 311,
-						"y": 355,
+						"x": 401,
+						"y": 252,
 						"w": 16,
 						"h": 16
 					}
@@ -7437,8 +7458,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 327,
-						"y": 353,
+						"x": 401,
+						"y": 268,
 						"w": 16,
 						"h": 16
 					}
@@ -7458,8 +7479,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 343,
-						"y": 353,
+						"x": 340,
+						"y": 275,
 						"w": 16,
 						"h": 16
 					}
@@ -7479,8 +7500,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 359,
-						"y": 353,
+						"x": 356,
+						"y": 275,
 						"w": 16,
 						"h": 16
 					}
@@ -7500,8 +7521,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 375,
-						"y": 354,
+						"x": 372,
+						"y": 275,
 						"w": 16,
 						"h": 16
 					}
@@ -7521,8 +7542,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 391,
-						"y": 354,
+						"x": 345,
+						"y": 291,
 						"w": 16,
 						"h": 16
 					}
@@ -7542,8 +7563,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 407,
-						"y": 350,
+						"x": 345,
+						"y": 307,
 						"w": 16,
 						"h": 16
 					}
@@ -7563,8 +7584,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 407,
-						"y": 366,
+						"x": 361,
+						"y": 291,
 						"w": 16,
 						"h": 16
 					}
@@ -7584,8 +7605,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 211,
-						"y": 391,
+						"x": 345,
+						"y": 323,
 						"w": 16,
 						"h": 16
 					}
@@ -7605,8 +7626,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 211,
-						"y": 407,
+						"x": 361,
+						"y": 307,
 						"w": 16,
 						"h": 16
 					}
@@ -7626,8 +7647,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 227,
-						"y": 390,
+						"x": 345,
+						"y": 339,
 						"w": 16,
 						"h": 16
 					}
@@ -7647,8 +7668,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 227,
-						"y": 406,
+						"x": 361,
+						"y": 323,
 						"w": 16,
 						"h": 16
 					}
@@ -7668,8 +7689,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 243,
-						"y": 390,
+						"x": 361,
+						"y": 339,
 						"w": 16,
 						"h": 16
 					}
@@ -7689,8 +7710,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 243,
-						"y": 406,
+						"x": 377,
+						"y": 291,
 						"w": 16,
 						"h": 16
 					}
@@ -7710,8 +7731,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 259,
-						"y": 390,
+						"x": 377,
+						"y": 307,
 						"w": 16,
 						"h": 16
 					}
@@ -7731,8 +7752,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 259,
-						"y": 406,
+						"x": 377,
+						"y": 323,
 						"w": 16,
 						"h": 16
 					}
@@ -7752,8 +7773,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 275,
-						"y": 390,
+						"x": 377,
+						"y": 339,
 						"w": 16,
 						"h": 16
 					}
@@ -7773,8 +7794,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 275,
-						"y": 406,
+						"x": 345,
+						"y": 355,
 						"w": 16,
 						"h": 16
 					}
@@ -7794,8 +7815,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 292,
-						"y": 372,
+						"x": 361,
+						"y": 355,
 						"w": 16,
 						"h": 16
 					}
@@ -7815,8 +7836,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 308,
-						"y": 371,
+						"x": 377,
+						"y": 355,
 						"w": 16,
 						"h": 16
 					}
@@ -7836,7 +7857,7 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 324,
+						"x": 344,
 						"y": 371,
 						"w": 16,
 						"h": 16
@@ -7857,8 +7878,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 340,
-						"y": 369,
+						"x": 360,
+						"y": 371,
 						"w": 16,
 						"h": 16
 					}
@@ -7878,8 +7899,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 356,
-						"y": 369,
+						"x": 376,
+						"y": 371,
 						"w": 16,
 						"h": 16
 					}
@@ -7899,8 +7920,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 372,
-						"y": 370,
+						"x": 344,
+						"y": 387,
 						"w": 16,
 						"h": 16
 					}
@@ -7920,8 +7941,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 388,
-						"y": 370,
+						"x": 360,
+						"y": 387,
 						"w": 16,
 						"h": 16
 					}
@@ -7941,8 +7962,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 292,
-						"y": 388,
+						"x": 376,
+						"y": 387,
 						"w": 16,
 						"h": 16
 					}
@@ -7962,8 +7983,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 308,
-						"y": 387,
+						"x": 328,
+						"y": 396,
 						"w": 16,
 						"h": 16
 					}
@@ -7983,8 +8004,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 324,
-						"y": 387,
+						"x": 344,
+						"y": 403,
 						"w": 16,
 						"h": 16
 					}
@@ -8004,8 +8025,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 340,
-						"y": 385,
+						"x": 360,
+						"y": 403,
 						"w": 16,
 						"h": 16
 					}
@@ -8025,8 +8046,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 356,
-						"y": 385,
+						"x": 376,
+						"y": 403,
 						"w": 16,
 						"h": 16
 					}
@@ -8046,8 +8067,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 291,
-						"y": 404,
+						"x": 393,
+						"y": 284,
 						"w": 16,
 						"h": 16
 					}
@@ -8067,8 +8088,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 372,
-						"y": 386,
+						"x": 393,
+						"y": 300,
 						"w": 16,
 						"h": 16
 					}
@@ -8088,8 +8109,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 388,
-						"y": 386,
+						"x": 393,
+						"y": 316,
 						"w": 16,
 						"h": 16
 					}
@@ -8109,8 +8130,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 404,
-						"y": 382,
+						"x": 393,
+						"y": 332,
 						"w": 16,
 						"h": 16
 					}
@@ -8130,8 +8151,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 404,
-						"y": 398,
+						"x": 393,
+						"y": 348,
 						"w": 16,
 						"h": 16
 					}
@@ -8151,8 +8172,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 340,
-						"y": 401,
+						"x": 409,
+						"y": 284,
 						"w": 16,
 						"h": 16
 					}
@@ -8172,8 +8193,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 356,
-						"y": 401,
+						"x": 409,
+						"y": 300,
 						"w": 16,
 						"h": 16
 					}
@@ -8193,8 +8214,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 372,
-						"y": 402,
+						"x": 409,
+						"y": 316,
 						"w": 16,
 						"h": 16
 					}
@@ -8214,8 +8235,8 @@
 						"h": 16
 					},
 					"frame": {
-						"x": 388,
-						"y": 402,
+						"x": 409,
+						"y": 332,
 						"w": 16,
 						"h": 16
 					}
@@ -8226,6 +8247,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:4669e332ee400e355936594c14e7221c:1a1f5a801c94e8eb8589e13bc50105a1:110e074689c9edd2c54833ce2e4d9270$"
+		"smartupdate": "$TexturePacker:SmartUpdate:6dd58685cd89890a4361a424b59bfe65:ff9159978f3a103ee1d656fb76e37457:110e074689c9edd2c54833ce2e4d9270$"
 	}
 }
diff --git a/public/images/items.png b/public/images/items.png
index 9de02d9e0e9..23c87cf3204 100644
Binary files a/public/images/items.png and b/public/images/items.png differ
diff --git a/public/images/pokemon/469.png b/public/images/pokemon/469.png
index 698f94fd61b..f9f9ea8af1a 100644
Binary files a/public/images/pokemon/469.png and b/public/images/pokemon/469.png differ
diff --git a/public/images/pokemon/472.png b/public/images/pokemon/472.png
index 56f3c91aa9b..cc13377bd53 100644
Binary files a/public/images/pokemon/472.png and b/public/images/pokemon/472.png differ
diff --git a/public/images/pokemon/back/469.png b/public/images/pokemon/back/469.png
index c9d40e7349a..f55bdd8f25f 100644
Binary files a/public/images/pokemon/back/469.png and b/public/images/pokemon/back/469.png differ
diff --git a/public/images/pokemon/back/472.png b/public/images/pokemon/back/472.png
index 223e43838d9..af5bfd64473 100644
Binary files a/public/images/pokemon/back/472.png and b/public/images/pokemon/back/472.png differ
diff --git a/public/images/pokemon/exp/751.json b/public/images/pokemon/exp/751.json
index 7ac34e0ac04..2e28048706d 100644
--- a/public/images/pokemon/exp/751.json
+++ b/public/images/pokemon/exp/751.json
@@ -4,71 +4,155 @@
 			"image": "751.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 146,
-				"h": 146
+				"w": 169,
+				"h": 169
 			},
 			"scale": 1,
 			"frames": [
 				{
-					"filename": "0005.png",
+					"filename": "0006.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 32,
-						"h": 55
+						"w": 35,
+						"h": 43
 					},
 					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 32,
-						"h": 52
-					},
-					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 32,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 55
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 32,
-						"h": 51
-					},
-					"frame": {
-						"x": 0,
-						"y": 52,
-						"w": 32,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 55
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 12,
-						"w": 32,
+						"w": 33,
 						"h": 43
 					},
 					"frame": {
 						"x": 0,
-						"y": 103,
-						"w": 32,
+						"y": 0,
+						"w": 33,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0007.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 33,
+						"h": 43
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 33,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0045.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 33,
+						"h": 43
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 33,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0046.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 33,
+						"h": 43
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 33,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0084.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 33,
+						"h": 43
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 33,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0085.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 33,
+						"h": 43
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 33,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0008.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 33,
+						"h": 43
+					},
+					"frame": {
+						"x": 0,
+						"y": 43,
+						"w": 33,
 						"h": 43
 					}
 				},
@@ -77,104 +161,104 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 32,
-						"h": 55
+						"w": 35,
+						"h": 43
 					},
 					"spriteSourceSize": {
 						"x": 0,
-						"y": 4,
-						"w": 32,
-						"h": 50
+						"y": 0,
+						"w": 33,
+						"h": 43
 					},
 					"frame": {
-						"x": 32,
-						"y": 0,
-						"w": 32,
-						"h": 50
+						"x": 0,
+						"y": 43,
+						"w": 33,
+						"h": 43
 					}
 				},
 				{
-					"filename": "0006.png",
+					"filename": "0047.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 32,
-						"h": 55
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 30,
-						"h": 51
-					},
-					"frame": {
-						"x": 32,
-						"y": 50,
-						"w": 30,
-						"h": 51
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 55
+						"w": 35,
+						"h": 43
 					},
 					"spriteSourceSize": {
 						"x": 0,
-						"y": 10,
-						"w": 32,
-						"h": 45
-					},
-					"frame": {
-						"x": 32,
-						"y": 101,
-						"w": 32,
-						"h": 45
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 32,
-						"h": 55
-					},
-					"spriteSourceSize": {
-						"x": 1,
 						"y": 0,
-						"w": 31,
-						"h": 50
+						"w": 33,
+						"h": 43
 					},
 					"frame": {
-						"x": 62,
-						"y": 50,
-						"w": 31,
-						"h": 50
+						"x": 0,
+						"y": 43,
+						"w": 33,
+						"h": 43
 					}
 				},
 				{
-					"filename": "0002.png",
+					"filename": "0048.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 32,
-						"h": 55
+						"w": 35,
+						"h": 43
 					},
 					"spriteSourceSize": {
 						"x": 0,
-						"y": 9,
-						"w": 32,
-						"h": 46
+						"y": 0,
+						"w": 33,
+						"h": 43
 					},
 					"frame": {
-						"x": 64,
-						"y": 100,
-						"w": 32,
-						"h": 46
+						"x": 0,
+						"y": 43,
+						"w": 33,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0086.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 33,
+						"h": 43
+					},
+					"frame": {
+						"x": 0,
+						"y": 43,
+						"w": 33,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0087.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 33,
+						"h": 43
+					},
+					"frame": {
+						"x": 0,
+						"y": 43,
+						"w": 33,
+						"h": 43
 					}
 				},
 				{
@@ -182,62 +266,377 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 32,
-						"h": 55
+						"w": 35,
+						"h": 43
 					},
 					"spriteSourceSize": {
 						"x": 0,
-						"y": 4,
-						"w": 32,
-						"h": 49
+						"y": 0,
+						"w": 33,
+						"h": 43
 					},
 					"frame": {
-						"x": 64,
+						"x": 33,
 						"y": 0,
-						"w": 32,
-						"h": 49
+						"w": 33,
+						"h": 43
 					}
 				},
 				{
-					"filename": "0007.png",
+					"filename": "0011.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
-						"w": 32,
-						"h": 55
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 33,
+						"h": 43
+					},
+					"frame": {
+						"x": 33,
+						"y": 0,
+						"w": 33,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0049.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 33,
+						"h": 43
+					},
+					"frame": {
+						"x": 33,
+						"y": 0,
+						"w": 33,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0050.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 33,
+						"h": 43
+					},
+					"frame": {
+						"x": 33,
+						"y": 0,
+						"w": 33,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0088.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 33,
+						"h": 43
+					},
+					"frame": {
+						"x": 33,
+						"y": 0,
+						"w": 33,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0089.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 33,
+						"h": 43
+					},
+					"frame": {
+						"x": 33,
+						"y": 0,
+						"w": 33,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0004.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
 					},
 					"spriteSourceSize": {
 						"x": 1,
 						"y": 0,
-						"w": 31,
-						"h": 49
+						"w": 32,
+						"h": 43
 					},
 					"frame": {
-						"x": 93,
-						"y": 49,
-						"w": 31,
-						"h": 49
+						"x": 0,
+						"y": 86,
+						"w": 32,
+						"h": 43
 					}
 				},
 				{
-					"filename": "0001.png",
+					"filename": "0005.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
 						"w": 32,
-						"h": 55
+						"h": 43
+					},
+					"frame": {
+						"x": 0,
+						"y": 86,
+						"w": 32,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0043.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 32,
+						"h": 43
+					},
+					"frame": {
+						"x": 0,
+						"y": 86,
+						"w": 32,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0044.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 32,
+						"h": 43
+					},
+					"frame": {
+						"x": 0,
+						"y": 86,
+						"w": 32,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0082.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 32,
+						"h": 43
+					},
+					"frame": {
+						"x": 0,
+						"y": 86,
+						"w": 32,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0083.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 32,
+						"h": 43
+					},
+					"frame": {
+						"x": 0,
+						"y": 86,
+						"w": 32,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0014.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
 					},
 					"spriteSourceSize": {
 						"x": 0,
-						"y": 7,
-						"w": 32,
-						"h": 48
+						"y": 3,
+						"w": 34,
+						"h": 40
 					},
 					"frame": {
-						"x": 96,
-						"y": 98,
-						"w": 32,
-						"h": 48
+						"x": 0,
+						"y": 129,
+						"w": 34,
+						"h": 40
+					}
+				},
+				{
+					"filename": "0033.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 3,
+						"w": 34,
+						"h": 40
+					},
+					"frame": {
+						"x": 0,
+						"y": 129,
+						"w": 34,
+						"h": 40
+					}
+				},
+				{
+					"filename": "0053.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 3,
+						"w": 34,
+						"h": 40
+					},
+					"frame": {
+						"x": 0,
+						"y": 129,
+						"w": 34,
+						"h": 40
+					}
+				},
+				{
+					"filename": "0072.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 3,
+						"w": 34,
+						"h": 40
+					},
+					"frame": {
+						"x": 0,
+						"y": 129,
+						"w": 34,
+						"h": 40
+					}
+				},
+				{
+					"filename": "0092.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 3,
+						"w": 34,
+						"h": 40
+					},
+					"frame": {
+						"x": 0,
+						"y": 129,
+						"w": 34,
+						"h": 40
+					}
+				},
+				{
+					"filename": "0111.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 3,
+						"w": 34,
+						"h": 40
+					},
+					"frame": {
+						"x": 0,
+						"y": 129,
+						"w": 34,
+						"h": 40
 					}
 				},
 				{
@@ -245,20 +644,2393 @@
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
 						"w": 32,
-						"h": 55
+						"h": 43
+					},
+					"frame": {
+						"x": 66,
+						"y": 0,
+						"w": 32,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0051.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 32,
+						"h": 43
+					},
+					"frame": {
+						"x": 66,
+						"y": 0,
+						"w": 32,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0090.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 32,
+						"h": 43
+					},
+					"frame": {
+						"x": 66,
+						"y": 0,
+						"w": 32,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0017.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
 					},
 					"spriteSourceSize": {
 						"x": 0,
-						"y": 10,
-						"w": 32,
-						"h": 45
+						"y": 2,
+						"w": 34,
+						"h": 41
 					},
 					"frame": {
-						"x": 96,
+						"x": 33,
+						"y": 43,
+						"w": 34,
+						"h": 41
+					}
+				},
+				{
+					"filename": "0018.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 2,
+						"w": 34,
+						"h": 41
+					},
+					"frame": {
+						"x": 33,
+						"y": 43,
+						"w": 34,
+						"h": 41
+					}
+				},
+				{
+					"filename": "0036.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 2,
+						"w": 34,
+						"h": 41
+					},
+					"frame": {
+						"x": 33,
+						"y": 43,
+						"w": 34,
+						"h": 41
+					}
+				},
+				{
+					"filename": "0037.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 2,
+						"w": 34,
+						"h": 41
+					},
+					"frame": {
+						"x": 33,
+						"y": 43,
+						"w": 34,
+						"h": 41
+					}
+				},
+				{
+					"filename": "0056.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 2,
+						"w": 34,
+						"h": 41
+					},
+					"frame": {
+						"x": 33,
+						"y": 43,
+						"w": 34,
+						"h": 41
+					}
+				},
+				{
+					"filename": "0057.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 2,
+						"w": 34,
+						"h": 41
+					},
+					"frame": {
+						"x": 33,
+						"y": 43,
+						"w": 34,
+						"h": 41
+					}
+				},
+				{
+					"filename": "0075.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 2,
+						"w": 34,
+						"h": 41
+					},
+					"frame": {
+						"x": 33,
+						"y": 43,
+						"w": 34,
+						"h": 41
+					}
+				},
+				{
+					"filename": "0076.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 2,
+						"w": 34,
+						"h": 41
+					},
+					"frame": {
+						"x": 33,
+						"y": 43,
+						"w": 34,
+						"h": 41
+					}
+				},
+				{
+					"filename": "0095.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 2,
+						"w": 34,
+						"h": 41
+					},
+					"frame": {
+						"x": 33,
+						"y": 43,
+						"w": 34,
+						"h": 41
+					}
+				},
+				{
+					"filename": "0096.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 2,
+						"w": 34,
+						"h": 41
+					},
+					"frame": {
+						"x": 33,
+						"y": 43,
+						"w": 34,
+						"h": 41
+					}
+				},
+				{
+					"filename": "0114.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 2,
+						"w": 34,
+						"h": 41
+					},
+					"frame": {
+						"x": 33,
+						"y": 43,
+						"w": 34,
+						"h": 41
+					}
+				},
+				{
+					"filename": "0115.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 2,
+						"w": 34,
+						"h": 41
+					},
+					"frame": {
+						"x": 33,
+						"y": 43,
+						"w": 34,
+						"h": 41
+					}
+				},
+				{
+					"filename": "0029.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 3,
 						"y": 0,
 						"w": 32,
-						"h": 45
+						"h": 43
+					},
+					"frame": {
+						"x": 98,
+						"y": 0,
+						"w": 32,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0030.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 0,
+						"w": 32,
+						"h": 43
+					},
+					"frame": {
+						"x": 98,
+						"y": 0,
+						"w": 32,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0068.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 0,
+						"w": 32,
+						"h": 43
+					},
+					"frame": {
+						"x": 98,
+						"y": 0,
+						"w": 32,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0069.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 0,
+						"w": 32,
+						"h": 43
+					},
+					"frame": {
+						"x": 98,
+						"y": 0,
+						"w": 32,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0107.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 0,
+						"w": 32,
+						"h": 43
+					},
+					"frame": {
+						"x": 98,
+						"y": 0,
+						"w": 32,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0108.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 0,
+						"w": 32,
+						"h": 43
+					},
+					"frame": {
+						"x": 98,
+						"y": 0,
+						"w": 32,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0122.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 2,
+						"w": 34,
+						"h": 41
+					},
+					"frame": {
+						"x": 67,
+						"y": 43,
+						"w": 34,
+						"h": 41
+					}
+				},
+				{
+					"filename": "0134.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 2,
+						"w": 34,
+						"h": 41
+					},
+					"frame": {
+						"x": 67,
+						"y": 43,
+						"w": 34,
+						"h": 41
+					}
+				},
+				{
+					"filename": "0123.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 2,
+						"w": 34,
+						"h": 41
+					},
+					"frame": {
+						"x": 130,
+						"y": 0,
+						"w": 34,
+						"h": 41
+					}
+				},
+				{
+					"filename": "0129.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 2,
+						"w": 34,
+						"h": 41
+					},
+					"frame": {
+						"x": 130,
+						"y": 0,
+						"w": 34,
+						"h": 41
+					}
+				},
+				{
+					"filename": "0135.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 2,
+						"w": 34,
+						"h": 41
+					},
+					"frame": {
+						"x": 130,
+						"y": 0,
+						"w": 34,
+						"h": 41
+					}
+				},
+				{
+					"filename": "0141.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 2,
+						"w": 34,
+						"h": 41
+					},
+					"frame": {
+						"x": 130,
+						"y": 0,
+						"w": 34,
+						"h": 41
+					}
+				},
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0002.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0003.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0015.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0016.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0019.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0020.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0021.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0022.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0034.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0035.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0038.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0039.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0040.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0041.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0042.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0054.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0055.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0058.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0059.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0060.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0061.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0073.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0074.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0077.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0078.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0079.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0080.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0081.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0093.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0094.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0097.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0098.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0099.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0100.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0112.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0113.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0116.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0117.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0118.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0124.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0130.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0136.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0142.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0143.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0144.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 1,
+						"w": 31,
+						"h": 42
+					},
+					"frame": {
+						"x": 101,
+						"y": 43,
+						"w": 31,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0023.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 31,
+						"h": 43
+					},
+					"frame": {
+						"x": 132,
+						"y": 41,
+						"w": 31,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0024.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 31,
+						"h": 43
+					},
+					"frame": {
+						"x": 132,
+						"y": 41,
+						"w": 31,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0062.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 31,
+						"h": 43
+					},
+					"frame": {
+						"x": 132,
+						"y": 41,
+						"w": 31,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0063.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 31,
+						"h": 43
+					},
+					"frame": {
+						"x": 132,
+						"y": 41,
+						"w": 31,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0101.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 31,
+						"h": 43
+					},
+					"frame": {
+						"x": 132,
+						"y": 41,
+						"w": 31,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0102.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 2,
+						"y": 0,
+						"w": 31,
+						"h": 43
+					},
+					"frame": {
+						"x": 132,
+						"y": 41,
+						"w": 31,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0025.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 0,
+						"w": 31,
+						"h": 43
+					},
+					"frame": {
+						"x": 32,
+						"y": 86,
+						"w": 31,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0026.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 0,
+						"w": 31,
+						"h": 43
+					},
+					"frame": {
+						"x": 32,
+						"y": 86,
+						"w": 31,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0064.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 0,
+						"w": 31,
+						"h": 43
+					},
+					"frame": {
+						"x": 32,
+						"y": 86,
+						"w": 31,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0065.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 0,
+						"w": 31,
+						"h": 43
+					},
+					"frame": {
+						"x": 32,
+						"y": 86,
+						"w": 31,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0103.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 0,
+						"w": 31,
+						"h": 43
+					},
+					"frame": {
+						"x": 32,
+						"y": 86,
+						"w": 31,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0104.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 0,
+						"w": 31,
+						"h": 43
+					},
+					"frame": {
+						"x": 32,
+						"y": 86,
+						"w": 31,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0128.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 2,
+						"w": 34,
+						"h": 41
+					},
+					"frame": {
+						"x": 63,
+						"y": 84,
+						"w": 34,
+						"h": 41
+					}
+				},
+				{
+					"filename": "0140.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 2,
+						"w": 34,
+						"h": 41
+					},
+					"frame": {
+						"x": 63,
+						"y": 84,
+						"w": 34,
+						"h": 41
+					}
+				},
+				{
+					"filename": "0121.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 4,
+						"w": 35,
+						"h": 39
+					},
+					"frame": {
+						"x": 97,
+						"y": 85,
+						"w": 35,
+						"h": 39
+					}
+				},
+				{
+					"filename": "0127.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 4,
+						"w": 35,
+						"h": 39
+					},
+					"frame": {
+						"x": 97,
+						"y": 85,
+						"w": 35,
+						"h": 39
+					}
+				},
+				{
+					"filename": "0133.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 4,
+						"w": 35,
+						"h": 39
+					},
+					"frame": {
+						"x": 97,
+						"y": 85,
+						"w": 35,
+						"h": 39
+					}
+				},
+				{
+					"filename": "0139.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 4,
+						"w": 35,
+						"h": 39
+					},
+					"frame": {
+						"x": 97,
+						"y": 85,
+						"w": 35,
+						"h": 39
+					}
+				},
+				{
+					"filename": "0027.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 1,
+						"w": 32,
+						"h": 42
+					},
+					"frame": {
+						"x": 132,
+						"y": 84,
+						"w": 32,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0028.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 1,
+						"w": 32,
+						"h": 42
+					},
+					"frame": {
+						"x": 132,
+						"y": 84,
+						"w": 32,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0066.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 1,
+						"w": 32,
+						"h": 42
+					},
+					"frame": {
+						"x": 132,
+						"y": 84,
+						"w": 32,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0067.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 1,
+						"w": 32,
+						"h": 42
+					},
+					"frame": {
+						"x": 132,
+						"y": 84,
+						"w": 32,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0105.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 1,
+						"w": 32,
+						"h": 42
+					},
+					"frame": {
+						"x": 132,
+						"y": 84,
+						"w": 32,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0106.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 1,
+						"w": 32,
+						"h": 42
+					},
+					"frame": {
+						"x": 132,
+						"y": 84,
+						"w": 32,
+						"h": 42
+					}
+				},
+				{
+					"filename": "0013.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 5,
+						"w": 35,
+						"h": 38
+					},
+					"frame": {
+						"x": 34,
+						"y": 129,
+						"w": 35,
+						"h": 38
+					}
+				},
+				{
+					"filename": "0032.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 5,
+						"w": 35,
+						"h": 38
+					},
+					"frame": {
+						"x": 34,
+						"y": 129,
+						"w": 35,
+						"h": 38
+					}
+				},
+				{
+					"filename": "0052.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 5,
+						"w": 35,
+						"h": 38
+					},
+					"frame": {
+						"x": 34,
+						"y": 129,
+						"w": 35,
+						"h": 38
+					}
+				},
+				{
+					"filename": "0071.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 5,
+						"w": 35,
+						"h": 38
+					},
+					"frame": {
+						"x": 34,
+						"y": 129,
+						"w": 35,
+						"h": 38
+					}
+				},
+				{
+					"filename": "0091.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 5,
+						"w": 35,
+						"h": 38
+					},
+					"frame": {
+						"x": 34,
+						"y": 129,
+						"w": 35,
+						"h": 38
+					}
+				},
+				{
+					"filename": "0110.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 5,
+						"w": 35,
+						"h": 38
+					},
+					"frame": {
+						"x": 34,
+						"y": 129,
+						"w": 35,
+						"h": 38
+					}
+				},
+				{
+					"filename": "0031.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 0,
+						"w": 31,
+						"h": 43
+					},
+					"frame": {
+						"x": 69,
+						"y": 126,
+						"w": 31,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0070.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 0,
+						"w": 31,
+						"h": 43
+					},
+					"frame": {
+						"x": 69,
+						"y": 126,
+						"w": 31,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0109.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 0,
+						"w": 31,
+						"h": 43
+					},
+					"frame": {
+						"x": 69,
+						"y": 126,
+						"w": 31,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0119.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 0,
+						"w": 31,
+						"h": 43
+					},
+					"frame": {
+						"x": 100,
+						"y": 126,
+						"w": 31,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0125.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 0,
+						"w": 31,
+						"h": 43
+					},
+					"frame": {
+						"x": 100,
+						"y": 126,
+						"w": 31,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0131.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 0,
+						"w": 31,
+						"h": 43
+					},
+					"frame": {
+						"x": 100,
+						"y": 126,
+						"w": 31,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0137.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 0,
+						"w": 31,
+						"h": 43
+					},
+					"frame": {
+						"x": 100,
+						"y": 126,
+						"w": 31,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0120.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 0,
+						"w": 31,
+						"h": 43
+					},
+					"frame": {
+						"x": 131,
+						"y": 126,
+						"w": 31,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0126.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 0,
+						"w": 31,
+						"h": 43
+					},
+					"frame": {
+						"x": 131,
+						"y": 126,
+						"w": 31,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0132.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 0,
+						"w": 31,
+						"h": 43
+					},
+					"frame": {
+						"x": 131,
+						"y": 126,
+						"w": 31,
+						"h": 43
+					}
+				},
+				{
+					"filename": "0138.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 35,
+						"h": 43
+					},
+					"spriteSourceSize": {
+						"x": 3,
+						"y": 0,
+						"w": 31,
+						"h": 43
+					},
+					"frame": {
+						"x": 131,
+						"y": 126,
+						"w": 31,
+						"h": 43
 					}
 				}
 			]
@@ -267,6 +3039,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:cc1e42833991a58e9cbe6f8a40a3d179:832e53524cd611a274742603a96b9ff4:1d193c65e68b1611f35fce7f3295865c$"
+		"smartupdate": "$TexturePacker:SmartUpdate:4cce3abef08fd679bfca3bda14d2e7a8:fa6cfa01fadaa0ac727b8c3a4d1d49fc:1d193c65e68b1611f35fce7f3295865c$"
 	}
 }
diff --git a/public/images/pokemon/exp/751.png b/public/images/pokemon/exp/751.png
index 2f331ba746a..b670acad126 100644
Binary files a/public/images/pokemon/exp/751.png and b/public/images/pokemon/exp/751.png differ
diff --git a/public/images/pokemon/exp/back/970.json b/public/images/pokemon/exp/back/970.json
index 9be45f39fd2..a516771c02b 100644
--- a/public/images/pokemon/exp/back/970.json
+++ b/public/images/pokemon/exp/back/970.json
@@ -1,419 +1,167 @@
-{
-	"textures": [
-		{
-			"image": "970.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 296,
-				"h": 296
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 8,
-						"w": 59,
-						"h": 60
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 8,
-						"w": 59,
-						"h": 60
-					},
-					"frame": {
-						"x": 59,
-						"y": 0,
-						"w": 59,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 59,
-						"h": 62
-					},
-					"frame": {
-						"x": 118,
-						"y": 0,
-						"w": 59,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 58,
-						"h": 63
-					},
-					"frame": {
-						"x": 177,
-						"y": 0,
-						"w": 58,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 5,
-						"w": 59,
-						"h": 66
-					},
-					"frame": {
-						"x": 235,
-						"y": 0,
-						"w": 59,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 60,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 60,
-						"w": 60,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 59,
-						"h": 66
-					},
-					"frame": {
-						"x": 60,
-						"y": 62,
-						"w": 59,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 59,
-						"h": 67
-					},
-					"frame": {
-						"x": 119,
-						"y": 63,
-						"w": 59,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 59,
-						"h": 67
-					},
-					"frame": {
-						"x": 178,
-						"y": 66,
-						"w": 59,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 59,
-						"h": 68
-					},
-					"frame": {
-						"x": 237,
-						"y": 66,
-						"w": 59,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 59,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 126,
-						"w": 59,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 60,
-						"h": 69
-					},
-					"frame": {
-						"x": 59,
-						"y": 128,
-						"w": 60,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 61,
-						"h": 69
-					},
-					"frame": {
-						"x": 119,
-						"y": 133,
-						"w": 61,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 61,
-						"h": 69
-					},
-					"frame": {
-						"x": 119,
-						"y": 133,
-						"w": 61,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 61,
-						"h": 69
-					},
-					"frame": {
-						"x": 180,
-						"y": 134,
-						"w": 61,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 61,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 197,
-						"w": 61,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 61,
-						"h": 69
-					},
-					"frame": {
-						"x": 61,
-						"y": 202,
-						"w": 61,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 71
-					},
-					"frame": {
-						"x": 122,
-						"y": 203,
-						"w": 61,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 71
-					},
-					"frame": {
-						"x": 183,
-						"y": 203,
-						"w": 61,
-						"h": 71
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:826f0c54b74572cfb274b9973fbd50bf:a0d3e34e9b94dc843d98c54879e0c70e:97e320d73d4227f4b083688478fb20b2$"
-	}
+{ "textures": [
+  {
+  "image": "970.png",
+  "format": "RGBA8888",
+  "size": { "w": 294, "h": 294 },
+  "scale": 1,
+  "frames": [
+   {
+    "filename": "0001.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 59, "h": 67 },
+    "frame": { "x": 120, "y": 0, "w": 59, "h": 67 }
+   },
+   {
+    "filename": "0002.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 59, "h": 67 },
+    "frame": { "x": 179, "y": 0, "w": 59, "h": 67 }
+   },
+   {
+    "filename": "0003.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 59, "h": 67 },
+    "frame": { "x": 120, "y": 67, "w": 59, "h": 67 }
+   },
+   {
+    "filename": "0004.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 57, "h": 65 },
+    "frame": { "x": 230, "y": 134, "w": 57, "h": 65 }
+   },
+   {
+    "filename": "0005.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 56, "h": 61 },
+    "frame": { "x": 238, "y": 0, "w": 56, "h": 61 }
+   },
+   {
+    "filename": "0006.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 57, "h": 60 },
+    "frame": { "x": 114, "y": 198, "w": 57, "h": 60 }
+   },
+   {
+    "filename": "0007.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 57, "h": 58 },
+    "frame": { "x": 57, "y": 199, "w": 57, "h": 58 }
+   },
+   {
+    "filename": "0008.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 58, "h": 58 },
+    "frame": { "x": 171, "y": 198, "w": 58, "h": 58 }
+   },
+   {
+    "filename": "0009.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 58, "h": 64 },
+    "frame": { "x": 114, "y": 134, "w": 58, "h": 64 }
+   },
+   {
+    "filename": "0010.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 58, "h": 64 },
+    "frame": { "x": 172, "y": 134, "w": 58, "h": 64 }
+   },
+   {
+    "filename": "0011.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 59, "h": 67 },
+    "frame": { "x": 120, "y": 0, "w": 59, "h": 67 }
+   },
+   {
+    "filename": "0012.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 57, "h": 66 },
+    "frame": { "x": 0, "y": 69, "w": 57, "h": 66 }
+   },
+   {
+    "filename": "0013.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 60, "h": 69 },
+    "frame": { "x": 0, "y": 0, "w": 60, "h": 69 }
+   },
+   {
+    "filename": "0014.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 67 },
+    "frame": { "x": 120, "y": 0, "w": 59, "h": 67 }
+   },
+   {
+    "filename": "0015.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 57, "h": 66 },
+    "frame": { "x": 57, "y": 69, "w": 57, "h": 66 }
+   },
+   {
+    "filename": "0016.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 60, "h": 69 },
+    "frame": { "x": 60, "y": 0, "w": 60, "h": 69 }
+   },
+   {
+    "filename": "0017.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 57, "h": 65 },
+    "frame": { "x": 0, "y": 135, "w": 57, "h": 65 }
+   },
+   {
+    "filename": "0018.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 57, "h": 64 },
+    "frame": { "x": 57, "y": 135, "w": 57, "h": 64 }
+   },
+   {
+    "filename": "0019.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 59, "h": 67 },
+    "frame": { "x": 179, "y": 67, "w": 59, "h": 67 }
+   }
+ ]
+}
+],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.7-x64"
+ }
 }
diff --git a/public/images/pokemon/exp/back/970.png b/public/images/pokemon/exp/back/970.png
index bd6464a7bfa..533b680c117 100644
Binary files a/public/images/pokemon/exp/back/970.png and b/public/images/pokemon/exp/back/970.png differ
diff --git a/public/images/pokemon/exp/back/shiny/745-midnight.png b/public/images/pokemon/exp/back/shiny/745-midnight.png
index 94a9c328d01..a7d7e0497b5 100644
Binary files a/public/images/pokemon/exp/back/shiny/745-midnight.png and b/public/images/pokemon/exp/back/shiny/745-midnight.png differ
diff --git a/public/images/pokemon/exp/back/shiny/970.json b/public/images/pokemon/exp/back/shiny/970.json
index 9be45f39fd2..a516771c02b 100644
--- a/public/images/pokemon/exp/back/shiny/970.json
+++ b/public/images/pokemon/exp/back/shiny/970.json
@@ -1,419 +1,167 @@
-{
-	"textures": [
-		{
-			"image": "970.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 296,
-				"h": 296
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 8,
-						"w": 59,
-						"h": 60
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 59,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 8,
-						"w": 59,
-						"h": 60
-					},
-					"frame": {
-						"x": 59,
-						"y": 0,
-						"w": 59,
-						"h": 60
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 6,
-						"w": 59,
-						"h": 62
-					},
-					"frame": {
-						"x": 118,
-						"y": 0,
-						"w": 59,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 5,
-						"w": 58,
-						"h": 63
-					},
-					"frame": {
-						"x": 177,
-						"y": 0,
-						"w": 58,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 5,
-						"w": 59,
-						"h": 66
-					},
-					"frame": {
-						"x": 235,
-						"y": 0,
-						"w": 59,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 4,
-						"w": 60,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 60,
-						"w": 60,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 59,
-						"h": 66
-					},
-					"frame": {
-						"x": 60,
-						"y": 62,
-						"w": 59,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 59,
-						"h": 67
-					},
-					"frame": {
-						"x": 119,
-						"y": 63,
-						"w": 59,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 59,
-						"h": 67
-					},
-					"frame": {
-						"x": 178,
-						"y": 66,
-						"w": 59,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 59,
-						"h": 68
-					},
-					"frame": {
-						"x": 237,
-						"y": 66,
-						"w": 59,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 4,
-						"w": 59,
-						"h": 68
-					},
-					"frame": {
-						"x": 0,
-						"y": 126,
-						"w": 59,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 60,
-						"h": 69
-					},
-					"frame": {
-						"x": 59,
-						"y": 128,
-						"w": 60,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 61,
-						"h": 69
-					},
-					"frame": {
-						"x": 119,
-						"y": 133,
-						"w": 61,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 61,
-						"h": 69
-					},
-					"frame": {
-						"x": 119,
-						"y": 133,
-						"w": 61,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 61,
-						"h": 69
-					},
-					"frame": {
-						"x": 180,
-						"y": 134,
-						"w": 61,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 61,
-						"h": 69
-					},
-					"frame": {
-						"x": 0,
-						"y": 197,
-						"w": 61,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 61,
-						"h": 69
-					},
-					"frame": {
-						"x": 61,
-						"y": 202,
-						"w": 61,
-						"h": 69
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 71
-					},
-					"frame": {
-						"x": 122,
-						"y": 203,
-						"w": 61,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 61,
-						"h": 77
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 71
-					},
-					"frame": {
-						"x": 183,
-						"y": 203,
-						"w": 61,
-						"h": 71
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:826f0c54b74572cfb274b9973fbd50bf:a0d3e34e9b94dc843d98c54879e0c70e:97e320d73d4227f4b083688478fb20b2$"
-	}
+{ "textures": [
+  {
+  "image": "970.png",
+  "format": "RGBA8888",
+  "size": { "w": 294, "h": 294 },
+  "scale": 1,
+  "frames": [
+   {
+    "filename": "0001.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 59, "h": 67 },
+    "frame": { "x": 120, "y": 0, "w": 59, "h": 67 }
+   },
+   {
+    "filename": "0002.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 0, "y": 3, "w": 59, "h": 67 },
+    "frame": { "x": 179, "y": 0, "w": 59, "h": 67 }
+   },
+   {
+    "filename": "0003.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 59, "h": 67 },
+    "frame": { "x": 120, "y": 67, "w": 59, "h": 67 }
+   },
+   {
+    "filename": "0004.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 57, "h": 65 },
+    "frame": { "x": 230, "y": 134, "w": 57, "h": 65 }
+   },
+   {
+    "filename": "0005.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 0, "y": 5, "w": 56, "h": 61 },
+    "frame": { "x": 238, "y": 0, "w": 56, "h": 61 }
+   },
+   {
+    "filename": "0006.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 0, "y": 6, "w": 57, "h": 60 },
+    "frame": { "x": 114, "y": 198, "w": 57, "h": 60 }
+   },
+   {
+    "filename": "0007.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 57, "h": 58 },
+    "frame": { "x": 57, "y": 199, "w": 57, "h": 58 }
+   },
+   {
+    "filename": "0008.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 2, "y": 8, "w": 58, "h": 58 },
+    "frame": { "x": 171, "y": 198, "w": 58, "h": 58 }
+   },
+   {
+    "filename": "0009.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 2, "y": 5, "w": 58, "h": 64 },
+    "frame": { "x": 114, "y": 134, "w": 58, "h": 64 }
+   },
+   {
+    "filename": "0010.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 1, "y": 4, "w": 58, "h": 64 },
+    "frame": { "x": 172, "y": 134, "w": 58, "h": 64 }
+   },
+   {
+    "filename": "0011.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 59, "h": 67 },
+    "frame": { "x": 120, "y": 0, "w": 59, "h": 67 }
+   },
+   {
+    "filename": "0012.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 57, "h": 66 },
+    "frame": { "x": 0, "y": 69, "w": 57, "h": 66 }
+   },
+   {
+    "filename": "0013.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 60, "h": 69 },
+    "frame": { "x": 0, "y": 0, "w": 60, "h": 69 }
+   },
+   {
+    "filename": "0014.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 1, "y": 1, "w": 59, "h": 67 },
+    "frame": { "x": 120, "y": 0, "w": 59, "h": 67 }
+   },
+   {
+    "filename": "0015.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 57, "h": 66 },
+    "frame": { "x": 57, "y": 69, "w": 57, "h": 66 }
+   },
+   {
+    "filename": "0016.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 60, "h": 69 },
+    "frame": { "x": 60, "y": 0, "w": 60, "h": 69 }
+   },
+   {
+    "filename": "0017.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 57, "h": 65 },
+    "frame": { "x": 0, "y": 135, "w": 57, "h": 65 }
+   },
+   {
+    "filename": "0018.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 0, "y": 4, "w": 57, "h": 64 },
+    "frame": { "x": 57, "y": 135, "w": 57, "h": 64 }
+   },
+   {
+    "filename": "0019.png",
+    "rotated": false,
+    "trimmed": true,
+    "sourceSize": { "w": 61, "h": 77 },
+    "spriteSourceSize": { "x": 0, "y": 2, "w": 59, "h": 67 },
+    "frame": { "x": 179, "y": 67, "w": 59, "h": 67 }
+   }
+ ]
+}
+],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.7-x64"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/970.png b/public/images/pokemon/exp/back/shiny/970.png
index 1d092da94cd..03ed35af776 100644
Binary files a/public/images/pokemon/exp/back/shiny/970.png and b/public/images/pokemon/exp/back/shiny/970.png differ
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/icons/variant/4/472_2.png b/public/images/pokemon/icons/variant/4/472_2.png
index 80282fd1f75..29cb7014389 100644
Binary files a/public/images/pokemon/icons/variant/4/472_2.png and b/public/images/pokemon/icons/variant/4/472_2.png differ
diff --git a/public/images/pokemon/variant/469.json b/public/images/pokemon/variant/469.json
new file mode 100644
index 00000000000..afaaeab8796
--- /dev/null
+++ b/public/images/pokemon/variant/469.json
@@ -0,0 +1,38 @@
+{
+	"1": {
+		"3a5a29": "8577e0",
+		"797982": "ba4369",
+		"f75a52": "5555ab",
+		"739c63": "dfbaff",
+		"733100": "322966",
+		"213a19": "534fab",
+		"4a4a52": "942b5a",
+		"ffffff": "c4f2ff",
+		"52844a": "c59eff",
+		"c5cee6": "91c2fa",
+		"7b7b84": "6143b3",
+		"797983": "6143b3",
+		"a5adc5": "6e8ce0",
+		"292931": "511d5e",
+		"b53119": "403a91",
+		"ff948c": "5c7db5"
+	},
+	"2": {
+		"3a5a29": "965a2f",
+		"797982": "516d82",
+		"f75a52": "21b0a6",
+		"739c63": "ebcf7c",
+		"733100": "2e5785",
+		"213a19": "70331d",
+		"4a4a52": "2e4a52",
+		"ffffff": "c1dede",
+		"52844a": "e0a14f",
+		"c5cee6": "97c0c4",
+		"7b7b84": "4f6b80",
+		"797983": "4f6b80",
+		"a5adc5": "678ea6",
+		"292931": "1f3144",
+		"b53119": "2c8199",
+		"ff948c": "79d4ba"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/472.json b/public/images/pokemon/variant/472.json
index a98fd1a0355..937ea1334de 100644
--- a/public/images/pokemon/variant/472.json
+++ b/public/images/pokemon/variant/472.json
@@ -1,44 +1,33 @@
 {
 	"1": {
 		"5a63a5": "974d16",
-		"293163": "5c2a09",
-		"9c8cef": "d28b36",
-		"b5a5ff": "e9bb57",
-		"ffffff": "ffffff",
-		"737bc5": "b86f27",
-		"101010": "101010",
-		"730800": "143262",
-		"ad2131": "2a6197",
 		"de3a6b": "4c83a9",
-		"43050d": "5c2a09",
-		"ad9400": "4b64ff",
-		"ffde00": "84b8ff",
-		"2a2a2a": "130e27",
+		"293163": "5c2a09",
 		"424252": "2a2752",
-		"c55294": "5270c5",
-		"d8d8d8": "d8d8d8",
+		"ffde00": "84b8ff",
+		"b5a5ff": "e9bb57",
 		"6b6b7b": "48487a",
-		"103f47": "103f47"
+		"737bc5": "b86f27",
+		"730800": "143262",
+		"9c8cef": "d28b36",
+		"ad2131": "2a6197",
+		"c55294": "5270c5",
+		"ad9400": "4b64ff",
+		"2a2a2a": "130e27"
 	},
 	"2": {
 		"5a63a5": "731e37",
-		"293163": "43050d",
-		"9c8cef": "b3404a",
-		"b5a5ff": "eb6a64",
-		"ffffff": "ffffff",
-		"737bc5": "952b41",
-		"101010": "101010",
-		"730800": "262138",
-		"ad2131": "453b57",
 		"de3a6b": "594b6a",
-		"43050d": "43050d",
-		"ad9400": "16a9c0",
-		"ffde00": "6bffd4",
-		"2a2a2a": "1a554f",
+		"293163": "43050d",
 		"424252": "57b6a6",
-		"c55294": "c55294",
-		"d8d8d8": "d8d8d8",
+		"ffde00": "6bffd4",
+		"b5a5ff": "eb6a64",
 		"6b6b7b": "81e4c2",
-		"103f47": "103f47"
+		"737bc5": "952b41",
+		"730800": "262138",
+		"9c8cef": "b3404a",
+		"ad2131": "453b57",
+		"ad9400": "16a9c0",
+		"2a2a2a": "103f47"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/751.json b/public/images/pokemon/variant/751.json
index 19dc7bedb56..f58b50b56a4 100644
--- a/public/images/pokemon/variant/751.json
+++ b/public/images/pokemon/variant/751.json
@@ -1,30 +1,33 @@
 {
 	"1": {
-		"8895ac": "ae504b",
-		"e8e8ea": "ffc8d1",
+		"5e9cbd": "cc7854",
+		"39628d": "a14835",
+		"516a7b": "812b3e",
+		"32455b": "4c152c",
+		"aed7ee": "f6e4c2",
+		"fcfcfd": "fffae3",
+		"cedf42": "673252",
+		"dee3f1": "ffc8d1",
 		"9bad34": "4e1f42",
 		"69670e": "3a112f",
-		"cedf42": "673252",
-		"fcfcfc": "fcfcfc",
-		"3c4459": "4c152c",
-		"aed7ee": "aed7ee",
+		"8895ac": "ae504b",
+		"8e99ad": "98433e",
 		"79c4d4": "f3bd8a",
-		"101010": "101010",
-		"516a7b": "812b3e",
-		"5e9cbd": "cc7854"
+		"3a4055": "4c152c"
 	},
 	"2": {
-		"8895ac": "ea9b43",
-		"e8e8ea": "f1dcc2",
+		"5e9cbd": "253155",
+		"39628d": "1c2246",
+		"516a7b": "ba5c2c",
+		"32455b": "7b3836",
+		"fcfcfd": "f0f0f2",
+		"cedf42": "72add9",
+		"dee3f1": "f1dcc2",
 		"9bad34": "4980ac",
 		"69670e": "263756",
-		"cedf42": "72add9",
-		"fcfcfc": "fcfcfc",
-		"3c4459": "73312f",
-		"aed7ee": "aed7ee",
+		"8895ac": "ea9b43",
+		"8e99ad": "cd8330",
 		"79c4d4": "3b5373",
-		"101010": "101010",
-		"516a7b": "ba5c2c",
-		"5e9cbd": "253155"
+		"3a4055": "73312f"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/_masterlist.json b/public/images/pokemon/variant/_masterlist.json
index 11578f2e084..87f80fd17c4 100644
--- a/public/images/pokemon/variant/_masterlist.json
+++ b/public/images/pokemon/variant/_masterlist.json
@@ -1711,8 +1711,8 @@
 	],
 	"469": [
 		0,
-		2,
-		2
+		1,
+		1
 	],
 	"470": [
 		1,
@@ -4312,6 +4312,11 @@
 			1,
 			1
 		],
+		"99-gigantamax": [
+			0,
+			1,
+			1
+		],
 		"100": [
 			0,
 			1,
@@ -5704,7 +5709,7 @@
 		],
 		"469": [
 			0,
-			2,
+			1,
 			1
 		],
 		"470": [
@@ -5720,7 +5725,7 @@
 		"472": [
 			0,
 			1,
-			2
+			1
 		],
 		"474": [
 			0,
@@ -9298,8 +9303,8 @@
 		],
 		"970": [
 			0,
-			2,
-			2
+			1,
+			1
 		],
 		"973": [
 			1,
@@ -9940,12 +9945,12 @@
 			],
 			"672": [
 				0,
-				2,
+				1,
 				1
 			],
 			"673": [
 				0,
-				2,
+				1,
 				1
 			],
 			"677": [
@@ -10806,7 +10811,7 @@
 			"962": [
 				1,
 				1,
-				2
+				1
 			],
 			"967": [
 				0,
@@ -11095,4 +11100,4 @@
 			1
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/public/images/pokemon/variant/back/469.json b/public/images/pokemon/variant/back/469.json
index 21d89cec3d5..d07bfada1c8 100644
--- a/public/images/pokemon/variant/back/469.json
+++ b/public/images/pokemon/variant/back/469.json
@@ -1,19 +1,34 @@
 {
+	"1": {
+		"797982": "ba4369",
+		"52844a": "c59eff",
+		"f75a52": "5555ab",
+		"47474f": "6143b3",
+		"a5adc5": "6e8ce0",
+		"b53119": "403a91",
+		"739c63": "dfbaff",
+		"4a4a52": "942b5a",
+		"213a19": "534fab",
+		"ffffff": "c4f2ff",
+		"733100": "322966",
+		"c5cee6": "91c2fa",
+		"3a5a29": "8577e0",
+		"7b7b84": "3b3687"
+	},
 	"2": {
-		"101010": "101010",
 		"797982": "516d82",
-		"4a4a52": "2e4a52",
-		"b53119": "2c8199",
+		"52844a": "e0a14f",
 		"f75a52": "21b0a6",
+		"47474f": "4f6b80",
 		"a5adc5": "678ea6",
+		"b53119": "2c8199",
+		"739c63": "ebcf7c",
+		"4a4a52": "2e4a52",
 		"213a19": "70331d",
+		"ffffff": "c1dede",
+		"733100": "2e5785",
 		"c5cee6": "97c0c4",
 		"3a5a29": "965a2f",
-		"ffffff": "c1dede",
-		"52844a": "e0a14f",
-		"739c63": "ebcf7c",
-		"733100": "2e5785",
-		"7b7b84": "4d687d",
-		"47474f": "4f6b80"
+		"7b7b84": "4d687d"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/472.json b/public/images/pokemon/variant/back/472.json
index a47102ad603..eedf44dc6ec 100644
--- a/public/images/pokemon/variant/back/472.json
+++ b/public/images/pokemon/variant/back/472.json
@@ -1,15 +1,25 @@
 {
 	"1": {
 		"5a63a5": "974d16",
-		"293163": "401b02",
-		"9c8cef": "d28b36",
-		"b5a5ff": "e9bb57",
 		"737bc5": "b86f27",
-		"ffffff": "ffffff",
-		"101010": "101010",
-		"6b6b7b": "48487a",
-		"424252": "2a2752",
+		"ad2131": "2a6197",
+		"9c8cef": "d28b36",
 		"730800": "143262",
-		"ad2131": "2a6197"
+		"293163": "401b02",
+		"424252": "2a2752",
+		"b5a5ff": "e9bb57",
+		"6b6b7b": "48487a"
+	},
+	"2": {
+		"5a63a5": "731e37",
+		"737bc5": "952b41",
+		"ad2131": "594b6a",
+		"9c8cef": "b3404a",
+		"730800": "262138",
+		"293163": "43050d",
+		"424252": "57b6a6",
+		"b5a5ff": "eb6a64",
+		"0d0d0d": "1a554f",
+		"6b6b7b": "81e4c2"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/99-gigantamax.json b/public/images/pokemon/variant/back/99-gigantamax.json
new file mode 100644
index 00000000000..31fa87f0e8d
--- /dev/null
+++ b/public/images/pokemon/variant/back/99-gigantamax.json
@@ -0,0 +1,32 @@
+{
+	"1": {
+		"c56a5a": "6232a9",
+		"f6c58b": "9f60d5",
+		"832908": "3b1c69",
+		"ee8b4a": "8853bf",
+		"101010": "101010",
+		"735210": "534681",
+		"fdfdfd": "ffdbdb",
+		"e1d0db": "d5869b",
+		"ffe6b4": "c3d6ff",
+		"eebd8b": "9ba3d9",
+		"b47b5a": "7c72b6",
+		"b5a6b5": "b65782",
+		"9a859a": "872d65"
+	},
+	"2": {
+		"c56a5a": "2d6f9e",
+		"f6c58b": "75e0e8",
+		"832908": "22447d",
+		"ee8b4a": "43adc4",
+		"101010": "101010",
+		"735210": "1e1743",
+		"fdfdfd": "b1f1cf",
+		"e1d0db": "73c1c2",
+		"ffe6b4": "464d89",
+		"eebd8b": "31296f",
+		"b47b5a": "231b4e",
+		"b5a6b5": "44778a",
+		"9a859a": "2f4c6b"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/751.json b/public/images/pokemon/variant/exp/751.json
index 70af2b6d7f4..fd1955824af 100644
--- a/public/images/pokemon/variant/exp/751.json
+++ b/public/images/pokemon/variant/exp/751.json
@@ -1,50 +1,33 @@
 {
 	"1": {
-		"85abc8": "ae504b",
-		"bdd9e5": "ffc8d1",
-		"acc38c": "a65f86",
+		"dee3f1": "ffc8d1",
+		"79c4d4": "f3bd8a",
+		"fcfcfd": "fffae3",
+		"39628d": "a14835",
+		"5e9cbd": "cc7854",
+		"32455b": "4c152c",
+		"8895ac": "ae504b",
 		"9bad34": "4e1f42",
-		"c6dc93": "8a4d6d",
-		"cedf42": "673252",
-		"93a079": "6c3064",
-		"697d89": "8d4358",
 		"69670e": "3a112f",
-		"8dd0e6": "f8b29c",
-		"101010": "101010",
-		"6893a5": "b0546e",
-		"8da0ac": "d37075",
-		"8397aa": "8397aa",
-		"66747a": "c75c5b",
-		"d3e1e8": "d3e1e8",
-		"81bbd1": "da826e",
-		"788a94": "9e4155",
-		"8ba8b8": "d37075",
-		"5d6773": "ae504b",
-		"15222d": "15222d",
-		"343c43": "812b3e"
+		"516a7b": "812b3e",
+		"aed7ee": "f6e4c2",
+		"cedf42": "673252",
+		"3a4055": "4c152c",
+		"8e99ad": "98433e"
 	},
 	"2": {
-		"85abc8": "ecaa61",
-		"bdd9e5": "f1dcc2",
-		"acc38c": "7196b1",
+		"dee3f1": "f1dcc2",
+		"79c4d4": "3b5373",
+		"fcfcfd": "f0f0f2",
+		"39628d": "1c2246",
+		"5e9cbd": "253155",
+		"32455b": "7b3836",
+		"8895ac": "ea9b43",
 		"9bad34": "4980ac",
-		"c6dc93": "90b8d4",
-		"cedf42": "72add9",
-		"93a079": "586d7a",
-		"697d89": "915952",
 		"69670e": "263756",
-		"8dd0e6": "667386",
-		"101010": "101010",
-		"6893a5": "b76545",
-		"8da0ac": "ecaa61",
-		"8397aa": "8397aa",
-		"66747a": "66747a",
-		"d3e1e8": "d3e1e8",
-		"81bbd1": "55596f",
-		"788a94": "c77a4f",
-		"8ba8b8": "c77a4f",
-		"5d6773": "ea9b43",
-		"15222d": "15222d",
-		"343c43": "ba5c2c"
+		"516a7b": "ba5c2c",
+		"cedf42": "72add9",
+		"3a4055": "73312f",
+		"8e99ad": "cd8330"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/970.json b/public/images/pokemon/variant/exp/970.json
new file mode 100644
index 00000000000..7e25970c4bc
--- /dev/null
+++ b/public/images/pokemon/variant/exp/970.json
@@ -0,0 +1,36 @@
+{
+	"1": {
+		"366956": "692915",
+		"ffff31": "dde4e6",
+		"5de0aa": "fbce5d",
+		"5a869c": "bd2646",
+		"2c369a": "435469",
+		"4d6076": "6b1933",
+		"3d464b": "44111b",
+		"000000": "ffffff",
+		"41968b": "c57833",
+		"e0548f": "758eb4",
+		"fd84ba": "bbe3ee",
+		"a02c75": "3f4a6f",
+		"3253d6": "577b81",
+		"242737": "171c28",
+		"262b6b": "323b51"
+	},
+	"2": {
+		"366956": "6d171f",
+		"ffff31": "c0efff",
+		"5de0aa": "df543b",
+		"5a869c": "656b8b",
+		"2c369a": "e1a47a",
+		"4d6076": "433e53",
+		"3d464b": "2d293a",
+		"000000": "ffffff",
+		"41968b": "a51414",
+		"e0548f": "235c65",
+		"fd84ba": "3e8768",
+		"a02c75": "1b3842",
+		"3253d6": "ffedd1",
+		"242737": "352b2f",
+		"262b6b": "bb7154"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/672.json b/public/images/pokemon/variant/exp/back/672.json
index 8ee91469917..7282ef5e693 100644
--- a/public/images/pokemon/variant/exp/back/672.json
+++ b/public/images/pokemon/variant/exp/back/672.json
@@ -1,4 +1,20 @@
 {
+	"1": {
+		"3d3128": "69112a",
+		"000000": "000000",
+		"67615b": "9e2c3d",
+		"615140": "89431b",
+		"7e6d5a": "b3743e",
+		"554538": "642509",
+		"efeded": "f8e2b7",
+		"beb8b6": "e3a378",
+		"0e5d58": "8c6859",
+		"09a77c": "f8f0e2",
+		"0d8374": "d2af94",
+		"c16a3f": "321512",
+		"c6b379": "552d30",
+		"a8905c": "4b2525"
+	},
 	"2": {
 		"3d3128": "161526",
 		"000000": "000000",
@@ -15,4 +31,4 @@
 		"c6b379": "9f5f9b",
 		"a8905c": "854d87"
 	}
-}
\ No newline at end of file
+}
diff --git a/public/images/pokemon/variant/exp/back/672_2.json b/public/images/pokemon/variant/exp/back/672_2.json
deleted file mode 100644
index 216c213bc12..00000000000
--- a/public/images/pokemon/variant/exp/back/672_2.json
+++ /dev/null
@@ -1,965 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "672_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 282,
-				"h": 282
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 42,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 42,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 84,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 126,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 168,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 0,
-						"y": 210,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 41,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 82,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 123,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 164,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 205,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 41,
-						"y": 42,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 41,
-						"y": 84,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 41,
-						"h": 42
-					},
-					"frame": {
-						"x": 41,
-						"y": 126,
-						"w": 41,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 41,
-						"h": 41
-					},
-					"frame": {
-						"x": 41,
-						"y": 168,
-						"w": 41,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 41,
-						"h": 41
-					},
-					"frame": {
-						"x": 41,
-						"y": 209,
-						"w": 41,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 41,
-						"h": 41
-					},
-					"frame": {
-						"x": 82,
-						"y": 42,
-						"w": 41,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 41,
-						"h": 41
-					},
-					"frame": {
-						"x": 123,
-						"y": 42,
-						"w": 41,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 41,
-						"h": 41
-					},
-					"frame": {
-						"x": 164,
-						"y": 42,
-						"w": 41,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 41,
-						"h": 41
-					},
-					"frame": {
-						"x": 205,
-						"y": 42,
-						"w": 41,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 41,
-						"h": 41
-					},
-					"frame": {
-						"x": 82,
-						"y": 83,
-						"w": 41,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 41,
-						"h": 41
-					},
-					"frame": {
-						"x": 82,
-						"y": 124,
-						"w": 41,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 40,
-						"h": 42
-					},
-					"frame": {
-						"x": 82,
-						"y": 165,
-						"w": 40,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 40,
-						"h": 42
-					},
-					"frame": {
-						"x": 82,
-						"y": 207,
-						"w": 40,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 40,
-						"h": 41
-					},
-					"frame": {
-						"x": 122,
-						"y": 165,
-						"w": 40,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 40,
-						"h": 41
-					},
-					"frame": {
-						"x": 122,
-						"y": 206,
-						"w": 40,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 40,
-						"h": 41
-					},
-					"frame": {
-						"x": 123,
-						"y": 83,
-						"w": 40,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 40,
-						"h": 41
-					},
-					"frame": {
-						"x": 123,
-						"y": 124,
-						"w": 40,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 40,
-						"h": 41
-					},
-					"frame": {
-						"x": 162,
-						"y": 165,
-						"w": 40,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 40,
-						"h": 41
-					},
-					"frame": {
-						"x": 162,
-						"y": 206,
-						"w": 40,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 1,
-						"w": 40,
-						"h": 41
-					},
-					"frame": {
-						"x": 163,
-						"y": 83,
-						"w": 40,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 41,
-						"h": 40
-					},
-					"frame": {
-						"x": 163,
-						"y": 124,
-						"w": 41,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 2,
-						"w": 41,
-						"h": 40
-					},
-					"frame": {
-						"x": 203,
-						"y": 83,
-						"w": 41,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 40,
-						"h": 40
-					},
-					"frame": {
-						"x": 202,
-						"y": 164,
-						"w": 40,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 40,
-						"h": 40
-					},
-					"frame": {
-						"x": 204,
-						"y": 123,
-						"w": 40,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 40,
-						"h": 40
-					},
-					"frame": {
-						"x": 242,
-						"y": 163,
-						"w": 40,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 40,
-						"h": 40
-					},
-					"frame": {
-						"x": 242,
-						"y": 203,
-						"w": 40,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 41,
-						"h": 42
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 2,
-						"w": 40,
-						"h": 40
-					},
-					"frame": {
-						"x": 202,
-						"y": 204,
-						"w": 40,
-						"h": 40
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:b36f1de558a8fa8ac8b56a9ba43a0dfd:5fe84a3f522e543bfbbfe0837355266b:2e4767b7cd134fc0ab1bb6e9eee82bc7$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/672_2.png b/public/images/pokemon/variant/exp/back/672_2.png
deleted file mode 100644
index a51b8cba11f..00000000000
Binary files a/public/images/pokemon/variant/exp/back/672_2.png and /dev/null differ
diff --git a/public/images/pokemon/variant/exp/back/673.json b/public/images/pokemon/variant/exp/back/673.json
index be9d3af3965..7e5bc69976d 100644
--- a/public/images/pokemon/variant/exp/back/673.json
+++ b/public/images/pokemon/variant/exp/back/673.json
@@ -1,4 +1,20 @@
 {
+	"1": {
+		"3d3128": "5a0e24",
+		"000000": "000000",
+		"554538": "471405",
+		"67615b": "8f2837",
+		"0d835a": "d2af94",
+		"0e5d58": "8c6352",
+		"74593a": "61240a",
+		"09a766": "f8f0e2",
+		"cabfbb": "e3a378",
+		"efeded": "f8e2b7",
+		"a8905c": "9e4e21",
+		"c6b379": "ce8648",
+		"ae492a": "321512",
+		"c16a3f": "552d30"
+	},
 	"2": {
 		"3d3128": "121123",
 		"000000": "000000",
@@ -15,4 +31,4 @@
 		"ae492a": "612c6b",
 		"c16a3f": "9f5f9b"
 	}
-}
\ No newline at end of file
+}
diff --git a/public/images/pokemon/variant/exp/back/673_2.json b/public/images/pokemon/variant/exp/back/673_2.json
deleted file mode 100644
index b9c2b2d54e7..00000000000
--- a/public/images/pokemon/variant/exp/back/673_2.json
+++ /dev/null
@@ -1,965 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "673_2.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 384,
-				"h": 384
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 62,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 62,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 62,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 62,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 62,
-						"h": 65
-					},
-					"frame": {
-						"x": 62,
-						"y": 0,
-						"w": 62,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 62,
-						"h": 65
-					},
-					"frame": {
-						"x": 62,
-						"y": 0,
-						"w": 62,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 62,
-						"h": 65
-					},
-					"frame": {
-						"x": 124,
-						"y": 0,
-						"w": 62,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 62,
-						"h": 65
-					},
-					"frame": {
-						"x": 186,
-						"y": 0,
-						"w": 62,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 62,
-						"h": 65
-					},
-					"frame": {
-						"x": 248,
-						"y": 0,
-						"w": 62,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 62,
-						"h": 65
-					},
-					"frame": {
-						"x": 248,
-						"y": 0,
-						"w": 62,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 62,
-						"h": 65
-					},
-					"frame": {
-						"x": 310,
-						"y": 0,
-						"w": 62,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 62,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 65,
-						"w": 62,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 62,
-						"h": 65
-					},
-					"frame": {
-						"x": 62,
-						"y": 65,
-						"w": 62,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 65
-					},
-					"frame": {
-						"x": 124,
-						"y": 65,
-						"w": 61,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 61,
-						"h": 65
-					},
-					"frame": {
-						"x": 124,
-						"y": 65,
-						"w": 61,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 60,
-						"h": 65
-					},
-					"frame": {
-						"x": 185,
-						"y": 65,
-						"w": 60,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 60,
-						"h": 65
-					},
-					"frame": {
-						"x": 245,
-						"y": 65,
-						"w": 60,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 60,
-						"h": 65
-					},
-					"frame": {
-						"x": 305,
-						"y": 65,
-						"w": 60,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 60,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 130,
-						"w": 60,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 3,
-						"w": 60,
-						"h": 62
-					},
-					"frame": {
-						"x": 60,
-						"y": 130,
-						"w": 60,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 59,
-						"h": 65
-					},
-					"frame": {
-						"x": 120,
-						"y": 130,
-						"w": 59,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 59,
-						"h": 65
-					},
-					"frame": {
-						"x": 120,
-						"y": 130,
-						"w": 59,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 59,
-						"h": 65
-					},
-					"frame": {
-						"x": 120,
-						"y": 130,
-						"w": 59,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 59,
-						"h": 65
-					},
-					"frame": {
-						"x": 120,
-						"y": 130,
-						"w": 59,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 59,
-						"h": 65
-					},
-					"frame": {
-						"x": 60,
-						"y": 192,
-						"w": 59,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 59,
-						"h": 65
-					},
-					"frame": {
-						"x": 60,
-						"y": 192,
-						"w": 59,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 59,
-						"h": 65
-					},
-					"frame": {
-						"x": 60,
-						"y": 192,
-						"w": 59,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 59,
-						"h": 65
-					},
-					"frame": {
-						"x": 60,
-						"y": 192,
-						"w": 59,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 59,
-						"h": 65
-					},
-					"frame": {
-						"x": 0,
-						"y": 195,
-						"w": 59,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 1,
-						"y": 0,
-						"w": 59,
-						"h": 65
-					},
-					"frame": {
-						"x": 179,
-						"y": 130,
-						"w": 59,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 58,
-						"h": 64
-					},
-					"frame": {
-						"x": 238,
-						"y": 130,
-						"w": 58,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 58,
-						"h": 64
-					},
-					"frame": {
-						"x": 238,
-						"y": 130,
-						"w": 58,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 58,
-						"h": 64
-					},
-					"frame": {
-						"x": 238,
-						"y": 194,
-						"w": 58,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 58,
-						"h": 64
-					},
-					"frame": {
-						"x": 59,
-						"y": 257,
-						"w": 58,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 58,
-						"h": 64
-					},
-					"frame": {
-						"x": 0,
-						"y": 260,
-						"w": 58,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 1,
-						"w": 58,
-						"h": 64
-					},
-					"frame": {
-						"x": 117,
-						"y": 257,
-						"w": 58,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 58,
-						"h": 62
-					},
-					"frame": {
-						"x": 119,
-						"y": 195,
-						"w": 58,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 1,
-						"w": 57,
-						"h": 64
-					},
-					"frame": {
-						"x": 175,
-						"y": 257,
-						"w": 57,
-						"h": 64
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 2,
-						"y": 3,
-						"w": 58,
-						"h": 62
-					},
-					"frame": {
-						"x": 177,
-						"y": 195,
-						"w": 58,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 57,
-						"h": 63
-					},
-					"frame": {
-						"x": 232,
-						"y": 258,
-						"w": 57,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 57,
-						"h": 63
-					},
-					"frame": {
-						"x": 289,
-						"y": 258,
-						"w": 57,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 57,
-						"h": 63
-					},
-					"frame": {
-						"x": 296,
-						"y": 130,
-						"w": 57,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 3,
-						"y": 2,
-						"w": 57,
-						"h": 63
-					},
-					"frame": {
-						"x": 296,
-						"y": 193,
-						"w": 57,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 56,
-						"h": 63
-					},
-					"frame": {
-						"x": 58,
-						"y": 321,
-						"w": 56,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 2,
-						"w": 56,
-						"h": 63
-					},
-					"frame": {
-						"x": 114,
-						"y": 321,
-						"w": 56,
-						"h": 63
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 56,
-						"h": 62
-					},
-					"frame": {
-						"x": 170,
-						"y": 321,
-						"w": 56,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 62,
-						"h": 65
-					},
-					"spriteSourceSize": {
-						"x": 4,
-						"y": 3,
-						"w": 56,
-						"h": 62
-					},
-					"frame": {
-						"x": 226,
-						"y": 321,
-						"w": 56,
-						"h": 62
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:05149e465b79b92adcb764d8f903ce8d:523fbed3890bc743f1863e6db3150ddb:5d92dd5d09b0875a1d8f3606df775958$"
-	}
-}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/673_2.png b/public/images/pokemon/variant/exp/back/673_2.png
deleted file mode 100644
index be4e73acce4..00000000000
Binary files a/public/images/pokemon/variant/exp/back/673_2.png and /dev/null differ
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/public/images/trainer/aether_grunt_f.json b/public/images/trainer/aether_grunt_f.json
new file mode 100644
index 00000000000..c43bdae9b2e
--- /dev/null
+++ b/public/images/trainer/aether_grunt_f.json
@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "aether_grunt_f.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 69,
+				"h": 69
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 23,
+						"y": 10,
+						"w": 35,
+						"h": 69
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 35,
+						"h": 69
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:0c9e77856d3b434e719021572bcb93de:f9c45dc5d67009b134dd1bbc5593f6ec:a694f8828aff21c718e5161e2fd63ade$"
+	}
+}
diff --git a/public/images/trainer/aether_grunt_f.png b/public/images/trainer/aether_grunt_f.png
new file mode 100644
index 00000000000..b43c5e71a51
Binary files /dev/null and b/public/images/trainer/aether_grunt_f.png differ
diff --git a/public/images/trainer/aether_grunt_m.json b/public/images/trainer/aether_grunt_m.json
new file mode 100644
index 00000000000..eba00096f8d
--- /dev/null
+++ b/public/images/trainer/aether_grunt_m.json
@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "aether_grunt_m.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 65,
+				"h": 65
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 16,
+						"y": 14,
+						"w": 47,
+						"h": 65
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 47,
+						"h": 65
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:963887cf29549ad3c123b8055cb4d701:68004c4a6e04c93bd21c26a6f8921f0c:d2241fc11d0fc31b26ecbedae6da74f4$"
+	}
+}
diff --git a/public/images/trainer/aether_grunt_m.png b/public/images/trainer/aether_grunt_m.png
new file mode 100644
index 00000000000..f4df26ef007
Binary files /dev/null and b/public/images/trainer/aether_grunt_m.png differ
diff --git a/public/images/trainer/faba.json b/public/images/trainer/faba.json
new file mode 100644
index 00000000000..0e9544e2529
--- /dev/null
+++ b/public/images/trainer/faba.json
@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "faba.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 74,
+				"h": 74
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 25,
+						"y": 5,
+						"w": 31,
+						"h": 74
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 31,
+						"h": 74
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:47622708d99a504998950bd9c389a504:fe1c51be191dd9fafb5b6f309c08ae1a:8d64db18930325b8b513740c1d83ce4c$"
+	}
+}
diff --git a/public/images/trainer/faba.png b/public/images/trainer/faba.png
new file mode 100644
index 00000000000..a7fa0fb4879
Binary files /dev/null and b/public/images/trainer/faba.png differ
diff --git a/public/images/trainer/guzma.json b/public/images/trainer/guzma.json
new file mode 100644
index 00000000000..c278d68be24
--- /dev/null
+++ b/public/images/trainer/guzma.json
@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "guzma.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 58,
+				"h": 58
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 21,
+						"y": 20,
+						"w": 37,
+						"h": 58
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 37,
+						"h": 58
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:c3b08a562a2882d1ca8b5e031e245da9:72a8305e547f091d15abccd2b142e401:3b302c7f9eb6ea81b65bcaeead4a95a9$"
+	}
+}
diff --git a/public/images/trainer/guzma.png b/public/images/trainer/guzma.png
new file mode 100644
index 00000000000..6afd6f3b34a
Binary files /dev/null and b/public/images/trainer/guzma.png differ
diff --git a/public/images/trainer/lusamine.json b/public/images/trainer/lusamine.json
new file mode 100644
index 00000000000..55a711a21fb
--- /dev/null
+++ b/public/images/trainer/lusamine.json
@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "lusamine.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 74,
+				"h": 74
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 22,
+						"y": 5,
+						"w": 36,
+						"h": 74
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 36,
+						"h": 74
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:41da3a1299e3831be70016dc91e49313:2413ba06767fb10fdc6fde8cc736c51c:4012333084c529872232c8d052561dc1$"
+	}
+}
diff --git a/public/images/trainer/lusamine.png b/public/images/trainer/lusamine.png
new file mode 100644
index 00000000000..8b835a2d0be
Binary files /dev/null and b/public/images/trainer/lusamine.png differ
diff --git a/public/images/trainer/macro_grunt_f.json b/public/images/trainer/macro_grunt_f.json
new file mode 100644
index 00000000000..04b30ec4ca5
--- /dev/null
+++ b/public/images/trainer/macro_grunt_f.json
@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "macro_grunt_f.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 74,
+				"h": 74
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 24,
+						"y": 5,
+						"w": 31,
+						"h": 74
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 31,
+						"h": 74
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:a015c43d80f8fd1932758e0e2cfcec61:59fc8205ea5ca04295831b4a2eb623ec:30df2ea8e9dac9e95f70534ec43d5ecd$"
+	}
+}
diff --git a/public/images/trainer/macro_grunt_f.png b/public/images/trainer/macro_grunt_f.png
new file mode 100644
index 00000000000..892299d701e
Binary files /dev/null and b/public/images/trainer/macro_grunt_f.png differ
diff --git a/public/images/trainer/macro_grunt_m.json b/public/images/trainer/macro_grunt_m.json
new file mode 100644
index 00000000000..5357fdb0767
--- /dev/null
+++ b/public/images/trainer/macro_grunt_m.json
@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "macro_grunt_m.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 75,
+				"h": 75
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 15,
+						"y": 4,
+						"w": 48,
+						"h": 75
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 48,
+						"h": 75
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:52fccff2a0675b4e10139ddb7067d4cf:10d254175d2d8a9111cce096ffb55fa3:d57016467aa07cafdfaf13e0ff643c1b$"
+	}
+}
diff --git a/public/images/trainer/macro_grunt_m.png b/public/images/trainer/macro_grunt_m.png
new file mode 100644
index 00000000000..aa6b3607a87
Binary files /dev/null and b/public/images/trainer/macro_grunt_m.png differ
diff --git a/public/images/trainer/oleana.json b/public/images/trainer/oleana.json
new file mode 100644
index 00000000000..7219b640c38
--- /dev/null
+++ b/public/images/trainer/oleana.json
@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "oleana.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 79,
+				"h": 79
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 10,
+						"y": 1,
+						"w": 53,
+						"h": 79
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 53,
+						"h": 79
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:30987a671771127a38491a588c465964:38b28effcfd5c6cbc0f358912a775af3:82e2a1f8afed29be57f6c2473f4c5be2$"
+	}
+}
diff --git a/public/images/trainer/oleana.png b/public/images/trainer/oleana.png
new file mode 100644
index 00000000000..3252c67ab8e
Binary files /dev/null and b/public/images/trainer/oleana.png differ
diff --git a/public/images/trainer/plumeria.json b/public/images/trainer/plumeria.json
new file mode 100644
index 00000000000..936a8766750
--- /dev/null
+++ b/public/images/trainer/plumeria.json
@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "plumeria.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 72,
+				"h": 72
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 23,
+						"y": 7,
+						"w": 36,
+						"h": 72
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 36,
+						"h": 72
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:5527e7b646932d429928b53f055e9d27:c0640510780d2974f9b74a7f8e6b29aa:7bfec029bae78c9d483f59c35b73afad$"
+	}
+}
diff --git a/public/images/trainer/plumeria.png b/public/images/trainer/plumeria.png
new file mode 100644
index 00000000000..b7382f6afde
Binary files /dev/null and b/public/images/trainer/plumeria.png differ
diff --git a/public/images/trainer/rose.json b/public/images/trainer/rose.json
new file mode 100644
index 00000000000..86869257b63
--- /dev/null
+++ b/public/images/trainer/rose.json
@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "rose.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 79,
+				"h": 79
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 16,
+						"y": 1,
+						"w": 52,
+						"h": 79
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 52,
+						"h": 79
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:2b4ccaff7255c7d72661eac13de83ff8:72ee3660cdf470bd67375d355307e19d:8d35b104fc841baa4443581e6cea979e$"
+	}
+}
diff --git a/public/images/trainer/rose.png b/public/images/trainer/rose.png
new file mode 100644
index 00000000000..f90da7568d4
Binary files /dev/null and b/public/images/trainer/rose.png differ
diff --git a/public/images/trainer/skull_grunt_f.json b/public/images/trainer/skull_grunt_f.json
new file mode 100644
index 00000000000..182f9300ad5
--- /dev/null
+++ b/public/images/trainer/skull_grunt_f.json
@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "skull_grunt_f.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 74,
+				"h": 74
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 31,
+						"h": 74
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 31,
+						"h": 74
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 31,
+						"h": 74
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:71a1f5b1981674c6e81163ac8ea576c3:a5e612d58e5f0a1489e111212baea09d:dd369353af16e4c5eb6547e129dfac18$"
+	}
+}
diff --git a/public/images/trainer/skull_grunt_f.png b/public/images/trainer/skull_grunt_f.png
new file mode 100644
index 00000000000..fe7834ba4a8
Binary files /dev/null and b/public/images/trainer/skull_grunt_f.png differ
diff --git a/public/images/trainer/skull_grunt_m.json b/public/images/trainer/skull_grunt_m.json
new file mode 100644
index 00000000000..7c728e9d3fc
--- /dev/null
+++ b/public/images/trainer/skull_grunt_m.json
@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "skull_grunt_m.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 72,
+				"h": 72
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 51,
+						"h": 72
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 51,
+						"h": 72
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 51,
+						"h": 72
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:4deb2a68e4d168bb1a40cb5d190a7d1f:be3d7b29f4b544ba51cf907691fef51d:df57ca2c9bf5f80d930306e15a851d4d$"
+	}
+}
diff --git a/public/images/trainer/skull_grunt_m.png b/public/images/trainer/skull_grunt_m.png
new file mode 100644
index 00000000000..f2b8acba984
Binary files /dev/null and b/public/images/trainer/skull_grunt_m.png differ
diff --git a/src/account.ts b/src/account.ts
index 6682e3e0b7c..c6d2f85489a 100644
--- a/src/account.ts
+++ b/src/account.ts
@@ -6,6 +6,7 @@ export interface UserInfo {
   lastSessionSlot: integer;
   discordId: string;
   googleId: string;
+  hasAdminRole: boolean;
 }
 
 export let loggedInUser: UserInfo | null = null;
@@ -13,13 +14,13 @@ export let loggedInUser: UserInfo | null = null;
 export const clientSessionId = Utils.randomString(32);
 
 export function initLoggedInUser(): void {
-  loggedInUser = { username: "Guest", lastSessionSlot: -1, discordId: "", googleId: ""};
+  loggedInUser = { username: "Guest", lastSessionSlot: -1, discordId: "", googleId: "", hasAdminRole: false };
 }
 
 export function updateUserInfo(): Promise<[boolean, integer]> {
   return new Promise<[boolean, integer]>(resolve => {
     if (bypassLogin) {
-      loggedInUser = { username: "Guest", lastSessionSlot: -1, discordId: "", googleId: "" };
+      loggedInUser = { username: "Guest", lastSessionSlot: -1, discordId: "", googleId: "", hasAdminRole: false};
       let lastSessionSlot = -1;
       for (let s = 0; s < 5; s++) {
         if (localStorage.getItem(`sessionData${s ? s : ""}_${loggedInUser.username}`)) {
diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 8104d1d4fa9..2a920864850 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -49,8 +49,8 @@ import CandyBar from "./ui/candy-bar";
 import { Variant, variantData } from "./data/variant";
 import { Localizable } from "#app/interfaces/locales";
 import Overrides from "#app/overrides";
-import {InputsController} from "./inputs-controller";
-import {UiInputs} from "./ui-inputs";
+import { InputsController } from "./inputs-controller";
+import { UiInputs } from "./ui-inputs";
 import { NewArenaEvent } from "./events/battle-scene";
 import { ArenaFlyout } from "./ui/arena-flyout";
 import { EaseType } from "#enums/ease-type";
@@ -65,7 +65,7 @@ import { Species } from "#enums/species";
 import { UiTheme } from "#enums/ui-theme";
 import { TimedEventManager } from "#app/timed-event-manager.js";
 import i18next from "i18next";
-import {TrainerType} from "#enums/trainer-type";
+import { TrainerType } from "#enums/trainer-type";
 import { battleSpecDialogue } from "./data/dialogue";
 import { LoadingScene } from "./loading-scene";
 import { LevelCapPhase } from "./phases/level-cap-phase";
@@ -124,7 +124,9 @@ export default class BattleScene extends SceneBase {
   public lastSavePlayTime: integer | null = null;
   public masterVolume: number = 0.5;
   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;
@@ -842,14 +844,13 @@ export default class BattleScene extends SceneBase {
     if (Overrides.OPP_SPECIES_OVERRIDE) {
       species = getPokemonSpecies(Overrides.OPP_SPECIES_OVERRIDE);
     }
-    const pokemon = new EnemyPokemon(this, species, level, trainerSlot, boss, dataSource);
+
     if (Overrides.OPP_LEVEL_OVERRIDE !== 0) {
-      pokemon.level = Overrides.OPP_LEVEL_OVERRIDE;
+      level = Overrides.OPP_LEVEL_OVERRIDE;
     }
 
-    if (Overrides.OPP_GENDER_OVERRIDE !== null) {
-      pokemon.gender = Overrides.OPP_GENDER_OVERRIDE;
-    }
+    const pokemon = new EnemyPokemon(this, species, level, trainerSlot, boss, dataSource);
+
     overrideModifiers(this, false);
     overrideHeldItems(this, pokemon, false);
     if (boss && !dataSource) {
@@ -1748,8 +1749,26 @@ export default class BattleScene extends SceneBase {
 
   updateSoundVolume(): void {
     if (this.sound) {
-      for (const sound of this.sound.getAllPlaying()) {
-        (sound as AnySound).setVolume(this.masterVolume * (this.bgmCache.has(sound.key) ? this.bgmVolume : this.seVolume));
+      for (const sound of this.sound.getAllPlaying() as AnySound[]) {
+        if (this.bgmCache.has(sound.key)) {
+          sound.setVolume(this.masterVolume * this.bgmVolume);
+        } else {
+          const soundDetails = sound.key.split("/");
+          switch (soundDetails[0]) {
+
+          case "battle_anims":
+          case "cry":
+            if (soundDetails[1].startsWith("PRSFX- ")) {
+              sound.setVolume(this.masterVolume*this.fieldVolume*0.5);
+            } else {
+              sound.setVolume(this.masterVolume*this.fieldVolume);
+            }
+            break;
+          case "se":
+          case "ui":
+            sound.setVolume(this.masterVolume*this.seVolume);
+          }
+        }
       }
     }
   }
@@ -1768,25 +1787,42 @@ export default class BattleScene extends SceneBase {
   }
 
   playSound(sound: string | AnySound, config?: object): AnySound {
-    if (config) {
-      if (config.hasOwnProperty("volume")) {
-        config["volume"] *= this.masterVolume * this.seVolume;
-      } else {
+    const key = typeof sound === "string" ? sound : sound.key;
+    config = config ?? {};
+    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;
+        //PRSFX sound files are unusually loud
+        if (keyDetails[1].startsWith("PRSFX- ")) {
+          config["volume"] *= 0.5;
+        }
+        break;
+      case "ui":
+        //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;
       }
-    } else {
-      config = { volume: this.masterVolume * this.seVolume };
-    }
-    // PRSFX sounds are mixed too loud
-    if ((typeof sound === "string" ? sound : sound.key).startsWith("PRSFX- ")) {
-      config["volume"] *= 0.5;
-    }
-    if (typeof sound === "string") {
-      this.sound.play(sound, config);
-      return this.sound.get(sound) as AnySound;
-    } else {
-      sound.play(config);
-      return sound;
+      this.sound.play(key, config);
+      return this.sound.get(key) as AnySound;
+    } catch {
+      console.log(`${key} not found`);
+      return sound as AnySound;
     }
   }
 
@@ -1897,6 +1933,8 @@ export default class BattleScene extends SceneBase {
       return 22.770;
     case "battle_legendary_dia_pal": //ORAS Dialga & Palkia Battle
       return 16.009;
+    case "battle_legendary_origin_forme": //LA Origin Dialga & Palkia Battle
+      return 18.961;
     case "battle_legendary_giratina": //ORAS Giratina Battle
       return 10.451;
     case "battle_legendary_arceus": //HGSS Arceus Battle
@@ -1925,6 +1963,8 @@ export default class BattleScene extends SceneBase {
       return 12.503;
     case "battle_legendary_calyrex": //SWSH Calyrex Battle
       return 50.641;
+    case "battle_legendary_riders": //SWSH Ice & Shadow Rider Calyrex Battle
+      return 18.155;
     case "battle_legendary_birds_galar": //SWSH Galarian Legendary Birds Battle
       return 0.175;
     case "battle_legendary_ruinous": //SV Treasures of Ruin Battle
@@ -1963,6 +2003,18 @@ export default class BattleScene extends SceneBase {
       return 12.974;
     case "battle_flare_grunt": //XY Team Flare Battle
       return 4.228;
+    case "battle_aether_grunt": // SM Aether Foundation Battle
+      return 16.00;
+    case "battle_skull_grunt": // SM Team Skull Battle
+      return 20.87;
+    case "battle_macro_grunt": // SWSH Trainer Battle
+      return 11.56;
+    case "battle_galactic_admin": //BDSP Team Galactic Admin Battle
+      return 11.997;
+    case "battle_skull_admin": //SM Team Skull Admin Battle
+      return 15.463;
+    case "battle_oleana": //SWSH Oleana Battle
+      return 14.110;
     case "battle_rocket_boss": //USUM Giovanni Battle
       return 9.115;
     case "battle_aqua_magma_boss": //ORAS Archie & Maxie Battle
@@ -1973,6 +2025,12 @@ export default class BattleScene extends SceneBase {
       return 25.624;
     case "battle_flare_boss": //XY Lysandre Battle
       return 8.085;
+    case "battle_aether_boss": //SM Lusamine Battle
+      return 11.33;
+    case "battle_skull_boss": //SM Guzma Battle
+      return 13.13;
+    case "battle_macro_boss": //SWSH Rose Battle
+      return 11.42;
     }
 
     return 0;
@@ -2668,7 +2726,8 @@ export default class BattleScene extends SceneBase {
       wave: this.currentBattle?.waveIndex || 0,
       party: this.party ? this.party.map(p => {
         return { name: p.name, level: p.level };
-      }) : []
+      }) : [],
+      modeChain: this.ui?.getModeChain() ?? [],
     };
     (window as any).gameInfo = gameInfo;
   }
diff --git a/src/battle.ts b/src/battle.ts
index 0e10333e6de..f9afbf09604 100644
--- a/src/battle.ts
+++ b/src/battle.ts
@@ -275,7 +275,12 @@ export default class Battle {
             return "battle_legendary_sinnoh";
           }
           if (pokemon.species.speciesId === Species.DIALGA || pokemon.species.speciesId === Species.PALKIA) {
-            return "battle_legendary_dia_pal";
+            if (pokemon.getFormKey() === "") {
+              return "battle_legendary_dia_pal";
+            }
+            if (pokemon.getFormKey() === "origin") {
+              return "battle_legendary_origin_forme";
+            }
           }
           if (pokemon.species.speciesId === Species.GIRATINA) {
             return "battle_legendary_giratina";
@@ -319,7 +324,12 @@ export default class Battle {
             return "battle_legendary_glas_spec";
           }
           if (pokemon.species.speciesId === Species.CALYREX) {
-            return "battle_legendary_calyrex";
+            if (pokemon.getFormKey() === "") {
+              return "battle_legendary_calyrex";
+            }
+            if (pokemon.getFormKey() === "ice" || pokemon.getFormKey() === "shadow") {
+              return "battle_legendary_riders";
+            }
           }
           if (pokemon.species.speciesId === Species.GALAR_ARTICUNO || pokemon.species.speciesId === Species.GALAR_ZAPDOS || pokemon.species.speciesId === Species.GALAR_MOLTRES) {
             return "battle_legendary_birds_galar";
@@ -485,27 +495,27 @@ export const classicFixedBattles: FixedBattleConfigs = {
   [25]: new FixedBattleConfig().setBattleType(BattleType.TRAINER)
     .setGetTrainerFunc(scene => new Trainer(scene, TrainerType.RIVAL_2, scene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT)),
   [35]: new FixedBattleConfig().setBattleType(BattleType.TRAINER)
-    .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_GRUNT, TrainerType.MAGMA_GRUNT, TrainerType.AQUA_GRUNT, TrainerType.GALACTIC_GRUNT, TrainerType.PLASMA_GRUNT, TrainerType.FLARE_GRUNT ], true)),
+    .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_GRUNT, TrainerType.MAGMA_GRUNT, TrainerType.AQUA_GRUNT, TrainerType.GALACTIC_GRUNT, TrainerType.PLASMA_GRUNT, TrainerType.FLARE_GRUNT, TrainerType.AETHER_GRUNT, TrainerType.SKULL_GRUNT, TrainerType.MACRO_GRUNT ], true)),
   [55]: new FixedBattleConfig().setBattleType(BattleType.TRAINER)
     .setGetTrainerFunc(scene => new Trainer(scene, TrainerType.RIVAL_3, scene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT)),
   [62]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(35)
-    .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_GRUNT, TrainerType.MAGMA_GRUNT, TrainerType.AQUA_GRUNT, TrainerType.GALACTIC_GRUNT, TrainerType.PLASMA_GRUNT, TrainerType.FLARE_GRUNT ], true)),
+    .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_GRUNT, TrainerType.MAGMA_GRUNT, TrainerType.AQUA_GRUNT, TrainerType.GALACTIC_GRUNT, TrainerType.PLASMA_GRUNT, TrainerType.FLARE_GRUNT, TrainerType.AETHER_GRUNT, TrainerType.SKULL_GRUNT, TrainerType.MACRO_GRUNT ], true)),
   [64]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(35)
-    .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_GRUNT, TrainerType.MAGMA_GRUNT, TrainerType.AQUA_GRUNT, TrainerType.GALACTIC_GRUNT, TrainerType.PLASMA_GRUNT, TrainerType.FLARE_GRUNT ], true)),
+    .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_GRUNT, TrainerType.MAGMA_GRUNT, TrainerType.AQUA_GRUNT, TrainerType.GALACTIC_GRUNT, TrainerType.PLASMA_GRUNT, TrainerType.FLARE_GRUNT, TrainerType.AETHER_GRUNT, TrainerType.SKULL_GRUNT, TrainerType.MACRO_GRUNT ], true)),
   [66]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(35)
-    .setGetTrainerFunc(getRandomTrainerFunc([[ TrainerType.ARCHER, TrainerType.ARIANA, TrainerType.PROTON, TrainerType.PETREL ], [ TrainerType.TABITHA, TrainerType.COURTNEY ], [ TrainerType.MATT, TrainerType.SHELLY ], [ TrainerType.JUPITER, TrainerType.MARS, TrainerType.SATURN ], [ TrainerType.ZINZOLIN, TrainerType.ROOD ], [ TrainerType.XEROSIC, TrainerType.BRYONY ] ], true)),
+    .setGetTrainerFunc(getRandomTrainerFunc([[ TrainerType.ARCHER, TrainerType.ARIANA, TrainerType.PROTON, TrainerType.PETREL ], [ TrainerType.TABITHA, TrainerType.COURTNEY ], [ TrainerType.MATT, TrainerType.SHELLY ], [ TrainerType.JUPITER, TrainerType.MARS, TrainerType.SATURN ], [ TrainerType.ZINZOLIN, TrainerType.ROOD ], [ TrainerType.XEROSIC, TrainerType.BRYONY ], TrainerType.FABA, TrainerType.PLUMERIA, TrainerType.OLEANA ], true)),
   [95]: new FixedBattleConfig().setBattleType(BattleType.TRAINER)
     .setGetTrainerFunc(scene => new Trainer(scene, TrainerType.RIVAL_4, scene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT)),
   [112]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(35)
-    .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_GRUNT, TrainerType.MAGMA_GRUNT, TrainerType.AQUA_GRUNT, TrainerType.GALACTIC_GRUNT, TrainerType.PLASMA_GRUNT, TrainerType.FLARE_GRUNT ], true)),
+    .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_GRUNT, TrainerType.MAGMA_GRUNT, TrainerType.AQUA_GRUNT, TrainerType.GALACTIC_GRUNT, TrainerType.PLASMA_GRUNT, TrainerType.FLARE_GRUNT, TrainerType.AETHER_GRUNT, TrainerType.SKULL_GRUNT, TrainerType.MACRO_GRUNT ], true)),
   [114]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(35)
-    .setGetTrainerFunc(getRandomTrainerFunc([[ TrainerType.ARCHER, TrainerType.ARIANA, TrainerType.PROTON, TrainerType.PETREL ], [ TrainerType.TABITHA, TrainerType.COURTNEY ], [ TrainerType.MATT, TrainerType.SHELLY ], [ TrainerType.JUPITER, TrainerType.MARS, TrainerType.SATURN ], [ TrainerType.ZINZOLIN, TrainerType.ROOD ], [ TrainerType.XEROSIC, TrainerType.BRYONY ] ], true, 1)),
+    .setGetTrainerFunc(getRandomTrainerFunc([[ TrainerType.ARCHER, TrainerType.ARIANA, TrainerType.PROTON, TrainerType.PETREL ], [ TrainerType.TABITHA, TrainerType.COURTNEY ], [ TrainerType.MATT, TrainerType.SHELLY ], [ TrainerType.JUPITER, TrainerType.MARS, TrainerType.SATURN ], [ TrainerType.ZINZOLIN, TrainerType.ROOD ], [ TrainerType.XEROSIC, TrainerType.BRYONY ], TrainerType.FABA, TrainerType.PLUMERIA, TrainerType.OLEANA ], true, 1)),
   [115]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(35)
-    .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_BOSS_GIOVANNI_1, TrainerType.MAXIE, TrainerType.ARCHIE, TrainerType.CYRUS, TrainerType.GHETSIS, TrainerType.LYSANDRE ])),
+    .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_BOSS_GIOVANNI_1, TrainerType.MAXIE, TrainerType.ARCHIE, TrainerType.CYRUS, TrainerType.GHETSIS, TrainerType.LYSANDRE, TrainerType.LUSAMINE, TrainerType.GUZMA, TrainerType.ROSE ])),
   [145]: new FixedBattleConfig().setBattleType(BattleType.TRAINER)
     .setGetTrainerFunc(scene => new Trainer(scene, TrainerType.RIVAL_5, scene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT)),
-  [165]:  new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(35)
-    .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_BOSS_GIOVANNI_2, TrainerType.MAXIE_2, TrainerType.ARCHIE_2, TrainerType.CYRUS_2, TrainerType.GHETSIS_2, TrainerType.LYSANDRE_2 ])),
+  [165]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(35)
+    .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_BOSS_GIOVANNI_2, TrainerType.MAXIE_2, TrainerType.ARCHIE_2, TrainerType.CYRUS_2, TrainerType.GHETSIS_2, TrainerType.LYSANDRE_2, TrainerType.LUSAMINE_2, TrainerType.GUZMA_2, TrainerType.ROSE_2 ])),
   [182]: new FixedBattleConfig().setBattleType(BattleType.TRAINER)
     .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.LORELEI, TrainerType.WILL, TrainerType.SIDNEY, TrainerType.AARON, TrainerType.SHAUNTAL, TrainerType.MALVA, [ TrainerType.HALA, TrainerType.MOLAYNE ], TrainerType.MARNIE_ELITE, TrainerType.RIKA, TrainerType.CRISPIN ])),
   [184]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(182)
diff --git a/src/data/ability.ts b/src/data/ability.ts
index 75b828ca0db..d947bcddd99 100644
--- a/src/data/ability.ts
+++ b/src/data/ability.ts
@@ -8,12 +8,12 @@ import { Weather, WeatherType } from "./weather";
 import { BattlerTag, GroundedTag, GulpMissileTag, SemiInvulnerableTag } from "./battler-tags";
 import { StatusEffect, getNonVolatileStatusEffects, getStatusEffectDescriptor, getStatusEffectHealText } from "./status-effect";
 import { Gender } from "./gender";
-import Move, { AttackMove, MoveCategory, MoveFlags, MoveTarget, FlinchAttr, OneHitKOAttr, HitHealAttr, allMoves, StatusMove, SelfStatusMove, VariablePowerAttr, applyMoveAttrs, IncrementMovePriorityAttr, VariableMoveTypeAttr, RandomMovesetMoveAttr, RandomMoveAttr, NaturePowerAttr, CopyMoveAttr, MoveAttr, MultiHitAttr, ChargeAttr, SacrificialAttr, SacrificialAttrOnHit } from "./move";
+import Move, { AttackMove, MoveCategory, MoveFlags, MoveTarget, FlinchAttr, OneHitKOAttr, HitHealAttr, allMoves, StatusMove, SelfStatusMove, VariablePowerAttr, applyMoveAttrs, IncrementMovePriorityAttr, VariableMoveTypeAttr, RandomMovesetMoveAttr, RandomMoveAttr, NaturePowerAttr, CopyMoveAttr, MoveAttr, MultiHitAttr, ChargeAttr, SacrificialAttr, SacrificialAttrOnHit, NeutralDamageAgainstFlyingTypeMultiplierAttr } from "./move";
 import { ArenaTagSide, ArenaTrapTag } from "./arena-tag";
 import { Stat, getStatName } from "./pokemon-stat";
 import { BerryModifier, PokemonHeldItemModifier } from "../modifier/modifier";
 import { TerrainType } from "./terrain";
-import { SpeciesFormChangeManualTrigger } from "./pokemon-forms";
+import { SpeciesFormChangeManualTrigger, SpeciesFormChangeRevertWeatherFormTrigger, SpeciesFormChangeWeatherTrigger } from "./pokemon-forms";
 import i18next from "i18next";
 import { Localizable } from "#app/interfaces/locales.js";
 import { Command } from "../ui/command-ui-handler";
@@ -25,10 +25,11 @@ import { ArenaTagType } from "#enums/arena-tag-type";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import { MovePhase } from "#app/phases/move-phase.js";
-import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase.js";
-import { ShowAbilityPhase } from "#app/phases/show-ability-phase.js";
-import { StatChangePhase } from "#app/phases/stat-change-phase.js";
+import { MovePhase } from "#app/phases/move-phase";
+import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase";
+import { ShowAbilityPhase } from "#app/phases/show-ability-phase";
+import { StatChangePhase } from "#app/phases/stat-change-phase";
+import BattleScene from "#app/battle-scene";
 
 export class Ability implements Localizable {
   public id: Abilities;
@@ -348,7 +349,7 @@ export class TypeImmunityAbAttr extends PreDefendAbAttr {
     if ([ MoveTarget.BOTH_SIDES, MoveTarget.ENEMY_SIDE, MoveTarget.USER_SIDE ].includes(move.moveTarget)) {
       return false;
     }
-    if (attacker !== pokemon && move.type === this.immuneType) {
+    if (attacker !== pokemon && attacker.getMoveType(move) === this.immuneType) {
       (args[0] as Utils.NumberHolder).value = 0;
       return true;
     }
@@ -371,7 +372,8 @@ export class AttackTypeImmunityAbAttr extends TypeImmunityAbAttr {
    * Example: Levitate
    */
   applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    if (move.category !== MoveCategory.STATUS) {
+    // this is a hacky way to fix the Levitate/Thousand Arrows interaction, but it works for now...
+    if (move.category !== MoveCategory.STATUS && !move.hasAttr(NeutralDamageAgainstFlyingTypeMultiplierAttr)) {
       return super.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args);
     }
     return false;
@@ -391,6 +393,7 @@ export class TypeImmunityHealAbAttr extends TypeImmunityAbAttr {
         const abilityName = (!passive ? pokemon.getAbility() : pokemon.getPassiveAbility()).name;
         pokemon.scene.unshiftPhase(new PokemonHealPhase(pokemon.scene, pokemon.getBattlerIndex(),
           Utils.toDmgValue(pokemon.getMaxHp() / 4), i18next.t("abilityTriggers:typeImmunityHeal", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName }), true));
+        cancelled.value = true; // Suppresses "No Effect" message
       }
       return true;
     }
@@ -414,7 +417,7 @@ class TypeImmunityStatChangeAbAttr extends TypeImmunityAbAttr {
     const ret = super.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args);
 
     if (ret) {
-      cancelled.value = true;
+      cancelled.value = true; // Suppresses "No Effect" message
       if (!simulated) {
         pokemon.scene.unshiftPhase(new StatChangePhase(pokemon.scene, pokemon.getBattlerIndex(), true, [ this.stat ], this.levels));
       }
@@ -439,7 +442,7 @@ class TypeImmunityAddBattlerTagAbAttr extends TypeImmunityAbAttr {
     const ret = super.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args);
 
     if (ret) {
-      cancelled.value = true;
+      cancelled.value = true; // Suppresses "No Effect" message
       if (!simulated) {
         pokemon.addTag(this.tagType, this.turnCount, undefined, pokemon.id);
       }
@@ -455,8 +458,8 @@ export class NonSuperEffectiveImmunityAbAttr extends TypeImmunityAbAttr {
   }
 
   applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    if (move instanceof AttackMove && pokemon.getAttackTypeEffectiveness(move.type, attacker) < 2) {
-      cancelled.value = true;
+    if (move instanceof AttackMove && pokemon.getAttackTypeEffectiveness(pokemon.getMoveType(move), attacker) < 2) {
+      cancelled.value = true; // Suppresses "No Effect" message
       (args[0] as Utils.NumberHolder).value = 0;
       return true;
     }
@@ -763,7 +766,7 @@ export class PostDefendTypeChangeAbAttr extends PostDefendAbAttr {
       if (simulated) {
         return true;
       }
-      const type = move.type;
+      const type = attacker.getMoveType(move);
       const pokemonTypes = pokemon.getTypes(true);
       if (pokemonTypes.length !== 1 || pokemonTypes[0] !== type) {
         pokemon.summonData.types = [ type ];
@@ -1211,7 +1214,7 @@ export class FieldMultiplyBattleStatAbAttr extends AbAttr {
 
 }
 
-export class MoveTypeChangeAttr extends PreAttackAbAttr {
+export class MoveTypeChangeAbAttr extends PreAttackAbAttr {
   constructor(
     private newType: Type,
     private powerMultiplier: number,
@@ -1220,11 +1223,14 @@ export class MoveTypeChangeAttr extends PreAttackAbAttr {
     super(true);
   }
 
+  // TODO: Decouple this into two attributes (type change / power boost)
   applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, args: any[]): boolean {
     if (this.condition && this.condition(pokemon, defender, move)) {
-      move.type = this.newType;
       if (args[0] && args[0] instanceof Utils.NumberHolder) {
-        args[0].value *= this.powerMultiplier;
+        args[0].value = this.newType;
+      }
+      if (args[1] && args[1] instanceof Utils.NumberHolder) {
+        args[1].value *= this.powerMultiplier;
       }
       return true;
     }
@@ -1256,22 +1262,12 @@ export class PokemonTypeChangeAbAttr extends PreAttackAbAttr {
         attr instanceof CopyMoveAttr
       )
     ) {
-      // TODO remove this copy when phase order is changed so that damage, type, category, etc.
-      // TODO are all calculated prior to playing the move animation.
-      const moveCopy = new Move(move.id, move.type, move.category, move.moveTarget, move.power, move.accuracy, move.pp, move.chance, move.priority, move.generation);
-      moveCopy.attrs = move.attrs;
+      const moveType = pokemon.getMoveType(move);
 
-      // Moves like Weather Ball ignore effects of abilities like Normalize and Refrigerate
-      if (move.findAttr(attr => attr instanceof VariableMoveTypeAttr)) {
-        applyMoveAttrs(VariableMoveTypeAttr, pokemon, null, moveCopy);
-      } else {
-        applyPreAttackAbAttrs(MoveTypeChangeAttr, pokemon, null, moveCopy);
-      }
-
-      if (pokemon.getTypes().some((t) => t !== moveCopy.type)) {
+      if (pokemon.getTypes().some((t) => t !== moveType)) {
         if (!simulated) {
-          this.moveType = moveCopy.type;
-          pokemon.summonData.types = [moveCopy.type];
+          this.moveType = moveType;
+          pokemon.summonData.types = [moveType];
           pokemon.updateInfo();
         }
 
@@ -2351,7 +2347,7 @@ export class PostSummonTransformAbAttr extends PostSummonAbAttr {
     pokemon.summonData.moveset = target.getMoveset().map(m => new PokemonMove(m!.moveId, m!.ppUsed, m!.ppUp)); // TODO: are those bangs correct?
     pokemon.summonData.types = target.getTypes();
 
-    pokemon.scene.playSound("PRSFX- Transform");
+    pokemon.scene.playSound("battle_anims/PRSFX- Transform");
 
     pokemon.loadAssets(false).then(() => pokemon.playAnim());
 
@@ -2361,6 +2357,73 @@ export class PostSummonTransformAbAttr extends PostSummonAbAttr {
   }
 }
 
+/**
+ * Reverts weather-based forms to their normal forms when the user is summoned.
+ * Used by Cloud Nine and Air Lock.
+ * @extends PostSummonAbAttr
+ */
+export class PostSummonWeatherSuppressedFormChangeAbAttr extends PostSummonAbAttr {
+  /**
+   * Triggers {@linkcode Arena.triggerWeatherBasedFormChangesToNormal | triggerWeatherBasedFormChangesToNormal}
+   * @param {Pokemon} pokemon the Pokemon with this ability
+   * @param passive n/a
+   * @param args n/a
+   * @returns whether a Pokemon was reverted to its normal form
+   */
+  applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]) {
+    const pokemonToTransform = getPokemonWithWeatherBasedForms(pokemon.scene);
+
+    if (pokemonToTransform.length < 1) {
+      return false;
+    }
+
+    if (!simulated) {
+      pokemon.scene.arena.triggerWeatherBasedFormChangesToNormal();
+    }
+
+    return true;
+  }
+}
+
+/**
+ * Triggers weather-based form change when summoned into an active weather.
+ * Used by Forecast.
+ * @extends PostSummonAbAttr
+ */
+export class PostSummonFormChangeByWeatherAbAttr extends PostSummonAbAttr {
+  private ability: Abilities;
+
+  constructor(ability: Abilities) {
+    super(false);
+
+    this.ability = ability;
+  }
+
+  /**
+   * Calls the {@linkcode BattleScene.triggerPokemonFormChange | triggerPokemonFormChange} for both
+   * {@linkcode SpeciesFormChange.SpeciesFormChangeWeatherTrigger | SpeciesFormChangeWeatherTrigger} and
+   * {@linkcode SpeciesFormChange.SpeciesFormChangeWeatherTrigger | SpeciesFormChangeRevertWeatherFormTrigger} if it
+   * is the specific Pokemon and ability
+   * @param {Pokemon} pokemon the Pokemon with this ability
+   * @param passive n/a
+   * @param args n/a
+   * @returns whether the form change was triggered
+   */
+  applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
+    if (pokemon.species.speciesId === Species.CASTFORM && this.ability === Abilities.FORECAST) {
+      if (simulated) {
+        return simulated;
+      }
+
+      pokemon.scene.triggerPokemonFormChange(pokemon, SpeciesFormChangeWeatherTrigger);
+      pokemon.scene.triggerPokemonFormChange(pokemon, SpeciesFormChangeRevertWeatherFormTrigger);
+      queueShowAbility(pokemon, passive);
+      return true;
+    }
+    return false;
+  }
+}
+
 export class PreSwitchOutAbAttr extends AbAttr {
   constructor() {
     super(true);
@@ -2910,16 +2973,20 @@ function getAnticipationCondition(): AbAttrCondition {
   return (pokemon: Pokemon) => {
     for (const opponent of pokemon.getOpponents()) {
       for (const move of opponent.moveset) {
-        // move is super effective
-        if (move!.getMove() instanceof AttackMove && pokemon.getAttackTypeEffectiveness(move!.getMove().type, opponent, true) >= 2) { // TODO: is this bang correct?
+        // ignore null/undefined moves
+        if (!move) {
+          continue;
+        }
+        // the move's base type (not accounting for variable type changes) is super effective
+        if (move.getMove() instanceof AttackMove && pokemon.getAttackTypeEffectiveness(move.getMove().type, opponent, true) >= 2) {
           return true;
         }
         // move is a OHKO
-        if (move?.getMove().hasAttr(OneHitKOAttr)) {
+        if (move.getMove().hasAttr(OneHitKOAttr)) {
           return true;
         }
         // edge case for hidden power, type is computed
-        if (move?.getMove().id === Moves.HIDDEN_POWER) {
+        if (move.getMove().id === Moves.HIDDEN_POWER) {
           const iv_val = Math.floor(((opponent.ivs[Stat.HP] & 1)
               +(opponent.ivs[Stat.ATK] & 1) * 2
               +(opponent.ivs[Stat.DEF] & 1) * 4
@@ -3014,6 +3081,49 @@ export class PostWeatherChangeAbAttr extends AbAttr {
   }
 }
 
+/**
+ * Triggers weather-based form change when weather changes.
+ * Used by Forecast.
+ * @extends PostWeatherChangeAbAttr
+ */
+export class PostWeatherChangeFormChangeAbAttr extends PostWeatherChangeAbAttr {
+  private ability: Abilities;
+
+  constructor(ability: Abilities) {
+    super(false);
+
+    this.ability = ability;
+  }
+
+  /**
+   * Calls {@linkcode Arena.triggerWeatherBasedFormChangesToNormal | triggerWeatherBasedFormChangesToNormal} when the
+   * weather changed to form-reverting weather, otherwise calls {@linkcode Arena.triggerWeatherBasedFormChanges | triggerWeatherBasedFormChanges}
+   * @param {Pokemon} pokemon the Pokemon that changed the weather
+   * @param passive n/a
+   * @param weather n/a
+   * @param args n/a
+   * @returns whether the form change was triggered
+   */
+  applyPostWeatherChange(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: WeatherType, args: any[]): boolean {
+    if (pokemon.species.speciesId === Species.CASTFORM && this.ability === Abilities.FORECAST) {
+      if (simulated) {
+        return simulated;
+      }
+
+      const formRevertingWeathers: WeatherType[] = [ WeatherType.NONE, WeatherType.SANDSTORM, WeatherType.STRONG_WINDS, WeatherType.FOG ];
+      const weatherType = pokemon.scene.arena.weather?.weatherType;
+
+      if (weatherType && formRevertingWeathers.includes(weatherType)) {
+        pokemon.scene.arena.triggerWeatherBasedFormChangesToNormal();
+      } else {
+        pokemon.scene.arena.triggerWeatherBasedFormChanges();
+      }
+      return true;
+    }
+    return false;
+  }
+}
+
 export class PostWeatherChangeAddBattlerTagAttr extends PostWeatherChangeAbAttr {
   private tagType: BattlerTagType;
   private turnCount: integer;
@@ -3784,6 +3894,38 @@ export class PostFaintAbAttr extends AbAttr {
   }
 }
 
+/**
+ * Used for weather suppressing abilities to trigger weather-based form changes upon being fainted.
+ * Used by Cloud Nine and Air Lock.
+ * @extends PostFaintAbAttr
+ */
+export class PostFaintUnsuppressedWeatherFormChangeAbAttr extends PostFaintAbAttr {
+  /**
+   * Triggers {@linkcode Arena.triggerWeatherBasedFormChanges | triggerWeatherBasedFormChanges}
+   * when the user of the ability faints
+   * @param {Pokemon} pokemon the fainted Pokemon
+   * @param passive n/a
+   * @param attacker n/a
+   * @param move n/a
+   * @param hitResult n/a
+   * @param args n/a
+   * @returns whether the form change was triggered
+   */
+  applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean {
+    const pokemonToTransform = getPokemonWithWeatherBasedForms(pokemon.scene);
+
+    if (pokemonToTransform.length < 1) {
+      return false;
+    }
+
+    if (!simulated) {
+      pokemon.scene.arena.triggerWeatherBasedFormChanges();
+    }
+
+    return true;
+  }
+}
+
 /**
  * Clears Desolate Land/Primordial Sea/Delta Stream upon the Pokemon fainting
  */
@@ -4243,7 +4385,7 @@ export class FormBlockDamageAbAttr extends ReceivedMoveDamageMultiplierAbAttr {
         (args[0] as Utils.NumberHolder).value = this.multiplier;
         pokemon.removeTag(this.tagType);
         if (this.recoilDamageFunc) {
-          pokemon.damageAndUpdate(this.recoilDamageFunc(pokemon), HitResult.OTHER);
+          pokemon.damageAndUpdate(this.recoilDamageFunc(pokemon), HitResult.OTHER, false, false, true, true);
         }
       }
       return true;
@@ -4559,6 +4701,16 @@ function setAbilityRevealed(pokemon: Pokemon): void {
   }
 }
 
+/**
+ * Returns the Pokemon with weather-based forms
+ * @param {BattleScene} scene - The current scene
+ */
+function getPokemonWithWeatherBasedForms(scene: BattleScene) {
+  return scene.getField(true).filter(p =>
+    p.hasAbility(Abilities.FORECAST) && p.species.speciesId === Species.CASTFORM
+  );
+}
+
 export const allAbilities = [ new Ability(Abilities.NONE, 3) ];
 
 export function initAbilities() {
@@ -4605,7 +4757,10 @@ export function initAbilities() {
       .ignorable(),
     new Ability(Abilities.CLOUD_NINE, 3)
       .attr(SuppressWeatherEffectAbAttr, true)
-      .attr(PostSummonUnnamedMessageAbAttr, i18next.t("abilityTriggers:weatherEffectDisappeared")),
+      .attr(PostSummonUnnamedMessageAbAttr, i18next.t("abilityTriggers:weatherEffectDisappeared"))
+      .attr(PostSummonWeatherSuppressedFormChangeAbAttr)
+      .attr(PostFaintUnsuppressedWeatherFormChangeAbAttr)
+      .bypassFaint(),
     new Ability(Abilities.COMPOUND_EYES, 3)
       .attr(BattleStatMultiplierAbAttr, BattleStat.ACC, 1.3),
     new Ability(Abilities.INSOMNIA, 3)
@@ -4750,7 +4905,8 @@ export function initAbilities() {
     new Ability(Abilities.FORECAST, 3)
       .attr(UncopiableAbilityAbAttr)
       .attr(NoFusionAbilityAbAttr)
-      .unimplemented(),
+      .attr(PostSummonFormChangeByWeatherAbAttr, Abilities.FORECAST)
+      .attr(PostWeatherChangeFormChangeAbAttr, Abilities.FORECAST),
     new Ability(Abilities.STICKY_HOLD, 3)
       .attr(BlockItemTheftAbAttr)
       .bypassFaint()
@@ -4800,7 +4956,10 @@ export function initAbilities() {
       .ignorable(),
     new Ability(Abilities.AIR_LOCK, 3)
       .attr(SuppressWeatherEffectAbAttr, true)
-      .attr(PostSummonUnnamedMessageAbAttr, i18next.t("abilityTriggers:weatherEffectDisappeared")),
+      .attr(PostSummonUnnamedMessageAbAttr, i18next.t("abilityTriggers:weatherEffectDisappeared"))
+      .attr(PostSummonWeatherSuppressedFormChangeAbAttr)
+      .attr(PostFaintUnsuppressedWeatherFormChangeAbAttr)
+      .bypassFaint(),
     new Ability(Abilities.TANGLED_FEET, 4)
       .conditionalAttr(pokemon => !!pokemon.getTag(BattlerTagType.CONFUSED), BattleStatMultiplierAbAttr, BattleStat.EVA, 2)
       .ignorable(),
@@ -4859,7 +5018,7 @@ export function initAbilities() {
       .conditionalAttr(pokemon => pokemon.status ? pokemon.status.effect === StatusEffect.PARALYSIS : false, BattleStatMultiplierAbAttr, BattleStat.SPD, 2)
       .conditionalAttr(pokemon => !!pokemon.status || pokemon.hasAbility(Abilities.COMATOSE), BattleStatMultiplierAbAttr, BattleStat.SPD, 1.5),
     new Ability(Abilities.NORMALIZE, 4)
-      .attr(MoveTypeChangeAttr, Type.NORMAL, 1.2, (user, target, move) => {
+      .attr(MoveTypeChangeAbAttr, Type.NORMAL, 1.2, (user, target, move) => {
         return ![Moves.HIDDEN_POWER, Moves.WEATHER_BALL, Moves.NATURAL_GIFT, Moves.JUDGMENT, Moves.TECHNO_BLAST].includes(move.id);
       }),
     new Ability(Abilities.SNIPER, 4)
@@ -5100,7 +5259,7 @@ export function initAbilities() {
     new Ability(Abilities.STRONG_JAW, 6)
       .attr(MovePowerBoostAbAttr, (user, target, move) => move.hasFlag(MoveFlags.BITING_MOVE), 1.5),
     new Ability(Abilities.REFRIGERATE, 6)
-      .attr(MoveTypeChangeAttr, Type.ICE, 1.2, (user, target, move) => move.type === Type.NORMAL),
+      .attr(MoveTypeChangeAbAttr, Type.ICE, 1.2, (user, target, move) => move.type === Type.NORMAL && !move.hasAttr(VariableMoveTypeAttr)),
     new Ability(Abilities.SWEET_VEIL, 6)
       .attr(UserFieldStatusEffectImmunityAbAttr, StatusEffect.SLEEP)
       .attr(UserFieldBattlerTagImmunityAbAttr, BattlerTagType.DROWSY)
@@ -5123,11 +5282,11 @@ export function initAbilities() {
     new Ability(Abilities.TOUGH_CLAWS, 6)
       .attr(MovePowerBoostAbAttr, (user, target, move) => move.hasFlag(MoveFlags.MAKES_CONTACT), 1.3),
     new Ability(Abilities.PIXILATE, 6)
-      .attr(MoveTypeChangeAttr, Type.FAIRY, 1.2, (user, target, move) => move.type === Type.NORMAL),
+      .attr(MoveTypeChangeAbAttr, Type.FAIRY, 1.2, (user, target, move) => move.type === Type.NORMAL && !move.hasAttr(VariableMoveTypeAttr)),
     new Ability(Abilities.GOOEY, 6)
       .attr(PostDefendStatChangeAbAttr, (target, user, move) => move.hasFlag(MoveFlags.MAKES_CONTACT), BattleStat.SPD, -1, false),
     new Ability(Abilities.AERILATE, 6)
-      .attr(MoveTypeChangeAttr, Type.FLYING, 1.2, (user, target, move) => move.type === Type.NORMAL),
+      .attr(MoveTypeChangeAbAttr, Type.FLYING, 1.2, (user, target, move) => move.type === Type.NORMAL && !move.hasAttr(VariableMoveTypeAttr)),
     new Ability(Abilities.PARENTAL_BOND, 6)
       .attr(AddSecondStrikeAbAttr, 0.25),
     new Ability(Abilities.DARK_AURA, 6)
@@ -5199,11 +5358,11 @@ export function initAbilities() {
     new Ability(Abilities.LONG_REACH, 7)
       .attr(IgnoreContactAbAttr),
     new Ability(Abilities.LIQUID_VOICE, 7)
-      .attr(MoveTypeChangeAttr, Type.WATER, 1, (user, target, move) => move.hasFlag(MoveFlags.SOUND_BASED)),
+      .attr(MoveTypeChangeAbAttr, Type.WATER, 1, (user, target, move) => move.hasFlag(MoveFlags.SOUND_BASED)),
     new Ability(Abilities.TRIAGE, 7)
       .attr(ChangeMovePriorityAbAttr, (pokemon, move) => move.hasFlag(MoveFlags.TRIAGE_MOVE), 3),
     new Ability(Abilities.GALVANIZE, 7)
-      .attr(MoveTypeChangeAttr, Type.ELECTRIC, 1.2, (user, target, move) => move.type === Type.NORMAL),
+      .attr(MoveTypeChangeAbAttr, Type.ELECTRIC, 1.2, (user, target, move) => move.type === Type.NORMAL && !move.hasAttr(VariableMoveTypeAttr)),
     new Ability(Abilities.SURGE_SURFER, 7)
       .conditionalAttr(getTerrainCondition(TerrainType.ELECTRIC), BattleStatMultiplierAbAttr, BattleStat.SPD, 2),
     new Ability(Abilities.SCHOOLING, 7)
diff --git a/src/data/battle-anims.ts b/src/data/battle-anims.ts
index c86f3db5085..a2f6e41f4ae 100644
--- a/src/data/battle-anims.ts
+++ b/src/data/battle-anims.ts
@@ -325,11 +325,11 @@ class AnimTimedSoundEvent extends AnimTimedEvent {
     const soundConfig = { rate: (this.pitch * 0.01), volume: (this.volume * 0.01) };
     if (this.resourceName) {
       try {
-        scene.playSound(this.resourceName, soundConfig);
+        scene.playSound(`battle_anims/${this.resourceName}`, soundConfig);
       } catch (err) {
         console.error(err);
       }
-      return Math.ceil((scene.sound.get(this.resourceName).totalDuration * 1000) / 33.33);
+      return Math.ceil((scene.sound.get(`battle_anims/${this.resourceName}`).totalDuration * 1000) / 33.33);
     } else {
       return Math.ceil((battleAnim.user!.cry(soundConfig).totalDuration * 1000) / 33.33); // TODO: is the bang behind user correct?
     }
diff --git a/src/data/biomes.ts b/src/data/biomes.ts
index 3f773aad98a..6bc965b44de 100644
--- a/src/data/biomes.ts
+++ b/src/data/biomes.ts
@@ -35,36 +35,36 @@ interface BiomeDepths {
 export const biomeLinks: BiomeLinks = {
   [Biome.TOWN]: Biome.PLAINS,
   [Biome.PLAINS]: [ Biome.GRASS, Biome.METROPOLIS, Biome.LAKE ],
-  [Biome.GRASS]: Biome.TALL_GRASS,
+  [Biome.GRASS]: [ Biome.TALL_GRASS, [ Biome.CONSTRUCTION_SITE, 2 ] ],
   [Biome.TALL_GRASS]: [ Biome.FOREST, Biome.CAVE ],
   [Biome.SLUM]: Biome.CONSTRUCTION_SITE,
   [Biome.FOREST]: [ Biome.JUNGLE, Biome.MEADOW ],
   [Biome.SEA]: [ Biome.SEABED, Biome.ICE_CAVE ],
   [Biome.SWAMP]: [ Biome.GRAVEYARD, Biome.TALL_GRASS ],
-  [Biome.BEACH]: [ Biome.SEA, [ Biome.ISLAND, 4 ] ],
+  [Biome.BEACH]: [ Biome.SEA, [ Biome.ISLAND, 3 ] ],
   [Biome.LAKE]: [ Biome.BEACH, Biome.SWAMP, Biome.CONSTRUCTION_SITE ],
-  [Biome.SEABED]: [ Biome.CAVE, [ Biome.VOLCANO, 4 ] ],
-  [Biome.MOUNTAIN]: [ Biome.VOLCANO, [ Biome.WASTELAND, 3 ] ],
+  [Biome.SEABED]: [ Biome.CAVE, [ Biome.VOLCANO, 3 ] ],
+  [Biome.MOUNTAIN]: [ Biome.VOLCANO, [ Biome.DOJO, 2] [ Biome.WASTELAND, 2 ] ],
   [Biome.BADLANDS]: [ Biome.DESERT, Biome.MOUNTAIN ],
   [Biome.CAVE]: [ Biome.BADLANDS, Biome.LAKE ],
-  [Biome.DESERT]: Biome.RUINS,
+  [Biome.DESERT]: [ Biome.RUINS, [ Biome.CONSTRUCTION_SITE, 2 ] ],
   [Biome.ICE_CAVE]: Biome.SNOWY_FOREST,
-  [Biome.MEADOW]: [ Biome.PLAINS, [ Biome.FAIRY_CAVE, 2 ] ],
+  [Biome.MEADOW]: [ Biome.PLAINS, Biome.FAIRY_CAVE ],
   [Biome.POWER_PLANT]: Biome.FACTORY,
-  [Biome.VOLCANO]: [ Biome.BEACH, [ Biome.ICE_CAVE, 4 ] ],
+  [Biome.VOLCANO]: [ Biome.BEACH, [ Biome.ICE_CAVE, 3 ] ],
   [Biome.GRAVEYARD]: Biome.ABYSS,
-  [Biome.DOJO]: [ Biome.PLAINS, [ Biome.TEMPLE, 3 ] ],
-  [Biome.FACTORY]: [ Biome.PLAINS, [ Biome.LABORATORY, 4 ] ],
+  [Biome.DOJO]: [ Biome.PLAINS, [ Biome.JUNGLE, 2], [ Biome.TEMPLE, 2 ] ],
+  [Biome.FACTORY]: [ Biome.TALL_GRASS, [ Biome.LABORATORY, 3 ] ],
   [Biome.RUINS]: [ Biome.FOREST ],
   [Biome.WASTELAND]: Biome.BADLANDS,
   [Biome.ABYSS]: [ Biome.CAVE, [ Biome.SPACE, 3 ], [ Biome.WASTELAND, 3 ] ],
   [Biome.SPACE]: Biome.RUINS,
-  [Biome.CONSTRUCTION_SITE]: [ Biome.DOJO, Biome.POWER_PLANT ],
+  [Biome.CONSTRUCTION_SITE]: [ Biome.POWER_PLANT, [ Biome.DOJO, 2 ] ],
   [Biome.JUNGLE]: [ Biome.TEMPLE ],
-  [Biome.FAIRY_CAVE]: [ Biome.ICE_CAVE, [ Biome.SPACE, 3 ] ],
-  [Biome.TEMPLE]: [ Biome.SWAMP, [ Biome.RUINS, 3 ] ],
+  [Biome.FAIRY_CAVE]: [ Biome.ICE_CAVE, [ Biome.SPACE, 2 ] ],
+  [Biome.TEMPLE]: [ Biome.DESERT, [ Biome.SWAMP, 2 ], [ Biome.RUINS, 2 ] ],
   [Biome.METROPOLIS]: Biome.SLUM,
-  [Biome.SNOWY_FOREST]: [ Biome.FOREST, Biome.LAKE, Biome.MOUNTAIN ],
+  [Biome.SNOWY_FOREST]: [ Biome.FOREST, Biome.MOUNTAIN, [ Biome.LAKE, 2 ] ],
   [Biome.ISLAND]: Biome.SEA,
   [Biome.LABORATORY]: Biome.CONSTRUCTION_SITE
 };
@@ -7667,6 +7667,12 @@ export function initBiomes() {
   biomeDepths[Biome.TOWN] = [ 0, 1 ];
 
   const traverseBiome = (biome: Biome, depth: integer) => {
+    if (biome === Biome.END) {
+      const biomeList = Object.keys(Biome).filter(key => !isNaN(Number(key)));
+      biomeList.pop(); // Removes Biome.END from the list
+      const randIndex = Utils.randInt(biomeList.length, 2); // Will never be Biome.TOWN or Biome.PLAINS
+      biome = Biome[biomeList[randIndex]];
+    }
     const linkedBiomes: (Biome | [ Biome, integer ])[] = Array.isArray(biomeLinks[biome])
       ? biomeLinks[biome] as (Biome | [ Biome, integer ])[]
       : [ biomeLinks[biome] as Biome ];
diff --git a/src/data/challenge.ts b/src/data/challenge.ts
index 40d53de3687..36f696e63c1 100644
--- a/src/data/challenge.ts
+++ b/src/data/challenge.ts
@@ -55,6 +55,11 @@ export enum ChallengeType {
    * @see {@link Challenge.applyFixedBattle}
   */
   FIXED_BATTLES,
+  /**
+   * Modifies the effectiveness of Type matchups in battle
+   * @see {@linkcode Challenge.applyTypeEffectiveness}
+  */
+  TYPE_EFFECTIVENESS,
   /**
    * Modifies what level the AI pokemon are. UNIMPLEMENTED.
    */
@@ -327,6 +332,15 @@ export abstract class Challenge {
     return false;
   }
 
+  /**
+   * An apply function for TYPE_EFFECTIVENESS challenges. Derived classes should alter this.
+   * @param effectiveness {@linkcode Utils.NumberHolder} The current effectiveness of the move.
+   * @returns Whether this function did anything.
+   */
+  applyTypeEffectiveness(effectiveness: Utils.NumberHolder): boolean {
+    return false;
+  }
+
   /**
    * An apply function for AI_LEVEL challenges. Derived classes should alter this.
    * @param level {@link Utils.IntegerHolder} The generated level.
@@ -651,10 +665,7 @@ export class FreshStartChallenge extends Challenge {
     return true;
   }
 
-  /**
-   * @overrides
-   */
-  getDifficulty(): number {
+  override getDifficulty(): number {
     return 0;
   }
 
@@ -666,6 +677,38 @@ export class FreshStartChallenge extends Challenge {
   }
 }
 
+/**
+ * Implements an inverse battle challenge.
+ */
+export class InverseBattleChallenge extends Challenge {
+  constructor() {
+    super(Challenges.INVERSE_BATTLE, 1);
+  }
+
+  static loadChallenge(source: InverseBattleChallenge | any): InverseBattleChallenge {
+    const newChallenge = new InverseBattleChallenge();
+    newChallenge.value = source.value;
+    newChallenge.severity = source.severity;
+    return newChallenge;
+  }
+
+  override getDifficulty(): number {
+    return 0;
+  }
+
+  applyTypeEffectiveness(effectiveness: Utils.NumberHolder): boolean {
+    if (effectiveness.value < 1) {
+      effectiveness.value = 2;
+      return true;
+    } else if (effectiveness.value > 1) {
+      effectiveness.value = 0.5;
+      return true;
+    }
+
+    return false;
+  }
+}
+
 /**
  * Lowers the amount of starter points available.
  */
@@ -785,6 +828,14 @@ export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType
  * @returns True if any challenge was successfully applied.
  */
 export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.FIXED_BATTLES, waveIndex: Number, battleConfig: FixedBattleConfig): boolean;
+/**
+ * Apply all challenges that modify type effectiveness.
+ * @param gameMode {@linkcode GameMode} The current gameMode
+ * @param challengeType {@linkcode ChallengeType} ChallengeType.TYPE_EFFECTIVENESS
+ * @param effectiveness {@linkcode Utils.NumberHolder} The current effectiveness of the move.
+ * @returns True if any challenge was successfully applied.
+ */
+export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.TYPE_EFFECTIVENESS, effectiveness: Utils.NumberHolder): boolean;
 /**
  * Apply all challenges that modify what level AI are.
  * @param gameMode {@link GameMode} The current gameMode
@@ -866,6 +917,9 @@ export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType
       case ChallengeType.FIXED_BATTLES:
         ret ||= c.applyFixedBattle(args[0], args[1]);
         break;
+      case ChallengeType.TYPE_EFFECTIVENESS:
+        ret ||= c.applyTypeEffectiveness(args[0]);
+        break;
       case ChallengeType.AI_LEVEL:
         ret ||= c.applyLevelChange(args[0], args[1], args[2], args[3]);
         break;
@@ -907,6 +961,8 @@ export function copyChallenge(source: Challenge | any): Challenge {
     return LowerStarterPointsChallenge.loadChallenge(source);
   case Challenges.FRESH_START:
     return FreshStartChallenge.loadChallenge(source);
+  case Challenges.INVERSE_BATTLE:
+    return InverseBattleChallenge.loadChallenge(source);
   }
   throw new Error("Unknown challenge copied");
 }
@@ -918,5 +974,6 @@ export function initChallenges() {
     new SingleGenerationChallenge(),
     new SingleTypeChallenge(),
     new FreshStartChallenge(),
+    new InverseBattleChallenge(),
   );
 }
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/dialogue.ts b/src/data/dialogue.ts
index 72ba256d791..8eee32504c2 100644
--- a/src/data/dialogue.ts
+++ b/src/data/dialogue.ts
@@ -753,6 +753,98 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
       ]
     }
   ],
+  [TrainerType.AETHER_GRUNT]: [
+    {
+      encounter: [
+        "dialogue:aether_grunt.encounter.1",
+        "dialogue:aether_grunt.encounter.2",
+        "dialogue:aether_grunt.encounter.3",
+        "dialogue:aether_grunt.encounter.4",
+        "dialogue:aether_grunt.encounter.5",
+      ],
+      victory: [
+        "dialogue:aether_grunt.victory.1",
+        "dialogue:aether_grunt.victory.2",
+        "dialogue:aether_grunt.victory.3",
+        "dialogue:aether_grunt.victory.4",
+        "dialogue:aether_grunt.victory.5",
+      ]
+    }
+  ],
+  [TrainerType.FABA]: [
+    {
+      encounter: [
+        "dialogue:faba.encounter.1",
+        "dialogue:faba.encounter.2",
+        "dialogue:faba.encounter.3",
+      ],
+      victory: [
+        "dialogue:faba.victory.1",
+        "dialogue:faba.victory.2",
+        "dialogue:faba.victory.3",
+      ]
+    }
+  ],
+  [TrainerType.SKULL_GRUNT]: [
+    {
+      encounter: [
+        "dialogue:skull_grunt.encounter.1",
+        "dialogue:skull_grunt.encounter.2",
+        "dialogue:skull_grunt.encounter.3",
+        "dialogue:skull_grunt.encounter.4",
+        "dialogue:skull_grunt.encounter.5",
+      ],
+      victory: [
+        "dialogue:skull_grunt.victory.1",
+        "dialogue:skull_grunt.victory.2",
+        "dialogue:skull_grunt.victory.3",
+        "dialogue:skull_grunt.victory.4",
+        "dialogue:skull_grunt.victory.5",
+      ]
+    }
+  ],
+  [TrainerType.PLUMERIA]: [
+    {
+      encounter: [
+        "dialogue:plumeria.encounter.1",
+        "dialogue:plumeria.encounter.2",
+        "dialogue:plumeria.encounter.3",
+      ],
+      victory: [
+        "dialogue:plumeria.victory.1",
+        "dialogue:plumeria.victory.2",
+        "dialogue:plumeria.victory.3",
+      ]
+    }
+  ],
+  [TrainerType.MACRO_GRUNT]: [
+    {
+      encounter: [
+        "dialogue:macro_grunt.encounter.1",
+        "dialogue:macro_grunt.encounter.2",
+        "dialogue:macro_grunt.encounter.3",
+      ],
+      victory: [
+        "dialogue:macro_grunt.victory.1",
+        "dialogue:macro_grunt.victory.2",
+        "dialogue:macro_grunt.victory.3",
+      ]
+    }
+  ],
+  [TrainerType.OLEANA]: [
+    {
+      encounter: [
+        "dialogue:oleana.encounter.1",
+        "dialogue:oleana.encounter.2",
+        "dialogue:oleana.encounter.3",
+      ],
+      victory: [
+        "dialogue:oleana.victory.1",
+        "dialogue:oleana.victory.2",
+        "dialogue:oleana.victory.3",
+      ]
+    }
+  ],
   [TrainerType.ROCKET_BOSS_GIOVANNI_1]: [
     {
       encounter: [
@@ -909,6 +1001,84 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
       ]
     }
   ],
+  [TrainerType.LUSAMINE]: [
+    {
+      encounter: [
+        "dialogue:aether_boss_lusamine_1.encounter.1"
+      ],
+      victory: [
+        "dialogue:aether_boss_lusamine_1.victory.1"
+      ],
+      defeat: [
+        "dialogue:aether_boss_lusamine_1.defeat.1"
+      ]
+    }
+  ],
+  [TrainerType.LUSAMINE_2]: [
+    {
+      encounter: [
+        "dialogue:aether_boss_lusamine_2.encounter.1"
+      ],
+      victory: [
+        "dialogue:aether_boss_lusamine_2.victory.1"
+      ],
+      defeat: [
+        "dialogue:aether_boss_lusamine_2.defeat.1"
+      ]
+    }
+  ],
+  [TrainerType.GUZMA]: [
+    {
+      encounter: [
+        "dialogue:skull_boss_guzma_1.encounter.1"
+      ],
+      victory: [
+        "dialogue:skull_boss_guzma_1.victory.1"
+      ],
+      defeat: [
+        "dialogue:skull_boss_guzma_1.defeat.1"
+      ]
+    }
+  ],
+  [TrainerType.GUZMA_2]: [
+    {
+      encounter: [
+        "dialogue:skull_boss_guzma_2.encounter.1"
+      ],
+      victory: [
+        "dialogue:skull_boss_guzma_2.victory.1"
+      ],
+      defeat: [
+        "dialogue:skull_boss_guzma_2.defeat.1"
+      ]
+    }
+  ],
+  [TrainerType.ROSE]: [
+    {
+      encounter: [
+        "dialogue:macro_boss_rose_1.encounter.1"
+      ],
+      victory: [
+        "dialogue:macro_boss_rose_1.victory.1"
+      ],
+      defeat: [
+        "dialogue:macro_boss_rose_1.defeat.1"
+      ]
+    }
+  ],
+  [TrainerType.ROSE_2]: [
+    {
+      encounter: [
+        "dialogue:macro_boss_rose_2.encounter.1"
+      ],
+      victory: [
+        "dialogue:macro_boss_rose_2.victory.1"
+      ],
+      defeat: [
+        "dialogue:macro_boss_rose_2.defeat.1"
+      ]
+    }
+  ],
   [TrainerType.BROCK]: {
     encounter: [
       "dialogue:brock.encounter.1",
diff --git a/src/data/egg-moves.ts b/src/data/egg-moves.ts
index f88ac2c71b2..b516238c46e 100644
--- a/src/data/egg-moves.ts
+++ b/src/data/egg-moves.ts
@@ -43,7 +43,7 @@ export const speciesEggMoves = {
   [Species.SHELLDER]: [ Moves.ROCK_BLAST, Moves.WATER_SHURIKEN, Moves.BANEFUL_BUNKER, Moves.BONE_RUSH ],
   [Species.GASTLY]: [ Moves.SLUDGE_BOMB, Moves.AURA_SPHERE, Moves.NASTY_PLOT, Moves.ASTRAL_BARRAGE ],
   [Species.ONIX]: [ Moves.SHORE_UP, Moves.BODY_PRESS, Moves.HEAVY_SLAM, Moves.DIAMOND_STORM ],
-  [Species.DROWZEE]: [ Moves.BADDY_BAD, Moves.STRENGTH_SAP, Moves.LUMINA_CRASH, Moves.SPORE ],
+  [Species.DROWZEE]: [ Moves.BADDY_BAD, Moves.STRENGTH_SAP, Moves.LUMINA_CRASH, Moves.DARK_VOID ],
   [Species.KRABBY]: [ Moves.FIRE_LASH, Moves.PLAY_ROUGH, Moves.IVY_CUDGEL, Moves.SHELL_SMASH ],
   [Species.VOLTORB]: [ Moves.NASTY_PLOT, Moves.OVERHEAT, Moves.FROST_BREATH, Moves.ELECTRO_DRIFT ],
   [Species.EXEGGCUTE]: [ Moves.FICKLE_BEAM, Moves.APPLE_ACID, Moves.TRICK_ROOM, Moves.LUMINA_CRASH ],
@@ -125,7 +125,7 @@ export const speciesEggMoves = {
   [Species.SUICUNE]: [ Moves.RECOVER, Moves.NASTY_PLOT, Moves.FREEZE_DRY, Moves.STEAM_ERUPTION ],
   [Species.LARVITAR]: [ Moves.DRAGON_DANCE, Moves.MOUNTAIN_GALE, Moves.SHORE_UP, Moves.DIAMOND_STORM ],
   [Species.LUGIA]: [ Moves.NASTY_PLOT, Moves.LUMINA_CRASH, Moves.AURA_SPHERE, Moves.OBLIVION_WING ],
-  [Species.HO_OH]: [ Moves.FLOATY_FALL, Moves.SOLAR_BLADE, Moves.REVIVAL_BLESSING, Moves.BOLT_BEAK ],
+  [Species.HO_OH]: [ Moves.FLOATY_FALL, Moves.PRECIPICE_BLADES, Moves.REVIVAL_BLESSING, Moves.BOLT_BEAK ],
   [Species.CELEBI]: [ Moves.PHOTON_GEYSER, Moves.MATCHA_GOTCHA, Moves.REVIVAL_BLESSING, Moves.QUIVER_DANCE ],
   [Species.TREECKO]: [ Moves.NASTY_PLOT, Moves.APPLE_ACID, Moves.SECRET_SWORD, Moves.DRAGON_ENERGY ],
   [Species.TORCHIC]: [ Moves.HIGH_JUMP_KICK, Moves.SUPERCELL_SLAM, Moves.KNOCK_OFF, Moves.V_CREATE ],
@@ -249,7 +249,7 @@ export const speciesEggMoves = {
   [Species.CRESSELIA]: [ Moves.COSMIC_POWER, Moves.SECRET_SWORD, Moves.SIZZLY_SLIDE, Moves.LUMINA_CRASH ],
   [Species.PHIONE]: [ Moves.BOUNCY_BUBBLE, Moves.FREEZE_DRY, Moves.SPLISHY_SPLASH, Moves.QUIVER_DANCE ],
   [Species.MANAPHY]: [ Moves.BOUNCY_BUBBLE, Moves.FREEZE_DRY, Moves.SPLISHY_SPLASH, Moves.QUIVER_DANCE ],
-  [Species.DARKRAI]: [ Moves.FIERY_WRATH, Moves.MOONBLAST, Moves.SEARING_SHOT, Moves.SPORE ],
+  [Species.DARKRAI]: [ Moves.FIERY_WRATH, Moves.MOONBLAST, Moves.FIERY_DANCE, Moves.MAKE_IT_RAIN ],
   [Species.SHAYMIN]: [ Moves.MATCHA_GOTCHA, Moves.FIERY_DANCE, Moves.AEROBLAST, Moves.QUIVER_DANCE ],
   [Species.ARCEUS]: [ Moves.NO_RETREAT, Moves.COLLISION_COURSE, Moves.ASTRAL_BARRAGE, Moves.MULTI_ATTACK ],
   [Species.VICTINI]: [ Moves.BLUE_FLARE, Moves.BOLT_STRIKE, Moves.LUSTER_PURGE, Moves.VICTORY_DANCE ],
diff --git a/src/data/move.ts b/src/data/move.ts
index 48cc03a5868..d50dc7e2074 100644
--- a/src/data/move.ts
+++ b/src/data/move.ts
@@ -3,13 +3,13 @@ import { BattleStat, getBattleStatName } from "./battle-stat";
 import { EncoreTag, GulpMissileTag, HelpingHandTag, SemiInvulnerableTag, ShellTrapTag, StockpilingTag, TrappedTag, TypeBoostTag } from "./battler-tags";
 import { getPokemonNameWithAffix } from "../messages";
 import Pokemon, { AttackMoveResult, EnemyPokemon, HitResult, MoveResult, PlayerPokemon, PokemonMove, TurnMove } from "../field/pokemon";
-import { StatusEffect, getStatusEffectHealText, isNonVolatileStatusEffect, getNonVolatileStatusEffects} from "./status-effect";
-import { getTypeResistances, Type } from "./type";
+import { StatusEffect, getStatusEffectHealText, isNonVolatileStatusEffect, getNonVolatileStatusEffects } from "./status-effect";
+import { getTypeDamageMultiplier, Type } from "./type";
 import { Constructor } from "#app/utils";
 import * as Utils from "../utils";
 import { WeatherType } from "./weather";
 import { ArenaTagSide, ArenaTrapTag, WeakenMoveTypeTag } from "./arena-tag";
-import { UnswappableAbilityAbAttr, UncopiableAbilityAbAttr, UnsuppressableAbilityAbAttr, BlockRecoilDamageAttr, BlockOneHitKOAbAttr, IgnoreContactAbAttr, MaxMultiHitAbAttr, applyAbAttrs, BlockNonDirectDamageAbAttr, MoveAbilityBypassAbAttr, ReverseDrainAbAttr, FieldPreventExplosiveMovesAbAttr, ForceSwitchOutImmunityAbAttr, BlockItemTheftAbAttr, applyPostAttackAbAttrs, ConfusionOnStatusEffectAbAttr, HealFromBerryUseAbAttr, IgnoreProtectOnContactAbAttr, IgnoreMoveEffectsAbAttr, applyPreDefendAbAttrs, MoveEffectChanceMultiplierAbAttr, WonderSkinAbAttr, applyPreAttackAbAttrs, MoveTypeChangeAttr, UserFieldMoveTypePowerBoostAbAttr, FieldMoveTypePowerBoostAbAttr, AllyMoveCategoryPowerBoostAbAttr, VariableMovePowerAbAttr } from "./ability";
+import { UnswappableAbilityAbAttr, UncopiableAbilityAbAttr, UnsuppressableAbilityAbAttr, BlockRecoilDamageAttr, BlockOneHitKOAbAttr, IgnoreContactAbAttr, MaxMultiHitAbAttr, applyAbAttrs, BlockNonDirectDamageAbAttr, MoveAbilityBypassAbAttr, ReverseDrainAbAttr, FieldPreventExplosiveMovesAbAttr, ForceSwitchOutImmunityAbAttr, BlockItemTheftAbAttr, applyPostAttackAbAttrs, ConfusionOnStatusEffectAbAttr, HealFromBerryUseAbAttr, IgnoreProtectOnContactAbAttr, IgnoreMoveEffectsAbAttr, applyPreDefendAbAttrs, MoveEffectChanceMultiplierAbAttr, WonderSkinAbAttr, applyPreAttackAbAttrs, MoveTypeChangeAbAttr, UserFieldMoveTypePowerBoostAbAttr, FieldMoveTypePowerBoostAbAttr, AllyMoveCategoryPowerBoostAbAttr, VariableMovePowerAbAttr } from "./ability";
 import { allAbilities } from "./ability";
 import { PokemonHeldItemModifier, BerryModifier, PreserveBerryModifier, PokemonMoveAccuracyBoosterModifier, AttackTypeBoosterModifier, PokemonMultiHitModifier } from "../modifier/modifier";
 import { BattlerIndex, BattleType } from "../battle";
@@ -26,16 +26,20 @@ import { BattlerTagType } from "#enums/battler-tag-type";
 import { Biome } from "#enums/biome";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import { MoveUsedEvent } from "#app/events/battle-scene.js";
-import { PartyStatusCurePhase } from "#app/phases/party-status-cure-phase.js";
-import { BattleEndPhase } from "#app/phases/battle-end-phase.js";
-import { MoveEndPhase } from "#app/phases/move-end-phase.js";
-import { MovePhase } from "#app/phases/move-phase.js";
-import { NewBattlePhase } from "#app/phases/new-battle-phase.js";
-import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase.js";
-import { StatChangePhase } from "#app/phases/stat-change-phase.js";
-import { SwitchPhase } from "#app/phases/switch-phase.js";
-import { SwitchSummonPhase } from "#app/phases/switch-summon-phase.js";
+import { MoveUsedEvent } from "#app/events/battle-scene";
+import { PartyStatusCurePhase } from "#app/phases/party-status-cure-phase";
+import { BattleEndPhase } from "#app/phases/battle-end-phase";
+import { MoveEndPhase } from "#app/phases/move-end-phase";
+import { MovePhase } from "#app/phases/move-phase";
+import { NewBattlePhase } from "#app/phases/new-battle-phase";
+import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase";
+import { StatChangePhase } from "#app/phases/stat-change-phase";
+import { SwitchPhase } from "#app/phases/switch-phase";
+import { SwitchSummonPhase } from "#app/phases/switch-summon-phase";
+import { SpeciesFormChangeRevertWeatherFormTrigger } from "./pokemon-forms";
+import { NumberHolder } from "#app/utils";
+import { GameMode } from "#app/game-mode";
+import { applyChallenges, ChallengeType } from "./challenge";
 
 export enum MoveCategory {
   PHYSICAL,
@@ -112,9 +116,8 @@ type UserMoveConditionFunc = (user: Pokemon, move: Move) => boolean;
 export default class Move implements Localizable {
   public id: Moves;
   public name: string;
-  public type: Type;
-  public defaultType: Type;
-  public category: MoveCategory;
+  private _type: Type;
+  private _category: MoveCategory;
   public moveTarget: MoveTarget;
   public power: integer;
   public accuracy: integer;
@@ -132,9 +135,8 @@ export default class Move implements Localizable {
     this.id = id;
 
     this.nameAppend = "";
-    this.type = type;
-    this.defaultType = type;
-    this.category = category;
+    this._type = type;
+    this._category = category;
     this.moveTarget = defaultMoveTarget;
     this.power = power;
     this.accuracy = accuracy;
@@ -157,6 +159,13 @@ export default class Move implements Localizable {
     this.localize();
   }
 
+  get type() {
+    return this._type;
+  }
+  get category() {
+    return this._category;
+  }
+
   localize(): void {
     const i18nKey = Moves[this.id].split("_").filter(f => f).map((f, i) => i ? `${f[0]}${f.slice(1).toLowerCase()}` : f.toLowerCase()).join("") as unknown as string;
 
@@ -595,11 +604,13 @@ export default class Move implements Localizable {
           return true;
         }
       }
+      break;
     case MoveFlags.IGNORE_PROTECT:
       if (user.hasAbilityWithAttr(IgnoreProtectOnContactAbAttr) &&
           this.checkFlag(MoveFlags.MAKES_CONTACT, user, target)) {
         return true;
       }
+      break;
     }
 
     return !!(this.flags & flag);
@@ -732,7 +743,7 @@ export default class Move implements Localizable {
     const power = new Utils.NumberHolder(this.power);
     const typeChangeMovePowerMultiplier = new Utils.NumberHolder(1);
 
-    applyPreAttackAbAttrs(MoveTypeChangeAttr, source, target, this, simulated, typeChangeMovePowerMultiplier);
+    applyPreAttackAbAttrs(MoveTypeChangeAbAttr, source, target, this, true, null, typeChangeMovePowerMultiplier);
 
     const sourceTeraType = source.getTeraType();
     if (sourceTeraType !== Type.UNKNOWN && sourceTeraType === this.type && power.value < 60 && this.priority <= 0 && !this.hasAttr(MultiHitAttr) && !source.scene.findModifier(m => m instanceof PokemonMultiHitModifier && m.pokemonId === source.id)) {
@@ -1082,15 +1093,12 @@ export class PreMoveMessageAttr extends MoveAttr {
   }
 }
 
-export class StatusMoveTypeImmunityAttr extends MoveAttr {
-  public immuneType: Type;
-
-  constructor(immuneType: Type) {
-    super(false);
-
-    this.immuneType = immuneType;
-  }
-}
+/**
+ * Attribute for Status moves that take attack type effectiveness
+ * into consideration (i.e. {@linkcode https://bulbapedia.bulbagarden.net/wiki/Thunder_Wave_(move) | Thunder Wave})
+ * @extends MoveAttr
+ */
+export class RespectAttackTypeImmunityAttr extends MoveAttr { }
 
 export class IgnoreOpponentStatChangesAttr extends MoveAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
@@ -1850,19 +1858,11 @@ export class MultiHitAttr extends MoveAttr {
    * @returns True
    */
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    let hitTimes: integer;
+    const hitType = new Utils.NumberHolder(this.multiHitType);
+    applyMoveAttrs(ChangeMultiHitTypeAttr, user, target, move, hitType);
+    this.multiHitType = hitType.value;
 
-    if (target.getAttackMoveEffectiveness(user, new PokemonMove(move.id)) === 0) {
-      // If there is a type immunity, the attack will stop no matter what
-      hitTimes = 1;
-    } else {
-      const hitType = new Utils.IntegerHolder(this.multiHitType);
-      applyMoveAttrs(ChangeMultiHitTypeAttr, user, target, move, hitType);
-      this.multiHitType = hitType.value;
-      hitTimes = this.getHitCount(user, target);
-    }
-
-    (args[0] as Utils.IntegerHolder).value = hitTimes;
+    (args[0] as Utils.NumberHolder).value = this.getHitCount(user, target);
     return true;
   }
 
@@ -3761,7 +3761,7 @@ export class VariableMoveCategoryAttr extends MoveAttr {
 
 export class PhotonGeyserCategoryAttr extends VariableMoveCategoryAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    const category = (args[0] as Utils.IntegerHolder);
+    const category = (args[0] as Utils.NumberHolder);
 
     if (user.getBattleStat(Stat.ATK, target, move) > user.getBattleStat(Stat.SPATK, target, move)) {
       category.value = MoveCategory.PHYSICAL;
@@ -3774,7 +3774,7 @@ export class PhotonGeyserCategoryAttr extends VariableMoveCategoryAttr {
 
 export class TeraBlastCategoryAttr extends VariableMoveCategoryAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    const category = (args[0] as Utils.IntegerHolder);
+    const category = (args[0] as Utils.NumberHolder);
 
     if (user.isTerastallized() && user.getBattleStat(Stat.ATK, target, move) > user.getBattleStat(Stat.SPATK, target, move)) {
       category.value = MoveCategory.PHYSICAL;
@@ -3790,18 +3790,21 @@ export class TeraBlastCategoryAttr extends VariableMoveCategoryAttr {
  * @extends VariablePowerAttr
  */
 export class TeraBlastPowerAttr extends VariablePowerAttr {
-  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
   /**
-   * @param user {@linkcode Pokemon} Pokemon using the move
-   * @param target {@linkcode Pokemon} N/A
-   * @param move {@linkcode Move} {@linkcode Move.TERA_BLAST}
-   * @param {any[]} args N/A
-   * @returns true or false
+   * Sets Tera Blast's power to 100 if the user is terastallized with
+   * the Stellar tera type.
+   * @param user {@linkcode Pokemon} the Pokemon using this move
+   * @param target n/a
+   * @param move {@linkcode Move} the Move with this attribute (i.e. Tera Blast)
+   * @param args
+   *   - [0] {@linkcode Utils.NumberHolder} the applied move's power, factoring in
+   *       previously applied power modifiers.
+   * @returns
    */
+  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     const power = args[0] as Utils.NumberHolder;
-    if (user.isTerastallized() && move.type === Type.STELLAR) {
-      //200 instead of 100 to reflect lack of stellar being 2x dmg on any type
-      power.value = 200;
+    if (user.isTerastallized() && user.getTeraType() === Type.STELLAR) {
+      power.value = 100;
       return true;
     }
 
@@ -3861,10 +3864,15 @@ export class VariableMoveTypeAttr extends MoveAttr {
 
 export class FormChangeItemTypeAttr extends VariableMoveTypeAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    const moveType = args[0];
+    if (!(moveType instanceof Utils.NumberHolder)) {
+      return false;
+    }
+
     if ([user.species.speciesId, user.fusionSpecies?.speciesId].includes(Species.ARCEUS) || [user.species.speciesId, user.fusionSpecies?.speciesId].includes(Species.SILVALLY)) {
       const form = user.species.speciesId === Species.ARCEUS || user.species.speciesId === Species.SILVALLY ? user.formIndex : user.fusionSpecies?.formIndex!; // TODO: is this bang correct?
 
-      move.type = Type[Type[form]];
+      moveType.value = Type[Type[form]];
       return true;
     }
 
@@ -3874,24 +3882,29 @@ export class FormChangeItemTypeAttr extends VariableMoveTypeAttr {
 
 export class TechnoBlastTypeAttr extends VariableMoveTypeAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    const moveType = args[0];
+    if (!(moveType instanceof Utils.NumberHolder)) {
+      return false;
+    }
+
     if ([user.species.speciesId, user.fusionSpecies?.speciesId].includes(Species.GENESECT)) {
       const form = user.species.speciesId === Species.GENESECT ? user.formIndex : user.fusionSpecies?.formIndex;
 
       switch (form) {
       case 1: // Shock Drive
-        move.type = Type.ELECTRIC;
+        moveType.value = Type.ELECTRIC;
         break;
       case 2: // Burn Drive
-        move.type = Type.FIRE;
+        moveType.value = Type.FIRE;
         break;
       case 3: // Chill Drive
-        move.type = Type.ICE;
+        moveType.value = Type.ICE;
         break;
       case 4: // Douse Drive
-        move.type = Type.WATER;
+        moveType.value = Type.WATER;
         break;
       default:
-        move.type = Type.NORMAL;
+        moveType.value = Type.NORMAL;
         break;
       }
       return true;
@@ -3903,15 +3916,20 @@ export class TechnoBlastTypeAttr extends VariableMoveTypeAttr {
 
 export class AuraWheelTypeAttr extends VariableMoveTypeAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    const moveType = args[0];
+    if (!(moveType instanceof Utils.NumberHolder)) {
+      return false;
+    }
+
     if ([user.species.speciesId, user.fusionSpecies?.speciesId].includes(Species.MORPEKO)) {
       const form = user.species.speciesId === Species.MORPEKO ? user.formIndex : user.fusionSpecies?.formIndex;
 
       switch (form) {
       case 1: // Hangry Mode
-        move.type = Type.DARK;
+        moveType.value = Type.DARK;
         break;
       default: // Full Belly Mode
-        move.type = Type.ELECTRIC;
+        moveType.value = Type.ELECTRIC;
         break;
       }
       return true;
@@ -3923,18 +3941,23 @@ export class AuraWheelTypeAttr extends VariableMoveTypeAttr {
 
 export class RagingBullTypeAttr extends VariableMoveTypeAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    const moveType = args[0];
+    if (!(moveType instanceof Utils.NumberHolder)) {
+      return false;
+    }
+
     if ([user.species.speciesId, user.fusionSpecies?.speciesId].includes(Species.PALDEA_TAUROS)) {
       const form = user.species.speciesId === Species.PALDEA_TAUROS ? user.formIndex : user.fusionSpecies?.formIndex;
 
       switch (form) {
       case 1: // Blaze breed
-        move.type = Type.FIRE;
+        moveType.value = Type.FIRE;
         break;
       case 2: // Aqua breed
-        move.type = Type.WATER;
+        moveType.value = Type.WATER;
         break;
       default:
-        move.type = Type.FIGHTING;
+        moveType.value = Type.FIGHTING;
         break;
       }
       return true;
@@ -3946,25 +3969,30 @@ export class RagingBullTypeAttr extends VariableMoveTypeAttr {
 
 export class IvyCudgelTypeAttr extends VariableMoveTypeAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    const moveType = args[0];
+    if (!(moveType instanceof Utils.NumberHolder)) {
+      return false;
+    }
+
     if ([user.species.speciesId, user.fusionSpecies?.speciesId].includes(Species.OGERPON)) {
       const form = user.species.speciesId === Species.OGERPON ? user.formIndex : user.fusionSpecies?.formIndex;
 
       switch (form) {
       case 1: // Wellspring Mask
       case 5: // Wellspring Mask Tera
-        move.type = Type.WATER;
+        moveType.value = Type.WATER;
         break;
       case 2: // Hearthflame Mask
       case 6: // Hearthflame Mask Tera
-        move.type = Type.FIRE;
+        moveType.value = Type.FIRE;
         break;
       case 3: // Cornerstone Mask
       case 7: // Cornerstone Mask Tera
-        move.type = Type.ROCK;
+        moveType.value = Type.ROCK;
         break;
       case 4: // Teal Mask Tera
       default:
-        move.type = Type.GRASS;
+        moveType.value = Type.GRASS;
         break;
       }
       return true;
@@ -3976,22 +4004,27 @@ export class IvyCudgelTypeAttr extends VariableMoveTypeAttr {
 
 export class WeatherBallTypeAttr extends VariableMoveTypeAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    const moveType = args[0];
+    if (!(moveType instanceof Utils.NumberHolder)) {
+      return false;
+    }
+
     if (!user.scene.arena.weather?.isEffectSuppressed(user.scene)) {
       switch (user.scene.arena.weather?.weatherType) {
       case WeatherType.SUNNY:
       case WeatherType.HARSH_SUN:
-        move.type = Type.FIRE;
+        moveType.value = Type.FIRE;
         break;
       case WeatherType.RAIN:
       case WeatherType.HEAVY_RAIN:
-        move.type = Type.WATER;
+        moveType.value = Type.WATER;
         break;
       case WeatherType.SANDSTORM:
-        move.type = Type.ROCK;
+        moveType.value = Type.ROCK;
         break;
       case WeatherType.HAIL:
       case WeatherType.SNOW:
-        move.type = Type.ICE;
+        moveType.value = Type.ICE;
         break;
       default:
         return false;
@@ -4014,10 +4047,15 @@ export class TerrainPulseTypeAttr extends VariableMoveTypeAttr {
    * @param user {@linkcode Pokemon} using this move
    * @param target N/A
    * @param move N/A
-   * @param args [0] {@linkcode Utils.IntegerHolder} The move's type to be modified
+   * @param args [0] {@linkcode Utils.NumberHolder} The move's type to be modified
    * @returns true if the function succeeds
    */
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    const moveType = args[0];
+    if (!(moveType instanceof Utils.NumberHolder)) {
+      return false;
+    }
+
     if (!user.isGrounded()) {
       return false;
     }
@@ -4025,16 +4063,16 @@ export class TerrainPulseTypeAttr extends VariableMoveTypeAttr {
     const currentTerrain = user.scene.arena.getTerrainType();
     switch (currentTerrain) {
     case TerrainType.MISTY:
-      move.type = Type.FAIRY;
+      moveType.value = Type.FAIRY;
       break;
     case TerrainType.ELECTRIC:
-      move.type = Type.ELECTRIC;
+      moveType.value = Type.ELECTRIC;
       break;
     case TerrainType.GRASSY:
-      move.type = Type.GRASS;
+      moveType.value = Type.GRASS;
       break;
     case TerrainType.PSYCHIC:
-      move.type = Type.PSYCHIC;
+      moveType.value = Type.PSYCHIC;
       break;
     default:
       return false;
@@ -4043,8 +4081,17 @@ export class TerrainPulseTypeAttr extends VariableMoveTypeAttr {
   }
 }
 
+/**
+ * Changes type based on the user's IVs
+ * @extends VariableMoveTypeAttr
+ */
 export class HiddenPowerTypeAttr extends VariableMoveTypeAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    const moveType = args[0];
+    if (!(moveType instanceof Utils.NumberHolder)) {
+      return false;
+    }
+
     const iv_val = Math.floor(((user.ivs[Stat.HP] & 1)
       +(user.ivs[Stat.ATK] & 1) * 2
       +(user.ivs[Stat.DEF] & 1) * 4
@@ -4052,7 +4099,7 @@ export class HiddenPowerTypeAttr extends VariableMoveTypeAttr {
       +(user.ivs[Stat.SPATK] & 1) * 16
       +(user.ivs[Stat.SPDEF] & 1) * 32) * 15/63);
 
-    move.type = [
+    moveType.value = [
       Type.FIGHTING, Type.FLYING, Type.POISON, Type.GROUND,
       Type.ROCK, Type.BUG, Type.GHOST, Type.STEEL,
       Type.FIRE, Type.WATER, Type.GRASS, Type.ELECTRIC,
@@ -4067,16 +4114,21 @@ export class HiddenPowerTypeAttr extends VariableMoveTypeAttr {
  * @extends VariableMoveTypeAttr
  */
 export class TeraBlastTypeAttr extends VariableMoveTypeAttr {
-  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
   /**
-   * @param user {@linkcode Pokemon} the user's type is checked
+   * @param user {@linkcode Pokemon} the user of the move
    * @param target {@linkcode Pokemon} N/A
-   * @param move {@linkcode Move} {@linkcode Move.TeraBlastTypeAttr}
-   * @param {any[]} args N/A
-   * @returns true or false
+   * @param move {@linkcode Move} the move with this attribute
+   * @param args `[0]` the move's type to be modified
+   * @returns `true` if the move's type was modified; `false` otherwise
    */
+  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    const moveType = args[0];
+    if (!(moveType instanceof Utils.NumberHolder)) {
+      return false;
+    }
+
     if (user.isTerastallized()) {
-      move.type = user.getTeraType(); //changes move type to tera type
+      moveType.value = user.getTeraType(); // changes move type to tera type
       return true;
     }
 
@@ -4086,14 +4138,18 @@ export class TeraBlastTypeAttr extends VariableMoveTypeAttr {
 
 export class MatchUserTypeAttr extends VariableMoveTypeAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    const moveType = args[0];
+    if (!(moveType instanceof Utils.NumberHolder)) {
+      return false;
+    }
     const userTypes = user.getTypes(true);
 
     if (userTypes.includes(Type.STELLAR)) { // will not change to stellar type
       const nonTeraTypes = user.getTypes();
-      move.type = nonTeraTypes[0];
+      moveType.value = nonTeraTypes[0];
       return true;
     } else if (userTypes.length > 0) {
-      move.type = userTypes[0];
+      moveType.value = userTypes[0];
       return true;
     } else {
       return false;
@@ -4112,8 +4168,8 @@ export class NeutralDamageAgainstFlyingTypeMultiplierAttr extends VariableMoveTy
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     if (!target.getTag(BattlerTagType.IGNORE_FLYING)) {
       const multiplier = args[0] as Utils.NumberHolder;
-      //When a flying type is hit, the first hit is always 1x multiplier. Levitating pokemon are instantly affected by typing
-      if (target.isOfType(Type.FLYING) || target.hasAbility(Abilities.LEVITATE)) {
+      //When a flying type is hit, the first hit is always 1x multiplier.
+      if (target.isOfType(Type.FLYING)) {
         multiplier.value = 1;
       }
       return true;
@@ -4127,8 +4183,12 @@ export class WaterSuperEffectTypeMultiplierAttr extends VariableMoveTypeMultipli
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     const multiplier = args[0] as Utils.NumberHolder;
     if (target.isOfType(Type.WATER)) {
-      multiplier.value *= 4; // Increased twice because initial reduction against water
-      return true;
+      const effectivenessAgainstWater = new Utils.NumberHolder(getTypeDamageMultiplier(move.type, Type.WATER));
+      applyChallenges(user.scene.gameMode, ChallengeType.TYPE_EFFECTIVENESS, effectivenessAgainstWater);
+      if (effectivenessAgainstWater.value !== 0) {
+        multiplier.value *= 2 / effectivenessAgainstWater.value;
+        return true;
+      }
     }
 
     return false;
@@ -5739,7 +5799,10 @@ export class AbilityChangeAttr extends MoveEffectAttr {
       return false;
     }
 
-    (this.selfTarget ? user : target).summonData.ability = this.ability;
+    const moveTarget = this.selfTarget ? user : target;
+
+    moveTarget.summonData.ability = this.ability;
+    user.scene.triggerPokemonFormChange(moveTarget, SpeciesFormChangeRevertWeatherFormTrigger);
 
     user.scene.queueMessage(i18next.t("moveTriggers:acquiredAbility", {pokemonName: getPokemonNameWithAffix((this.selfTarget ? user : target)), abilityName: allAbilities[this.ability].name}));
 
@@ -5825,6 +5888,10 @@ export class SwitchAbilitiesAttr extends MoveEffectAttr {
     target.summonData.ability = tempAbilityId;
 
     user.scene.queueMessage(i18next.t("moveTriggers:swappedAbilitiesWithTarget", {pokemonName: getPokemonNameWithAffix(user)}));
+    // Swaps Forecast from Castform
+    user.scene.arena.triggerWeatherBasedFormChangesToNormal();
+    // Swaps Forecast to Castform (edge case)
+    user.scene.arena.triggerWeatherBasedFormChanges();
 
     return true;
   }
@@ -5850,6 +5917,7 @@ export class SuppressAbilitiesAttr extends MoveEffectAttr {
     }
 
     target.summonData.abilitySuppressed = true;
+    target.scene.arena.triggerWeatherBasedFormChangesToNormal();
 
     target.scene.queueMessage(i18next.t("moveTriggers:suppressAbilities", {pokemonName: getPokemonNameWithAffix(target)}));
 
@@ -6142,7 +6210,7 @@ export class ResistLastMoveTypeAttr extends MoveEffectAttr {
       return false;
     }
     const userTypes = user.getTypes();
-    const validTypes = getTypeResistances(moveData.type).filter(t => !userTypes.includes(t)); // valid types are ones that are not already the user's types
+    const validTypes = this.getTypeResistances(user.scene.gameMode, moveData.type).filter(t => !userTypes.includes(t)); // valid types are ones that are not already the user's types
     if (!validTypes.length) {
       return false;
     }
@@ -6154,6 +6222,25 @@ export class ResistLastMoveTypeAttr extends MoveEffectAttr {
     return true;
   }
 
+  /**
+   * Retrieve the types resisting a given type. Used by Conversion 2
+   * @returns An array populated with Types, or an empty array if no resistances exist (Unknown or Stellar type)
+   */
+  getTypeResistances(gameMode: GameMode, type: number): Type[] {
+    const typeResistances: Type[] = [];
+
+    for (let i = 0; i < Object.keys(Type).length; i++) {
+      const multiplier = new NumberHolder(1);
+      multiplier.value = getTypeDamageMultiplier(type, i);
+      applyChallenges(gameMode, ChallengeType.TYPE_EFFECTIVENESS, multiplier);
+      if (multiplier.value < 1) {
+        typeResistances.push(i);
+      }
+    }
+
+    return typeResistances;
+  }
+
   getCondition(): MoveConditionFunc {
     return (user, target, move) => {
       const moveHistory = target.getLastXMoves();
@@ -6496,7 +6583,7 @@ export function initMoves() {
       .attr(StatusEffectAttr, StatusEffect.PARALYSIS),
     new StatusMove(Moves.THUNDER_WAVE, Type.ELECTRIC, 90, 20, -1, 0, 1)
       .attr(StatusEffectAttr, StatusEffect.PARALYSIS)
-      .attr(StatusMoveTypeImmunityAttr, Type.GROUND),
+      .attr(RespectAttackTypeImmunityAttr),
     new AttackMove(Moves.THUNDER, Type.ELECTRIC, MoveCategory.SPECIAL, 110, 70, 10, 30, 0, 1)
       .attr(StatusEffectAttr, StatusEffect.PARALYSIS)
       .attr(ThunderAccuracyAttr)
@@ -6793,7 +6880,16 @@ export function initMoves() {
       .attr(ExposedMoveAttr, BattlerTagType.IGNORE_GHOST),
     new SelfStatusMove(Moves.DESTINY_BOND, Type.GHOST, -1, 5, -1, 0, 2)
       .ignoresProtect()
-      .attr(DestinyBondAttr),
+      .attr(DestinyBondAttr)
+      .condition((user, target, move) => {
+        // Retrieves user's previous move, returns empty array if no moves have been used
+        const lastTurnMove = user.getLastXMoves(1);
+        // Checks last move and allows destiny bond to be used if:
+        // - no previous moves have been made
+        // - the previous move used was not destiny bond
+        // - the previous move was unsuccessful
+        return lastTurnMove.length === 0 || lastTurnMove[0].move !== move.id || lastTurnMove[0].result !== MoveResult.SUCCESS;
+      }),
     new StatusMove(Moves.PERISH_SONG, Type.NORMAL, -1, 5, -1, 0, 2)
       .attr(FaintCountdownAttr)
       .ignoresProtect()
@@ -7870,7 +7966,8 @@ export function initMoves() {
       .target(MoveTarget.ALL_NEAR_OTHERS),
     new AttackMove(Moves.FREEZE_DRY, Type.ICE, MoveCategory.SPECIAL, 70, 100, 20, 10, 0, 6)
       .attr(StatusEffectAttr, StatusEffect.FREEZE)
-      .attr(WaterSuperEffectTypeMultiplierAttr),
+      .attr(WaterSuperEffectTypeMultiplierAttr)
+      .partial(), // This currently just multiplies the move's power instead of changing its effectiveness. It also doesn't account for abilities that modify type effectiveness such as tera shell.
     new AttackMove(Moves.DISARMING_VOICE, Type.FAIRY, MoveCategory.SPECIAL, 40, -1, 15, -1, 0, 6)
       .soundBased()
       .target(MoveTarget.ALL_NEAR_ENEMIES),
@@ -8336,8 +8433,8 @@ export function initMoves() {
       .partial()
       .ignoresVirtual(),
     /* End Unused */
-    new AttackMove(Moves.ZIPPY_ZAP, Type.ELECTRIC, MoveCategory.PHYSICAL, 80, 100, 10, 100, 2, 7)
-      .attr(StatChangeAttr, BattleStat.EVA, 1, true),
+    new AttackMove(Moves.ZIPPY_ZAP, Type.ELECTRIC, MoveCategory.PHYSICAL, 50, 100, 15, 100, 2, 7) //LGPE Implementation
+      .attr(CritOnlyAttr),
     new AttackMove(Moves.SPLISHY_SPLASH, Type.WATER, MoveCategory.SPECIAL, 90, 100, 15, 30, 0, 7)
       .attr(StatusEffectAttr, StatusEffect.PARALYSIS)
       .target(MoveTarget.ALL_NEAR_ENEMIES),
@@ -8509,7 +8606,8 @@ export function initMoves() {
     new AttackMove(Moves.BODY_PRESS, Type.FIGHTING, MoveCategory.PHYSICAL, 80, 100, 10, -1, 0, 8)
       .attr(DefAtkAttr),
     new StatusMove(Moves.DECORATE, Type.FAIRY, -1, 15, -1, 0, 8)
-      .attr(StatChangeAttr, [ BattleStat.ATK, BattleStat.SPATK ], 2),
+      .attr(StatChangeAttr, [ BattleStat.ATK, BattleStat.SPATK ], 2)
+      .ignoresProtect(),
     new AttackMove(Moves.DRUM_BEATING, Type.GRASS, MoveCategory.PHYSICAL, 80, 100, 10, 100, 0, 8)
       .attr(StatChangeAttr, BattleStat.SPD, -1)
       .makesContact(false),
@@ -8623,7 +8721,6 @@ export function initMoves() {
       .attr(StatusEffectAttr, StatusEffect.BURN),
     new StatusMove(Moves.JUNGLE_HEALING, Type.GRASS, -1, 10, -1, 0, 8)
       .attr(HealAttr, 0.25, true, false)
-      .attr(HealStatusEffectAttr, true, StatusEffect.PARALYSIS, StatusEffect.POISON, StatusEffect.TOXIC, StatusEffect.BURN, StatusEffect.SLEEP)
       .attr(HealStatusEffectAttr, false, StatusEffect.PARALYSIS, StatusEffect.POISON, StatusEffect.TOXIC, StatusEffect.BURN, StatusEffect.SLEEP)
       .target(MoveTarget.USER_AND_ALLIES),
     new AttackMove(Moves.WICKED_BLOW, Type.DARK, MoveCategory.PHYSICAL, 75, 100, 5, -1, 0, 8)
@@ -8727,8 +8824,7 @@ export function initMoves() {
       .windMove()
       .target(MoveTarget.ALL_NEAR_ENEMIES),
     new StatusMove(Moves.LUNAR_BLESSING, Type.PSYCHIC, -1, 5, -1, 0, 8)
-      .attr(HealAttr, 0.25)
-      .attr(HealStatusEffectAttr, true, StatusEffect.PARALYSIS, StatusEffect.POISON, StatusEffect.TOXIC, StatusEffect.BURN, StatusEffect.SLEEP)
+      .attr(HealAttr, 0.25, true, false)
       .attr(HealStatusEffectAttr, false, StatusEffect.PARALYSIS, StatusEffect.POISON, StatusEffect.TOXIC, StatusEffect.BURN, StatusEffect.SLEEP)
       .target(MoveTarget.USER_AND_ALLIES)
       .triageMove(),
diff --git a/src/data/pokeball.ts b/src/data/pokeball.ts
index f26451b802b..59ff4ed86ce 100644
--- a/src/data/pokeball.ts
+++ b/src/data/pokeball.ts
@@ -95,7 +95,7 @@ export function doPokeballBounceAnim(scene: BattleScene, pokeball: Phaser.GameOb
       duration: bouncePower * baseBounceDuration,
       ease: "Cubic.easeIn",
       onComplete: () => {
-        scene.playSound("pb_bounce_1", { volume: bouncePower });
+        scene.playSound("se/pb_bounce_1", { volume: bouncePower });
 
         bouncePower = bouncePower > 0.01 ? bouncePower * 0.5 : 0;
 
diff --git a/src/data/pokemon-evolutions.ts b/src/data/pokemon-evolutions.ts
index 0c91263f1f3..315e75e53e1 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-forms.ts b/src/data/pokemon-forms.ts
index 95a89c7c640..e4417f8e8bb 100644
--- a/src/data/pokemon-forms.ts
+++ b/src/data/pokemon-forms.ts
@@ -10,6 +10,7 @@ import { Species } from "#enums/species";
 import { TimeOfDay } from "#enums/time-of-day";
 import { getPokemonNameWithAffix } from "#app/messages.js";
 import i18next from "i18next";
+import { WeatherType } from "./weather";
 
 export enum FormChangeItem {
   NONE,
@@ -356,6 +357,78 @@ export class SpeciesDefaultFormMatchTrigger extends SpeciesFormChangeTrigger {
   }
 }
 
+/**
+ * Class used for triggering form changes based on weather.
+ * Used by Castform.
+ * @extends SpeciesFormChangeTrigger
+ */
+export class SpeciesFormChangeWeatherTrigger extends SpeciesFormChangeTrigger {
+  /** The ability that  triggers the form change */
+  public ability: Abilities;
+  /** The list of weathers that trigger the form change */
+  public weathers: WeatherType[];
+
+  constructor(ability: Abilities, weathers: WeatherType[]) {
+    super();
+    this.ability = ability;
+    this.weathers = weathers;
+  }
+
+  /**
+   * Checks if the Pokemon has the required ability and is in the correct weather while
+   * the weather or ability is also not suppressed.
+   * @param {Pokemon} pokemon the pokemon that is trying to do the form change
+   * @returns `true` if the Pokemon can change forms, `false` otherwise
+   */
+  canChange(pokemon: Pokemon): boolean {
+    const currentWeather = pokemon.scene.arena.weather?.weatherType ?? WeatherType.NONE;
+    const isWeatherSuppressed = pokemon.scene.arena.weather?.isEffectSuppressed(pokemon.scene);
+    const isAbilitySuppressed = pokemon.summonData.abilitySuppressed;
+
+    return !isAbilitySuppressed && !isWeatherSuppressed && (pokemon.hasAbility(this.ability) && this.weathers.includes(currentWeather));
+  }
+}
+
+/**
+ * Class used for reverting to the original form when the weather runs out
+ * or when the user loses the ability/is suppressed.
+ * Used by Castform.
+ * @extends SpeciesFormChangeTrigger
+ */
+export class SpeciesFormChangeRevertWeatherFormTrigger extends SpeciesFormChangeTrigger {
+  /** The ability that triggers the form change*/
+  public ability: Abilities;
+  /** The list of weathers that will also trigger a form change to original form */
+  public weathers: WeatherType[];
+
+  constructor(ability: Abilities, weathers: WeatherType[]) {
+    super();
+    this.ability = ability;
+    this.weathers = weathers;
+  }
+
+  /**
+   * Checks if the Pokemon has the required ability and the weather is one that will revert
+   * the Pokemon to its original form or the weather or ability is suppressed
+   * @param {Pokemon} pokemon the pokemon that is trying to do the form change
+   * @returns `true` if the Pokemon will revert to its original form, `false` otherwise
+   */
+  canChange(pokemon: Pokemon): boolean {
+    if (pokemon.hasAbility(this.ability, false, true)) {
+      const currentWeather = pokemon.scene.arena.weather?.weatherType ?? WeatherType.NONE;
+      const isWeatherSuppressed = pokemon.scene.arena.weather?.isEffectSuppressed(pokemon.scene);
+      const isAbilitySuppressed = pokemon.summonData.abilitySuppressed;
+      const summonDataAbility = pokemon.summonData.ability;
+      const isAbilityChanged = summonDataAbility !== this.ability && summonDataAbility !== Abilities.NONE;
+
+      if (this.weathers.includes(currentWeather) || isWeatherSuppressed || isAbilitySuppressed || isAbilityChanged) {
+        return true;
+      }
+    }
+    return false;
+  }
+}
+
 export function getSpeciesFormChangeMessage(pokemon: Pokemon, formChange: SpeciesFormChange, preName: string): string {
   const isMega = formChange.formKey.indexOf(SpeciesFormKey.MEGA) > -1;
   const isGmax = formChange.formKey.indexOf(SpeciesFormKey.GIGANTAMAX) > -1;
@@ -839,7 +912,24 @@ export const pokemonFormChanges: PokemonFormChanges = {
     new SpeciesFormChange(Species.CRAMORANT, "gorging", "", new SpeciesFormChangeManualTrigger, true),
     new SpeciesFormChange(Species.CRAMORANT, "gulping", "", new SpeciesFormChangeActiveTrigger(false), true),
     new SpeciesFormChange(Species.CRAMORANT, "gorging", "", new SpeciesFormChangeActiveTrigger(false), true),
-  ]
+  ],
+  [Species.CASTFORM]: [
+    new SpeciesFormChange(Species.CASTFORM, "", "sunny", new SpeciesFormChangeWeatherTrigger(Abilities.FORECAST, [WeatherType.SUNNY, WeatherType.HARSH_SUN]), true),
+    new SpeciesFormChange(Species.CASTFORM, "rainy", "sunny", new SpeciesFormChangeWeatherTrigger(Abilities.FORECAST, [WeatherType.SUNNY, WeatherType.HARSH_SUN]), true),
+    new SpeciesFormChange(Species.CASTFORM, "snowy", "sunny", new SpeciesFormChangeWeatherTrigger(Abilities.FORECAST, [WeatherType.SUNNY, WeatherType.HARSH_SUN]), true),
+    new SpeciesFormChange(Species.CASTFORM, "", "rainy", new SpeciesFormChangeWeatherTrigger(Abilities.FORECAST, [WeatherType.RAIN, WeatherType.HEAVY_RAIN]), true),
+    new SpeciesFormChange(Species.CASTFORM, "sunny", "rainy", new SpeciesFormChangeWeatherTrigger(Abilities.FORECAST, [WeatherType.RAIN, WeatherType.HEAVY_RAIN]), true),
+    new SpeciesFormChange(Species.CASTFORM, "snowy", "rainy", new SpeciesFormChangeWeatherTrigger(Abilities.FORECAST, [WeatherType.RAIN, WeatherType.HEAVY_RAIN]), true),
+    new SpeciesFormChange(Species.CASTFORM, "", "snowy", new SpeciesFormChangeWeatherTrigger(Abilities.FORECAST, [WeatherType.HAIL, WeatherType.SNOW]), true),
+    new SpeciesFormChange(Species.CASTFORM, "sunny", "snowy", new SpeciesFormChangeWeatherTrigger(Abilities.FORECAST, [WeatherType.HAIL, WeatherType.SNOW]), true),
+    new SpeciesFormChange(Species.CASTFORM, "rainy", "snowy", new SpeciesFormChangeWeatherTrigger(Abilities.FORECAST, [WeatherType.HAIL, WeatherType.SNOW]), true),
+    new SpeciesFormChange(Species.CASTFORM, "sunny", "", new SpeciesFormChangeRevertWeatherFormTrigger(Abilities.FORECAST, [WeatherType.NONE, WeatherType.SANDSTORM, WeatherType.STRONG_WINDS, WeatherType.FOG]), true),
+    new SpeciesFormChange(Species.CASTFORM, "rainy", "", new SpeciesFormChangeRevertWeatherFormTrigger(Abilities.FORECAST, [WeatherType.NONE, WeatherType.SANDSTORM, WeatherType.STRONG_WINDS, WeatherType.FOG]), true),
+    new SpeciesFormChange(Species.CASTFORM, "snowy", "", new SpeciesFormChangeRevertWeatherFormTrigger(Abilities.FORECAST, [WeatherType.NONE, WeatherType.SANDSTORM, WeatherType.STRONG_WINDS, WeatherType.FOG]), true),
+    new SpeciesFormChange(Species.CASTFORM, "sunny", "", new SpeciesFormChangeActiveTrigger(), true),
+    new SpeciesFormChange(Species.CASTFORM, "rainy", "", new SpeciesFormChangeActiveTrigger(), true),
+    new SpeciesFormChange(Species.CASTFORM, "snowy", "", new SpeciesFormChangeActiveTrigger(), true),
+  ],
 };
 
 export function initPokemonForms() {
diff --git a/src/data/pokemon-level-moves.ts b/src/data/pokemon-level-moves.ts
index 9e8c7053334..93bd57ae32c 100644
--- a/src/data/pokemon-level-moves.ts
+++ b/src/data/pokemon-level-moves.ts
@@ -18800,6 +18800,85 @@ export const pokemonFormLevelMoves: PokemonSpeciesFormLevelMoves = {
       [ 44, Moves.THUNDER ],
       [ 48, Moves.PIKA_PAPOW ],
     ],
+    8: [
+      [ 1, Moves.TAIL_WHIP ],
+      [ 1, Moves.GROWL ],
+      [ 1, Moves.THUNDER_SHOCK ],
+      [ 1, Moves.QUICK_ATTACK ],
+      [ 1, Moves.SWEET_KISS ],
+      [ 1, Moves.CHARM ],
+      [ 1, Moves.NASTY_PLOT ],
+      [ 1, Moves.PLAY_NICE ],
+      [ 1, Moves.NUZZLE ],
+      [ 4, Moves.THUNDER_WAVE ],
+      [ 8, Moves.DOUBLE_TEAM ],
+      [ 12, Moves.ELECTRO_BALL ],
+      [ 16, Moves.FEINT ],
+      [ 20, Moves.ZIPPY_ZAP ], //Custom
+      [ 24, Moves.AGILITY ],
+      [ 28, Moves.IRON_TAIL ],
+      [ 32, Moves.DISCHARGE ],
+      [ 34, Moves.FLOATY_FALL ], //Custom
+      [ 36, Moves.THUNDERBOLT ],
+      [ 40, Moves.LIGHT_SCREEN ],
+      [ 42, Moves.SPLISHY_SPLASH ], //Custom
+      [ 44, Moves.THUNDER ],
+      [ 48, Moves.PIKA_PAPOW ],
+    ],
+  },
+  [Species.EEVEE]: { //Custom
+    1: [
+      [ 1, Moves.TACKLE ],
+      [ 1, Moves.TAIL_WHIP ],
+      [ 1, Moves.GROWL ],
+      [ 1, Moves.HELPING_HAND ],
+      [ 1, Moves.COVET ],
+      [ 5, Moves.SAND_ATTACK ],
+      [ 10, Moves.QUICK_ATTACK ],
+      [ 15, Moves.BABY_DOLL_EYES ],
+      [ 18, Moves.BOUNCY_BUBBLE ], //Custom
+      [ 18, Moves.SIZZLY_SLIDE ], //Custom
+      [ 18, Moves.BUZZY_BUZZ ], //Custom
+      [ 20, Moves.SWIFT ],
+      [ 25, Moves.BITE ],
+      [ 30, Moves.COPYCAT ],
+      [ 33, Moves.BADDY_BAD ], //Custom
+      [ 33, Moves.GLITZY_GLOW ], //Custom
+      [ 35, Moves.BATON_PASS ],
+      [ 40, Moves.VEEVEE_VOLLEY ], //Custom, replaces Take Down
+      [ 43, Moves.FREEZY_FROST ], //Custom
+      [ 43, Moves.SAPPY_SEED ], //Custom
+      [ 45, Moves.CHARM ],
+      [ 50, Moves.DOUBLE_EDGE ],
+      [ 53, Moves.SPARKLY_SWIRL ], //Custom
+      [ 55, Moves.LAST_RESORT ],
+    ],
+    2: [
+      [ 1, Moves.TACKLE ],
+      [ 1, Moves.TAIL_WHIP ],
+      [ 1, Moves.GROWL ],
+      [ 1, Moves.HELPING_HAND ],
+      [ 1, Moves.COVET ],
+      [ 5, Moves.SAND_ATTACK ],
+      [ 10, Moves.QUICK_ATTACK ],
+      [ 15, Moves.BABY_DOLL_EYES ],
+      [ 18, Moves.BOUNCY_BUBBLE ], //Custom
+      [ 18, Moves.SIZZLY_SLIDE ], //Custom
+      [ 18, Moves.BUZZY_BUZZ ], //Custom
+      [ 20, Moves.SWIFT ],
+      [ 25, Moves.BITE ],
+      [ 30, Moves.COPYCAT ],
+      [ 33, Moves.BADDY_BAD ], //Custom
+      [ 33, Moves.GLITZY_GLOW ], //Custom
+      [ 35, Moves.BATON_PASS ],
+      [ 40, Moves.VEEVEE_VOLLEY ], //Custom, replaces Take Down
+      [ 43, Moves.FREEZY_FROST ], //Custom
+      [ 43, Moves.SAPPY_SEED ], //Custom
+      [ 45, Moves.CHARM ],
+      [ 50, Moves.DOUBLE_EDGE ],
+      [ 53, Moves.SPARKLY_SWIRL ], //Custom
+      [ 55, Moves.LAST_RESORT ],
+    ],
   },
   [Species.DEOXYS]: {
     1: [
diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts
index a9958c200ed..db601935bfc 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 "./pokemon-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
@@ -301,7 +306,7 @@ export abstract class PokemonSpeciesForm {
     let variantDataIndex: integer | string = this.speciesId;
     const species = getPokemonSpecies(this.speciesId);
     if (species.forms.length > 0 && formIndex !== undefined) {
-      formkey = species.forms[formIndex]?.formSpriteKey;
+      formkey = species.forms[formIndex]?.getFormSpriteKey(formIndex);
       if (formkey) {
         variantDataIndex = `${this.speciesId}-${formkey}`;
       }
@@ -455,7 +460,7 @@ export abstract class PokemonSpeciesForm {
     return new Promise(resolve => {
       const spriteKey = this.getSpriteKey(female, formIndex, shiny, variant);
       scene.loadPokemonAtlas(spriteKey, this.getSpriteAtlasPath(female, formIndex, shiny, variant));
-      scene.load.audio(this.getCryKey(formIndex), `audio/cry/${this.getCryKey(formIndex)}.m4a`);
+      scene.load.audio(`cry/${this.getCryKey(formIndex)}`, `audio/cry/${this.getCryKey(formIndex)}.m4a`);
       scene.load.once(Phaser.Loader.Events.COMPLETE, () => {
         const originalWarn = console.warn;
         // Ignore warnings for missing frames, because there will be a lot
@@ -511,7 +516,7 @@ export abstract class PokemonSpeciesForm {
     if (cry?.pendingRemove) {
       cry = null;
     }
-    cry = scene.playSound(cry || cryKey, soundConfig);
+    cry = scene.playSound(`cry/${(cry ?? cryKey)}`, soundConfig);
     if (ignorePlay) {
       cry.stop();
     }
@@ -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);
       }
     }
 
@@ -913,7 +923,7 @@ export function initSpecies() {
     new PokemonSpecies(Species.VENUSAUR, 1, false, false, false, "Seed Pokémon", Type.GRASS, Type.POISON, 2, 100, Abilities.OVERGROW, Abilities.NONE, Abilities.CHLOROPHYLL, 525, 80, 82, 83, 100, 100, 80, 45, 50, 263, GrowthRate.MEDIUM_SLOW, 87.5, true, true,
       new PokemonForm("Normal", "", Type.GRASS, Type.POISON, 2, 100, Abilities.OVERGROW, Abilities.NONE, Abilities.CHLOROPHYLL, 525, 80, 82, 83, 100, 100, 80, 45, 50, 263, true, null, true),
       new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.GRASS, Type.POISON, 2.4, 155.5, Abilities.THICK_FAT, Abilities.THICK_FAT, Abilities.THICK_FAT, 625, 80, 100, 123, 122, 120, 80, 45, 50, 263, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.GRASS, Type.POISON, 24, 100, Abilities.OVERGROW, Abilities.NONE, Abilities.CHLOROPHYLL, 625, 100, 90, 120, 110, 130, 75, 45, 50, 263, true),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.GRASS, Type.POISON, 24, 100, Abilities.CHLOROPHYLL, Abilities.CHLOROPHYLL, Abilities.CHLOROPHYLL, 625, 120, 82, 98, 130, 115, 80, 45, 50, 263, true),
     ),
     new PokemonSpecies(Species.CHARMANDER, 1, false, false, false, "Lizard Pokémon", Type.FIRE, null, 0.6, 8.5, Abilities.BLAZE, Abilities.NONE, Abilities.SOLAR_POWER, 309, 39, 52, 43, 60, 50, 65, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false),
     new PokemonSpecies(Species.CHARMELEON, 1, false, false, false, "Flame Pokémon", Type.FIRE, null, 1.1, 19, Abilities.BLAZE, Abilities.NONE, Abilities.SOLAR_POWER, 405, 58, 64, 58, 80, 65, 80, 45, 50, 142, GrowthRate.MEDIUM_SLOW, 87.5, false),
@@ -921,20 +931,20 @@ export function initSpecies() {
       new PokemonForm("Normal", "", Type.FIRE, Type.FLYING, 1.7, 90.5, Abilities.BLAZE, Abilities.NONE, Abilities.SOLAR_POWER, 534, 78, 84, 78, 109, 85, 100, 45, 50, 267, false, null, true),
       new PokemonForm("Mega X", SpeciesFormKey.MEGA_X, Type.FIRE, Type.DRAGON, 1.7, 110.5, Abilities.TOUGH_CLAWS, Abilities.NONE, Abilities.TOUGH_CLAWS, 634, 78, 130, 111, 130, 85, 100, 45, 50, 267),
       new PokemonForm("Mega Y", SpeciesFormKey.MEGA_Y, Type.FIRE, Type.FLYING, 1.7, 100.5, Abilities.DROUGHT, Abilities.NONE, Abilities.DROUGHT, 634, 78, 104, 78, 159, 115, 100, 45, 50, 267),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.FIRE, Type.FLYING, 28, 90.5, Abilities.BLAZE, Abilities.NONE, Abilities.SOLAR_POWER, 634, 98, 100, 96, 135, 110, 95, 45, 50, 267),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.FIRE, Type.FLYING, 28, 90.5, Abilities.SOLAR_POWER, Abilities.SOLAR_POWER, Abilities.SOLAR_POWER, 634, 118, 84, 93, 139, 110, 100, 45, 50, 267),
     ),
     new PokemonSpecies(Species.SQUIRTLE, 1, false, false, false, "Tiny Turtle Pokémon", Type.WATER, null, 0.5, 9, Abilities.TORRENT, Abilities.NONE, Abilities.RAIN_DISH, 314, 44, 48, 65, 50, 64, 43, 45, 50, 63, GrowthRate.MEDIUM_SLOW, 87.5, false),
     new PokemonSpecies(Species.WARTORTLE, 1, false, false, false, "Turtle Pokémon", Type.WATER, null, 1, 22.5, Abilities.TORRENT, Abilities.NONE, Abilities.RAIN_DISH, 405, 59, 63, 80, 65, 80, 58, 45, 50, 142, GrowthRate.MEDIUM_SLOW, 87.5, false),
     new PokemonSpecies(Species.BLASTOISE, 1, false, false, false, "Shellfish Pokémon", Type.WATER, null, 1.6, 85.5, Abilities.TORRENT, Abilities.NONE, Abilities.RAIN_DISH, 530, 79, 83, 100, 85, 105, 78, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false, true,
       new PokemonForm("Normal", "", Type.WATER, null, 1.6, 85.5, Abilities.TORRENT, Abilities.NONE, Abilities.RAIN_DISH, 530, 79, 83, 100, 85, 105, 78, 45, 50, 265, false, null, true),
       new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.WATER, null, 1.6, 101.1, Abilities.MEGA_LAUNCHER, Abilities.NONE, Abilities.MEGA_LAUNCHER, 630, 79, 103, 120, 135, 115, 78, 45, 50, 265),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.WATER, null, 25, 85.5, Abilities.TORRENT, Abilities.NONE, Abilities.RAIN_DISH, 630, 100, 95, 130, 105, 125, 75, 45, 50, 265),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.WATER, Type.STEEL, 25, 85.5, Abilities.SHELL_ARMOR, Abilities.SHELL_ARMOR, Abilities.SHELL_ARMOR, 630, 119, 83, 130, 115, 115, 68, 45, 50, 265),
     ),
     new PokemonSpecies(Species.CATERPIE, 1, false, false, false, "Worm Pokémon", Type.BUG, null, 0.3, 2.9, Abilities.SHIELD_DUST, Abilities.NONE, Abilities.RUN_AWAY, 195, 45, 30, 35, 20, 20, 45, 255, 50, 39, GrowthRate.MEDIUM_FAST, 50, false),
     new PokemonSpecies(Species.METAPOD, 1, false, false, false, "Cocoon Pokémon", Type.BUG, null, 0.7, 9.9, Abilities.SHED_SKIN, Abilities.NONE, Abilities.SHED_SKIN, 205, 50, 20, 55, 25, 25, 30, 120, 50, 72, GrowthRate.MEDIUM_FAST, 50, false),
     new PokemonSpecies(Species.BUTTERFREE, 1, false, false, false, "Butterfly Pokémon", Type.BUG, Type.FLYING, 1.1, 32, Abilities.COMPOUND_EYES, Abilities.NONE, Abilities.TINTED_LENS, 395, 60, 45, 50, 90, 80, 70, 45, 50, 198, GrowthRate.MEDIUM_FAST, 50, true, true,
       new PokemonForm("Normal", "", Type.BUG, Type.FLYING, 1.1, 32, Abilities.COMPOUND_EYES, Abilities.NONE, Abilities.TINTED_LENS, 395, 60, 45, 50, 90, 80, 70, 45, 50, 198, true, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.BUG, Type.FLYING, 17, 32, Abilities.COMPOUND_EYES, Abilities.NONE, Abilities.TINTED_LENS, 495, 75, 50, 75, 120, 100, 75, 45, 50, 198, true),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.BUG, Type.FLYING, 17, 32, Abilities.TINTED_LENS, Abilities.TINTED_LENS, Abilities.TINTED_LENS, 495, 85, 35, 80, 120, 90, 85, 45, 50, 198, true),
     ),
     new PokemonSpecies(Species.WEEDLE, 1, false, false, false, "Hairy Bug Pokémon", Type.BUG, Type.POISON, 0.3, 3.2, Abilities.SHIELD_DUST, Abilities.NONE, Abilities.RUN_AWAY, 195, 40, 35, 30, 20, 20, 50, 255, 70, 39, GrowthRate.MEDIUM_FAST, 50, false),
     new PokemonSpecies(Species.KAKUNA, 1, false, false, false, "Cocoon Pokémon", Type.BUG, Type.POISON, 0.6, 10, Abilities.SHED_SKIN, Abilities.NONE, Abilities.SHED_SKIN, 205, 45, 25, 50, 25, 25, 35, 120, 70, 72, GrowthRate.MEDIUM_FAST, 50, false),
@@ -963,7 +973,7 @@ export function initSpecies() {
       new PokemonForm("Cute Cosplay", "cute-cosplay", Type.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 430, 45, 80, 50, 75, 60, 120, 190, 50, 112, true, null, true), //Custom
       new PokemonForm("Smart Cosplay", "smart-cosplay", Type.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 430, 45, 80, 50, 75, 60, 120, 190, 50, 112, true, null, true), //Custom
       new PokemonForm("Tough Cosplay", "tough-cosplay", Type.ELECTRIC, null, 0.4, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 430, 45, 80, 50, 75, 60, 120, 190, 50, 112, true, null, true), //Custom
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.ELECTRIC, null, 21, 6, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 420, 45, 60, 65, 100, 75, 75, 190, 50, 112),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.ELECTRIC, null, 21, 6, Abilities.LIGHTNING_ROD, Abilities.LIGHTNING_ROD, Abilities.LIGHTNING_ROD, 530, 125, 95, 60, 90, 70, 90, 190, 50, 112), //+100 BST from Partner Form
     ),
     new PokemonSpecies(Species.RAICHU, 1, false, false, false, "Mouse Pokémon", Type.ELECTRIC, null, 0.8, 30, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 485, 60, 90, 55, 90, 80, 110, 75, 50, 243, GrowthRate.MEDIUM_FAST, 50, true),
     new PokemonSpecies(Species.SANDSHREW, 1, false, false, false, "Mouse Pokémon", Type.GROUND, null, 0.6, 12, Abilities.SAND_VEIL, Abilities.NONE, Abilities.SAND_RUSH, 300, 50, 75, 85, 20, 30, 40, 255, 50, 60, GrowthRate.MEDIUM_FAST, 50, false),
@@ -993,7 +1003,7 @@ export function initSpecies() {
     new PokemonSpecies(Species.DUGTRIO, 1, false, false, false, "Mole Pokémon", Type.GROUND, null, 0.7, 33.3, Abilities.SAND_VEIL, Abilities.ARENA_TRAP, Abilities.SAND_FORCE, 425, 35, 100, 50, 50, 70, 120, 50, 50, 149, GrowthRate.MEDIUM_FAST, 50, false),
     new PokemonSpecies(Species.MEOWTH, 1, false, false, false, "Scratch Cat Pokémon", Type.NORMAL, null, 0.4, 4.2, Abilities.PICKUP, Abilities.TECHNICIAN, Abilities.UNNERVE, 290, 40, 45, 35, 40, 40, 90, 255, 50, 58, GrowthRate.MEDIUM_FAST, 50, false, true,
       new PokemonForm("Normal", "", Type.NORMAL, null, 0.4, 4.2, Abilities.PICKUP, Abilities.TECHNICIAN, Abilities.UNNERVE, 290, 40, 45, 35, 40, 40, 90, 255, 50, 58, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.NORMAL, null, 33, 4.2, Abilities.PICKUP, Abilities.TECHNICIAN, Abilities.UNNERVE, 390, 50, 85, 60, 70, 50, 75, 255, 50, 58),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.NORMAL, null, 33, 4.2, Abilities.TECHNICIAN, Abilities.TECHNICIAN, Abilities.TECHNICIAN, 540, 115, 110, 65, 65, 70, 115, 255, 50, 58), //+100 BST from Persian
     ),
     new PokemonSpecies(Species.PERSIAN, 1, false, false, false, "Classy Cat Pokémon", Type.NORMAL, null, 1, 32, Abilities.LIMBER, Abilities.TECHNICIAN, Abilities.UNNERVE, 440, 65, 70, 60, 65, 65, 115, 90, 50, 154, GrowthRate.MEDIUM_FAST, 50, false),
     new PokemonSpecies(Species.PSYDUCK, 1, false, false, false, "Duck Pokémon", Type.WATER, null, 0.8, 19.6, Abilities.DAMP, Abilities.CLOUD_NINE, Abilities.SWIFT_SWIM, 320, 50, 52, 48, 65, 50, 55, 190, 50, 64, GrowthRate.MEDIUM_FAST, 50, false),
@@ -1015,7 +1025,7 @@ export function initSpecies() {
     new PokemonSpecies(Species.MACHOKE, 1, false, false, false, "Superpower Pokémon", Type.FIGHTING, null, 1.5, 70.5, Abilities.GUTS, Abilities.NO_GUARD, Abilities.STEADFAST, 405, 80, 100, 70, 50, 60, 45, 90, 50, 142, GrowthRate.MEDIUM_SLOW, 75, false),
     new PokemonSpecies(Species.MACHAMP, 1, false, false, false, "Superpower Pokémon", Type.FIGHTING, null, 1.6, 130, Abilities.GUTS, Abilities.NO_GUARD, Abilities.STEADFAST, 505, 90, 130, 80, 65, 85, 55, 45, 50, 253, GrowthRate.MEDIUM_SLOW, 75, false, true,
       new PokemonForm("Normal", "", Type.FIGHTING, null, 1.6, 130, Abilities.GUTS, Abilities.NO_GUARD, Abilities.STEADFAST, 505, 90, 130, 80, 65, 85, 55, 45, 50, 253, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.FIGHTING, null, 25, 130, Abilities.GUTS, Abilities.NO_GUARD, Abilities.STEADFAST, 605, 113, 170, 90, 70, 95, 67, 45, 50, 253),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.FIGHTING, null, 25, 130, Abilities.GUTS, Abilities.GUTS, Abilities.GUTS, 605, 115, 170, 95, 65, 95, 65, 45, 50, 253),
     ),
     new PokemonSpecies(Species.BELLSPROUT, 1, false, false, false, "Flower Pokémon", Type.GRASS, Type.POISON, 0.7, 4, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.GLUTTONY, 300, 50, 75, 35, 70, 30, 40, 255, 70, 60, GrowthRate.MEDIUM_SLOW, 50, false),
     new PokemonSpecies(Species.WEEPINBELL, 1, false, false, false, "Flycatcher Pokémon", Type.GRASS, Type.POISON, 1, 6.4, Abilities.CHLOROPHYLL, Abilities.NONE, Abilities.GLUTTONY, 390, 65, 90, 50, 85, 45, 55, 120, 70, 137, GrowthRate.MEDIUM_SLOW, 50, false),
@@ -1048,7 +1058,7 @@ export function initSpecies() {
     new PokemonSpecies(Species.GENGAR, 1, false, false, false, "Shadow Pokémon", Type.GHOST, Type.POISON, 1.5, 40.5, Abilities.CURSED_BODY, Abilities.NONE, Abilities.NONE, 500, 60, 65, 60, 130, 75, 110, 45, 50, 250, GrowthRate.MEDIUM_SLOW, 50, false, true,
       new PokemonForm("Normal", "", Type.GHOST, Type.POISON, 1.5, 40.5, Abilities.CURSED_BODY, Abilities.NONE, Abilities.NONE, 500, 60, 65, 60, 130, 75, 110, 45, 50, 250, false, null, true),
       new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.GHOST, Type.POISON, 1.4, 40.5, Abilities.SHADOW_TAG, Abilities.NONE, Abilities.NONE, 600, 60, 65, 80, 170, 95, 130, 45, 50, 250),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.GHOST, Type.POISON, 20, 40.5, Abilities.CURSED_BODY, Abilities.NONE, Abilities.NONE, 600, 75, 95, 85, 160, 95, 90, 45, 50, 250),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.GHOST, Type.POISON, 20, 40.5, Abilities.CURSED_BODY, Abilities.CURSED_BODY, Abilities.CURSED_BODY, 600, 140, 65, 70, 140, 85, 100, 45, 50, 250),
     ),
     new PokemonSpecies(Species.ONIX, 1, false, false, false, "Rock Snake Pokémon", Type.ROCK, Type.GROUND, 8.8, 210, Abilities.ROCK_HEAD, Abilities.STURDY, Abilities.WEAK_ARMOR, 385, 35, 45, 160, 30, 45, 70, 45, 50, 77, GrowthRate.MEDIUM_FAST, 50, false),
     new PokemonSpecies(Species.DROWZEE, 1, false, false, false, "Hypnosis Pokémon", Type.PSYCHIC, null, 1, 32.4, Abilities.INSOMNIA, Abilities.FOREWARN, Abilities.INNER_FOCUS, 328, 60, 48, 45, 43, 90, 42, 190, 70, 66, GrowthRate.MEDIUM_FAST, 50, false),
@@ -1056,7 +1066,7 @@ export function initSpecies() {
     new PokemonSpecies(Species.KRABBY, 1, false, false, false, "River Crab Pokémon", Type.WATER, null, 0.4, 6.5, Abilities.HYPER_CUTTER, Abilities.SHELL_ARMOR, Abilities.SHEER_FORCE, 325, 30, 105, 90, 25, 25, 50, 225, 50, 65, GrowthRate.MEDIUM_FAST, 50, false),
     new PokemonSpecies(Species.KINGLER, 1, false, false, false, "Pincer Pokémon", Type.WATER, null, 1.3, 60, Abilities.HYPER_CUTTER, Abilities.SHELL_ARMOR, Abilities.SHEER_FORCE, 475, 55, 130, 115, 50, 50, 75, 60, 50, 166, GrowthRate.MEDIUM_FAST, 50, false, true,
       new PokemonForm("Normal", "", Type.WATER, null, 1.3, 60, Abilities.HYPER_CUTTER, Abilities.SHELL_ARMOR, Abilities.SHEER_FORCE, 475, 55, 130, 115, 50, 50, 75, 60, 50, 166, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.WATER, null, 19, 60, Abilities.HYPER_CUTTER, Abilities.SHELL_ARMOR, Abilities.SHEER_FORCE, 575, 70, 165, 145, 60, 70, 65, 60, 50, 166),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.WATER, null, 19, 60, Abilities.TOUGH_CLAWS, Abilities.TOUGH_CLAWS, Abilities.TOUGH_CLAWS, 575, 90, 155, 140, 50, 80, 70, 60, 50, 166),
     ),
     new PokemonSpecies(Species.VOLTORB, 1, false, false, false, "Ball Pokémon", Type.ELECTRIC, null, 0.5, 10.4, Abilities.SOUNDPROOF, Abilities.STATIC, Abilities.AFTERMATH, 330, 40, 30, 50, 55, 55, 100, 190, 70, 66, GrowthRate.MEDIUM_FAST, null, false),
     new PokemonSpecies(Species.ELECTRODE, 1, false, false, false, "Ball Pokémon", Type.ELECTRIC, null, 1.2, 66.6, Abilities.SOUNDPROOF, Abilities.STATIC, Abilities.AFTERMATH, 490, 60, 50, 70, 80, 80, 150, 60, 70, 172, GrowthRate.MEDIUM_FAST, null, false),
@@ -1100,13 +1110,13 @@ export function initSpecies() {
     ),
     new PokemonSpecies(Species.LAPRAS, 1, false, false, false, "Transport Pokémon", Type.WATER, Type.ICE, 2.5, 220, Abilities.WATER_ABSORB, Abilities.SHELL_ARMOR, Abilities.HYDRATION, 535, 130, 85, 80, 85, 95, 60, 45, 50, 187, GrowthRate.SLOW, 50, false, true,
       new PokemonForm("Normal", "", Type.WATER, Type.ICE, 2.5, 220, Abilities.WATER_ABSORB, Abilities.SHELL_ARMOR, Abilities.HYDRATION, 535, 130, 85, 80, 85, 95, 60, 45, 50, 187, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.WATER, Type.ICE, 24, 220, Abilities.WATER_ABSORB, Abilities.SHELL_ARMOR, Abilities.HYDRATION, 635, 160, 95, 110, 95, 125, 50, 45, 50, 187),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.WATER, Type.ICE, 24, 220, Abilities.SHELL_ARMOR, Abilities.SHELL_ARMOR, Abilities.SHELL_ARMOR, 635, 170, 85, 95, 115, 110, 60, 45, 50, 187),
     ),
     new PokemonSpecies(Species.DITTO, 1, false, false, false, "Transform Pokémon", Type.NORMAL, null, 0.3, 4, Abilities.LIMBER, Abilities.NONE, Abilities.IMPOSTER, 288, 48, 48, 48, 48, 48, 48, 35, 50, 101, GrowthRate.MEDIUM_FAST, null, false),
     new PokemonSpecies(Species.EEVEE, 1, false, false, false, "Evolution Pokémon", Type.NORMAL, null, 0.3, 6.5, Abilities.RUN_AWAY, Abilities.ADAPTABILITY, Abilities.ANTICIPATION, 325, 55, 55, 50, 45, 65, 55, 45, 50, 65, GrowthRate.MEDIUM_FAST, 87.5, false, true,
       new PokemonForm("Normal", "", Type.NORMAL, null, 0.3, 6.5, Abilities.RUN_AWAY, Abilities.ADAPTABILITY, Abilities.ANTICIPATION, 325, 55, 55, 50, 45, 65, 55, 45, 50, 65, false, null, true),
       new PokemonForm("Partner", "partner", Type.NORMAL, null, 0.3, 6.5, Abilities.RUN_AWAY, Abilities.ADAPTABILITY, Abilities.ANTICIPATION, 435, 65, 75, 70, 65, 85, 75, 45, 50, 65, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.NORMAL, null, 18, 6.5, Abilities.RUN_AWAY, Abilities.ADAPTABILITY, Abilities.ANTICIPATION, 425, 70, 75, 80, 60, 95, 45, 45, 50, 65),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.NORMAL, null, 18, 6.5, Abilities.PROTEAN, Abilities.PROTEAN, Abilities.PROTEAN, 535, 105, 95, 70, 95, 85, 85, 45, 50, 65), //+100 BST from Partner Form
     ),
     new PokemonSpecies(Species.VAPOREON, 1, false, false, false, "Bubble Jet Pokémon", Type.WATER, null, 1, 29, Abilities.WATER_ABSORB, Abilities.NONE, Abilities.HYDRATION, 525, 130, 65, 60, 110, 95, 65, 45, 50, 184, GrowthRate.MEDIUM_FAST, 87.5, false),
     new PokemonSpecies(Species.JOLTEON, 1, false, false, false, "Lightning Pokémon", Type.ELECTRIC, null, 0.8, 24.5, Abilities.VOLT_ABSORB, Abilities.NONE, Abilities.QUICK_FEET, 525, 65, 65, 60, 110, 95, 130, 45, 50, 184, GrowthRate.MEDIUM_FAST, 87.5, false),
@@ -1122,7 +1132,7 @@ export function initSpecies() {
     ),
     new PokemonSpecies(Species.SNORLAX, 1, false, false, false, "Sleeping Pokémon", Type.NORMAL, null, 2.1, 460, Abilities.IMMUNITY, Abilities.THICK_FAT, Abilities.GLUTTONY, 540, 160, 110, 65, 65, 110, 30, 25, 50, 189, GrowthRate.SLOW, 87.5, false, true,
       new PokemonForm("Normal", "", Type.NORMAL, null, 2.1, 460, Abilities.IMMUNITY, Abilities.THICK_FAT, Abilities.GLUTTONY, 540, 160, 110, 65, 65, 110, 30, 25, 50, 189, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.NORMAL, null, 35, 460, Abilities.IMMUNITY, Abilities.THICK_FAT, Abilities.GLUTTONY, 640, 200, 130, 85, 75, 130, 20, 25, 50, 189),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.NORMAL, null, 35, 460, Abilities.THICK_FAT, Abilities.THICK_FAT, Abilities.THICK_FAT, 640, 200, 135, 85, 80, 125, 15, 25, 50, 189),
     ),
     new PokemonSpecies(Species.ARTICUNO, 1, true, false, false, "Freeze Pokémon", Type.ICE, Type.FLYING, 1.7, 55.4, Abilities.PRESSURE, Abilities.NONE, Abilities.SNOW_CLOAK, 580, 90, 85, 100, 95, 125, 85, 3, 35, 290, GrowthRate.SLOW, null, false),
     new PokemonSpecies(Species.ZAPDOS, 1, true, false, false, "Electric Pokémon", Type.ELECTRIC, Type.FLYING, 1.6, 52.6, Abilities.PRESSURE, Abilities.NONE, Abilities.STATIC, 580, 90, 90, 85, 125, 90, 100, 3, 35, 290, GrowthRate.SLOW, null, false),
@@ -1762,7 +1772,7 @@ export function initSpecies() {
     new PokemonSpecies(Species.TRUBBISH, 5, false, false, false, "Trash Bag Pokémon", Type.POISON, null, 0.6, 31, Abilities.STENCH, Abilities.STICKY_HOLD, Abilities.AFTERMATH, 329, 50, 50, 62, 40, 62, 65, 190, 50, 66, GrowthRate.MEDIUM_FAST, 50, false),
     new PokemonSpecies(Species.GARBODOR, 5, false, false, false, "Trash Heap Pokémon", Type.POISON, null, 1.9, 107.3, Abilities.STENCH, Abilities.WEAK_ARMOR, Abilities.AFTERMATH, 474, 80, 95, 82, 60, 82, 75, 60, 50, 166, GrowthRate.MEDIUM_FAST, 50, false, true,
       new PokemonForm("Normal", "", Type.POISON, null, 1.9, 107.3, Abilities.STENCH, Abilities.WEAK_ARMOR, Abilities.AFTERMATH, 474, 80, 95, 82, 60, 82, 75, 60, 50, 166, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.POISON, null, 21, 107.3, Abilities.STENCH, Abilities.WEAK_ARMOR, Abilities.AFTERMATH, 574, 100, 125, 102, 80, 102, 65, 60, 50, 166),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.POISON, Type.STEEL, 21, 107.3, Abilities.TOXIC_DEBRIS, Abilities.TOXIC_DEBRIS, Abilities.TOXIC_DEBRIS, 574, 135, 125, 102, 57, 102, 53, 60, 50, 166),
     ),
     new PokemonSpecies(Species.ZORUA, 5, false, false, false, "Tricky Fox Pokémon", Type.DARK, null, 0.7, 12.5, Abilities.ILLUSION, Abilities.NONE, Abilities.NONE, 330, 40, 65, 40, 80, 40, 65, 75, 50, 66, GrowthRate.MEDIUM_SLOW, 87.5, false),
     new PokemonSpecies(Species.ZOROARK, 5, false, false, false, "Illusion Fox Pokémon", Type.DARK, null, 1.6, 81.1, Abilities.ILLUSION, Abilities.NONE, Abilities.NONE, 510, 60, 105, 60, 120, 60, 105, 45, 50, 179, GrowthRate.MEDIUM_SLOW, 87.5, false),
@@ -2236,25 +2246,25 @@ export function initSpecies() {
     new PokemonSpecies(Species.MELTAN, 7, false, false, true, "Hex Nut Pokémon", Type.STEEL, null, 0.2, 8, Abilities.MAGNET_PULL, Abilities.NONE, Abilities.NONE, 300, 46, 65, 65, 55, 35, 34, 3, 0, 150, GrowthRate.SLOW, null, false),
     new PokemonSpecies(Species.MELMETAL, 7, false, false, true, "Hex Nut Pokémon", Type.STEEL, null, 2.5, 800, Abilities.IRON_FIST, Abilities.NONE, Abilities.NONE, 600, 135, 143, 143, 80, 65, 34, 3, 0, 300, GrowthRate.SLOW, null, false, true,
       new PokemonForm("Normal", "", Type.STEEL, null, 2.5, 800, Abilities.IRON_FIST, Abilities.NONE, Abilities.NONE, 600, 135, 143, 143, 80, 65, 34, 3, 0, 300, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.STEEL, null, 25, 800, Abilities.IRON_FIST, Abilities.NONE, Abilities.NONE, 700, 170, 165, 165, 95, 75, 30, 3, 0, 300),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.STEEL, null, 25, 800, Abilities.IRON_FIST, Abilities.IRON_FIST, Abilities.IRON_FIST, 700, 175, 165, 155, 85, 75, 45, 3, 0, 300),
     ),
     new PokemonSpecies(Species.GROOKEY, 8, false, false, false, "Chimp Pokémon", Type.GRASS, null, 0.3, 5, Abilities.OVERGROW, Abilities.NONE, Abilities.GRASSY_SURGE, 310, 50, 65, 50, 40, 40, 65, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false),
     new PokemonSpecies(Species.THWACKEY, 8, false, false, false, "Beat Pokémon", Type.GRASS, null, 0.7, 14, Abilities.OVERGROW, Abilities.NONE, Abilities.GRASSY_SURGE, 420, 70, 85, 70, 55, 60, 80, 45, 50, 147, GrowthRate.MEDIUM_SLOW, 87.5, false),
     new PokemonSpecies(Species.RILLABOOM, 8, false, false, false, "Drummer Pokémon", Type.GRASS, null, 2.1, 90, Abilities.OVERGROW, Abilities.NONE, Abilities.GRASSY_SURGE, 530, 100, 125, 90, 60, 70, 85, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false, true,
       new PokemonForm("Normal", "", Type.GRASS, null, 2.1, 90, Abilities.OVERGROW, Abilities.NONE, Abilities.GRASSY_SURGE, 530, 100, 125, 90, 60, 70, 85, 45, 50, 265, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.GRASS, null, 28, 90, Abilities.OVERGROW, Abilities.NONE, Abilities.GRASSY_SURGE, 630, 125, 150, 115, 75, 90, 75, 45, 50, 265),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.GRASS, null, 28, 90, Abilities.GRASSY_SURGE, Abilities.GRASSY_SURGE, Abilities.GRASSY_SURGE, 630, 125, 150, 105, 85, 85, 80, 45, 50, 265),
     ),
     new PokemonSpecies(Species.SCORBUNNY, 8, false, false, false, "Rabbit Pokémon", Type.FIRE, null, 0.3, 4.5, Abilities.BLAZE, Abilities.NONE, Abilities.LIBERO, 310, 50, 71, 40, 40, 40, 69, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false),
     new PokemonSpecies(Species.RABOOT, 8, false, false, false, "Rabbit Pokémon", Type.FIRE, null, 0.6, 9, Abilities.BLAZE, Abilities.NONE, Abilities.LIBERO, 420, 65, 86, 60, 55, 60, 94, 45, 50, 147, GrowthRate.MEDIUM_SLOW, 87.5, false),
     new PokemonSpecies(Species.CINDERACE, 8, false, false, false, "Striker Pokémon", Type.FIRE, null, 1.4, 33, Abilities.BLAZE, Abilities.NONE, Abilities.LIBERO, 530, 80, 116, 75, 65, 75, 119, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false, true,
       new PokemonForm("Normal", "", Type.FIRE, null, 1.4, 33, Abilities.BLAZE, Abilities.NONE, Abilities.LIBERO, 530, 80, 116, 75, 65, 75, 119, 45, 50, 265, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.FIRE, null, 27, 33, Abilities.BLAZE, Abilities.NONE, Abilities.LIBERO, 630, 100, 145, 90, 75, 90, 130, 45, 50, 265),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.FIRE, null, 27, 33, Abilities.LIBERO, Abilities.LIBERO, Abilities.LIBERO, 630, 100, 146, 80, 90, 80, 134, 45, 50, 265),
     ),
     new PokemonSpecies(Species.SOBBLE, 8, false, false, false, "Water Lizard Pokémon", Type.WATER, null, 0.3, 4, Abilities.TORRENT, Abilities.NONE, Abilities.SNIPER, 310, 50, 40, 40, 70, 40, 70, 45, 50, 62, GrowthRate.MEDIUM_SLOW, 87.5, false),
     new PokemonSpecies(Species.DRIZZILE, 8, false, false, false, "Water Lizard Pokémon", Type.WATER, null, 0.7, 11.5, Abilities.TORRENT, Abilities.NONE, Abilities.SNIPER, 420, 65, 60, 55, 95, 55, 90, 45, 50, 147, GrowthRate.MEDIUM_SLOW, 87.5, false),
     new PokemonSpecies(Species.INTELEON, 8, false, false, false, "Secret Agent Pokémon", Type.WATER, null, 1.9, 45.2, Abilities.TORRENT, Abilities.NONE, Abilities.SNIPER, 530, 70, 85, 65, 125, 65, 120, 45, 50, 265, GrowthRate.MEDIUM_SLOW, 87.5, false, true,
       new PokemonForm("Normal", "", Type.WATER, null, 1.9, 45.2, Abilities.TORRENT, Abilities.NONE, Abilities.SNIPER, 530, 70, 85, 65, 125, 65, 120, 45, 50, 265, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.WATER, null, 40, 45.2, Abilities.TORRENT, Abilities.NONE, Abilities.SNIPER, 630, 90, 100, 90, 150, 90, 110, 45, 50, 265),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.WATER, null, 40, 45.2, Abilities.SNIPER, Abilities.SNIPER, Abilities.SNIPER, 630, 95, 97, 77, 147, 77, 137, 45, 50, 265),
     ),
     new PokemonSpecies(Species.SKWOVET, 8, false, false, false, "Cheeky Pokémon", Type.NORMAL, null, 0.3, 2.5, Abilities.CHEEK_POUCH, Abilities.NONE, Abilities.GLUTTONY, 275, 70, 55, 55, 35, 35, 25, 255, 50, 55, GrowthRate.MEDIUM_FAST, 50, false),
     new PokemonSpecies(Species.GREEDENT, 8, false, false, false, "Greedy Pokémon", Type.NORMAL, null, 0.6, 6, Abilities.CHEEK_POUCH, Abilities.NONE, Abilities.GLUTTONY, 460, 120, 95, 95, 55, 75, 20, 90, 50, 161, GrowthRate.MEDIUM_FAST, 50, false),
@@ -2262,13 +2272,13 @@ export function initSpecies() {
     new PokemonSpecies(Species.CORVISQUIRE, 8, false, false, false, "Raven Pokémon", Type.FLYING, null, 0.8, 16, Abilities.KEEN_EYE, Abilities.UNNERVE, Abilities.BIG_PECKS, 365, 68, 67, 55, 43, 55, 77, 120, 50, 128, GrowthRate.MEDIUM_SLOW, 50, false),
     new PokemonSpecies(Species.CORVIKNIGHT, 8, false, false, false, "Raven Pokémon", Type.FLYING, Type.STEEL, 2.2, 75, Abilities.PRESSURE, Abilities.UNNERVE, Abilities.MIRROR_ARMOR, 495, 98, 87, 105, 53, 85, 67, 45, 50, 248, GrowthRate.MEDIUM_SLOW, 50, false, true,
       new PokemonForm("Normal", "", Type.FLYING, Type.STEEL, 2.2, 75, Abilities.PRESSURE, Abilities.UNNERVE, Abilities.MIRROR_ARMOR, 495, 98, 87, 105, 53, 85, 67, 45, 50, 248, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.FLYING, Type.STEEL, 14, 75, Abilities.PRESSURE, Abilities.UNNERVE, Abilities.MIRROR_ARMOR, 595, 125, 100, 135, 60, 95, 80, 45, 50, 248),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.FLYING, Type.STEEL, 14, 75, Abilities.MIRROR_ARMOR, Abilities.MIRROR_ARMOR, Abilities.MIRROR_ARMOR, 595, 128, 102, 140, 53, 95, 77, 45, 50, 248),
     ),
     new PokemonSpecies(Species.BLIPBUG, 8, false, false, false, "Larva Pokémon", Type.BUG, null, 0.4, 8, Abilities.SWARM, Abilities.COMPOUND_EYES, Abilities.TELEPATHY, 180, 25, 20, 20, 25, 45, 45, 255, 50, 36, GrowthRate.MEDIUM_FAST, 50, false),
     new PokemonSpecies(Species.DOTTLER, 8, false, false, false, "Radome Pokémon", Type.BUG, Type.PSYCHIC, 0.4, 19.5, Abilities.SWARM, Abilities.COMPOUND_EYES, Abilities.TELEPATHY, 335, 50, 35, 80, 50, 90, 30, 120, 50, 117, GrowthRate.MEDIUM_FAST, 50, false),
     new PokemonSpecies(Species.ORBEETLE, 8, false, false, false, "Seven Spot Pokémon", Type.BUG, Type.PSYCHIC, 0.4, 40.8, Abilities.SWARM, Abilities.FRISK, Abilities.TELEPATHY, 505, 60, 45, 110, 80, 120, 90, 45, 50, 253, GrowthRate.MEDIUM_FAST, 50, false, true,
       new PokemonForm("Normal", "", Type.BUG, Type.PSYCHIC, 0.4, 40.8, Abilities.SWARM, Abilities.FRISK, Abilities.TELEPATHY, 505, 60, 45, 110, 80, 120, 90, 45, 50, 253, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.BUG, Type.PSYCHIC, 14, 40.8, Abilities.SWARM, Abilities.FRISK, Abilities.TELEPATHY, 605, 75, 50, 140, 90, 150, 100, 45, 50, 253),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.BUG, Type.PSYCHIC, 14, 40.8, Abilities.TRACE, Abilities.TRACE, Abilities.TRACE, 605, 90, 45, 130, 110, 140, 90, 45, 50, 253),
     ),
     new PokemonSpecies(Species.NICKIT, 8, false, false, false, "Fox Pokémon", Type.DARK, null, 0.6, 8.9, Abilities.RUN_AWAY, Abilities.UNBURDEN, Abilities.STAKEOUT, 245, 40, 28, 28, 47, 52, 50, 255, 50, 49, GrowthRate.FAST, 50, false),
     new PokemonSpecies(Species.THIEVUL, 8, false, false, false, "Fox Pokémon", Type.DARK, null, 1.2, 19.9, Abilities.RUN_AWAY, Abilities.UNBURDEN, Abilities.STAKEOUT, 455, 70, 58, 58, 87, 92, 90, 127, 50, 159, GrowthRate.FAST, 50, false),
@@ -2279,7 +2289,7 @@ export function initSpecies() {
     new PokemonSpecies(Species.CHEWTLE, 8, false, false, false, "Snapping Pokémon", Type.WATER, null, 0.3, 8.5, Abilities.STRONG_JAW, Abilities.SHELL_ARMOR, Abilities.SWIFT_SWIM, 284, 50, 64, 50, 38, 38, 44, 255, 50, 57, GrowthRate.MEDIUM_FAST, 50, false),
     new PokemonSpecies(Species.DREDNAW, 8, false, false, false, "Bite Pokémon", Type.WATER, Type.ROCK, 1, 115.5, Abilities.STRONG_JAW, Abilities.SHELL_ARMOR, Abilities.SWIFT_SWIM, 485, 90, 115, 90, 48, 68, 74, 75, 50, 170, GrowthRate.MEDIUM_FAST, 50, false, true,
       new PokemonForm("Normal", "", Type.WATER, Type.ROCK, 1, 115.5, Abilities.STRONG_JAW, Abilities.SHELL_ARMOR, Abilities.SWIFT_SWIM, 485, 90, 115, 90, 48, 68, 74, 75, 50, 170, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.WATER, Type.ROCK, 24, 115.5, Abilities.STRONG_JAW, Abilities.SHELL_ARMOR, Abilities.SWIFT_SWIM, 585, 115, 150, 110, 55, 85, 70, 75, 50, 170),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.WATER, Type.ROCK, 24, 115.5, Abilities.STRONG_JAW, Abilities.STRONG_JAW, Abilities.STRONG_JAW, 585, 115, 145, 115, 43, 83, 84, 75, 50, 170),
     ),
     new PokemonSpecies(Species.YAMPER, 8, false, false, false, "Puppy Pokémon", Type.ELECTRIC, null, 0.3, 13.5, Abilities.BALL_FETCH, Abilities.NONE, Abilities.RATTLED, 270, 59, 45, 50, 40, 50, 26, 255, 50, 54, GrowthRate.FAST, 50, false),
     new PokemonSpecies(Species.BOLTUND, 8, false, false, false, "Dog Pokémon", Type.ELECTRIC, null, 1, 34, Abilities.STRONG_JAW, Abilities.NONE, Abilities.COMPETITIVE, 490, 69, 90, 60, 90, 60, 121, 45, 50, 172, GrowthRate.FAST, 50, false),
@@ -2287,21 +2297,21 @@ export function initSpecies() {
     new PokemonSpecies(Species.CARKOL, 8, false, false, false, "Coal Pokémon", Type.ROCK, Type.FIRE, 1.1, 78, Abilities.STEAM_ENGINE, Abilities.FLAME_BODY, Abilities.FLASH_FIRE, 410, 80, 60, 90, 60, 70, 50, 120, 50, 144, GrowthRate.MEDIUM_SLOW, 50, false),
     new PokemonSpecies(Species.COALOSSAL, 8, false, false, false, "Coal Pokémon", Type.ROCK, Type.FIRE, 2.8, 310.5, Abilities.STEAM_ENGINE, Abilities.FLAME_BODY, Abilities.FLASH_FIRE, 510, 110, 80, 120, 80, 90, 30, 45, 50, 255, GrowthRate.MEDIUM_SLOW, 50, false, true,
       new PokemonForm("Normal", "", Type.ROCK, Type.FIRE, 2.8, 310.5, Abilities.STEAM_ENGINE, Abilities.FLAME_BODY, Abilities.FLASH_FIRE, 510, 110, 80, 120, 80, 90, 30, 45, 50, 255, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.ROCK, Type.FIRE, 42, 310.5, Abilities.STEAM_ENGINE, Abilities.FLAME_BODY, Abilities.FLASH_FIRE, 610, 140, 95, 150, 95, 105, 25, 45, 50, 255),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.ROCK, Type.FIRE, 42, 310.5, Abilities.STEAM_ENGINE, Abilities.STEAM_ENGINE, Abilities.STEAM_ENGINE, 610, 140, 95, 130, 95, 110, 40, 45, 50, 255),
     ),
     new PokemonSpecies(Species.APPLIN, 8, false, false, false, "Apple Core Pokémon", Type.GRASS, Type.DRAGON, 0.2, 0.5, Abilities.RIPEN, Abilities.GLUTTONY, Abilities.BULLETPROOF, 260, 40, 40, 80, 40, 40, 20, 255, 50, 52, GrowthRate.ERRATIC, 50, false),
     new PokemonSpecies(Species.FLAPPLE, 8, false, false, false, "Apple Wing Pokémon", Type.GRASS, Type.DRAGON, 0.3, 1, Abilities.RIPEN, Abilities.GLUTTONY, Abilities.HUSTLE, 485, 70, 110, 80, 95, 60, 70, 45, 50, 170, GrowthRate.ERRATIC, 50, false, true,
       new PokemonForm("Normal", "", Type.GRASS, Type.DRAGON, 0.3, 1, Abilities.RIPEN, Abilities.GLUTTONY, Abilities.HUSTLE, 485, 70, 110, 80, 95, 60, 70, 45, 50, 170, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.GRASS, Type.DRAGON, 24, 1, Abilities.RIPEN, Abilities.GLUTTONY, Abilities.HUSTLE, 585, 90, 140, 90, 120, 75, 70, 45, 50, 170),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.GRASS, Type.DRAGON, 24, 1, Abilities.HUSTLE, Abilities.HUSTLE, Abilities.HUSTLE, 585, 90, 130, 100, 85, 80, 100, 45, 50, 170),
     ),
     new PokemonSpecies(Species.APPLETUN, 8, false, false, false, "Apple Nectar Pokémon", Type.GRASS, Type.DRAGON, 0.4, 13, Abilities.RIPEN, Abilities.GLUTTONY, Abilities.THICK_FAT, 485, 110, 85, 80, 100, 80, 30, 45, 50, 170, GrowthRate.ERRATIC, 50, false, true,
       new PokemonForm("Normal", "", Type.GRASS, Type.DRAGON, 0.4, 13, Abilities.RIPEN, Abilities.GLUTTONY, Abilities.THICK_FAT, 485, 110, 85, 80, 100, 80, 30, 45, 50, 170, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.GRASS, Type.DRAGON, 24, 13, Abilities.RIPEN, Abilities.GLUTTONY, Abilities.THICK_FAT, 585, 140, 95, 95, 135, 95, 25, 45, 50, 170),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.GRASS, Type.DRAGON, 24, 13, Abilities.THICK_FAT, Abilities.THICK_FAT, Abilities.THICK_FAT, 585, 130, 75, 115, 125, 115, 25, 45, 50, 170),
     ),
     new PokemonSpecies(Species.SILICOBRA, 8, false, false, false, "Sand Snake Pokémon", Type.GROUND, null, 2.2, 7.6, Abilities.SAND_SPIT, Abilities.SHED_SKIN, Abilities.SAND_VEIL, 315, 52, 57, 75, 35, 50, 46, 255, 50, 63, GrowthRate.MEDIUM_FAST, 50, false),
     new PokemonSpecies(Species.SANDACONDA, 8, false, false, false, "Sand Snake Pokémon", Type.GROUND, null, 3.8, 65.5, Abilities.SAND_SPIT, Abilities.SHED_SKIN, Abilities.SAND_VEIL, 510, 72, 107, 125, 65, 70, 71, 120, 50, 179, GrowthRate.MEDIUM_FAST, 50, false, true,
       new PokemonForm("Normal", "", Type.GROUND, null, 3.8, 65.5, Abilities.SAND_SPIT, Abilities.SHED_SKIN, Abilities.SAND_VEIL, 510, 72, 107, 125, 65, 70, 71, 120, 50, 179, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.GROUND, null, 22, 65.5, Abilities.SAND_SPIT, Abilities.SHED_SKIN, Abilities.SAND_VEIL, 610, 90, 135, 150, 75, 80, 80, 120, 50, 179),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.GROUND, null, 22, 65.5, Abilities.SAND_SPIT, Abilities.SAND_SPIT, Abilities.SAND_SPIT, 610, 117, 137, 140, 55, 80, 81, 120, 50, 179),
     ),
     new PokemonSpecies(Species.CRAMORANT, 8, false, false, false, "Gulp Pokémon", Type.FLYING, Type.WATER, 0.8, 18, Abilities.GULP_MISSILE, Abilities.NONE, Abilities.NONE, 475, 70, 85, 55, 85, 95, 85, 45, 50, 166, GrowthRate.MEDIUM_FAST, 50, false, false,
       new PokemonForm("Normal", "", Type.FLYING, Type.WATER, 0.8, 18, Abilities.GULP_MISSILE, Abilities.NONE, Abilities.NONE, 475, 70, 85, 55, 85, 95, 85, 45, 50, 166, false, null, true),
@@ -2314,12 +2324,12 @@ export function initSpecies() {
     new PokemonSpecies(Species.TOXTRICITY, 8, false, false, false, "Punk Pokémon", Type.ELECTRIC, Type.POISON, 1.6, 40, Abilities.PUNK_ROCK, Abilities.PLUS, Abilities.TECHNICIAN, 502, 75, 98, 70, 114, 70, 75, 45, 50, 176, GrowthRate.MEDIUM_SLOW, 50, false, true,
       new PokemonForm("Amped Form", "amped", Type.ELECTRIC, Type.POISON, 1.6, 40, Abilities.PUNK_ROCK, Abilities.PLUS, Abilities.TECHNICIAN, 502, 75, 98, 70, 114, 70, 75, 45, 50, 176, false, "", true),
       new PokemonForm("Low-Key Form", "lowkey", Type.ELECTRIC, Type.POISON, 1.6, 40, Abilities.PUNK_ROCK, Abilities.MINUS, Abilities.TECHNICIAN, 502, 75, 98, 70, 114, 70, 75, 45, 50, 176, false, "lowkey", true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.ELECTRIC, Type.POISON, 24, 40, Abilities.PUNK_ROCK, Abilities.MINUS, Abilities.TECHNICIAN, 602, 95, 118, 80, 144, 80, 85, 45, 50, 176),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.ELECTRIC, Type.POISON, 24, 40, Abilities.PUNK_ROCK, Abilities.PUNK_ROCK, Abilities.PUNK_ROCK, 602, 114, 98, 82, 144, 82, 82, 45, 50, 176),
     ),
     new PokemonSpecies(Species.SIZZLIPEDE, 8, false, false, false, "Radiator Pokémon", Type.FIRE, Type.BUG, 0.7, 1, Abilities.FLASH_FIRE, Abilities.WHITE_SMOKE, Abilities.FLAME_BODY, 305, 50, 65, 45, 50, 50, 45, 190, 50, 61, GrowthRate.MEDIUM_FAST, 50, false),
     new PokemonSpecies(Species.CENTISKORCH, 8, false, false, false, "Radiator Pokémon", Type.FIRE, Type.BUG, 3, 120, Abilities.FLASH_FIRE, Abilities.WHITE_SMOKE, Abilities.FLAME_BODY, 525, 100, 115, 65, 90, 90, 65, 75, 50, 184, GrowthRate.MEDIUM_FAST, 50, false, true,
       new PokemonForm("Normal", "", Type.FIRE, Type.BUG, 3, 120, Abilities.FLASH_FIRE, Abilities.WHITE_SMOKE, Abilities.FLAME_BODY, 525, 100, 115, 65, 90, 90, 65, 75, 50, 184, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.FIRE, Type.BUG, 75, 120, Abilities.FLASH_FIRE, Abilities.WHITE_SMOKE, Abilities.FLAME_BODY, 625, 125, 145, 75, 105, 105, 70, 75, 50, 184),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.FIRE, Type.BUG, 75, 120, Abilities.FLASH_FIRE, Abilities.FLASH_FIRE, Abilities.FLASH_FIRE, 625, 140, 145, 75, 90, 100, 75, 75, 50, 184),
     ),
     new PokemonSpecies(Species.CLOBBOPUS, 8, false, false, false, "Tantrum Pokémon", Type.FIGHTING, null, 0.6, 4, Abilities.LIMBER, Abilities.NONE, Abilities.TECHNICIAN, 310, 50, 68, 60, 50, 50, 32, 180, 50, 62, GrowthRate.MEDIUM_SLOW, 50, false),
     new PokemonSpecies(Species.GRAPPLOCT, 8, false, false, false, "Jujitsu Pokémon", Type.FIGHTING, null, 1.6, 39, Abilities.LIMBER, Abilities.NONE, Abilities.TECHNICIAN, 480, 80, 118, 90, 70, 80, 42, 45, 50, 168, GrowthRate.MEDIUM_SLOW, 50, false),
@@ -2335,13 +2345,13 @@ export function initSpecies() {
     new PokemonSpecies(Species.HATTREM, 8, false, false, false, "Serene Pokémon", Type.PSYCHIC, null, 0.6, 4.8, Abilities.HEALER, Abilities.ANTICIPATION, Abilities.MAGIC_BOUNCE, 370, 57, 40, 65, 86, 73, 49, 120, 50, 130, GrowthRate.SLOW, 0, false),
     new PokemonSpecies(Species.HATTERENE, 8, false, false, false, "Silent Pokémon", Type.PSYCHIC, Type.FAIRY, 2.1, 5.1, Abilities.HEALER, Abilities.ANTICIPATION, Abilities.MAGIC_BOUNCE, 510, 57, 90, 95, 136, 103, 29, 45, 50, 255, GrowthRate.SLOW, 0, false, true,
       new PokemonForm("Normal", "", Type.PSYCHIC, Type.FAIRY, 2.1, 5.1, Abilities.HEALER, Abilities.ANTICIPATION, Abilities.MAGIC_BOUNCE, 510, 57, 90, 95, 136, 103, 29, 45, 50, 255, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.PSYCHIC, Type.FAIRY, 26, 5.1, Abilities.HEALER, Abilities.ANTICIPATION, Abilities.MAGIC_BOUNCE, 610, 70, 105, 110, 160, 125, 40, 45, 50, 255),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.PSYCHIC, Type.FAIRY, 26, 5.1, Abilities.MAGIC_BOUNCE, Abilities.MAGIC_BOUNCE, Abilities.MAGIC_BOUNCE, 610, 97, 90, 105, 146, 122, 50, 45, 50, 255),
     ),
     new PokemonSpecies(Species.IMPIDIMP, 8, false, false, false, "Wily Pokémon", Type.DARK, Type.FAIRY, 0.4, 5.5, Abilities.PRANKSTER, Abilities.FRISK, Abilities.PICKPOCKET, 265, 45, 45, 30, 55, 40, 50, 255, 50, 53, GrowthRate.MEDIUM_FAST, 100, false),
     new PokemonSpecies(Species.MORGREM, 8, false, false, false, "Devious Pokémon", Type.DARK, Type.FAIRY, 0.8, 12.5, Abilities.PRANKSTER, Abilities.FRISK, Abilities.PICKPOCKET, 370, 65, 60, 45, 75, 55, 70, 120, 50, 130, GrowthRate.MEDIUM_FAST, 100, false),
     new PokemonSpecies(Species.GRIMMSNARL, 8, false, false, false, "Bulk Up Pokémon", Type.DARK, Type.FAIRY, 1.5, 61, Abilities.PRANKSTER, Abilities.FRISK, Abilities.PICKPOCKET, 510, 95, 120, 65, 95, 75, 60, 45, 50, 255, GrowthRate.MEDIUM_FAST, 100, false, true,
       new PokemonForm("Normal", "", Type.DARK, Type.FAIRY, 1.5, 61, Abilities.PRANKSTER, Abilities.FRISK, Abilities.PICKPOCKET, 510, 95, 120, 65, 95, 75, 60, 45, 50, 255, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.DARK, Type.FAIRY, 32, 61, Abilities.PRANKSTER, Abilities.FRISK, Abilities.PICKPOCKET, 610, 120, 155, 75, 110, 85, 65, 45, 50, 255),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.DARK, Type.FAIRY, 32, 61, Abilities.PRANKSTER, Abilities.PRANKSTER, Abilities.PRANKSTER, 610, 135, 138, 77, 110, 85, 65, 45, 50, 255),
     ),
     new PokemonSpecies(Species.OBSTAGOON, 8, false, false, false, "Blocking Pokémon", Type.DARK, Type.NORMAL, 1.6, 46, Abilities.RECKLESS, Abilities.GUTS, Abilities.DEFIANT, 520, 93, 90, 101, 60, 81, 95, 45, 50, 260, GrowthRate.MEDIUM_FAST, 50, false),
     new PokemonSpecies(Species.PERRSERKER, 8, false, false, false, "Viking Pokémon", Type.STEEL, null, 0.8, 28, Abilities.BATTLE_ARMOR, Abilities.TOUGH_CLAWS, Abilities.STEELY_SPIRIT, 440, 70, 110, 100, 50, 60, 50, 90, 50, 154, GrowthRate.MEDIUM_FAST, 50, false),
@@ -2360,7 +2370,7 @@ export function initSpecies() {
       new PokemonForm("Ruby Swirl", "ruby-swirl", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true),
       new PokemonForm("Caramel Swirl", "caramel-swirl", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true),
       new PokemonForm("Rainbow Swirl", "rainbow-swirl", Type.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.FAIRY, null, 30, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 595, 85, 70, 85, 140, 150, 65, 100, 50, 173),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.FAIRY, null, 30, 0.5, Abilities.MISTY_SURGE, Abilities.MISTY_SURGE, Abilities.MISTY_SURGE, 595, 135, 60, 75, 130, 131, 64, 100, 50, 173),
     ),
     new PokemonSpecies(Species.FALINKS, 8, false, false, false, "Formation Pokémon", Type.FIGHTING, null, 3, 62, Abilities.BATTLE_ARMOR, Abilities.NONE, Abilities.DEFIANT, 470, 65, 100, 100, 70, 60, 75, 45, 50, 165, GrowthRate.MEDIUM_FAST, null, false),
     new PokemonSpecies(Species.PINCURCHIN, 8, false, false, false, "Sea Urchin Pokémon", Type.ELECTRIC, null, 0.3, 1, Abilities.LIGHTNING_ROD, Abilities.NONE, Abilities.ELECTRIC_SURGE, 435, 48, 101, 95, 91, 85, 15, 75, 50, 152, GrowthRate.MEDIUM_FAST, 50, false),
@@ -2382,7 +2392,7 @@ export function initSpecies() {
     new PokemonSpecies(Species.CUFANT, 8, false, false, false, "Copperderm Pokémon", Type.STEEL, null, 1.2, 100, Abilities.SHEER_FORCE, Abilities.NONE, Abilities.HEAVY_METAL, 330, 72, 80, 49, 40, 49, 40, 190, 50, 66, GrowthRate.MEDIUM_FAST, 50, false),
     new PokemonSpecies(Species.COPPERAJAH, 8, false, false, false, "Copperderm Pokémon", Type.STEEL, null, 3, 650, Abilities.SHEER_FORCE, Abilities.NONE, Abilities.HEAVY_METAL, 500, 122, 130, 69, 80, 69, 30, 90, 50, 175, GrowthRate.MEDIUM_FAST, 50, false, true,
       new PokemonForm("Normal", "", Type.STEEL, null, 3, 650, Abilities.SHEER_FORCE, Abilities.NONE, Abilities.HEAVY_METAL, 500, 122, 130, 69, 80, 69, 30, 90, 50, 175, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.STEEL, null, 23, 650, Abilities.SHEER_FORCE, Abilities.NONE, Abilities.HEAVY_METAL, 600, 150, 160, 80, 90, 80, 40, 90, 50, 175),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.STEEL, Type.GROUND, 23, 650, Abilities.MOLD_BREAKER, Abilities.MOLD_BREAKER, Abilities.MOLD_BREAKER, 600, 167, 155, 89, 80, 89, 20, 90, 50, 175),
     ),
     new PokemonSpecies(Species.DRACOZOLT, 8, false, false, false, "Fossil Pokémon", Type.ELECTRIC, Type.DRAGON, 1.8, 190, Abilities.VOLT_ABSORB, Abilities.HUSTLE, Abilities.SAND_RUSH, 505, 90, 100, 90, 80, 70, 75, 45, 50, 177, GrowthRate.SLOW, null, false),
     new PokemonSpecies(Species.ARCTOZOLT, 8, false, false, false, "Fossil Pokémon", Type.ELECTRIC, Type.ICE, 2.3, 150, Abilities.VOLT_ABSORB, Abilities.STATIC, Abilities.SLUSH_RUSH, 505, 90, 100, 90, 90, 80, 55, 45, 50, 177, GrowthRate.SLOW, null, false),
@@ -2390,7 +2400,7 @@ export function initSpecies() {
     new PokemonSpecies(Species.ARCTOVISH, 8, false, false, false, "Fossil Pokémon", Type.WATER, Type.ICE, 2, 175, Abilities.WATER_ABSORB, Abilities.ICE_BODY, Abilities.SLUSH_RUSH, 505, 90, 90, 100, 80, 90, 55, 45, 50, 177, GrowthRate.SLOW, null, false),
     new PokemonSpecies(Species.DURALUDON, 8, false, false, false, "Alloy Pokémon", Type.STEEL, Type.DRAGON, 1.8, 40, Abilities.LIGHT_METAL, Abilities.HEAVY_METAL, Abilities.STALWART, 535, 70, 95, 115, 120, 50, 85, 45, 50, 187, GrowthRate.MEDIUM_FAST, 50, false, true,
       new PokemonForm("Normal", "", Type.STEEL, Type.DRAGON, 1.8, 40, Abilities.LIGHT_METAL, Abilities.HEAVY_METAL, Abilities.STALWART, 535, 70, 95, 115, 120, 50, 85, 45, 50, 187, false, null, true),
-      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.STEEL, Type.DRAGON, 43, 40, Abilities.LIGHT_METAL, Abilities.HEAVY_METAL, Abilities.STALWART, 635, 90, 110, 145, 140, 60, 90, 45, 50, 187),
+      new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.STEEL, Type.DRAGON, 43, 40, Abilities.LIGHTNING_ROD, Abilities.LIGHTNING_ROD, Abilities.LIGHTNING_ROD, 635, 100, 105, 119, 166, 57, 88, 45, 50, 187),
     ),
     new PokemonSpecies(Species.DREEPY, 8, false, false, false, "Lingering Pokémon", Type.DRAGON, Type.GHOST, 0.5, 2, Abilities.CLEAR_BODY, Abilities.INFILTRATOR, Abilities.CURSED_BODY, 270, 28, 60, 30, 40, 30, 82, 45, 50, 54, GrowthRate.SLOW, 50, false),
     new PokemonSpecies(Species.DRAKLOAK, 8, false, false, false, "Caretaker Pokémon", Type.DRAGON, Type.GHOST, 1.4, 11, Abilities.CLEAR_BODY, Abilities.INFILTRATOR, Abilities.CURSED_BODY, 410, 68, 80, 50, 60, 50, 102, 45, 50, 144, GrowthRate.SLOW, 50, false),
@@ -2411,8 +2421,8 @@ export function initSpecies() {
     new PokemonSpecies(Species.URSHIFU, 8, true, false, false, "Wushu Pokémon", Type.FIGHTING, Type.DARK, 1.9, 105, Abilities.UNSEEN_FIST, Abilities.NONE, Abilities.NONE, 550, 100, 130, 100, 63, 60, 97, 3, 50, 275, GrowthRate.SLOW, 87.5, false, true,
       new PokemonForm("Single Strike Style", "single-strike", Type.FIGHTING, Type.DARK, 1.9, 105, Abilities.UNSEEN_FIST, Abilities.NONE, Abilities.NONE, 550, 100, 130, 100, 63, 60, 97, 3, 50, 275, false, "", true),
       new PokemonForm("Rapid Strike Style", "rapid-strike", Type.FIGHTING, Type.WATER, 1.9, 105, Abilities.UNSEEN_FIST, Abilities.NONE, Abilities.NONE, 550, 100, 130, 100, 63, 60, 97, 3, 50, 275, false, null, true),
-      new PokemonForm("G-Max Single Strike Style", SpeciesFormKey.GIGANTAMAX_SINGLE, Type.FIGHTING, Type.DARK, 29, 105, Abilities.UNSEEN_FIST, Abilities.NONE, Abilities.NONE, 650, 125, 160, 120, 75, 70, 100, 3, 50, 275),
-      new PokemonForm("G-Max Rapid Strike Style", SpeciesFormKey.GIGANTAMAX_RAPID, Type.FIGHTING, Type.WATER, 26, 105, Abilities.UNSEEN_FIST, Abilities.NONE, Abilities.NONE, 650, 125, 160, 120, 75, 70, 100, 3, 50, 275),
+      new PokemonForm("G-Max Single Strike Style", SpeciesFormKey.GIGANTAMAX_SINGLE, Type.FIGHTING, Type.DARK, 29, 105, Abilities.UNSEEN_FIST, Abilities.NONE, Abilities.NONE, 650, 125, 150, 115, 73, 70, 117, 3, 50, 275),
+      new PokemonForm("G-Max Rapid Strike Style", SpeciesFormKey.GIGANTAMAX_RAPID, Type.FIGHTING, Type.WATER, 26, 105, Abilities.UNSEEN_FIST, Abilities.NONE, Abilities.NONE, 650, 125, 150, 115, 73, 70, 117, 3, 50, 275),
     ),
     new PokemonSpecies(Species.ZARUDE, 8, false, false, true, "Rogue Monkey Pokémon", Type.DARK, Type.GRASS, 1.8, 70, Abilities.LEAF_GUARD, Abilities.NONE, Abilities.NONE, 600, 105, 120, 105, 70, 95, 105, 3, 0, 300, GrowthRate.SLOW, null, false, false,
       new PokemonForm("Normal", "", Type.DARK, Type.GRASS, 1.8, 70, Abilities.LEAF_GUARD, Abilities.NONE, Abilities.NONE, 600, 105, 120, 105, 70, 95, 105, 3, 0, 300, false, null, true),
@@ -3460,7 +3470,7 @@ export const starterPassiveAbilities = {
   [Species.SUICUNE]: Abilities.UNAWARE,
   [Species.LARVITAR]: Abilities.SAND_RUSH,
   [Species.LUGIA]: Abilities.DELTA_STREAM,
-  [Species.HO_OH]: Abilities.DROUGHT,
+  [Species.HO_OH]: Abilities.MAGIC_GUARD,
   [Species.CELEBI]: Abilities.GRASSY_SURGE,
   [Species.TREECKO]: Abilities.TINTED_LENS,
   [Species.TORCHIC]: Abilities.RECKLESS,
@@ -3581,7 +3591,7 @@ export const starterPassiveAbilities = {
   [Species.HEATRAN]: Abilities.EARTH_EATER,
   [Species.REGIGIGAS]: Abilities.MINDS_EYE,
   [Species.GIRATINA]: Abilities.SHADOW_SHIELD,
-  [Species.CRESSELIA]: Abilities.UNAWARE,
+  [Species.CRESSELIA]: Abilities.SHADOW_SHIELD,
   [Species.PHIONE]: Abilities.SIMPLE,
   [Species.MANAPHY]: Abilities.PRIMORDIAL_SEA,
   [Species.DARKRAI]: Abilities.UNNERVE,
@@ -3622,7 +3632,7 @@ export const starterPassiveAbilities = {
   [Species.YAMASK]: Abilities.PURIFYING_SALT,
   [Species.TIRTOUGA]: Abilities.WATER_ABSORB,
   [Species.ARCHEN]: Abilities.MULTISCALE,
-  [Species.TRUBBISH]: Abilities.TOXIC_DEBRIS,
+  [Species.TRUBBISH]: Abilities.NEUTRALIZING_GAS,
   [Species.ZORUA]: Abilities.DARK_AURA,
   [Species.MINCCINO]: Abilities.FUR_COAT,
   [Species.GOTHITA]: Abilities.UNNERVE,
@@ -3783,7 +3793,7 @@ export const starterPassiveAbilities = {
   [Species.SINISTEA]: Abilities.SHADOW_SHIELD,
   [Species.HATENNA]: Abilities.FAIRY_AURA,
   [Species.IMPIDIMP]: Abilities.FUR_COAT,
-  [Species.MILCERY]: Abilities.MISTY_SURGE,
+  [Species.MILCERY]: Abilities.REGENERATOR,
   [Species.FALINKS]: Abilities.PARENTAL_BOND,
   [Species.PINCURCHIN]: Abilities.ELECTROMORPHOSIS,
   [Species.SNOM]: Abilities.SNOW_WARNING,
diff --git a/src/data/tms.ts b/src/data/tms.ts
index 761dcdf6be4..55f0602c84a 100644
--- a/src/data/tms.ts
+++ b/src/data/tms.ts
@@ -47576,6 +47576,7 @@ export const tmSpecies: TmSpecies = {
     Species.PIGNITE,
     Species.EMBOAR,
     Species.PANSEAR,
+    Species.SIMISEAR,
     Species.DARUMAKA,
     Species.DARMANITAN,
     Species.LITWICK,
@@ -47617,6 +47618,7 @@ export const tmSpecies: TmSpecies = {
     Species.CHI_YU,
     Species.KORAIDON,
     Species.GOUGING_FIRE,
+    Species.TERAPAGOS,
     Species.ALOLA_MAROWAK,
     Species.GALAR_DARUMAKA,
     Species.GALAR_DARMANITAN,
@@ -50733,6 +50735,7 @@ export const tmSpecies: TmSpecies = {
     Species.KECLEON,
     Species.SHUPPET,
     Species.BANETTE,
+    Species.DEOXYS,
     Species.CHIMCHAR,
     Species.MONFERNO,
     Species.INFERNAPE,
@@ -50761,8 +50764,11 @@ export const tmSpecies: TmSpecies = {
     Species.PURRLOIN,
     Species.LIEPARD,
     Species.PANSAGE,
+    Species.SIMISAGE,
     Species.PANSEAR,
+    Species.SIMISEAR,
     Species.PANPOUR,
+    Species.SIMIPOUR,
     Species.WOOBAT,
     Species.SWOOBAT,
     Species.YAMASK,
@@ -55614,8 +55620,14 @@ export const tmSpecies: TmSpecies = {
     Species.HISUI_DECIDUEYE,
   ],
   [Moves.ACID_SPRAY]: [
+    Species.BULBASAUR,
+    Species.IVYSAUR,
+    Species.VENUSAUR,
     Species.EKANS,
     Species.ARBOK,
+    Species.ODDISH,
+    Species.GLOOM,
+    Species.VILEPLUME,
     Species.VENONAT,
     Species.VENOMOTH,
     Species.BELLSPROUT,
@@ -55630,13 +55642,17 @@ export const tmSpecies: TmSpecies = {
     Species.GENGAR,
     Species.KOFFING,
     Species.WEEZING,
+    Species.MAGMAR,
     Species.MEW,
     Species.SPINARAK,
     Species.ARIADOS,
+    Species.BELLOSSOM,
     Species.WOOPER,
     Species.QUAGSIRE,
     Species.QWILFISH,
     Species.REMORAID,
+    Species.OCTILLERY,
+    Species.MAGBY,
     Species.GULPIN,
     Species.SWALOT,
     Species.SEVIPER,
@@ -55645,13 +55661,16 @@ export const tmSpecies: TmSpecies = {
     Species.CROAGUNK,
     Species.TOXICROAK,
     Species.CARNIVINE,
+    Species.MAGMORTAR,
     Species.ARCEUS,
     Species.SCRAGGY,
+    Species.SCRAFTY,
     Species.TRUBBISH,
     Species.GARBODOR,
     Species.KARRABLAST,
     Species.ESCAVALIER,
     Species.FERROSEED,
+    Species.FERROTHORN,
     Species.EELEKTRIK,
     Species.EELEKTROSS,
     Species.ACCELGOR,
@@ -55667,6 +55686,7 @@ export const tmSpecies: TmSpecies = {
     Species.FLAPPLE,
     Species.TOXTRICITY,
     Species.SNEASLER,
+    Species.OVERQWIL,
     Species.ARMAROUGE,
     Species.TADBULB,
     Species.BELLIBOLT,
@@ -60261,6 +60281,7 @@ export const tmSpecies: TmSpecies = {
     Species.CHIMECHO,
     Species.GOREBYSS,
     Species.LUVDISC,
+    Species.LATIAS,
     Species.CHERUBI,
     Species.CHERRIM,
     Species.MISMAGIUS,
@@ -63878,6 +63899,8 @@ export const tmSpecies: TmSpecies = {
     Species.ALAKAZAM,
     Species.SLOWPOKE,
     Species.SLOWBRO,
+    Species.DROWZEE,
+    Species.HYPNO,
     Species.EXEGGUTOR,
     Species.STARMIE,
     Species.MR_MIME,
@@ -63888,12 +63911,18 @@ export const tmSpecies: TmSpecies = {
     Species.XATU,
     Species.ESPEON,
     Species.SLOWKING,
+    Species.GIRAFARIG,
     Species.CELEBI,
     Species.RALTS,
     Species.KIRLIA,
     Species.GARDEVOIR,
+    Species.MEDITITE,
+    Species.MEDICHAM,
+    Species.SPOINK,
+    Species.GRUMPIG,
     Species.BALTOY,
     Species.CLAYDOL,
+    Species.CHIMECHO,
     Species.METANG,
     Species.METAGROSS,
     Species.JIRACHI,
@@ -63920,11 +63949,14 @@ export const tmSpecies: TmSpecies = {
     Species.REUNICLUS,
     Species.ELGYEM,
     Species.BEHEEYEM,
+    Species.DELPHOX,
     Species.ESPURR,
     Species.MEOWSTIC,
     Species.INKAY,
     Species.MALAMAR,
+    Species.HOOPA,
     Species.ORANGURU,
+    Species.BRUXISH,
     Species.SOLGALEO,
     Species.LUNALA,
     Species.NECROZMA,
@@ -63954,6 +63986,7 @@ export const tmSpecies: TmSpecies = {
     Species.GALAR_MR_MIME,
     Species.GALAR_ARTICUNO,
     Species.GALAR_SLOWKING,
+    Species.HISUI_BRAVIARY,
   ],
   [Moves.STEEL_ROLLER]: [
     Species.SANDSHREW,
diff --git a/src/data/trainer-config.ts b/src/data/trainer-config.ts
index 1eb96d60d2c..7d357639a5b 100644
--- a/src/data/trainer-config.ts
+++ b/src/data/trainer-config.ts
@@ -16,6 +16,7 @@ import {Moves} from "#enums/moves";
 import {PartyMemberStrength} from "#enums/party-member-strength";
 import {Species} from "#enums/species";
 import {TrainerType} from "#enums/trainer-type";
+import {Gender} from "./gender";
 
 export enum TrainerPoolTier {
     COMMON,
@@ -142,7 +143,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)),
@@ -324,6 +325,15 @@ export class TrainerConfig {
     case TrainerType.LYSANDRE_2:
       trainerType = TrainerType.LYSANDRE;
       break;
+    case TrainerType.LUSAMINE_2:
+      trainerType = TrainerType.LUSAMINE;
+      break;
+    case TrainerType.GUZMA_2:
+      trainerType = TrainerType.GUZMA;
+      break;
+    case TrainerType.ROSE_2:
+      trainerType = TrainerType.ROSE;
+      break;
     case TrainerType.MARNIE_ELITE:
       trainerType = TrainerType.MARNIE;
       break;
@@ -562,9 +572,9 @@ export class TrainerConfig {
     }
     case "magma": {
       return {
-        [TrainerPoolTier.COMMON]: [Species.NUMEL, Species.POOCHYENA, Species.SLUGMA, Species.SOLROCK, Species.HIPPOPOTAS, Species.SANDACONDA, Species.PHANPY, Species.SWINUB, Species.GLIGAR],
+        [TrainerPoolTier.COMMON]: [Species.NUMEL, Species.POOCHYENA, Species.SLUGMA, Species.SOLROCK, Species.HIPPOPOTAS, Species.SANDACONDA, Species.PHANPY, Species.ROLYCOLY, Species.GLIGAR],
         [TrainerPoolTier.UNCOMMON]: [Species.TRAPINCH, Species.HEATMOR],
-        [TrainerPoolTier.RARE]: [Species.TURTONATOR, Species.CHARCADET]
+        [TrainerPoolTier.RARE]: [Species.CAPSAKID, Species.CHARCADET]
       };
     }
     case "aqua": {
@@ -595,6 +605,27 @@ export class TrainerConfig {
         [TrainerPoolTier.RARE]: [Species.NOIVERN, Species.DRUDDIGON]
       };
     }
+    case "aether": {
+      return {
+        [TrainerPoolTier.COMMON]: [ Species.BRUXISH, Species.SLOWPOKE, Species.BALTOY, Species.EXEGGCUTE, Species.ABRA, Species.ALOLA_RAICHU, Species.ELGYEM, Species.NATU],
+        [TrainerPoolTier.UNCOMMON]: [Species.GALAR_SLOWKING, Species.MEDITITE, Species.BELDUM, Species.ORANGURU, Species.HATTERENE, Species.INKAY, Species.RALTS],
+        [TrainerPoolTier.RARE]: [Species.ARMAROUGE, Species.GIRAFARIG, Species.PORYGON]
+      };
+    }
+    case "skull": {
+      return {
+        [TrainerPoolTier.COMMON]: [ Species.MAREANIE, Species.ALOLA_GRIMER, Species.GASTLY, Species.ZUBAT, Species.LURANTIS, Species.VENIPEDE, Species.BUDEW, Species.KOFFING],
+        [TrainerPoolTier.UNCOMMON]: [Species.GALAR_SLOWBRO, Species.SKORUPI, Species.PALDEA_WOOPER, Species.NIDORAN_F, Species.CROAGUNK, Species.MANDIBUZZ],
+        [TrainerPoolTier.RARE]: [Species.DRAGALGE, Species.HISUI_SNEASEL]
+      };
+    }
+    case "macro": {
+      return {
+        [TrainerPoolTier.COMMON]: [ Species.HATTERENE, Species.MILOTIC, Species.TSAREENA, Species.SALANDIT, Species.GALAR_PONYTA, Species.GOTHITA, Species.FROSLASS],
+        [TrainerPoolTier.UNCOMMON]: [Species.MANDIBUZZ, Species.MAREANIE, Species.ALOLA_VULPIX, Species.TOGEPI, Species.GALAR_CORSOLA, Species.SINISTEA, Species.APPLIN],
+        [TrainerPoolTier.RARE]: [Species.TINKATINK, Species.HISUI_LILLIGANT]
+      };
+    }
     }
 
     console.warn(`Evil team admin for ${team} not found. Returning empty species pools.`);
@@ -974,7 +1005,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);
   };
@@ -984,7 +1015,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;
   };
 }
@@ -1336,9 +1367,9 @@ export const trainerConfigs: TrainerConfigs = {
   [TrainerType.MAGMA_GRUNT]: new TrainerConfig(++t).setHasGenders("Magma Grunt Female").setHasDouble("Magma Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aqua_magma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene))
     .setSpeciesPools({
       [TrainerPoolTier.COMMON]: [Species.SLUGMA, Species.POOCHYENA, Species.NUMEL, Species.ZIGZAGOON, Species.DIGLETT, Species.MAGBY, Species.TORKOAL, Species.BALTOY, Species.BARBOACH],
-      [TrainerPoolTier.UNCOMMON]: [Species.SOLROCK, Species.HIPPOPOTAS, Species.SANDACONDA, Species.PHANPY, Species.SWINUB, Species.GLIGAR],
+      [TrainerPoolTier.UNCOMMON]: [Species.SOLROCK, Species.HIPPOPOTAS, Species.SANDACONDA, Species.PHANPY, Species.ROLYCOLY, Species.GLIGAR],
       [TrainerPoolTier.RARE]: [Species.TRAPINCH, Species.HEATMOR],
-      [TrainerPoolTier.SUPER_RARE]: [Species.TURTONATOR, Species.CHARCADET]
+      [TrainerPoolTier.SUPER_RARE]: [Species.CAPSAKID, Species.CHARCADET]
     }),
   [TrainerType.TABITHA]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("magma_admin", "magma", [Species.CAMERUPT]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aqua_magma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
   [TrainerType.COURTNEY]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("magma_admin_female", "magma", [Species.CAMERUPT]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aqua_magma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
@@ -1358,10 +1389,9 @@ export const trainerConfigs: TrainerConfigs = {
       [TrainerPoolTier.RARE]: [Species.HISUI_GROWLITHE, Species.HISUI_QWILFISH, Species.HISUI_SNEASEL],
       [TrainerPoolTier.SUPER_RARE]: [Species.HISUI_ZORUA, Species.HISUI_SLIGGOO]
     }),
-
-  [TrainerType.JUPITER]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("galactic_commander_female", "galactic", [Species.SKUNTANK]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_galactic_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
-  [TrainerType.MARS]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("galactic_commander_female", "galactic", [Species.PURUGLY]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_galactic_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
-  [TrainerType.SATURN]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("galactic_commander", "galactic", [Species.TOXICROAK]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_galactic_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
+  [TrainerType.JUPITER]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("galactic_commander_female", "galactic", [Species.SKUNTANK]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_galactic_admin").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
+  [TrainerType.MARS]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("galactic_commander_female", "galactic", [Species.PURUGLY]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_galactic_admin").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
+  [TrainerType.SATURN]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("galactic_commander", "galactic", [Species.TOXICROAK]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_galactic_admin").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
   [TrainerType.PLASMA_GRUNT]: new TrainerConfig(++t).setHasGenders("Plasma Grunt Female").setHasDouble("Plasma Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_plasma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene))
     .setSpeciesPools({
       [TrainerPoolTier.COMMON]: [Species.PATRAT, Species.LILLIPUP, Species.PURRLOIN, Species.SCRAFTY, Species.WOOBAT, Species.VANILLITE, Species.SANDILE, Species.TRUBBISH],
@@ -1371,7 +1401,6 @@ export const trainerConfigs: TrainerConfigs = {
     }),
   [TrainerType.ZINZOLIN]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("plasma_sage", "plasma", [Species.CRYOGONAL]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_plasma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
   [TrainerType.ROOD]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("plasma_sage", "plasma", [Species.SWOOBAT]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_plasma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
-
   [TrainerType.FLARE_GRUNT]: new TrainerConfig(++t).setHasGenders("Flare Grunt Female").setHasDouble("Flare Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_flare_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene))
     .setSpeciesPools({
       [TrainerPoolTier.COMMON]: [Species.FLETCHLING, Species.LITLEO, Species.PONYTA, Species.INKAY, Species.HOUNDOUR, Species.SKORUPI, Species.SCRAFTY, Species.CROAGUNK],
@@ -1381,6 +1410,31 @@ export const trainerConfigs: TrainerConfigs = {
     }),
   [TrainerType.BRYONY]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("flare_admin_female", "flare", [Species.LIEPARD]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_flare_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
   [TrainerType.XEROSIC]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("flare_admin", "flare", [Species.MALAMAR]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_flare_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
+  [TrainerType.AETHER_GRUNT]: new TrainerConfig(++t).setHasGenders("Aether Grunt Female").setHasDouble("Aether Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aether_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene))
+    .setSpeciesPools({
+      [TrainerPoolTier.COMMON]: [ Species.PIKIPEK, Species.ROCKRUFF, Species.ALOLA_DIGLETT, Species.YUNGOOS, Species.CORSOLA, Species.ALOLA_GEODUDE, Species.BOUNSWEET, Species.LILLIPUP, Species.ALOLA_MAROWAK],
+      [TrainerPoolTier.UNCOMMON]: [ Species.POLIWAG, Species.STUFFUL, Species.ALOLA_EXEGGUTOR, Species.CRABRAWLER, Species.CUTIEFLY, Species.ALOLA_RAICHU, Species.ORICORIO, Species.MUDBRAY],
+      [TrainerPoolTier.RARE]: [ Species.ORANGURU, Species.PASSIMIAN, Species.GALAR_CORSOLA, Species.ALOLA_SANDSHREW, Species.ALOLA_VULPIX, Species.TURTONATOR, Species.DRAMPA],
+      [TrainerPoolTier.SUPER_RARE]: [Species.JANGMO_O, Species.PORYGON]
+    }),
+  [TrainerType.FABA]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("aether_admin", "aether", [Species.HYPNO]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aether_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
+  [TrainerType.SKULL_GRUNT]: new TrainerConfig(++t).setHasGenders("Skull Grunt Female").setHasDouble("Skull Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_skull_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene))
+    .setSpeciesPools({
+      [TrainerPoolTier.COMMON]: [ Species.SALANDIT, Species.ALOLA_RATTATA, Species.ALOLA_MEOWTH, Species.SCRAGGY, Species.KOFFING, Species.ALOLA_GRIMER, Species.MAREANIE, Species.SPINARAK, Species.TRUBBISH],
+      [TrainerPoolTier.UNCOMMON]: [ Species.FOMANTIS, Species.SABLEYE, Species.SANDILE, Species.ALOLA_MAROWAK, Species.PANCHAM, Species.DROWZEE, Species.ZUBAT, Species.VENIPEDE, Species.VULLABY],
+      [TrainerPoolTier.RARE]: [Species.SANDYGAST, Species.PAWNIARD, Species.MIMIKYU, Species.DHELMISE, Species.GASTLY, Species.WISHIWASHI],
+      [TrainerPoolTier.SUPER_RARE]: [Species.GRUBBIN, Species.DEWPIDER]
+    }),
+  [TrainerType.PLUMERIA]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("skull_admin", "skull", [Species.SALAZZLE]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_skull_admin").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
+  [TrainerType.MACRO_GRUNT]: new TrainerConfig(++t).setHasGenders("Macro Grunt Female").setHasDouble("Macro Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_macro_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene))
+    .setSpeciesPools({
+      [TrainerPoolTier.COMMON]: [ Species.CUFANT, Species.GALAR_MEOWTH, Species.KLINK, Species.ROOKIDEE, Species.CRAMORANT, Species.GALAR_ZIGZAGOON, Species.SKWOVET, Species.STEELIX, Species.MAWILE, Species.FERROSEED],
+      [TrainerPoolTier.UNCOMMON]: [ Species.DRILBUR, Species.MAGNEMITE, Species.HATENNA, Species.ARROKUDA, Species.APPLIN, Species.GALAR_PONYTA, Species.GALAR_YAMASK, Species.SINISTEA, Species.RIOLU],
+      [TrainerPoolTier.RARE]: [Species.FALINKS, Species.BELDUM, Species.GALAR_FARFETCHD, Species.GALAR_MR_MIME, Species.HONEDGE, Species.SCIZOR, Species.GALAR_DARUMAKA],
+      [TrainerPoolTier.SUPER_RARE]: [Species.DURALUDON, Species.DREEPY]
+    }),
+  [TrainerType.OLEANA]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("macro_admin", "macro", [Species.GARBODOR]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_oleana").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
+
   [TrainerType.BROCK]: new TrainerConfig((t = TrainerType.BROCK)).initForGymLeader(signatureSpecies["BROCK"], true, Type.ROCK).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"),
   [TrainerType.MISTY]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["MISTY"], false, Type.WATER).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"),
   [TrainerType.LT_SURGE]: new TrainerConfig(++t).initForGymLeader(signatureSpecies["LT_SURGE"], true, Type.ELECTRIC).setBattleBgm("battle_kanto_gym").setMixedBattleBgm("battle_kanto_gym"),
@@ -1758,7 +1812,7 @@ export const trainerConfigs: TrainerConfigs = {
       p.generateName();
     })),
   [TrainerType.ARCHIE_2]: new TrainerConfig(++t).setName("Archie").initForEvilTeamLeader("Aqua Boss", [], true).setMixedBattleBgm("battle_aqua_magma_boss").setVictoryBgm("victory_team_plasma")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.KINGDRA, Species.LUDICOLO], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.EMPOLEON, Species.LUDICOLO], TrainerSlot.TRAINER, true, p => {
       p.setBoss(true, 2);
       p.generateAndPopulateMoveset();
       p.pokeball = PokeballType.ULTRA_BALL;
@@ -1771,9 +1825,9 @@ export const trainerConfigs: TrainerConfigs = {
       p.generateAndPopulateMoveset();
       p.abilityIndex = 2; // Swift Swim
     }))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.HUNTAIL, Species.GOREBYSS], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.OVERQWIL ], TrainerSlot.TRAINER, true, p => {
       p.generateAndPopulateMoveset();
-      p.abilityIndex = 0; // Swift Swim
+      p.abilityIndex = 1; // Swift Swim
     }))
     .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.SHARPEDO], TrainerSlot.TRAINER, true, p => {
       p.setBoss(true, 2);
@@ -1788,11 +1842,11 @@ export const trainerConfigs: TrainerConfigs = {
       p.pokeball = PokeballType.MASTER_BALL;
     })),
   [TrainerType.CYRUS]: new TrainerConfig(++t).setName("Cyrus").initForEvilTeamLeader("Galactic Boss", []).setMixedBattleBgm("battle_galactic_boss").setVictoryBgm("victory_team_plasma")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.GYARADOS, Species.BASCULEGION]))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.HONCHKROW, Species.HISUI_BRAVIARY]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.CROBAT, Species.OVERQWIL]))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.AZELF, Species.UXIE, Species.MESPRIT]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.HOUNDOOM], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.GYARADOS ]))
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.HONCHKROW, Species.HISUI_BRAVIARY ]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.CROBAT, Species.GLISCOR ]))
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.AZELF, Species.UXIE, Species.MESPRIT ]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.HOUNDOOM ], TrainerSlot.TRAINER, true, p => {
       p.generateAndPopulateMoveset();
       p.pokeball = PokeballType.ULTRA_BALL;
       p.formIndex = 1;
@@ -1838,15 +1892,20 @@ export const trainerConfigs: TrainerConfigs = {
       p.pokeball = PokeballType.ULTRA_BALL;
     })),
   [TrainerType.GHETSIS_2]: new TrainerConfig(++t).setName("Ghetsis").initForEvilTeamLeader("Plasma Boss", [], true).setMixedBattleBgm("battle_plasma_boss").setVictoryBgm("victory_team_plasma")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.SLITHER_WING, Species.IRON_MOTH], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.GENESECT ], TrainerSlot.TRAINER, true, p => {
       p.setBoss(true, 2);
       p.generateAndPopulateMoveset();
-      p.pokeball = PokeballType.ULTRA_BALL;
+      p.pokeball = PokeballType.MASTER_BALL;
+      p.formIndex = Utils.randSeedInt(5);
     }))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.DURANT]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.DARMANITAN, Species.GALAR_DARMANITAN]))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.KINGAMBIT]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.HYDREIGON, Species.IRON_JUGULIS], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.BASCULEGION, Species.JELLICENT ], TrainerSlot.TRAINER, true, p => {
+      p.generateAndPopulateMoveset();
+      p.gender = Gender.MALE;
+      p.formIndex = 1;
+    }))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.KINGAMBIT ]))
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.VOLCARONA, Species.SLITHER_WING ]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.HYDREIGON, Species.IRON_JUGULIS ], TrainerSlot.TRAINER, true, p => {
       p.setBoss(true, 2);
       p.generateAndPopulateMoveset();
       p.pokeball = PokeballType.ULTRA_BALL;
@@ -1857,12 +1916,15 @@ export const trainerConfigs: TrainerConfigs = {
       p.pokeball = PokeballType.MASTER_BALL;
     })),
   [TrainerType.LYSANDRE]: new TrainerConfig(++t).setName("Lysandre").initForEvilTeamLeader("Flare Boss", []).setMixedBattleBgm("battle_flare_boss").setVictoryBgm("victory_team_plasma")
-    .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.MIENSHAO]))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.HONCHKROW, Species.TALONFLAME]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.PYROAR]))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.MILOTIC]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.HELIOLISK]))
-    .setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.GYARADOS], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.MIENSHAO ]))
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.HONCHKROW, Species.TALONFLAME ]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.PYROAR ], TrainerSlot.TRAINER, true, p => {
+      p.generateAndPopulateMoveset();
+      p.gender = Gender.MALE;
+    }))
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.CLAWITZER, Species.DRAGALGE ]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.HELIOLISK, Species.MALAMAR ]))
+    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.GYARADOS ], TrainerSlot.TRAINER, true, p => {
       p.setBoss(true, 2);
       p.generateAndPopulateMoveset();
       p.pokeball = PokeballType.ULTRA_BALL;
@@ -1875,10 +1937,13 @@ export const trainerConfigs: TrainerConfigs = {
       p.generateAndPopulateMoveset();
       p.pokeball = PokeballType.ULTRA_BALL;
     }))
-    .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.GHOLDENGO, Species.AEGISLASH]))
-    .setPartyMemberFunc(2, getRandomPartyMemberFunc([Species.PYROAR]))
-    .setPartyMemberFunc(3, getRandomPartyMemberFunc([Species.GOODRA, Species.HISUI_GOODRA]))
-    .setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.GYARADOS], TrainerSlot.TRAINER, true, p => {
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.PYROAR ], TrainerSlot.TRAINER, true, p => {
+      p.generateAndPopulateMoveset();
+      p.gender = Gender.MALE;
+    }))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.IRON_MOTH ]))
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.GOODRA, Species.HISUI_GOODRA ]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.GYARADOS ], TrainerSlot.TRAINER, true, p => {
       p.setBoss(true, 2);
       p.generateAndPopulateMoveset();
       p.pokeball = PokeballType.ULTRA_BALL;
@@ -1890,4 +1955,111 @@ export const trainerConfigs: TrainerConfigs = {
       p.generateAndPopulateMoveset();
       p.pokeball = PokeballType.MASTER_BALL;
     })),
+  [TrainerType.LUSAMINE]: new TrainerConfig(++t).setName("Lusamine").initForEvilTeamLeader("Aether Boss", []).setMixedBattleBgm("battle_aether_boss").setVictoryBgm("victory_team_plasma")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.CLEFABLE ]))
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.LILLIGANT, Species.HISUI_LILLIGANT ]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.MILOTIC, Species.PRIMARINA ]))
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.GALAR_SLOWBRO, Species.GALAR_SLOWKING ]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.BEWEAR ]))
+    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.NIHILEGO ], TrainerSlot.TRAINER, true, p => {
+      p.setBoss(true, 2);
+      p.generateAndPopulateMoveset();
+    })),
+  [TrainerType.LUSAMINE_2]: new TrainerConfig(++t).setName("Lusamine").initForEvilTeamLeader("Aether Boss", [], true).setMixedBattleBgm("battle_aether_boss").setVictoryBgm("victory_team_plasma")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.CLEFABLE ], TrainerSlot.TRAINER, true, p => {
+      p.setBoss(true, 2);
+      p.generateAndPopulateMoveset();
+    }))
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.MILOTIC, Species.PRIMARINA ]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.PHEROMOSA ], TrainerSlot.TRAINER, true, p => {
+      p.generateAndPopulateMoveset();
+      p.pokeball = PokeballType.MASTER_BALL;
+    }))
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.STAKATAKA, Species.CELESTEELA, Species.GUZZLORD ], TrainerSlot.TRAINER, true, p => {
+      p.generateAndPopulateMoveset();
+      p.pokeball = PokeballType.MASTER_BALL;
+    }))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.NIHILEGO ], TrainerSlot.TRAINER, true, p => {
+      p.setBoss(true, 2);
+      p.generateAndPopulateMoveset();
+      p.pokeball = PokeballType.MASTER_BALL;
+    }))
+    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.NECROZMA ], TrainerSlot.TRAINER, true, p => {
+      p.setBoss(true, 2);
+      p.generateAndPopulateMoveset();
+      p.pokeball = PokeballType.MASTER_BALL;
+    })),
+  [TrainerType.GUZMA]: new TrainerConfig(++t).setName("Guzma").initForEvilTeamLeader("Skull Boss", []).setMixedBattleBgm("battle_skull_boss").setVictoryBgm("victory_team_plasma")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.LOKIX, Species.YANMEGA ]))
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.HERACROSS ]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.SCIZOR, Species.KLEAVOR ]))
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.GALVANTULA, Species.VIKAVOLT]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.PINSIR ], TrainerSlot.TRAINER, true, p => {
+      p.generateAndPopulateMoveset();
+      p.formIndex = 1;
+      p.generateName();
+    }))
+    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.GOLISOPOD ], TrainerSlot.TRAINER, true, p => {
+      p.setBoss(true, 2);
+      p.generateAndPopulateMoveset();
+    })),
+  [TrainerType.GUZMA_2]: new TrainerConfig(++t).setName("Guzma").initForEvilTeamLeader("Skull Boss", [], true).setMixedBattleBgm("battle_skull_boss").setVictoryBgm("victory_team_plasma")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.GOLISOPOD ], TrainerSlot.TRAINER, true, p => {
+      p.setBoss(true, 2);
+      p.generateAndPopulateMoveset();
+      p.abilityIndex = 2; //Anticipation
+    }))
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.HISUI_SAMUROTT, Species.CRAWDAUNT ], TrainerSlot.TRAINER, true, p => {
+      p.abilityIndex = 2; //Sharpness, Adaptability
+    }))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.SCIZOR, Species.KLEAVOR ]))
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.PINSIR ], TrainerSlot.TRAINER, true, p => {
+      p.generateAndPopulateMoveset();
+      p.formIndex = 1;
+      p.generateName();
+    }))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.BUZZWOLE ], TrainerSlot.TRAINER, true, p => {
+      p.setBoss(true, 2);
+      p.generateAndPopulateMoveset();
+      p.pokeball = PokeballType.MASTER_BALL;
+    }))
+    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.XURKITREE ], TrainerSlot.TRAINER, true, p => {
+      p.setBoss(true, 2);
+      p.generateAndPopulateMoveset();
+      p.pokeball = PokeballType.MASTER_BALL;
+    })),
+  [TrainerType.ROSE]: new TrainerConfig(++t).setName("Rose").initForEvilTeamLeader("Macro Boss", []).setMixedBattleBgm("battle_macro_boss").setVictoryBgm("victory_team_plasma")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.ARCHALUDON ]))
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.FERROTHORN, Species.ESCAVALIER ]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.SIRFETCHD, Species.MR_RIME ]))
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.CORVIKNIGHT ]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.PERRSERKER, Species.KLINKLANG ]))
+    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.COPPERAJAH ], TrainerSlot.TRAINER, true, p => {
+      p.setBoss(true, 2);
+      p.generateAndPopulateMoveset();
+      p.formIndex = 1;
+      p.generateName();
+    })),
+  [TrainerType.ROSE_2]: new TrainerConfig(++t).setName("Rose").initForEvilTeamLeader("Macro Boss", [], true).setMixedBattleBgm("battle_macro_boss").setVictoryBgm("victory_team_plasma")
+    .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.ARCHALUDON ], TrainerSlot.TRAINER, true, p => {
+      p.setBoss(true, 2);
+      p.generateAndPopulateMoveset();
+    }))
+    .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.AEGISLASH, Species.GHOLDENGO ]))
+    .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.DRACOVISH, Species.DRACOZOLT ], TrainerSlot.TRAINER, true, p => {
+      p.generateAndPopulateMoveset();
+      p.abilityIndex = 1; //Strong Jaw, Hustle
+    }))
+    .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.MELMETAL ]))
+    .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.GALAR_ARTICUNO, Species.GALAR_ZAPDOS, Species.GALAR_MOLTRES ], TrainerSlot.TRAINER, true, p => {
+      p.setBoss(true, 2);
+      p.generateAndPopulateMoveset();
+      p.pokeball = PokeballType.MASTER_BALL;
+    }))
+    .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.COPPERAJAH ], TrainerSlot.TRAINER, true, p => {
+      p.setBoss(true, 2);
+      p.generateAndPopulateMoveset();
+      p.formIndex = 1;
+      p.generateName();
+    })),
 };
diff --git a/src/data/type.ts b/src/data/type.ts
index 7a9f7f3605e..47bea8dd72b 100644
--- a/src/data/type.ts
+++ b/src/data/type.ts
@@ -23,7 +23,7 @@ export enum Type {
 
 export type TypeDamageMultiplier = 0 | 0.125 | 0.25 | 0.5 | 1 | 2 | 4 | 8;
 
-export function getTypeDamageMultiplier(attackType: integer, defType: integer): TypeDamageMultiplier {
+export function getTypeDamageMultiplier(attackType: Type, defType: Type): TypeDamageMultiplier {
   if (attackType === Type.UNKNOWN || defType === Type.UNKNOWN) {
     return 1;
   }
@@ -33,26 +33,10 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
     switch (attackType) {
     case Type.FIGHTING:
       return 2;
-    case Type.NORMAL:
-    case Type.FLYING:
-    case Type.POISON:
-    case Type.GROUND:
-    case Type.ROCK:
-    case Type.BUG:
-    case Type.STEEL:
-    case Type.FIRE:
-    case Type.WATER:
-    case Type.GRASS:
-    case Type.ELECTRIC:
-    case Type.PSYCHIC:
-    case Type.ICE:
-    case Type.DRAGON:
-    case Type.DARK:
-    case Type.FAIRY:
-      return 1;
     case Type.GHOST:
-    default:
       return 0;
+    default:
+      return 1;
     }
   case Type.FIGHTING:
     switch (attackType) {
@@ -60,25 +44,12 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
     case Type.PSYCHIC:
     case Type.FAIRY:
       return 2;
-    case Type.NORMAL:
-    case Type.FIGHTING:
-    case Type.POISON:
-    case Type.GROUND:
-    case Type.GHOST:
-    case Type.STEEL:
-    case Type.FIRE:
-    case Type.WATER:
-    case Type.GRASS:
-    case Type.ELECTRIC:
-    case Type.ICE:
-    case Type.DRAGON:
-      return 1;
     case Type.ROCK:
     case Type.BUG:
     case Type.DARK:
       return 0.5;
     default:
-      return 0;
+      return 1;
     }
   case Type.FLYING:
     switch (attackType) {
@@ -86,43 +57,20 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
     case Type.ELECTRIC:
     case Type.ICE:
       return 2;
-    case Type.NORMAL:
-    case Type.FLYING:
-    case Type.POISON:
-    case Type.GHOST:
-    case Type.STEEL:
-    case Type.FIRE:
-    case Type.WATER:
-    case Type.PSYCHIC:
-    case Type.DRAGON:
-    case Type.DARK:
-    case Type.FAIRY:
-      return 1;
     case Type.FIGHTING:
     case Type.BUG:
     case Type.GRASS:
       return 0.5;
     case Type.GROUND:
-    default:
       return 0;
+    default:
+      return 1;
     }
   case Type.POISON:
     switch (attackType) {
     case Type.GROUND:
     case Type.PSYCHIC:
       return 2;
-    case Type.NORMAL:
-    case Type.FLYING:
-    case Type.ROCK:
-    case Type.GHOST:
-    case Type.STEEL:
-    case Type.FIRE:
-    case Type.WATER:
-    case Type.ELECTRIC:
-    case Type.ICE:
-    case Type.DRAGON:
-    case Type.DARK:
-      return 1;
     case Type.FIGHTING:
     case Type.POISON:
     case Type.BUG:
@@ -130,7 +78,7 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
     case Type.FAIRY:
       return 0.5;
     default:
-      return 0;
+      return 1;
     }
   case Type.GROUND:
     switch (attackType) {
@@ -138,25 +86,13 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
     case Type.GRASS:
     case Type.ICE:
       return 2;
-    case Type.NORMAL:
-    case Type.FIGHTING:
-    case Type.FLYING:
-    case Type.GROUND:
-    case Type.BUG:
-    case Type.GHOST:
-    case Type.STEEL:
-    case Type.FIRE:
-    case Type.PSYCHIC:
-    case Type.DRAGON:
-    case Type.DARK:
-    case Type.FAIRY:
-      return 1;
     case Type.POISON:
     case Type.ROCK:
       return 0.5;
     case Type.ELECTRIC:
-    default:
       return 0;
+    default:
+      return 1;
     }
   case Type.ROCK:
     switch (attackType) {
@@ -166,23 +102,13 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
     case Type.WATER:
     case Type.GRASS:
       return 2;
-    case Type.ROCK:
-    case Type.BUG:
-    case Type.GHOST:
-    case Type.ELECTRIC:
-    case Type.PSYCHIC:
-    case Type.ICE:
-    case Type.DRAGON:
-    case Type.DARK:
-    case Type.FAIRY:
-      return 1;
     case Type.NORMAL:
     case Type.FLYING:
     case Type.POISON:
     case Type.FIRE:
       return 0.5;
     default:
-      return 0;
+      return 1;
     }
   case Type.BUG:
     switch (attackType) {
@@ -190,51 +116,26 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
     case Type.ROCK:
     case Type.FIRE:
       return 2;
-    case Type.NORMAL:
-    case Type.POISON:
-    case Type.BUG:
-    case Type.GHOST:
-    case Type.STEEL:
-    case Type.WATER:
-    case Type.ELECTRIC:
-    case Type.PSYCHIC:
-    case Type.ICE:
-    case Type.DRAGON:
-    case Type.DARK:
-    case Type.FAIRY:
-      return 1;
     case Type.FIGHTING:
     case Type.GROUND:
     case Type.GRASS:
       return 0.5;
     default:
-      return 0;
+      return 1;
     }
   case Type.GHOST:
     switch (attackType) {
     case Type.GHOST:
     case Type.DARK:
       return 2;
-    case Type.FLYING:
-    case Type.GROUND:
-    case Type.ROCK:
-    case Type.STEEL:
-    case Type.FIRE:
-    case Type.WATER:
-    case Type.GRASS:
-    case Type.ELECTRIC:
-    case Type.PSYCHIC:
-    case Type.ICE:
-    case Type.DRAGON:
-    case Type.FAIRY:
-      return 1;
     case Type.POISON:
     case Type.BUG:
       return 0.5;
     case Type.NORMAL:
     case Type.FIGHTING:
-    default:
       return 0;
+    default:
+      return 1;
     }
   case Type.STEEL:
     switch (attackType) {
@@ -242,11 +143,6 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
     case Type.GROUND:
     case Type.FIRE:
       return 2;
-    case Type.GHOST:
-    case Type.WATER:
-    case Type.ELECTRIC:
-    case Type.DARK:
-      return 1;
     case Type.NORMAL:
     case Type.FLYING:
     case Type.ROCK:
@@ -259,8 +155,9 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
     case Type.FAIRY:
       return 0.5;
     case Type.POISON:
-    default:
       return 0;
+    default:
+      return 1;
     }
   case Type.FIRE:
     switch (attackType) {
@@ -268,16 +165,6 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
     case Type.ROCK:
     case Type.WATER:
       return 2;
-    case Type.NORMAL:
-    case Type.FIGHTING:
-    case Type.FLYING:
-    case Type.POISON:
-    case Type.GHOST:
-    case Type.ELECTRIC:
-    case Type.PSYCHIC:
-    case Type.DRAGON:
-    case Type.DARK:
-      return 1;
     case Type.BUG:
     case Type.STEEL:
     case Type.FIRE:
@@ -286,33 +173,20 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
     case Type.FAIRY:
       return 0.5;
     default:
-      return 0;
+      return 1;
     }
   case Type.WATER:
     switch (attackType) {
     case Type.GRASS:
     case Type.ELECTRIC:
       return 2;
-    case Type.NORMAL:
-    case Type.FIGHTING:
-    case Type.FLYING:
-    case Type.POISON:
-    case Type.GROUND:
-    case Type.ROCK:
-    case Type.BUG:
-    case Type.GHOST:
-    case Type.PSYCHIC:
-    case Type.DRAGON:
-    case Type.DARK:
-    case Type.FAIRY:
-      return 1;
     case Type.STEEL:
     case Type.FIRE:
     case Type.WATER:
     case Type.ICE:
       return 0.5;
     default:
-      return 0;
+      return 1;
     }
   case Type.GRASS:
     switch (attackType) {
@@ -322,49 +196,24 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
     case Type.FIRE:
     case Type.ICE:
       return 2;
-    case Type.NORMAL:
-    case Type.FIGHTING:
-    case Type.ROCK:
-    case Type.GHOST:
-    case Type.STEEL:
-    case Type.PSYCHIC:
-    case Type.DRAGON:
-    case Type.DARK:
-    case Type.FAIRY:
-      return 1;
     case Type.GROUND:
     case Type.WATER:
     case Type.GRASS:
     case Type.ELECTRIC:
       return 0.5;
     default:
-      return 0;
+      return 1;
     }
   case Type.ELECTRIC:
     switch (attackType) {
     case Type.GROUND:
       return 2;
-    case Type.NORMAL:
-    case Type.FIGHTING:
-    case Type.POISON:
-    case Type.ROCK:
-    case Type.BUG:
-    case Type.GHOST:
-    case Type.FIRE:
-    case Type.WATER:
-    case Type.GRASS:
-    case Type.PSYCHIC:
-    case Type.ICE:
-    case Type.DRAGON:
-    case Type.DARK:
-    case Type.FAIRY:
-      return 1;
     case Type.FLYING:
     case Type.STEEL:
     case Type.ELECTRIC:
       return 0.5;
     default:
-      return 0;
+      return 1;
     }
   case Type.PSYCHIC:
     switch (attackType) {
@@ -372,25 +221,11 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
     case Type.GHOST:
     case Type.DARK:
       return 2;
-    case Type.NORMAL:
-    case Type.FLYING:
-    case Type.POISON:
-    case Type.GROUND:
-    case Type.ROCK:
-    case Type.STEEL:
-    case Type.FIRE:
-    case Type.WATER:
-    case Type.GRASS:
-    case Type.ELECTRIC:
-    case Type.ICE:
-    case Type.DRAGON:
-    case Type.FAIRY:
-      return 1;
     case Type.FIGHTING:
     case Type.PSYCHIC:
       return 0.5;
     default:
-      return 0;
+      return 1;
     }
   case Type.ICE:
     switch (attackType) {
@@ -399,24 +234,10 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
     case Type.STEEL:
     case Type.FIRE:
       return 2;
-    case Type.NORMAL:
-    case Type.FLYING:
-    case Type.POISON:
-    case Type.GROUND:
-    case Type.BUG:
-    case Type.GHOST:
-    case Type.WATER:
-    case Type.GRASS:
-    case Type.ELECTRIC:
-    case Type.PSYCHIC:
-    case Type.DRAGON:
-    case Type.DARK:
-    case Type.FAIRY:
-      return 1;
     case Type.ICE:
       return 0.5;
     default:
-      return 0;
+      return 1;
     }
   case Type.DRAGON:
     switch (attackType) {
@@ -424,25 +245,13 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
     case Type.DRAGON:
     case Type.FAIRY:
       return 2;
-    case Type.NORMAL:
-    case Type.FIGHTING:
-    case Type.FLYING:
-    case Type.POISON:
-    case Type.GROUND:
-    case Type.ROCK:
-    case Type.BUG:
-    case Type.GHOST:
-    case Type.STEEL:
-    case Type.PSYCHIC:
-    case Type.DARK:
-      return 1;
     case Type.FIRE:
     case Type.WATER:
     case Type.GRASS:
     case Type.ELECTRIC:
       return 0.5;
     default:
-      return 0;
+      return 1;
     }
   case Type.DARK:
     switch (attackType) {
@@ -450,106 +259,33 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
     case Type.BUG:
     case Type.FAIRY:
       return 2;
-    case Type.NORMAL:
-    case Type.FLYING:
-    case Type.POISON:
-    case Type.GROUND:
-    case Type.ROCK:
-    case Type.STEEL:
-    case Type.FIRE:
-    case Type.WATER:
-    case Type.GRASS:
-    case Type.ELECTRIC:
-    case Type.ICE:
-    case Type.DRAGON:
-      return 1;
     case Type.GHOST:
     case Type.DARK:
       return 0.5;
     case Type.PSYCHIC:
-    default:
       return 0;
+    default:
+      return 1;
     }
   case Type.FAIRY:
     switch (attackType) {
     case Type.POISON:
     case Type.STEEL:
       return 2;
-    case Type.NORMAL:
-    case Type.FLYING:
-    case Type.GROUND:
-    case Type.ROCK:
-    case Type.GHOST:
-    case Type.FIRE:
-    case Type.WATER:
-    case Type.GRASS:
-    case Type.ELECTRIC:
-    case Type.PSYCHIC:
-    case Type.ICE:
-    case Type.FAIRY:
-      return 1;
     case Type.FIGHTING:
     case Type.BUG:
     case Type.DARK:
       return 0.5;
     case Type.DRAGON:
-    default:
       return 0;
+    default:
+      return 1;
     }
   case Type.STELLAR:
     return 1;
   }
 
-  return 0;
-}
-
-/**
- * Retrieve the types resisting a given type
- * @returns An array populated with Types, or an empty array if no resistances exist (Unknown or Stellar type)
- */
-export function getTypeResistances(type: number): Type[] {
-  switch (type) {
-  case Type.NORMAL:
-    return [Type.ROCK, Type.STEEL, Type.GHOST];
-  case Type.FIGHTING:
-    return [Type.FLYING, Type.POISON, Type.BUG, Type.PSYCHIC, Type.FAIRY, Type.GHOST];
-  case Type.FLYING:
-    return [Type.ROCK, Type.ELECTRIC, Type.STEEL];
-  case Type.POISON:
-    return [Type.POISON, Type.GROUND, Type.ROCK, Type.GHOST, Type.STEEL];
-  case Type.GROUND:
-    return [Type.BUG, Type.GRASS, Type.FLYING];
-  case Type.ROCK:
-    return [Type.FIGHTING, Type.GROUND, Type.STEEL];
-  case Type.BUG:
-    return [Type.FIGHTING, Type.FLYING, Type.POISON, Type.GHOST, Type.STEEL, Type.FIRE, Type.FAIRY];
-  case Type.GHOST:
-    return [Type.DARK, Type.NORMAL];
-  case Type.STEEL:
-    return [Type.STEEL, Type.FIRE, Type.WATER, Type.ELECTRIC];
-  case Type.FIRE:
-    return [Type.ROCK, Type.FIRE, Type.WATER, Type.DRAGON];
-  case Type.WATER:
-    return [Type.WATER, Type.GRASS, Type.DRAGON];
-  case Type.GRASS:
-    return [Type.FLYING, Type.POISON, Type.BUG, Type.STEEL, Type.FIRE, Type.GRASS, Type.DRAGON];
-  case Type.ELECTRIC:
-    return [Type.GRASS, Type.ELECTRIC, Type.DRAGON, Type.GROUND];
-  case Type.PSYCHIC:
-    return [Type.STEEL, Type.PSYCHIC];
-  case Type.ICE:
-    return [Type.STEEL, Type.FIRE, Type.WATER, Type.ICE];
-  case Type.DRAGON:
-    return [Type.STEEL, Type.FAIRY];
-  case Type.DARK:
-    return [Type.FIGHTING, Type.DARK, Type.FAIRY];
-  case Type.FAIRY:
-    return [Type.POISON, Type.STEEL, Type.FIRE];
-  case Type.UNKNOWN:
-  case Type.STELLAR:
-  default:
-    return [];
-  }
+  return 1;
 }
 
 /**
diff --git a/src/enums/challenges.ts b/src/enums/challenges.ts
index 690e1cdc32d..c4dc7460dfe 100644
--- a/src/enums/challenges.ts
+++ b/src/enums/challenges.ts
@@ -3,5 +3,6 @@ export enum Challenges {
     SINGLE_TYPE,
     LOWER_MAX_STARTER_COST,
     LOWER_STARTER_POINTS,
-    FRESH_START
+    FRESH_START,
+    INVERSE_BATTLE,
 }
diff --git a/src/enums/trainer-type.ts b/src/enums/trainer-type.ts
index 2ecd3641d21..189016c4837 100644
--- a/src/enums/trainer-type.ts
+++ b/src/enums/trainer-type.ts
@@ -72,6 +72,12 @@ export enum TrainerType {
     FLARE_GRUNT,
     BRYONY,
     XEROSIC,
+    AETHER_GRUNT,
+    FABA,
+    SKULL_GRUNT,
+    PLUMERIA,
+    MACRO_GRUNT,
+    OLEANA,
     ROCKET_BOSS_GIOVANNI_1,
     ROCKET_BOSS_GIOVANNI_2,
     MAXIE,
@@ -84,6 +90,12 @@ export enum TrainerType {
     GHETSIS_2,
     LYSANDRE,
     LYSANDRE_2,
+    LUSAMINE,
+    LUSAMINE_2,
+    GUZMA,
+    GUZMA_2,
+    ROSE,
+    ROSE_2,
 
     BROCK = 200,
     MISTY,
diff --git a/src/field/arena.ts b/src/field/arena.ts
index 0443ef19544..7622b9a014f 100644
--- a/src/field/arena.ts
+++ b/src/field/arena.ts
@@ -20,7 +20,10 @@ import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { TimeOfDay } from "#enums/time-of-day";
 import { TrainerType } from "#enums/trainer-type";
-import { CommonAnimPhase } from "#app/phases/common-anim-phase.js";
+import { Abilities } from "#app/enums/abilities";
+import { SpeciesFormChangeRevertWeatherFormTrigger, SpeciesFormChangeWeatherTrigger } from "#app/data/pokemon-forms";
+import { CommonAnimPhase } from "#app/phases/common-anim-phase";
+import { ShowAbilityPhase } from "#app/phases/show-ability-phase";
 
 export class Arena {
   public scene: BattleScene;
@@ -331,6 +334,30 @@ export class Arena {
     return true;
   }
 
+  /**
+   * Function to trigger all weather based form changes
+   */
+  triggerWeatherBasedFormChanges(): void {
+    this.scene.getField(true).forEach( p => {
+      if (p.hasAbility(Abilities.FORECAST) && p.species.speciesId === Species.CASTFORM) {
+        new ShowAbilityPhase(this.scene, p.getBattlerIndex());
+        this.scene.triggerPokemonFormChange(p, SpeciesFormChangeWeatherTrigger);
+      }
+    });
+  }
+
+  /**
+   * Function to trigger all weather based form changes back into their normal forms
+   */
+  triggerWeatherBasedFormChangesToNormal(): void {
+    this.scene.getField(true).forEach( p => {
+      if (p.hasAbility(Abilities.FORECAST, false, true) && p.species.speciesId === Species.CASTFORM) {
+        new ShowAbilityPhase(this.scene, p.getBattlerIndex());
+        return this.scene.triggerPokemonFormChange(p, SpeciesFormChangeRevertWeatherFormTrigger);
+      }
+    });
+  }
+
   trySetTerrain(terrain: TerrainType, hasPokemonSource: boolean, ignoreAnim: boolean = false): boolean {
     if (this.terrain?.terrainType === (terrain || undefined)) {
       return false;
diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 234afae3f40..6df486aab39 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -3,7 +3,7 @@ import BattleScene, { AnySound } from "../battle-scene";
 import { Variant, VariantSet, variantColorCache } from "#app/data/variant";
 import { variantData } from "#app/data/variant";
 import BattleInfo, { PlayerBattleInfo, EnemyBattleInfo } from "../ui/battle-info";
-import Move, { HighCritAttr, HitsTagAttr, applyMoveAttrs, FixedDamageAttr, VariableAtkAttr, allMoves, MoveCategory, TypelessAttr, CritOnlyAttr, getMoveTargets, OneHitKOAttr, VariableMoveTypeAttr, StatusMoveTypeImmunityAttr, VariableDefAttr, AttackMove, ModifiedDamageAttr, VariableMoveTypeMultiplierAttr, IgnoreOpponentStatChangesAttr, SacrificialAttr, VariableMoveCategoryAttr, CounterDamageAttr, StatChangeAttr, RechargeAttr, ChargeAttr, IgnoreWeatherTypeDebuffAttr, BypassBurnDamageReductionAttr, SacrificialAttrOnHit, NeutralDamageAgainstFlyingTypeMultiplierAttr, OneHitKOAccuracyAttr } from "../data/move";
+import Move, { HighCritAttr, HitsTagAttr, applyMoveAttrs, FixedDamageAttr, VariableAtkAttr, allMoves, MoveCategory, TypelessAttr, CritOnlyAttr, getMoveTargets, OneHitKOAttr, VariableMoveTypeAttr, VariableDefAttr, AttackMove, ModifiedDamageAttr, VariableMoveTypeMultiplierAttr, IgnoreOpponentStatChangesAttr, SacrificialAttr, VariableMoveCategoryAttr, CounterDamageAttr, StatChangeAttr, RechargeAttr, ChargeAttr, IgnoreWeatherTypeDebuffAttr, BypassBurnDamageReductionAttr, SacrificialAttrOnHit, OneHitKOAccuracyAttr, RespectAttackTypeImmunityAttr } from "../data/move";
 import { default as PokemonSpecies, PokemonSpeciesForm, SpeciesFormKey, getFusedSpeciesName, getPokemonSpecies, getPokemonSpeciesForm, getStarterValueFriendshipCap, speciesStarters, starterPassiveAbilities } from "../data/pokemon-species";
 import { Constructor } from "#app/utils";
 import * as Utils from "../utils";
@@ -22,7 +22,7 @@ import { BattlerTag, BattlerTagLapseType, EncoreTag, GroundedTag, HighestStatBoo
 import { WeatherType } from "../data/weather";
 import { TempBattleStat } from "../data/temp-battle-stat";
 import { ArenaTagSide, NoCritTag, WeakenMoveScreenTag } from "../data/arena-tag";
-import { Ability, AbAttr, BattleStatMultiplierAbAttr, BlockCritAbAttr, BonusCritAbAttr, BypassBurnDamageReductionAbAttr, FieldPriorityMoveImmunityAbAttr, IgnoreOpponentStatChangesAbAttr, MoveImmunityAbAttr, PreDefendFullHpEndureAbAttr, ReceivedMoveDamageMultiplierAbAttr, ReduceStatusEffectDurationAbAttr, StabBoostAbAttr, StatusEffectImmunityAbAttr, TypeImmunityAbAttr, WeightMultiplierAbAttr, allAbilities, applyAbAttrs, applyBattleStatMultiplierAbAttrs, applyPreApplyBattlerTagAbAttrs, applyPreAttackAbAttrs, applyPreDefendAbAttrs, applyPreSetStatusAbAttrs, UnsuppressableAbilityAbAttr, SuppressFieldAbilitiesAbAttr, NoFusionAbilityAbAttr, MultCritAbAttr, IgnoreTypeImmunityAbAttr, DamageBoostAbAttr, IgnoreTypeStatusEffectImmunityAbAttr, ConditionalCritAbAttr, applyFieldBattleStatMultiplierAbAttrs, FieldMultiplyBattleStatAbAttr, AddSecondStrikeAbAttr, IgnoreOpponentEvasionAbAttr, UserFieldStatusEffectImmunityAbAttr, UserFieldBattlerTagImmunityAbAttr, BattlerTagImmunityAbAttr } from "../data/ability";
+import { Ability, AbAttr, BattleStatMultiplierAbAttr, BlockCritAbAttr, BonusCritAbAttr, BypassBurnDamageReductionAbAttr, FieldPriorityMoveImmunityAbAttr, IgnoreOpponentStatChangesAbAttr, MoveImmunityAbAttr, PreDefendFullHpEndureAbAttr, ReceivedMoveDamageMultiplierAbAttr, ReduceStatusEffectDurationAbAttr, StabBoostAbAttr, StatusEffectImmunityAbAttr, TypeImmunityAbAttr, WeightMultiplierAbAttr, allAbilities, applyAbAttrs, applyBattleStatMultiplierAbAttrs, applyPreApplyBattlerTagAbAttrs, applyPreAttackAbAttrs, applyPreDefendAbAttrs, applyPreSetStatusAbAttrs, UnsuppressableAbilityAbAttr, SuppressFieldAbilitiesAbAttr, NoFusionAbilityAbAttr, MultCritAbAttr, IgnoreTypeImmunityAbAttr, DamageBoostAbAttr, IgnoreTypeStatusEffectImmunityAbAttr, ConditionalCritAbAttr, applyFieldBattleStatMultiplierAbAttrs, FieldMultiplyBattleStatAbAttr, AddSecondStrikeAbAttr, IgnoreOpponentEvasionAbAttr, UserFieldStatusEffectImmunityAbAttr, UserFieldBattlerTagImmunityAbAttr, BattlerTagImmunityAbAttr, MoveTypeChangeAbAttr } from "../data/ability";
 import PokemonData from "../system/pokemon-data";
 import { BattlerIndex } from "../battle";
 import { Mode } from "../ui/ui";
@@ -49,6 +49,7 @@ import { BerryType } from "#enums/berry-type";
 import { Biome } from "#enums/biome";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
+import { Challenges } from "#enums/challenges";
 import { getPokemonNameWithAffix } from "#app/messages.js";
 import { DamagePhase } from "#app/phases/damage-phase.js";
 import { FaintPhase } from "#app/phases/faint-phase.js";
@@ -1140,7 +1141,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * effects which can affect whether an ability will be present or in effect, and both passive and
    * non-passive. This is the primary way to check whether a pokemon has a particular ability.
    * @param {Abilities} ability The ability to check for
-   * @param {boolean} canApply If false, it doesn't check whether the abiltiy is currently active
+   * @param {boolean} canApply If false, it doesn't check whether the ability is currently active
    * @param {boolean} ignoreOverride If true, it ignores ability changing effects
    * @returns {boolean} Whether the ability is present and active
    */
@@ -1208,60 +1209,83 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   }
 
   /**
-   * Calculates the effectiveness of a move against the Pokémon.
-   *
-   * @param source - The Pokémon using the move.
-   * @param move - The move being used.
-   * @returns The type damage multiplier or 1 if it's a status move
+   * Calculates the type of a move when used by this Pokemon after
+   * type-changing move and ability attributes have applied.
+   * @param move {@linkcode Move} The move being used.
+   * @param simulated If `true`, prevents showing abilities applied in this calculation.
+   * @returns the {@linkcode Type} of the move after attributes are applied
    */
-  getMoveEffectiveness(source: Pokemon, move: PokemonMove): TypeDamageMultiplier {
-    if (move.getMove().category === MoveCategory.STATUS) {
-      return 1;
-    }
+  getMoveType(move: Move, simulated: boolean = true): Type {
+    const moveTypeHolder = new Utils.NumberHolder(move.type);
 
-    return this.getAttackMoveEffectiveness(source, move, !this.battleData?.abilityRevealed);
+    applyMoveAttrs(VariableMoveTypeAttr, this, null, move, moveTypeHolder);
+    applyPreAttackAbAttrs(MoveTypeChangeAbAttr, this, null, move, simulated, moveTypeHolder);
+
+    return moveTypeHolder.value as Type;
   }
 
+
+
   /**
-   * Calculates the effectiveness of an attack move against the Pokémon.
+   * Calculates the effectiveness of a move against the Pokémon.
    *
-   * @param source - The attacking Pokémon.
-   * @param pokemonMove - The move being used by the attacking Pokémon.
-   * @param ignoreAbility - Whether to check for abilities that might affect type effectiveness or immunity.
+   * @param source {@linkcode Pokemon} The attacking Pokémon.
+   * @param move {@linkcode Move} The move being used by the attacking Pokémon.
+   * @param ignoreAbility Whether to ignore abilities that might affect type effectiveness or immunity (defaults to `false`).
+   * @param simulated Whether to apply abilities via simulated calls (defaults to `true`)
+   * @param cancelled {@linkcode Utils.BooleanHolder} Stores whether the move was cancelled by a non-type-based immunity.
+   * Currently only used by {@linkcode Pokemon.apply} to determine whether a "No effect" message should be shown.
    * @returns The type damage multiplier, indicating the effectiveness of the move
    */
-  getAttackMoveEffectiveness(source: Pokemon, pokemonMove: PokemonMove, ignoreAbility: boolean = false): TypeDamageMultiplier {
-    const move = pokemonMove.getMove();
-    const typeless = move.hasAttr(TypelessAttr);
-    const typeMultiplier = new Utils.NumberHolder(this.getAttackTypeEffectiveness(move, source));
-    const cancelled = new Utils.BooleanHolder(false);
-    applyMoveAttrs(VariableMoveTypeMultiplierAttr, source, this, move, typeMultiplier);
-    if (!typeless && !ignoreAbility) {
-      applyPreDefendAbAttrs(TypeImmunityAbAttr, this, source, move, cancelled, true, typeMultiplier);
+  getMoveEffectiveness(source: Pokemon, move: Move, ignoreAbility: boolean = false, simulated: boolean = true, cancelled?: Utils.BooleanHolder): TypeDamageMultiplier {
+    if (move.hasAttr(TypelessAttr)) {
+      return 1;
     }
-    if (!cancelled.value && !ignoreAbility) {
-      applyPreDefendAbAttrs(MoveImmunityAbAttr, this, source, move, cancelled, true, typeMultiplier);
+    const moveType = source.getMoveType(move);
+
+    const typeMultiplier = new Utils.NumberHolder((move.category !== MoveCategory.STATUS || move.hasAttr(RespectAttackTypeImmunityAttr))
+      ? this.getAttackTypeEffectiveness(moveType, source, false, simulated)
+      : 1);
+
+    applyMoveAttrs(VariableMoveTypeMultiplierAttr, source, this, move, typeMultiplier);
+    if (this.getTypes().find(t => move.isTypeImmune(source, this, t))) {
+      typeMultiplier.value = 0;
     }
 
-    return (!cancelled.value ? Number(typeMultiplier.value) : 0) as TypeDamageMultiplier;
+    const cancelledHolder = cancelled ?? new Utils.BooleanHolder(false);
+    if (!ignoreAbility) {
+      applyPreDefendAbAttrs(TypeImmunityAbAttr, this, source, move, cancelledHolder, simulated, typeMultiplier);
+
+      if (!cancelledHolder.value) {
+        applyPreDefendAbAttrs(MoveImmunityAbAttr, this, source, move, cancelledHolder, simulated, typeMultiplier);
+      }
+
+      if (!cancelledHolder.value) {
+        const defendingSidePlayField = this.isPlayer() ? this.scene.getPlayerField() : this.scene.getEnemyField();
+        defendingSidePlayField.forEach((p) => applyPreDefendAbAttrs(FieldPriorityMoveImmunityAbAttr, p, source, move, cancelledHolder));
+      }
+    }
+
+    const immuneTags = this.findTags(tag => tag instanceof TypeImmuneTag && tag.immuneType === moveType);
+    for (const tag of immuneTags) {
+      if (move && !move.getAttrs(HitsTagAttr).some(attr => attr.tagType === tag.tagType)) {
+        typeMultiplier.value = 0;
+        break;
+      }
+    }
+
+    return (!cancelledHolder.value ? typeMultiplier.value : 0) as TypeDamageMultiplier;
   }
 
   /**
    * Calculates the type effectiveness multiplier for an attack type
-   * @param moveOrType The move being used, or a type if the move is unknown
-   * @param source the Pokemon using the move
+   * @param moveType {@linkcode Type} the type of the move being used
+   * @param source {@linkcode Pokemon} the Pokemon using the move
    * @param ignoreStrongWinds whether or not this ignores strong winds (anticipation, forewarn, stealth rocks)
    * @param simulated tag to only apply the strong winds effect message when the move is used
    * @returns a multiplier for the type effectiveness
    */
-  getAttackTypeEffectiveness(moveOrType: Move | Type, source?: Pokemon, ignoreStrongWinds: boolean = false, simulated: boolean = true): TypeDamageMultiplier {
-    const move = (moveOrType instanceof Move)
-      ? moveOrType
-      : undefined;
-    const moveType = (moveOrType instanceof Move)
-      ? move!.type // TODO: is this bang correct?
-      : moveOrType;
-
+  getAttackTypeEffectiveness(moveType: Type, source?: Pokemon, ignoreStrongWinds: boolean = false, simulated: boolean = true): TypeDamageMultiplier {
     if (moveType === Type.STELLAR) {
       return this.isTerastallized() ? 2 : 1;
     }
@@ -1281,7 +1305,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       if (source) {
         const ignoreImmunity = new Utils.BooleanHolder(false);
         if (source.isActive(true) && source.hasAbilityWithAttr(IgnoreTypeImmunityAbAttr)) {
-          applyAbAttrs(IgnoreTypeImmunityAbAttr, source, ignoreImmunity, false, moveType, defType);
+          applyAbAttrs(IgnoreTypeImmunityAbAttr, source, ignoreImmunity, simulated, moveType, defType);
         }
         if (ignoreImmunity.value) {
           return 1;
@@ -1292,26 +1316,20 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
           return 1;
         }
       }
-
-      return getTypeDamageMultiplier(moveType, defType);
+      const multiplier = new Utils.NumberHolder(getTypeDamageMultiplier(moveType, defType));
+      applyChallenges(this.scene.gameMode, ChallengeType.TYPE_EFFECTIVENESS, multiplier);
+      return multiplier.value;
     }).reduce((acc, cur) => acc * cur, 1) as TypeDamageMultiplier;
 
+    const typeMultiplierAgainstFlying = new Utils.NumberHolder(getTypeDamageMultiplier(moveType, Type.FLYING));
+    applyChallenges(this.scene.gameMode, ChallengeType.TYPE_EFFECTIVENESS, typeMultiplierAgainstFlying);
     // Handle strong winds lowering effectiveness of types super effective against pure flying
-    if (!ignoreStrongWinds && arena.weather?.weatherType === WeatherType.STRONG_WINDS && !arena.weather.isEffectSuppressed(this.scene) && this.isOfType(Type.FLYING) && getTypeDamageMultiplier(moveType, Type.FLYING) === 2) {
+    if (!ignoreStrongWinds && arena.weather?.weatherType === WeatherType.STRONG_WINDS && !arena.weather.isEffectSuppressed(this.scene) && this.isOfType(Type.FLYING) && typeMultiplierAgainstFlying.value === 2) {
       multiplier /= 2;
       if (!simulated) {
         this.scene.queueMessage(i18next.t("weather:strongWindsEffectMessage"));
       }
     }
-
-    const immuneTags = this.findTags(tag => tag instanceof TypeImmuneTag && tag.immuneType === moveType);
-    for (const tag of immuneTags) {
-      if (move && !move.getAttrs(HitsTagAttr).some(attr => attr.tagType === tag.tagType)) {
-        multiplier = 0;
-        break;
-      }
-    }
-
     return multiplier as TypeDamageMultiplier;
   }
 
@@ -1959,29 +1977,23 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     let result: HitResult;
     const damage = new Utils.NumberHolder(0);
     const defendingSide = this.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY;
-    const defendingSidePlayField = this.isPlayer() ? this.scene.getPlayerField() : this.scene.getEnemyField();
 
-    const variableCategory = new Utils.IntegerHolder(move.category);
+    const variableCategory = new Utils.NumberHolder(move.category);
     applyMoveAttrs(VariableMoveCategoryAttr, source, this, move, variableCategory);
     const moveCategory = variableCategory.value as MoveCategory;
 
-    applyMoveAttrs(VariableMoveTypeAttr, source, this, move);
-    const types = this.getTypes(true, true);
+    /** The move's type after type-changing effects are applied */
+    const moveType = source.getMoveType(move);
 
+    /** If `value` is `true`, cancels the move and suppresses "No Effect" messages */
     const cancelled = new Utils.BooleanHolder(false);
-    const power = move.calculateBattlePower(source, this);
-    const typeless = move.hasAttr(TypelessAttr);
 
-    const typeMultiplier = new Utils.NumberHolder(!typeless && (moveCategory !== MoveCategory.STATUS || move.getAttrs(StatusMoveTypeImmunityAttr).find(attr => types.includes(attr.immuneType)))
-      ? this.getAttackTypeEffectiveness(move, source, false, false)
-      : 1);
-    applyMoveAttrs(VariableMoveTypeMultiplierAttr, source, this, move, typeMultiplier);
-    if (typeless) {
-      typeMultiplier.value = 1;
-    }
-    if (types.find(t => move.isTypeImmune(source, this, t))) {
-      typeMultiplier.value = 0;
-    }
+    /**
+     * The effectiveness of the move being used. Along with type matchups, this
+     * accounts for changes in effectiveness from the move's attributes and the
+     * abilities of both the source and this Pokemon.
+     */
+    const typeMultiplier = this.getMoveEffectiveness(source, move, false, false, cancelled);
 
     switch (moveCategory) {
     case MoveCategory.PHYSICAL:
@@ -1989,27 +2001,44 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       const isPhysical = moveCategory === MoveCategory.PHYSICAL;
       const sourceTeraType = source.getTeraType();
 
-      if (!typeless) {
-        applyPreDefendAbAttrs(TypeImmunityAbAttr, this, source, move, cancelled, false, typeMultiplier);
-        applyMoveAttrs(NeutralDamageAgainstFlyingTypeMultiplierAttr, source, this, move, typeMultiplier);
-      }
-      if (!cancelled.value) {
-        applyPreDefendAbAttrs(MoveImmunityAbAttr, this, source, move, cancelled, false, typeMultiplier);
-        defendingSidePlayField.forEach((p) => applyPreDefendAbAttrs(FieldPriorityMoveImmunityAbAttr, p, source, move, cancelled, false, typeMultiplier));
-      }
+      const power = move.calculateBattlePower(source, this);
 
       if (cancelled.value) {
+        // Cancelled moves fail silently
         source.stopMultiHit(this);
-        result = HitResult.NO_EFFECT;
+        return HitResult.NO_EFFECT;
       } else {
-        const typeBoost = source.findTag(t => t instanceof TypeBoostTag && t.boostedType === move.type) as TypeBoostTag;
+        const typeBoost = source.findTag(t => t instanceof TypeBoostTag && t.boostedType === moveType) as TypeBoostTag;
         if (typeBoost?.oneUse) {
           source.removeTag(typeBoost.tagType);
         }
 
-        const arenaAttackTypeMultiplier = new Utils.NumberHolder(this.scene.arena.getAttackTypeMultiplier(move.type, source.isGrounded()));
+        /** Combined damage multiplier from field effects such as weather, terrain, etc. */
+        const arenaAttackTypeMultiplier = new Utils.NumberHolder(this.scene.arena.getAttackTypeMultiplier(moveType, source.isGrounded()));
         applyMoveAttrs(IgnoreWeatherTypeDebuffAttr, source, this, move, arenaAttackTypeMultiplier);
 
+        /**
+         * Whether or not this Pokemon is immune to the incoming move.
+         * Note that this isn't fully resolved in `getMoveEffectiveness` because
+         * of possible type-suppressing field effects (e.g. Desolate Land's effect on Water-type attacks).
+         */
+        const isTypeImmune = (typeMultiplier * arenaAttackTypeMultiplier.value) === 0;
+        if (isTypeImmune) {
+          // Moves with no effect that were not cancelled queue a "no effect" message before failing
+          source.stopMultiHit(this);
+          result = (move.id === Moves.SHEER_COLD)
+            ? HitResult.IMMUNE
+            : HitResult.NO_EFFECT;
+
+          if (result === HitResult.IMMUNE) {
+            this.scene.queueMessage(i18next.t("battle:hitResultImmune", { pokemonName: this.name }));
+          } else {
+            this.scene.queueMessage(i18next.t("battle:hitResultNoEffect", { pokemonName: getPokemonNameWithAffix(this) }));
+          }
+
+          return result;
+        }
+
         const glaiveRushModifier = new Utils.IntegerHolder(1);
         if (this.getTag(BattlerTagType.RECEIVE_DOUBLE_DAMAGE)) {
           glaiveRushModifier.value = 2;
@@ -2059,13 +2088,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
         if (!isCritical) {
           this.scene.arena.applyTagsForSide(WeakenMoveScreenTag, defendingSide, move.category, this.scene.currentBattle.double, screenMultiplier);
         }
-        const isTypeImmune = (typeMultiplier.value * arenaAttackTypeMultiplier.value) === 0;
         const sourceTypes = source.getTypes();
-        const matchesSourceType = sourceTypes[0] === move.type || (sourceTypes.length > 1 && sourceTypes[1] === move.type);
+        const matchesSourceType = sourceTypes[0] === moveType || (sourceTypes.length > 1 && sourceTypes[1] === moveType);
         const stabMultiplier = new Utils.NumberHolder(1);
         if (sourceTeraType === Type.UNKNOWN && matchesSourceType) {
           stabMultiplier.value += 0.5;
-        } else if (sourceTeraType !== Type.UNKNOWN && sourceTeraType === move.type) {
+        } else if (sourceTeraType !== Type.UNKNOWN && sourceTeraType === moveType) {
           stabMultiplier.value += 0.5;
         }
 
@@ -2075,8 +2103,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
           stabMultiplier.value = Math.min(stabMultiplier.value + 0.5, 2.25);
         }
 
-        const targetCount = getMoveTargets(source, move.id).targets.length;
-        const targetMultiplier = targetCount > 1 ? 0.75 : 1; // 25% damage debuff on multi-target hits (even if it's immune)
+        // 25% damage debuff on moves hitting more than one non-fainted target (regardless of immunities)
+        const { targets, multiple } = getMoveTargets(source, move.id);
+        const targetMultiplier = (multiple && targets.length > 1) ? 0.75 : 1;
 
         applyMoveAttrs(VariableAtkAttr, source, this, move, sourceAtk);
         applyMoveAttrs(VariableDefAttr, source, this, move, targetDef);
@@ -2094,7 +2123,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
           const randomMultiplier = ((this.scene.randBattleSeedInt(16) + 85) / 100);
           damage.value = Utils.toDmgValue((((levelMultiplier * power * sourceAtk.value / targetDef.value) / 50) + 2)
                                    * stabMultiplier.value
-                                   * typeMultiplier.value
+                                   * typeMultiplier
                                    * arenaAttackTypeMultiplier.value
                                    * screenMultiplier.value
                                    * twoStrikeMultiplier.value
@@ -2128,7 +2157,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
           });
         }
 
-        if (this.scene.arena.terrain?.terrainType === TerrainType.MISTY && this.isGrounded() && move.type === Type.DRAGON) {
+        if (this.scene.arena.terrain?.terrainType === TerrainType.MISTY && this.isGrounded() && moveType === Type.DRAGON) {
           damage.value = Utils.toDmgValue(damage.value / 2);
         }
 
@@ -2142,22 +2171,18 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
         result = result!; // telling TS compiler that result is defined!
 
         if (!result) {
-          if (!typeMultiplier.value) {
-            result = move.id === Moves.SHEER_COLD ? HitResult.IMMUNE : HitResult.NO_EFFECT;
+          const isOneHitKo = new Utils.BooleanHolder(false);
+          applyMoveAttrs(OneHitKOAttr, source, this, move, isOneHitKo);
+          if (isOneHitKo.value) {
+            result = HitResult.ONE_HIT_KO;
+            isCritical = false;
+            damage.value = this.hp;
+          } else if (typeMultiplier >= 2) {
+            result = HitResult.SUPER_EFFECTIVE;
+          } else if (typeMultiplier >= 1) {
+            result = HitResult.EFFECTIVE;
           } else {
-            const isOneHitKo = new Utils.BooleanHolder(false);
-            applyMoveAttrs(OneHitKOAttr, source, this, move, isOneHitKo);
-            if (isOneHitKo.value) {
-              result = HitResult.ONE_HIT_KO;
-              isCritical = false;
-              damage.value = this.hp;
-            } else if (typeMultiplier.value >= 2) {
-              result = HitResult.SUPER_EFFECTIVE;
-            } else if (typeMultiplier.value >= 1) {
-              result = HitResult.EFFECTIVE;
-            } else {
-              result = HitResult.NOT_VERY_EFFECTIVE;
-            }
+            result = HitResult.NOT_VERY_EFFECTIVE;
           }
         }
 
@@ -2224,15 +2249,13 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
           case HitResult.NOT_VERY_EFFECTIVE:
             this.scene.queueMessage(i18next.t("battle:hitResultNotVeryEffective"));
             break;
-          case HitResult.NO_EFFECT:
-            this.scene.queueMessage(i18next.t("battle:hitResultNoEffect", { pokemonName: getPokemonNameWithAffix(this) }));
-            break;
-          case HitResult.IMMUNE:
-            this.scene.queueMessage(i18next.t("battle:hitResultImmune", { pokemonName: this.name }));
-            break;
           case HitResult.ONE_HIT_KO:
             this.scene.queueMessage(i18next.t("battle:hitResultOneHitKO"));
             break;
+          case HitResult.IMMUNE:
+          case HitResult.NO_EFFECT:
+            console.error("Unhandled move immunity!");
+            break;
           }
         }
 
@@ -2244,23 +2267,15 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
         }
 
         if (damage) {
-          const attacker = this.scene.getPokemonById(source.id)!; // TODO: is this bang correct?
-          destinyTag?.lapse(attacker, BattlerTagLapseType.CUSTOM);
+          destinyTag?.lapse(source, BattlerTagLapseType.CUSTOM);
         }
       }
       break;
     case MoveCategory.STATUS:
-      if (!typeless) {
-        applyPreDefendAbAttrs(TypeImmunityAbAttr, this, source, move, cancelled, false, typeMultiplier);
-      }
-      if (!cancelled.value) {
-        applyPreDefendAbAttrs(MoveImmunityAbAttr, this, source, move, cancelled, false, typeMultiplier);
-        defendingSidePlayField.forEach((p) => applyPreDefendAbAttrs(FieldPriorityMoveImmunityAbAttr, p, source, move, cancelled, false, typeMultiplier));
-      }
-      if (!typeMultiplier.value) {
+      if (!cancelled.value && typeMultiplier === 0) {
         this.scene.queueMessage(i18next.t("battle:hitResultNoEffect", { pokemonName: getPokemonNameWithAffix(this) }));
       }
-      result = cancelled.value || !typeMultiplier.value ? HitResult.NO_EFFECT : HitResult.STATUS;
+      result = (typeMultiplier === 0) ? HitResult.NO_EFFECT : HitResult.STATUS;
       break;
     }
 
@@ -2572,7 +2587,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       return this.fusionFaintCry(callback);
     }
 
-    const key = this.getSpeciesForm().getCryKey(this.formIndex);
+    const key = `cry/${this.getSpeciesForm().getCryKey(this.formIndex)}`;
     //eslint-disable-next-line @typescript-eslint/no-unused-vars
     let i = 0;
     let rate = 0.85;
@@ -2630,7 +2645,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;
@@ -2638,7 +2653,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();
@@ -2682,7 +2698,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;
@@ -2997,7 +3013,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   sparkle(): void {
     if (this.shinySparkle) {
       this.shinySparkle.play(`sparkle${this.variant ? `_${this.variant + 1}` : ""}`);
-      this.scene.playSound("sparkle");
+      this.scene.playSound("se/sparkle");
     }
   }
 
@@ -3746,6 +3762,18 @@ export class EnemyPokemon extends Pokemon {
       this.status = new Status(Overrides.OPP_STATUS_OVERRIDE);
     }
 
+    if (Overrides.OPP_GENDER_OVERRIDE) {
+      this.gender = Overrides.OPP_GENDER_OVERRIDE;
+    }
+
+    const speciesId = this.species.speciesId;
+
+    if (speciesId in Overrides.OPP_FORM_OVERRIDES
+      && Overrides.OPP_FORM_OVERRIDES[speciesId]
+      && this.species.forms[Overrides.OPP_FORM_OVERRIDES[speciesId]]) {
+      this.formIndex = Overrides.OPP_FORM_OVERRIDES[speciesId] ?? 0;
+    }
+
     if (!dataSource) {
       this.generateAndPopulateMoveset();
 
@@ -3818,7 +3846,7 @@ export class EnemyPokemon extends Pokemon {
       this.moveset = (formIndex !== undefined ? formIndex : this.formIndex)
         ? [
           new PokemonMove(Moves.DYNAMAX_CANNON),
-          new PokemonMove(Moves.SLUDGE_BOMB),
+          new PokemonMove(Moves.CROSS_POISON),
           new PokemonMove(Moves.FLAMETHROWER),
           new PokemonMove(Moves.RECOVER, 0, -4)
         ]
@@ -3828,6 +3856,9 @@ export class EnemyPokemon extends Pokemon {
           new PokemonMove(Moves.FLAMETHROWER),
           new PokemonMove(Moves.COSMIC_POWER)
         ];
+      if (this.scene.gameMode.hasChallenge(Challenges.INVERSE_BATTLE)) {
+        this.moveset[2] = new PokemonMove(Moves.THUNDERBOLT);
+      }
       break;
     default:
       super.generateAndPopulateMoveset();
@@ -3917,7 +3948,7 @@ export class EnemyPokemon extends Pokemon {
                * Attack moves are given extra multipliers to their base benefit score based on
                * the move's type effectiveness against the target and whether the move is a STAB move.
                */
-              const effectiveness = target.getAttackMoveEffectiveness(this, pokemonMove);
+              const effectiveness = target.getMoveEffectiveness(this, move, !target.battleData?.abilityRevealed);
               if (target.isPlayer() !== this.isPlayer()) {
                 targetScore *= effectiveness;
                 if (this.isOfType(move.type)) {
diff --git a/src/field/trainer.ts b/src/field/trainer.ts
index 91784dc4dc5..de5d85dfda6 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 (ret.isOfType(this.config.specialtyType)) {
           retry = false;
diff --git a/src/inputs-controller.ts b/src/inputs-controller.ts
index 7b0cb9cb050..652e3d58062 100644
--- a/src/inputs-controller.ts
+++ b/src/inputs-controller.ts
@@ -51,21 +51,6 @@ export interface InterfaceConfig {
 
 const repeatInputDelayMillis = 250;
 
-// Phaser.Input.Gamepad.GamepadPlugin#refreshPads
-declare module "phaser" {
-  namespace Input {
-    namespace Gamepad {
-      interface GamepadPlugin {
-        /**
-         * Refreshes the list of connected Gamepads.
-         * This is called automatically when a gamepad is connected or disconnected, and during the update loop.
-         */
-        refreshPads(): void;
-      }
-    }
-  }
-}
-
 /**
  * Manages and handles all input controls for the game, including keyboard and gamepad interactions.
  *
diff --git a/src/loading-scene.ts b/src/loading-scene.ts
index ae5149d28f6..f4aa12c56c6 100644
--- a/src/loading-scene.ts
+++ b/src/loading-scene.ts
@@ -282,8 +282,9 @@ export class LoadingScene extends SceneBase {
     this.loadAtlas("xbox", "inputs");
     this.loadAtlas("keyboard", "inputs");
 
-    this.loadSe("select");
-    this.loadSe("menu_open");
+    this.loadSe("select", "ui");
+    this.loadSe("menu_open", "ui");
+    this.loadSe("error", "ui");
     this.loadSe("hit");
     this.loadSe("hit_strong");
     this.loadSe("hit_weak");
@@ -303,7 +304,6 @@ export class LoadingScene extends SceneBase {
     this.loadSe("upgrade");
     this.loadSe("buy");
     this.loadSe("achv");
-    this.loadSe("error");
 
     this.loadSe("pb_rel");
     this.loadSe("pb_throw");
diff --git a/src/locales/ca_ES/achv-female.json b/src/locales/ca_ES/achv.json
similarity index 100%
rename from src/locales/ca_ES/achv-female.json
rename to src/locales/ca_ES/achv.json
diff --git a/src/locales/ca_ES/config.ts b/src/locales/ca_ES/config.ts
index 427dea40eda..4d8f6c9dc59 100644
--- a/src/locales/ca_ES/config.ts
+++ b/src/locales/ca_ES/config.ts
@@ -4,8 +4,7 @@ import ability from "./ability.json";
 import abilityTriggers from "./ability-trigger.json";
 import arenaFlyout from "./arena-flyout.json";
 import arenaTag from "./arena-tag.json";
-import achvMale from "./achv-male.json";
-import achvFemale from "./achv-female.json";
+import achv from "./achv.json";
 import battle from "./battle.json";
 import battleScene from "./battle-scene.json";
 import battleInfo from "./battle-info.json";
@@ -16,14 +15,10 @@ import bgmName from "./bgm-name.json";
 import biome from "./biome.json";
 import challenges from "./challenges.json";
 import commandUiHandler from "./command-ui-handler.json";
-import dialogueMale from "./dialogue-male.json";
-import dialogueFemale from "./dialogue-female.json";
-import dialogueEndbossMale from "./dialogue-final-boss-male.json";
-import dialogueEndbossFemale from "./dialogue-final-boss-female.json";
-import dialogueMiscMale from "./dialogue-misc-male.json";
-import dialogueMiscFemale from "./dialogue-misc-female.json";
-import dialogueDoubleBattleMale from "./dialogue-double-battle-male.json";
-import dialogueDoubleBattleFemale from "./dialogue-double-battle-female.json";
+import dialogue from "./dialogue.json";
+import battleSpecDialogue from "./dialogue-final-boss.json";
+import miscDialogue from "./dialogue-misc.json";
+import doubleBattleDialogue from "./dialogue-double-battle.json";
 import egg from "./egg.json";
 import fightUiHandler from "./fight-ui-handler.json";
 import filterBar from "./filter-bar.json";
@@ -57,7 +52,7 @@ import weather from "./weather.json";
 import terrain from "./terrain.json";
 import modifierSelectUiHandler from "./modifier-select-ui-handler.json";
 import moveTriggers from "./move-trigger.json";
-import runHistory from "./run-history-ui-handler.json";
+import runHistory from "./run-history.json";
 
 export const caEsConfig = {
   ability,
@@ -76,16 +71,11 @@ export const caEsConfig = {
   challenges,
   commandUiHandler,
   common,
-  PGMachv: achvMale,
-  PGFachv: achvFemale,
-  PGMdialogue: dialogueMale,
-  PGFdialogue: dialogueFemale,
-  PGMbattleSpecDialogue: dialogueEndbossMale,
-  PGFbattleSpecDialogue: dialogueEndbossFemale,
-  PGMmiscDialogue: dialogueMiscMale,
-  PGFmiscDialogue: dialogueMiscFemale,
-  PGMdoubleBattleDialogue: dialogueDoubleBattleMale,
-  PGFdoubleBattleDialogue: dialogueDoubleBattleFemale,
+  achv,
+  dialogue,
+  battleSpecDialogue,
+  miscDialogue,
+  doubleBattleDialogue,
   egg,
   fightUiHandler,
   filterBar,
diff --git a/src/locales/ca_ES/achv-male.json b/src/locales/ca_ES/dialogue-double-battle.json
similarity index 100%
rename from src/locales/ca_ES/achv-male.json
rename to src/locales/ca_ES/dialogue-double-battle.json
diff --git a/src/locales/ca_ES/dialogue-double-battle-female.json b/src/locales/ca_ES/dialogue-final-boss.json
similarity index 100%
rename from src/locales/ca_ES/dialogue-double-battle-female.json
rename to src/locales/ca_ES/dialogue-final-boss.json
diff --git a/src/locales/ca_ES/dialogue-double-battle-male.json b/src/locales/ca_ES/dialogue-misc.json
similarity index 100%
rename from src/locales/ca_ES/dialogue-double-battle-male.json
rename to src/locales/ca_ES/dialogue-misc.json
diff --git a/src/locales/ca_ES/dialogue-female.json b/src/locales/ca_ES/dialogue.json
similarity index 100%
rename from src/locales/ca_ES/dialogue-female.json
rename to src/locales/ca_ES/dialogue.json
diff --git a/src/locales/ca_ES/dialogue-final-boss-female.json b/src/locales/ca_ES/run-history.json
similarity index 100%
rename from src/locales/ca_ES/dialogue-final-boss-female.json
rename to src/locales/ca_ES/run-history.json
diff --git a/src/locales/de/achv-male.json b/src/locales/de/achv-male.json
deleted file mode 100644
index dcbaf2ebffc..00000000000
--- a/src/locales/de/achv-male.json
+++ /dev/null
@@ -1,264 +0,0 @@
-{
-  "Achievements": {
-    "name": "Errungenschaften"
-  },
-  "Locked": {
-    "name": "Gesperrt"
-  },
-  "MoneyAchv": {
-    "description": "Häufe eine Gesamtsumme von {{moneyAmount}} ₽ an."
-  },
-  "10K_MONEY": {
-    "name": "Besserverdiener"
-  },
-  "100K_MONEY": {
-    "name": "Reich"
-  },
-  "1M_MONEY": {
-    "name": "Millionär"
-  },
-  "10M_MONEY": {
-    "name": "Einprozenter"
-  },
-  "DamageAchv": {
-    "description": "Füge mit einem Treffer {{damageAmount}} Schaden zu."
-  },
-  "250_DMG": {
-    "name": "Harte Treffer"
-  },
-  "1000_DMG": {
-    "name": "Härtere Treffer"
-  },
-  "2500_DMG": {
-    "name": "Das ist ne Menge Schaden!"
-  },
-  "10000_DMG": {
-    "name": "One Punch Man"
-  },
-  "HealAchv": {
-    "description": "Heile {{healAmount}} {{HP}} auf einmal. Mit einer Attacke, Fähigkeit oder einem gehaltenen Gegenstand."
-  },
-  "250_HEAL": {
-    "name": "Anfänger-Heiler"
-  },
-  "1000_HEAL": {
-    "name": "Gesundheitsprofi"
-  },
-  "2500_HEAL": {
-    "name": "Kleriker"
-  },
-  "10000_HEAL": {
-    "name": "Wiederherstellungsmeister"
-  },
-  "LevelAchv": {
-    "description": "Erhöhe das Level eines Pokémon auf {{level}}."
-  },
-  "LV_100": {
-    "name": "Warte, es gibt mehr!"
-  },
-  "LV_250": {
-    "name": "Elite"
-  },
-  "LV_1000": {
-    "name": "Geh noch höher hinaus!"
-  },
-  "RibbonAchv": {
-    "description": "Sammle insgesamt {{ribbonAmount}} Bänder."
-  },
-  "10_RIBBONS": {
-    "name": "Champion der Pokémon Liga"
-  },
-  "25_RIBBONS": {
-    "name": "Bänder-Sammler"
-  },
-  "50_RIBBONS": {
-    "name": "Bänder-Experte"
-  },
-  "75_RIBBONS": {
-    "name": "Bänder-Guru"
-  },
-  "100_RIBBONS": {
-    "name": "Bänder-Meister"
-  },
-  "TRANSFER_MAX_BATTLE_STAT": {
-    "name": "Teamwork",
-    "description": "Nutze Staffette, während der Anwender mindestens eines Statuswertes maximiert hat."
-  },
-  "MAX_FRIENDSHIP": {
-    "name": "Freundschaftsmaximierung",
-    "description": "Erreiche maximale Freundschaft bei einem Pokémon."
-  },
-  "MEGA_EVOLVE": {
-    "name": "Megaverwandlung",
-    "description": "Megaentwickle ein Pokémon."
-  },
-  "GIGANTAMAX": {
-    "name": "Absolute Einheit",
-    "description": "Gigadynamaximiere ein Pokémon."
-  },
-  "TERASTALLIZE": {
-    "name": "Typen-Bonus Enthusiast",
-    "description": "Terrakristallisiere ein Pokémon."
-  },
-  "STELLAR_TERASTALLIZE": {
-    "name": "Der geheime Typ",
-    "description": "Terrakristallisiere ein Pokémon zum Typen Stellar."
-  },
-  "SPLICE": {
-    "name": "Unendliche Fusion",
-    "description": "Kombiniere zwei Pokémon mit einem DNS-Keil."
-  },
-  "MINI_BLACK_HOLE": {
-    "name": "Ein Loch voller Items",
-    "description": "Erlange ein Mini-Schwarzes Loch."
-  },
-  "CATCH_MYTHICAL": {
-    "name": "Mysteriöses!",
-    "description": "Fange ein mysteriöses Pokémon."
-  },
-  "CATCH_SUB_LEGENDARY": {
-    "name": "Sub-Legendär",
-    "description": "Fange ein sub-legendäres Pokémon."
-  },
-  "CATCH_LEGENDARY": {
-    "name": "Legendär",
-    "description": "Fange ein legendäres Pokémon."
-  },
-  "SEE_SHINY": {
-    "name": "Schillerndes Licht",
-    "description": "Finde ein wildes schillerndes Pokémon."
-  },
-  "SHINY_PARTY": {
-    "name": "Das ist Hingabe",
-    "description": "Habe ein Team aus schillernden Pokémon."
-  },
-  "HATCH_MYTHICAL": {
-    "name": "Mysteriöses Ei",
-    "description": "Lass ein mysteriöses Pokémon aus einem Ei schlüpfen."
-  },
-  "HATCH_SUB_LEGENDARY": {
-    "name": "Sub-Legendäres Ei",
-    "description": "Lass ein sub-legendäres Pokémon aus einem Ei schlüpfen."
-  },
-  "HATCH_LEGENDARY": {
-    "name": "Legendäres Ei",
-    "description": "Lass ein legendäres Pokémon aus einem Ei schlüpfen."
-  },
-  "HATCH_SHINY": {
-    "name": "Schillerndes Ei",
-    "description": "Lass ein schillerndes Pokémon aus einem Ei schlüpfen."
-  },
-  "HIDDEN_ABILITY": {
-    "name": "Geheimes Talent",
-    "description": "Fang ein Pokémon mit versteckter Fähigkeit."
-  },
-  "PERFECT_IVS": {
-    "name": "Zertifikat der Echtheit",
-    "description": "Erhalte ein Pokémon mit perfekten IS-Werten."
-  },
-  "CLASSIC_VICTORY": {
-    "name": "Ungeschlagen",
-    "description": "Beende den klassischen Modus erfolgreich."
-  },
-  "UNEVOLVED_CLASSIC_VICTORY": {
-    "name": "'Bringe dein Kind mit zur Arbeit'-Tag",
-    "description": "Beende den klassischen Modus erfolgreich mit mindestens einem nicht entwickeltem Pokémon in deinem Team"
-  },
-  "MONO_GEN_ONE": {
-    "name": "Der originale Rivale",
-    "description": "Schließe die 'Nur 1. Generation' Herausforderung ab."
-  },
-  "MONO_GEN_TWO": {
-    "name": "Generation 1.5",
-    "description": "Schließe die 'Nur 2. Generation' Herausforderung ab."
-  },
-  "MONO_GEN_THREE": {
-    "name": "Zu viel Wasser?",
-    "description": "Schließe die 'Nur 3. Generation' Herausforderung ab."
-  },
-  "MONO_GEN_FOUR": {
-    "name": "Ist SIE wirklich die Stärkste?",
-    "description": "Schließe die 'Nur 4. Generation' Herausforderung ab."
-  },
-  "MONO_GEN_FIVE": {
-    "name": "Komplett Original",
-    "description": "Schließe die 'Nur 5. Generation' Herausforderung ab."
-  },
-  "MONO_GEN_SIX": {
-    "name": "Fast Königlich",
-    "description": "Schließe die 'Nur 6. Generation' Herausforderung ab."
-  },
-  "MONO_GEN_SEVEN": {
-    "name": "Technisch gesehen",
-    "description": "Schließe die 'Nur 7. Generation' Herausforderung ab."
-  },
-  "MONO_GEN_EIGHT": {
-    "name": "Die Zeit des Champions",
-    "description": "Schließe die 'Nur 8. Generation' Herausforderung ab."
-  },
-  "MONO_GEN_NINE": {
-    "name": "Sie hat es dir leicht gemacht...",
-    "description": "Schließe die 'Nur 9. Generation' Herausforderung ab."
-  },
-  "MonoType": {
-    "description": "Beende die Monotyp-{{type}} Herausforderung."
-  },
-  "MONO_NORMAL": {
-    "name": "Normaler Typ"
-  },
-  "MONO_FIGHTING": {
-    "name": "Ich kenne Kung Fu."
-  },
-  "MONO_FLYING": {
-    "name": "Ich glaube ich kann fliegen."
-  },
-  "MONO_POISON": {
-    "name": "Kantos Liebling"
-  },
-  "MONO_GROUND": {
-    "name": "Auf dem Boden bleiben."
-  },
-  "MONO_ROCK": {
-    "name": "So hart wie Rocko."
-  },
-  "MONO_BUG": {
-    "name": "Steche wie ein Bibor."
-  },
-  "MONO_GHOST": {
-    "name": "Wer wird angerufen?"
-  },
-  "MONO_STEEL": {
-    "name": "Stahlharte Entschlossenheit"
-  },
-  "MONO_FIRE": {
-    "name": "Brennende Leidenschaft"
-  },
-  "MONO_WATER": {
-    "name": "Wenn es regnet, schüttet es!"
-  },
-  "MONO_GRASS": {
-    "name": "Grüner Daumen"
-  },
-  "MONO_ELECTRIC": {
-    "name": "Elektrisierend"
-  },
-  "MONO_PSYCHIC": {
-    "name": "Übernatürliches Talent"
-  },
-  "MONO_ICE": {
-    "name": "Eis Eis Baby"
-  },
-  "MONO_DRAGON": {
-    "name": "Siegfried bist du es?"
-  },
-  "MONO_DARK": {
-    "name": "Es ist nur eine Phase!"
-  },
-  "MONO_FAIRY": {
-    "name": "Ein ewiges Abenteuer!"
-  },
-  "FRESH_START": {
-    "name": "Hussa, noch einmal von vorn!",
-    "description": "Schließe die 'Neuanfang' Herausforderung ab"
-  }
-}
\ No newline at end of file
diff --git a/src/locales/de/achv-female.json b/src/locales/de/achv.json
similarity index 89%
rename from src/locales/de/achv-female.json
rename to src/locales/de/achv.json
index 5dd99c18eb1..d2e56089720 100644
--- a/src/locales/de/achv-female.json
+++ b/src/locales/de/achv.json
@@ -1,31 +1,4 @@
 {
-  "10K_MONEY": {
-    "name": "Besserverdienerin"
-  },
-  "1M_MONEY": {
-    "name": "Millionärin"
-  },
-  "10000_DMG": {
-    "name": "One Punch Woman"
-  },
-  "250_HEAL": {
-    "name": "Anfänger-Heilerin"
-  },
-  "2500_HEAL": {
-    "name": "Klerikerin"
-  },
-  "10000_HEAL": {
-    "name": "Wiederherstellungsmeisterin"
-  },
-  "25_RIBBONS": {
-    "name": "Bänder-Sammlerin"
-  },
-  "50_RIBBONS": {
-    "name": "Bänder-Expertin"
-  },
-  "100_RIBBONS": {
-    "name": "Bänder-Meisterin"
-  },
   "Achievements": {
     "name": "Errungenschaften"
   },
@@ -35,9 +8,17 @@
   "MoneyAchv": {
     "description": "Häufe eine Gesamtsumme von {{moneyAmount}} ₽ an."
   },
+  "10K_MONEY": {
+    "name": "Besserverdiener",
+    "name_female": "Besserverdienerin"
+  },
   "100K_MONEY": {
     "name": "Reich"
   },
+  "1M_MONEY": {
+    "name": "Millionär",
+    "name_female": "Millionärin"
+  },
   "10M_MONEY": {
     "name": "Einprozenter"
   },
@@ -53,12 +34,28 @@
   "2500_DMG": {
     "name": "Das ist ne Menge Schaden!"
   },
+  "10000_DMG": {
+    "name": "One Punch Man",
+    "name_female": "One Punch Woman"
+  },
   "HealAchv": {
     "description": "Heile {{healAmount}} {{HP}} auf einmal. Mit einer Attacke, Fähigkeit oder einem gehaltenen Gegenstand."
   },
+  "250_HEAL": {
+    "name": "Anfänger-Heiler",
+    "name_female": "Anfänger-Heilerin"
+  },
   "1000_HEAL": {
     "name": "Gesundheitsprofi"
   },
+  "2500_HEAL": {
+    "name": "Kleriker",
+    "name_female": "Klerikerin"
+  },
+  "10000_HEAL": {
+    "name": "Wiederherstellungsmeister",
+    "name_female": "Wiederherstellungsmeisterin"
+  },
   "LevelAchv": {
     "description": "Erhöhe das Level eines Pokémon auf {{level}}."
   },
@@ -77,9 +74,21 @@
   "10_RIBBONS": {
     "name": "Champion der Pokémon Liga"
   },
+  "25_RIBBONS": {
+    "name": "Bänder-Sammler",
+    "name_female": "Bänder-Sammlerin"
+  },
+  "50_RIBBONS": {
+    "name": "Bänder-Experte",
+    "name_female": "Bänder-Expertin"
+  },
   "75_RIBBONS": {
     "name": "Bänder-Guru"
   },
+  "100_RIBBONS": {
+    "name": "Bänder-Meister",
+    "name_female": "Bänder-Meisterin"
+  },
   "TRANSFER_MAX_BATTLE_STAT": {
     "name": "Teamwork",
     "description": "Nutze Staffette, während der Anwender mindestens eines Statuswertes maximiert hat."
@@ -260,5 +269,9 @@
   "FRESH_START": {
     "name": "Hussa, noch einmal von vorn!",
     "description": "Schließe die 'Neuanfang' Herausforderung ab"
+  },
+  "INVERSE_BATTLE": {
+    "name": "Spieglein, Spieglein an der Wand",
+    "description": "Schließe die 'Umkehrkampf' Herausforderung ab"
   }
 }
\ No newline at end of file
diff --git a/src/locales/de/battle.json b/src/locales/de/battle.json
index 9e97a4d5b17..762b5848439 100644
--- a/src/locales/de/battle.json
+++ b/src/locales/de/battle.json
@@ -38,7 +38,7 @@
   "learnMoveNotLearned": "{{pokemonName}} hat {{moveName}} nicht erlernt.",
   "learnMoveForgetQuestion": "Welche Attacke soll vergessen werden?",
   "learnMoveForgetSuccess": "{{pokemonName}} hat {{moveName}} vergessen.",
-  "countdownPoof": "@d{32}Eins, @d{15}zwei @d{15}und@d{15}… @d{15}… @d{15}… @d{15}@s{pb_bounce_1}schwupp!",
+  "countdownPoof": "@d{32}Eins, @d{15}zwei @d{15}und@d{15}… @d{15}… @d{15}… @d{15}@s{se/pb_bounce_1}schwupp!",
   "learnMoveAnd": "Und…",
   "levelCapUp": "Die Levelbeschränkung wurde auf {{levelCap}} erhöht!",
   "moveNotImplemented": "{{moveName}} ist noch nicht implementiert und kann nicht ausgewählt werden.",
diff --git a/src/locales/de/bgm-name.json b/src/locales/de/bgm-name.json
index d5f64a93338..1eab276a70a 100644
--- a/src/locales/de/bgm-name.json
+++ b/src/locales/de/bgm-name.json
@@ -45,6 +45,7 @@
   "battle_legendary_lake_trio": "ORAS Vs. Seen-Trio",
   "battle_legendary_sinnoh": "ORAS Vs. Legendäres Sinnoh Pokémon",
   "battle_legendary_dia_pal": "ORAS Vs. Dialga & Palkia",
+  "battle_legendary_origin_forme": "PLA Vs. Urform Dialga & Palkia",
   "battle_legendary_giratina": "ORAS Vs. Giratina",
   "battle_legendary_arceus": "HGSS Vs. Arceus",
   "battle_legendary_unova": "SW Vs. Legendäres Einall Pokémon",
@@ -59,6 +60,7 @@
   "battle_legendary_zac_zam": "SWSH Vs. Zacian & Zamazenta",
   "battle_legendary_glas_spec": "SWSH Vs. Polaross & Phantoross",
   "battle_legendary_calyrex": "SWSH Vs. Coronospa",
+  "battle_legendary_riders": "SWSH Vs. Schimmelreiter & Rappenreiter Coronospa",
   "battle_legendary_birds_galar": "SWSH Vs. Legendäre Galar-Vögel",
   "battle_legendary_ruinous": "KAPU Vs. Schätze des Unheils",
   "battle_legendary_kor_mir": "KAPU Die Tiefen von Zone Null",
@@ -78,11 +80,21 @@
   "battle_galactic_grunt": "BDSP Vs. Team Galaktik Rüpel",
   "battle_plasma_grunt": "SW Vs. Team Plasma Rüpel",
   "battle_flare_grunt": "XY Vs. Team Flare Rüpel",
+  "battle_aether_grunt": "SM Vs. Æther Foundation",
+  "battle_skull_grunt": "SM Vs. Team Skull Rüpel",
+  "battle_macro_grunt": "SWSH Vs. Trainer",
+  "battle_galactic_admin": "BDSP Vs. Team Galactic Commander",
+  "battle_skull_admin": "SM Vs. Team Skull Vorstand",
+  "battle_oleana": "SWSH Vs. Oleana",
   "battle_rocket_boss": "USUM Vs. Giovanni",
   "battle_aqua_magma_boss": "ORAS Vs. Team Aqua & Magma Boss",
   "battle_galactic_boss": "BDSP Vs. Zyrus",
   "battle_plasma_boss": "S2W2 Vs. G-Cis",
   "battle_flare_boss": "XY Vs. Flordelis",
+  "battle_aether_boss": "SM Vs. Samantha",
+  "battle_skull_boss": "SM Vs. Bromley",
+  "battle_macro_boss": "SWSH Vs. Rose",
+
   "abyss": "PMD Erkundungsteam Himmel Dunkelkrater",
   "badlands": "PMD Erkundungsteam Himmel Kargtal",
   "beach": "PMD Erkundungsteam Himmel Feuchtklippe",
@@ -135,4 +147,4 @@
   "heal": "SW Pokémon-Heilung",
   "menu": "PMD Erkundungsteam Himmel Willkommen in der Welt der Pokémon!",
   "title": "PMD Erkundungsteam Himmel Top-Menü-Thema"
-}
\ No newline at end of file
+}
diff --git a/src/locales/de/challenges.json b/src/locales/de/challenges.json
index 1b41a707a81..17c33353bc6 100644
--- a/src/locales/de/challenges.json
+++ b/src/locales/de/challenges.json
@@ -25,5 +25,12 @@
     "desc": "Du kannst nur die ursprünglichen Starter verwenden, genau so, als hättest du gerade erst mit Pokérogue begonnen.",
     "value.0": "Aus",
     "value.1": "An"
+  },
+  "inverseBattle": {
+    "name": "Umkehrkampf",
+    "shortName": "Umkehrkampf",
+    "desc": "Die Typen-Effektivität wird umgekehrt, und kein Typ ist gegen einen anderen Typ immun.\nDeaktiviert die Erfolge anderer Herausforderungen.",
+    "value.0": "Aus",
+    "value.1": "An"
   }
 }
\ No newline at end of file
diff --git a/src/locales/de/config.ts b/src/locales/de/config.ts
index 988468ef476..772bfb6d1d5 100644
--- a/src/locales/de/config.ts
+++ b/src/locales/de/config.ts
@@ -4,8 +4,7 @@ import ability from "./ability.json";
 import abilityTriggers from "./ability-trigger.json";
 import arenaFlyout from "./arena-flyout.json";
 import arenaTag from "./arena-tag.json";
-import achvMale from "./achv-male.json";
-import achvFemale from "./achv-female.json";
+import achv from "./achv.json";
 import battle from "./battle.json";
 import battleScene from "./battle-scene.json";
 import battleInfo from "./battle-info.json";
@@ -16,14 +15,10 @@ import bgmName from "./bgm-name.json";
 import biome from "./biome.json";
 import challenges from "./challenges.json";
 import commandUiHandler from "./command-ui-handler.json";
-import dialogueMale from "./dialogue-male.json";
-import dialogueFemale from "./dialogue-female.json";
-import dialogueEndbossMale from "./dialogue-final-boss-male.json";
-import dialogueEndbossFemale from "./dialogue-final-boss-female.json";
-import dialogueMiscMale from "./dialogue-misc-male.json";
-import dialogueMiscFemale from "./dialogue-misc-female.json";
-import dialogueDoubleBattleMale from "./dialogue-double-battle-male.json";
-import dialogueDoubleBattleFemale from "./dialogue-double-battle-female.json";
+import dialogue from "./dialogue.json";
+import battleSpecDialogue from "./dialogue-final-boss.json";
+import miscDialogue from "./dialogue-misc.json";
+import doubleBattleDialogue from "./dialogue-double-battle.json";
 import egg from "./egg.json";
 import fightUiHandler from "./fight-ui-handler.json";
 import filterBar from "./filter-bar.json";
@@ -57,7 +52,7 @@ import weather from "./weather.json";
 import terrain from "./terrain.json";
 import modifierSelectUiHandler from "./modifier-select-ui-handler.json";
 import moveTriggers from "./move-trigger.json";
-import runHistory from "./run-history-ui-handler.json";
+import runHistory from "./run-history.json";
 
 export const deConfig = {
   ability,
@@ -76,16 +71,11 @@ export const deConfig = {
   challenges,
   commandUiHandler,
   common,
-  PGMachv: achvMale,
-  PGFachv: achvFemale,
-  PGMdialogue: dialogueMale,
-  PGFdialogue: dialogueFemale,
-  PGMbattleSpecDialogue: dialogueEndbossMale,
-  PGFbattleSpecDialogue: dialogueEndbossFemale,
-  PGMmiscDialogue: dialogueMiscMale,
-  PGFmiscDialogue: dialogueMiscFemale,
-  PGMdoubleBattleDialogue: dialogueDoubleBattleMale,
-  PGFdoubleBattleDialogue: dialogueDoubleBattleFemale,
+  achv,
+  dialogue,
+  battleSpecDialogue,
+  miscDialogue,
+  doubleBattleDialogue,
   egg,
   fightUiHandler,
   filterBar,
diff --git a/src/locales/de/dialogue-double-battle-male.json b/src/locales/de/dialogue-double-battle-male.json
deleted file mode 100644
index ec7cf375c0c..00000000000
--- a/src/locales/de/dialogue-double-battle-male.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "blue_red_double": {
-    "encounter": {
-      "1": "Blau: Hey Rot, lass uns ihnen zeigen, was wir drauf haben!\n$Rot: ...\n$Blau: Das ist die Macht von Alabastia!"
-    },
-    "victory": {
-      "1": "Blau: Das war ein großartiger Kampf!\n$Rot: ..."
-    }
-  },
-  "red_blue_double": {
-    "encounter": {
-      "1": "Rot: ...!\n$Blau: Er redet nicht viel...\n$Blau: Aber lass dich davon nicht täuschen! Er ist schließlich ein Champ!"
-    },
-    "victory": {
-      "1": "Rot: ...!\n$Blau: Das nächste Mal gewinnen wir!"
-    }
-  },
-  "tate_liza_double": {
-    "encounter": {
-      "1": "Ben: Hehehe...Bist du überrascht?\n$Svenja: Wir sind zwei Arenaleiter auf einmal!\n$Ben: Wir sind Zwillinge!\n$Svenja: Wir müssen nicht reden um uns gegenseitig zu verstehen!\n$Ben: Die doppelte Kraft...\n$Svenja: Kannst du ihr standhalten?"
-    },
-    "victory": {
-      "1": "Ben: Was? Unsere Kombination war perfekt!\n$Svenja: Sieht so aus als müssten wir wohl mehr tranieren..."
-    }
-  },
-  "liza_tate_double": {
-    "encounter": {
-      "1": "Svenja: Hihihi... Bist du überrascht?\n$Ben: Ja, wir sind wirklich zwei Arenaleiter auf einmal!\n$Svenja: Das ist mein Zwillingsbruder Ben!\n$Ben: Und das meine Zwillingsschwester Svenja!\n$Svenja: Wir sind die perfekte Kombo!"
-    },
-    "victory": {
-      "1": "Svenja: Sind wir...\n$Ben: ...nicht so stark wie wir dachten?"
-    }
-  },
-  "wallace_steven_double": {
-    "encounter": {
-      "1": "Troy: Wassili, lass uns ihnen die Kraft von Champions zeigen!\n$Wassili: Wir zeigen dir die Kraft von Hoenn!\n$Troy: Los gehts!"
-    },
-    "victory": {
-      "1": "Troy: Das war ein großartiger Kampf!\n$Wassili: Das nächste Mal gewinnen wir!"
-    }
-  },
-  "steven_wallace_double": {
-    "encounter": {
-      "1": "Troy: Hast du irgendwelche seltenen Pokémon?\n$Wassili: Troy... Wir sind hier um zu kämpfen und nicht um mit unseren Pokémon zu prahlen...\n$Troy: Oh... Wenn das so ist... Lass uns anfangen!"
-    },
-    "victory": {
-      "1": "Troy: Jetzt da wir mit Kämpfen fertig sind... Lass uns mit unsereren Pokémon prahlen!\n$Wassili: Troy..."
-    }
-  },
-  "alder_iris_double": {
-    "encounter": {
-      "1": "Lauro: Wir sind die stärksten Trainer aus Einall!\n$Lilia: Kämpfe gegen starke Trainer machen am meisten Spaß!"
-    },
-    "victory": {
-      "1": "Lauro: Wow! Du bist super stark!\n$Lilia: Beim nächsten Mal schlagen wir dich!"
-    }
-  },
-  "iris_alder_double": {
-    "encounter": {
-      "1": "Lilia: Willkommen Herausforderer! Ich bin DER Champion von Einall!\n$Lauro: Lilia, bist du nicht etwas zu aufgeregt?"
-    },
-    "victory": {
-      "1": "Lilia: Eine solche Niederlage ist nicht einfach zu verkraften...\n$Lauro: Aber wir wachsen an unseren Niederlagen und werden immer besser!"
-    }
-  },
-  "marnie_piers_double": {
-    "encounter": {
-      "1": "Mary: Bruder, lass uns ihnen die Kraft von Spikeford zeigen!\n$Nezz: Wir bringen die Dunkelheit!"
-    },
-    "victory": {
-      "1": "Mary: Du hast Licht in unsere Dunkelheit gebracht!\n$Piers: Es ist viel zu hell..."
-    }
-  },
-  "piers_marnie_double": {
-    "encounter": {
-      "1": "Nezz: Bereit für ein Konzert?\n$Mary: Bruder...Sie sind hier um zu kämpfen, nicht um zu singen..."
-    },
-    "victory": {
-      "1": "Nezz: Das war mal ein großartiges Konzert!\n$Marnie: Bruder..."
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/locales/de/dialogue-double-battle-female.json b/src/locales/de/dialogue-double-battle.json
similarity index 100%
rename from src/locales/de/dialogue-double-battle-female.json
rename to src/locales/de/dialogue-double-battle.json
diff --git a/src/locales/de/dialogue-final-boss-male.json b/src/locales/de/dialogue-final-boss-male.json
deleted file mode 100644
index bffbd779be0..00000000000
--- a/src/locales/de/dialogue-final-boss-male.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "encounter": "Es scheint, als wäre es wieder mal an der Zeit.\nDu weißt, warum du hierher kommen musst, oder?\n$Dich hat es hierher gezogen, du warst bereits hier.\nUnzählige Male.\n$Obwohl, vielleicht doch nicht unzählig.\nUm genau zu sein, dies ist der {{cycleCount}}te Zyklus.\n$Du verlierst jeden Zyklus dein Gedächtnis. Trotzdem \nbleibt etwas, ein Teil deines ehemaligen Ichs, erhalten.\n$Bis jetzt hast du es noch nicht vollbracht zu siegen, aber dieses Mal spüre ich eine andere Präsenz in dir.\n\n$Du bist der Einzige hier, aber es kommt mir so vor als wäre da...jemand anderes.\n$Wirst du endlich beweisen, dass du ein würdiger Herausforder bist?\nDie Herausforderung auf die ich seit Jahrtausenden warte?\n$Lass uns beginnen.","firstStageWin": "Ahh verstehe. Diese Präsenz, die ich gespürt habe, ist wirklich real.\nEs scheint als müsste ich micht nicht länger zurück halten.\n$Enttäusche mich nicht.",
-  "secondStageWin": "…Herrlich."
-}
\ No newline at end of file
diff --git a/src/locales/de/dialogue-final-boss-female.json b/src/locales/de/dialogue-final-boss.json
similarity index 100%
rename from src/locales/de/dialogue-final-boss-female.json
rename to src/locales/de/dialogue-final-boss.json
diff --git a/src/locales/de/dialogue-male.json b/src/locales/de/dialogue-male.json
deleted file mode 100644
index 85df3594f16..00000000000
--- a/src/locales/de/dialogue-male.json
+++ /dev/null
@@ -1,2545 +0,0 @@
-{
-  "youngster": {
-    "encounter": {
-      "1": "Hey, willst du kämpfen?",
-      "2": "Bist du auch ein neuer Trainer?",
-      "3": "Hey, ich habe dich noch nie gesehen. Lass uns kämpfen!",
-      "4": "Ich habe gerade verloren und suche nach neuen Pokémon.\nWarte! Du siehst schwach aus! Lass uns kämpfen!",
-      "5": "Haben wir uns schon mal getroffen oder nicht? Ich erinnere mich nicht wirklich\n$Nun, ich denke, es ist trotzdem schön, dich zu treffen!",
-      "6": "Okay, lass uns kämpfen!",
-      "7": "Okay, hier komme ich! Ich zeige dir meine Kraft!",
-      "8": "Fan fan fan... Ich zeige dir wie fantastisch meine Pokémon sind!",
-      "9": "Es ist nicht nötig, Zeit mit Begrüßungen zu verschwenden.\nSobald du bereit bist geht es los!",
-      "10": "Lass deine Deckung nicht fallen, sonst weinst du, wenn dich ein Kind besiegt.",
-      "11": "Ich habe meine Pokémon mit großer Sorgfalt aufgezogen. Du darfst ihnen nicht wehtun!",
-      "12": "Schön, dass du es geschafft hast! Von hier an wird es nicht einfacher.",
-      "13": "Die Kämpfe gehen immer weiter! Willkommen in der Welt ohne Ende!"
-    },
-    "victory": {
-      "1": "Wow! Du bist stark!",
-      "2": "Ich hatte keine Chance, oder?",
-      "3": "Wenn ich älter bin, werde ich dich besiegen!",
-      "4": "Ugh. Ich habe keine Pokémon mehr.",
-      "5": "Das kann nicht sein… DAS KANN NICHT SEIN! Wie konnte ich schon wieder verlieren…",
-      "6": "Nein! Ich habe verloren!",
-      "7": "Wow! Du bist unglaublich! Ich bin erstaunt und überrascht!",
-      "8": "Kann es sein… Wie… Meine Pokémon und ich sind die stärksten, aber…",
-      "9": "Das nächste Mal werde ich dich besiegen! Lass uns wieder kämpfen!",
-      "10": "Man! Kannst du nicht sehen, dass ich nur ein Kind bin? Es war nicht fair von dir, so hart zu kämpfen!",
-      "11": "Deine Pokémon sind unglaublich! Tauschst du mit mir?",
-      "12": "Ich habe mich ein bisschen mitreißen lassen, worüber habe ich vorhin gesprochen?",
-      "13": "Ahaha! Da ist es! Genau! Du bist schon jetzt in dieser Welt zu Hause!"
-    }
-  },
-  "lass": {
-    "encounter": {
-      "1": "Lass uns kämpfen, wollen wir?",
-      "2": "Du siehst wie ein neuer Trainer aus. Lass uns kämpfen!",
-      "3": "Ich erkenne dich nicht. Wie wäre es mit einem Kampf?",
-      "4": "Lass uns einen lustigen Pokémon-Kampf haben!",
-      "5": "Ich zeige dir, wie man Pokémon wirklich einsetzt!",
-      "6": "Ein ernsthafter Kampf beginnt mit einem ernsten Anfang! Bist du sicher, dass du bereit bist?",
-      "7": "Du bist nur einmal jung. Und du hast nur eine Chance bei einem bestimmten Kampf.\n$Bald wirst du nur noch eine Erinnerung sein.",
-      "8": "Du solltest es leicht mit mir angehen, OK? Aber ich kämpfe ernsthaft!",
-      "9": "Die Schule ist langweilig. Ich habe nichts zu tun. Gähn. Ich kämpfe nur, um die Zeit totzuschlagen."
-    },
-    "victory": {
-      "1": "Das war beeindruckend! Ich habe noch viel zu lernen.",
-      "2": "Ich dachte nicht, dass du mich so schlagen würdest…",
-      "3": "Ich hoffe, wir haben eines Tages ein Rematch.",
-      "4": "Das war ziemlich erstaunlich! Du hast mich total erschöpft…",
-      "5": "Du hast mir tatsächlich eine Lektion erteilt! Du bist ziemlich erstaunlich!",
-      "6": "Ernsthaft, ich habe verloren. Das ist, wie, ernsthaft deprimierend, aber du warst ernsthaft cool.",
-      "7": "Ich brauche keine Erinnerungen wie diese. Löschen der Erinnerung…",
-      "8": "Hey! Ich habe dir gesagt, du sollst es leicht mit mir angehen!\n$Trotzdem bist du ziemlich cool, wenn du ernsthaft bist.",
-      "9": "Ich werde langsam müde vom Kämpfen… Es muss etwas Neues zu tun geben…"
-    }
-  },
-  "breeder": {
-    "encounter": {
-      "1": "Gehorsame Pokémon, eigensinnige Pokémon… Pokémon haben einzigartige Eigenschaften.",
-      "2": "Auch wenn meine Erziehung und mein Verhalten schlecht sind, habe ich meine Pokémon gut aufgezogen.",
-      "3": "Hmm, disziplinierst du deine Pokémon? Zu viel Verwöhnen ist nicht gut."
-    },
-    "victory": {
-      "1": "Es ist wichtig, die Eigenschaften jedes Pokémon zu pflegen und zu trainieren.",
-      "2": "Im Gegensatz zu meinem teuflischen Selbst sind dies einige gute Pokémon.",
-      "3": "Zu viel Lob kann sowohl Pokémon als auch Menschen verwöhnen."
-    },
-    "defeat": {
-      "1": "Du solltest nicht wütend auf deine Pokémon werden, auch wenn du einen Kampf verlierst.",
-      "2": "Richtig? Ziemlich gute Pokémon, oder? Ich bin dafür geeignet, Dinge großzuziehen.",
-      "3": "Egal wie sehr du deine Pokémon liebst,\n$du musst sie trotzdem disziplinieren, wenn sie sich schlecht benehmen."
-    }
-  },
-  "breeder_female": {
-    "encounter": {
-      "1": "Pokémon verraten dich nie. Sie erwidern die ganze Liebe, die du ihnen gibst.",
-      "2": "Soll ich dir einen Tipp geben, wie man gute Pokémon trainiert?",
-      "3": "Ich habe diese sehr speziellen Pokémon mit einer speziellen Methode aufgezogen."
-    },
-    "victory": {
-      "1": "Ugh… So sollte das nicht laufen. Habe ich die falsche Mischung verabreicht?",
-      "2": "Wie konnte das meinen Pokémon passieren… Was fütterst du deine Pokémon?",
-      "3": "Wenn ich verliere, sagt dir das, dass ich nur die Zeit totgeschlagen habe.\n$Es verletzt mein Ego überhaupt nicht."
-    },
-    "defeat": {
-      "1": "Das beweist, dass meine Pokémon meine Liebe angenommen haben.",
-      "2": "Der wahre Trick, um gute Pokémon zu trainieren, besteht darin, gute Pokémon zu fangen.",
-      "3": "Pokémon werden stark oder schwach, je nachdem, wie du sie großziehst."
-    }
-  },
-  "fisherman": {
-    "encounter": {
-      "1": "Aack! Du hast mich einen Biss verlieren lassen!\nWas wirst du dagegen tun?",
-      "2": "Geh weg! Du erschreckst die Pokémon!",
-      "3": "Mal sehen, ob du einen Sieg an Land ziehen kannst!"
-    },
-    "victory": {
-      "1": "Vergiss es einfach.",
-      "2": "Nächstes Mal werde ich den Triumph an Land ziehen!",
-      "3": "Ich glaube, ich habe die Strömungen diesmal unterschätzt."
-    }
-  },
-  "fisherman_female": {
-    "encounter": {
-      "1": "Woah! Ich habe einen großen Fang gemacht!",
-      "2": "Die Leine ist drin, bereit, den Erfolg an Land zu ziehen!",
-      "3": "Bereit, Wellen zu schlagen!"
-    },
-    "victory": {
-      "1": "Ich komme mit einem stärkeren Haken zurück.",
-      "2": "Ich werde das nächste Mal den Sieg an Land ziehen.",
-      "3": "Ich schärfe nur meine Haken für das Comeback!"
-    }
-  },
-  "swimmer": {
-    "encounter": {
-      "1": "Zeit, einzutauchen!",
-      "2": "Lass uns die Wellen des Sieges reiten!",
-      "3": "Bereit, einen Sprung ins Wasser zu machen!"
-    },
-    "victory": {
-      "1": "Getränkt in Niederlage!",
-      "2": "Eine Welle der Niederlage!",
-      "3": "Zurück ans Ufer, schätze ich."
-    }
-  },
-  "backpacker": {
-    "encounter": {
-      "1": "Packe deine Sachen, es geht los!",
-      "2": "Mal sehen, ob du mithalten kannst!",
-      "3": "Bereit machen, Herausforderer!",
-      "4": "Ich habe 20 Jahre damit verbracht, mich selbst zu finden… Aber wo bin ich?"
-    },
-    "victory": {
-      "1": "Diesmal bin ich gestolpert!",
-      "2": "Oh, ich glaube, ich bin verloren.",
-      "3": "Sackgasse!",
-      "4": "Warte eine Sekunde! Hey! Weißt du nicht, wer ich bin?"
-    }
-  },
-  "ace_trainer": {
-    "encounter": {
-      "1": "Du scheinst ziemlich zuversichtlich zu sein.",
-      "2": "Deine Pokémon… Zeig sie mir…",
-      "3": "Weil ich ein Ass-Trainer bin, denken die Leute, ich sei stark.",
-      "4": "Weißt du, was es braucht, um ein Ass-Trainer zu sein?"
-    },
-    "victory": {
-      "1": "Ja… Du hast gute Pokémon…",
-      "2": "Was?! Aber ich bin ein Kampfgott!",
-      "3": "Natürlich, du bist der Hauptcharakter!",
-      "4": "OK! OK! Du könntest ein Ass-Trainer sein!"
-    },
-    "defeat": {
-      "1": "Ich widme meinen Körper und meine Seele den Pokémon-Kämpfen!",
-      "2": "Alles innerhalb meiner Erwartungen… Nichts Überraschendes…",
-      "3": "Ich dachte, ich würde zu einem zerbrechlichen Menschen heranwachsen, \n$der aussieht, als würde er zerbrechen, wenn du ihn zu fest drückst.",
-      "4": "Natürlich bin ich stark und verliere nicht. Es ist wichtig, dass ich anmutig gewinne."
-    }
-  },
-  "parasol_lady": {
-    "encounter": {
-      "1": "Zeit, das Schlachtfeld mit Eleganz und Anmut zu betreten!"
-    },
-    "victory": {
-      "1": "Meine Eleganz bleibt ungebrochen!"
-    }
-  },
-  "twins": {
-    "encounter": {
-      "1": "Mach dich bereit, denn wenn wir zusammenarbeiten, gibt es doppelten Ärger!",
-      "2": "Zwei Herzen, eine Strategie – mal sehen, ob du mit unserer Zwillingskraft mithalten kannst!",
-      "3": "Hoffe, du bist bereit für doppelten Ärger, denn wir werden dir einheizen!"
-    },
-    "victory": {
-      "1": "Wir haben vielleicht diese Runde verloren, aber unsere Bindung bleibt unzerbrechlich!",
-      "2": "Unser Zwillingsgeist wird nicht lange getrübt bleiben.",
-      "3": "Wir werden als dynamisches Duo stärker zurückkommen!"
-    },
-    "defeat": {
-      "1": "Zwillingskraft herrscht vor!",
-      "2": "Zwei Herzen, ein Triumph!",
-      "3": "Doppelte Freude, doppelter Siegestanz!"
-    }
-  },
-  "cyclist": {
-    "encounter": {
-      "1": "Mach dich bereit, meinen Staub zu schlucken!",
-      "2": "Mach dich bereit, Herausforderer! Ich werde dich im Staub zurücklassen!",
-      "3": "Volle Fahrt voraus, mal sehen, ob du mithalten kannst!"
-    },
-    "victory": {
-      "1": "Die Speichen stehen still, aber die Entschlossenheit dreht weiter.",
-      "2": "Abgehängt!",
-      "3": "Der Weg zum Sieg hat viele Kurven und Wendungen, die es noch zu erkunden gilt."
-    }
-  },
-  "black_belt": {
-    "encounter": {
-      "1": "Ich lobe deinen Mut, mich herauszufordern! Denn ich bin derjenige mit dem stärksten Tritt!",
-      "2": "Oh, ich verstehe. Möchtest du in Stücke geschnitten werden? Oder bevorzugst du die Rolle des Punchingballs?"
-    },
-    "victory": {
-      "1": "Oh. Die Pokémon haben gekämpft. Mein starker Tritt hat überhaupt nicht geholfen.",
-      "2": "Hmmm… Wenn ich sowieso verlieren würde, wollte ich wenigstens total vermöbelt werden."
-    }
-  },
-  "battle_girl": {
-    "encounter": {
-      "1": "Du musst mich nicht beeindrucken. Du kannst gegen mich verlieren."
-    },
-    "victory": {
-      "1": "Es ist schwer, sich zu verabschieden, aber uns läuft die Zeit davon…"
-    }
-  },
-  "hiker": {
-    "encounter": {
-      "1": "Mein mittelalterlicher Bauch gibt mir so viel Gravitas wie die Berge, die ich besteige!",
-      "2": "Ich habe diesen kräftigen Körper von meinen Eltern geerbt… Ich bin wie eine lebende Bergkette…"
-    },
-    "victory": {
-      "1": "Zumindest kann ich nicht verlieren, wenn es um BMI geht!",
-      "2": "Es ist nicht genug… Es ist nie genug. Mein schlechtes Cholesterin ist nicht hoch genug…"
-    }
-  },
-  "ranger": {
-    "encounter": {
-      "1": "Wenn ich von der Natur umgeben bin, hören die meisten anderen Dinge auf, wichtig zu sein.",
-      "2": "Wenn ich ohne die Natur in meinem Leben lebe, fühle ich mich wie ein Fisch ohne Wasser."
-    },
-    "victory": {
-      "1": "Es spielt keine Rolle für die Weite der Natur, ob ich gewinne oder verliere…",
-      "2": "So etwas ist ziemlich trivial im Vergleich zu den erdrückenden Gefühlen des Stadtlebens."
-    },
-    "defeat": {
-      "1": "Ich habe den Kampf gewonnen. Aber der Sieg ist nichts im Vergleich zur Weite der Natur…",
-      "2": "Ich bin sicher, das mein Sieg nur dank der Natur möglich war."
-    }
-  },
-  "scientist": {
-    "encounter": {
-      "1": "Meine Forschung wird diese Welt zu Frieden und Freude führen."
-    },
-    "victory": {
-      "1": "Ich bin ein Genie… Ich sollte nicht gegen jemanden wie dich verlieren…"
-    }
-  },
-  "school_kid": {
-    "encounter": {
-      "1": "…Heehee. Ich bin zuversichtlich in meine Berechnungen und Analysen.",
-      "2": "Ich sammle so viel Erfahrung wie möglich, weil ich eines Tages ein Arenaleiter sein möchte."
-    },
-    "victory": {
-      "1": "Ohhhh… Berechnungen und Analysen sind kein Gegner für den Zufall…",
-      "2": "Auch schwierige, anstrengende Erfahrungen haben ihren Zweck, denke ich."
-    }
-  },
-  "artist": {
-    "encounter": {
-      "1": "Früher war ich beliebt, aber jetzt bin ich völlig veraltet."
-    },
-    "victory": {
-      "1": "Mit der Zeit ändern sich auch die Werte. Das habe ich zu spät erkannt."
-    }
-  },
-  "guitarist": {
-    "encounter": {
-      "1": "Mach dich bereit, den Rhythmus der Niederlage zu spüren, während ich meinen Weg zum Sieg spiele!"
-    },
-    "victory": {
-      "1": "Für den Moment zum Schweigen gebracht, aber meine Melodie der Widerstandsfähigkeit wird weiterspielen."
-    }
-  },
-  "worker": {
-    "encounter": {
-      "1": "Es stört mich, dass die Leute mich immer missverstehen. Ich bin garnicht so grob wie alle denken."
-    },
-    "victory": {
-      "1": "Ich will wirklich nicht, dass meine Haut verbrennt, also möchte ich im Schatten arbeiten."
-    }
-  },
-  "worker_female": {
-    "encounter": {
-      "1": "Es stört mich, dass die Leute mich immer missverstehen. Ich bin garnicht so grob wie alle denken."
-    },
-    "victory": {
-      "1": "Ich will wirklich nicht, dass meine Haut verbrennt, also möchte ich im Schatten arbeiten."
-    },
-    "defeat": {
-      "1": "Mein Körper und mein Geist sind nicht immer unbedingt synchron."
-    }
-  },
-  "worker_double": {
-    "encounter": {
-      "1": "Ich zeige dir, dass wir dich brechen können. Wir haben auf dem Feld trainiert!"
-    },
-    "victory": {
-      "1": "Wie seltsam… Wie konnte das passieren… Ich hätte nicht ausgemuskelt werden sollen."
-    }
-  },
-  "hex_maniac": {
-    "encounter": {
-      "1": "Ich höre normalerweise nur klassische Musik, aber wenn ich verliere,\n$werde ich ein bisschen New Age ausprobieren!",
-      "2": "Ich werde mit jeder Träne stärker, die ich weine."
-    },
-    "victory": {
-      "1": "Ist das der Beginn des Zeitalters des Wassermanns? Ich bin bereit für die Veränderung.",
-      "2": "Jetzt kann ich noch stärker werden. Ich wachse mit jedem Groll."
-    },
-    "defeat": {
-      "1": "New Age bezieht sich einfach auf Komponisten der klassischen Musik des 20. Jahrhunderts, richtig?",
-      "2": "Lass dich nicht von Traurigkeit oder Frustration aufhalten.\n$Du kannst deine Groll nutzen, um dich zu motivieren."
-    }
-  },
-  "psychic": {
-    "encounter": {
-      "1": "Hallo! Konzentrier dich!"
-    },
-    "victory": {
-      "1": "Eeeeek!"
-    }
-  },
-  "officer": {
-    "encounter": {
-      "1": "Bereite dich vor, denn die Gerechtigkeit wird gleich vollstreckt!",
-      "2": "Bereit, das Gesetz zu verteidigen und die Gerechtigkeit auf dem Schlachtfeld zu wahren!"
-    },
-    "victory": {
-      "1": "Die Gerechtigkeit auf meinen Schultern fühlt sich schwerer an denn je…",
-      "2": "Die Schatten der Niederlage schweben über dem Revier."
-    }
-  },
-  "beauty": {
-    "encounter": {
-      "1": "Mein letzter Kampf überhaupt… So möchte ich, dass wir diesen Kampf sehen…"
-    },
-    "victory": {
-      "1": "Es war schön… Lass uns irgendwann wieder einen letzten Kampf haben…"
-    }
-  },
-  "baker": {
-    "encounter": {
-      "1": "Hoffe, du bist bereit, die Niederlage zu schmecken!"
-    },
-    "victory": {
-      "1": "Ich werde ein Comeback backen."
-    }
-  },
-  "biker": {
-    "encounter": {
-      "1": "Zeit, aufzudrehen und dich im Staub zurückzulassen!"
-    },
-    "victory": {
-      "1": "Ich werde für das nächste Rennen tunen."
-    }
-  },
-  "archer": {
-    "encounter": {
-      "1": "Bevor du weitergehst, lass uns sehen, wie du dich gegen uns, Team Rocket, schlägst!",
-      "2": "Ich habe Berichte erhalten, dass deine Fähigkeiten nicht unbedeutend sind.\n$Mal sehen, ob sie wahr sind.",
-      "3": "Ich bin Atlas, ein Vorstand von Team Rocket.\n$Und ich mache es den Feinden unserer Organisation nicht leicht."
-    },
-    "victory": {
-      "1": "Was für ein Fehler!",
-      "2": "Mit meinen aktuellen Fähigkeiten war ich der Aufgabe doch nicht gewachsen.",
-      "3": "V-verzeih mir, Giovanni... Dass ich von einem einfachen Trainer besiegt wurde..."
-    }
-  },
-  "ariana": {
-    "encounter": {
-      "1": "Halt! Wir können niemanden herumlaufen lassen. \n$Es ist schädlich für den Stolz von Team Rocket, verstehst du.",
-      "2": "Ich weiß nicht und es ist mir egal, ob das, was ich tue, richtig oder falsch ist...\n$Ich vertraue einfach auf Giovanni und tue, was mir gesagt wird.",
-      "3": "Dein Trip endet hier. Ich werde dich erledigen!"
-    },
-    "victory": {
-      "1": "Tch, du bist wirklich stark. Es ist schade. \n$Wenn du Team Rocket beitreten würdest, könntest du ein Vorstand werden.",
-      "2": "Ich... ich bin zerstört...",
-      "3": "Aaaieeeee! Das kann nicht passieren! Ich habe hart gekämpft, aber trotzdem verloren..."
-    }
-  },
-  "proton": {
-    "encounter": {
-      "1": "Was willst du? Wenn du unsere Arbeit unterbrichst, erwarte keine Gnade!",
-      "2": "Was haben wir hier? Ich werde oft als der gruseligste und grausamste Typ bei Team Rocket bezeichnet…\n$Ich rate dir dringend, dich nicht in unsere Geschäfte einzumischen!",
-      "3": "Ich bin Proton, ein Admin von Team Rocket. Ich bin hier, um deinem Einmischen ein Ende zu setzen!"
-    },
-    "victory": {
-      "1": "Die Festung ist gefallen! Alle Mann zurückziehen!",
-      "2": "Du hast diesmal gewonnen… Aber alles, was du getan hast, war, den Zorn von Team Rocket zu vergrößern…",
-      "3": "Ich bin besiegt… Aber ich werde das nicht vergessen!"
-    }
-  },
-  "petrel": {
-    "encounter": {
-      "1": "Muhahaha, wir haben auf dich gewartet. Ich? Du weißt nicht, wer ich bin? Ich bin Giovanni.\n$Der majestätische Giovanni höchstpersönlich! Wahahaha!\n$…Huh? Ich klinge überhaupt nicht wie Giovanni?\n$Ich sehe nicht einmal aus wie Giovanni?\n$Wie kommt das? Ich habe so hart daran gearbeitet, ihn nachzuahmen!",
-      "2": "Ich bin Lambda, ein Admin von Team Rocket. Ich werde nicht zulassen, dass du unsere Pläne störst!",
-      "3": "Rocket Vorstand Lambda wird sich um diesen Eindringling kümmern!"
-    },
-    "victory": {
-      "1": "OK, OK. Ich sage dir, wo er ist.",
-      "2": "Ich… Ich konnte nichts tun… Giovanni, bitte vergib mir…",
-      "3": "Nein, ich kann das nicht auf mich sitzen lassen. Ich muss die anderen informieren…"
-    }
-  },
-  "tabitha": {
-    "encounter": {
-      "1": "Hehehe! Du bist also bis hierher gekommen! Aber du bist zu spät!",
-      "2": "Hehehe... Schon hier, oder? Wir haben dich unterschätzt! Aber das war's! \n$Ich bin eine Klasse über den Rüpeln, die du bisher gesehen hast. Ich halte dich nicht hin.\n$Ich werde dich zermalmen!",
-      "3": "Ich werde dir eine kleine Kostprobe des Schmerzes geben! Ergebe dich!"
-    },
-    "victory": {
-      "1": "Hehehe! Du hast mich vielleicht besiegt, aber du hast keine Chance gegen den Boss!\n$Wenn du jetzt aufgibst, musst du dich keiner ordentlichen Tracht Prügel stellen!",
-      "2": "Hehehe... Also habe ich auch verloren...",
-      "3": "Ahya! Wie konnte das passieren? Ein Vorstand wie ich von einem zufälligen Trainer besiegt..."
-    }
-  },
-  "courtney": {
-    "encounter": {
-      "1": "Das Ding... Das Ding, das du hältst... Das ist es, was...\n$Das ist es, wonach wir von Team Magma suchen...",
-      "2": "... Nun dann... Auslöschen...",
-      "3": "...?! Du... Hm... ♪ Das trifft sich ausgezeichnet... ♪\n$Dann hole ich mir eben zuerst deine Pokémon... Her damit..."
-    },
-    "victory": {
-      "1": "... ...Ändere... die Welt.",
-      "2": "Wie erwartet. Unerwartet. Du. Ziel erfasst... abgeschlossen.\n$Beginne... Experiment. Du. Für immer. Aha... ♪",
-      "3": "...Schon wieder? Das war unerwartet. ...Ich wusste es. Du... bist interessant! ...Haha. ♪"
-    }
-  },
-  "shelly": {
-    "encounter": {
-      "1": "Ahahahaha! Du wirst dich in die Angelegenheiten von Team Aqua einmischen?\n$Du bist entweder absolut furchtlos, einfach unwissend oder beides!\n$Du bist so süß, dass es ekelhaft ist! Ich werde dich erledigen.",
-      "2": "Was ist das? Wer ist dieser verwöhnte Gör?",
-      "3": "Beruhige dich. Sei geduldig. Ich werde dich gleich zermalmen."
-    },
-    "victory": {
-      "1": "Ahahahaha! Wir wurden unerwartet gestört! Uns bleiben keine Optionen.\n$Wir müssen uns zurückziehen. Aber das ist nicht das letzte Mal, dass du Team Aqua siehst!\n$Wir haben andere Pläne! Vergiss das nicht!",
-      "2": "Ahhh?! War ich zu nachsichtig mit dir?!",
-      "3": "Uh. Willst du mir sagen, dass du während des Kampfes noch besser geworden bist?\n$Du bist ein Gör mit einer glänzenden Zukunft…\n$Meine Pokémon und ich haben keine Kraft mehr zu kämpfen…\n$Geh weiter… Geh und werde von Adrian zerstört."
-    }
-  },
-  "matt": {
-    "encounter": {
-      "1": "Hoohahaha! Was, hast du eine Schraube locker oder so?\n$Sieh dich an, kleiner Makuhita-ähnlicher Trainer!",
-      "2": "Oho! Du! Du bist das lustige Kind!",
-      "3": "Was machst du hier? Bist du uns gefolgt?"
-    },
-    "victory": {
-      "1": "Na gut, bis der Boss Zeit für dich hat, werde ich dein Gegner sein!",
-      "2": "Ich kann es fühlen! Ich kann es spüren, das ist klar! Die Stärke, die von dir ausgeht!\n$Mehr! Ich will noch mehr! Aber es sieht so aus, als hätten wir keine Zeit mehr...",
-      "3": "Das war Spaß! Ich wusste, dass du mir eine gute Zeit bieten würdest!\n$Ich freue mich darauf, dich eines Tages wieder zu treffen!"
-    }
-  },
-  "mars": {
-    "encounter": {
-      "1": "Ich bin Mars, eine der obersten Commander von Team Galaktik.",
-      "2": "Die Vision von Team Galaktik für die Zukunft ist unbeirrt. Opposition wird gnadenlos zerschlagen!",
-      "3": "Fühlst du dich nervös? Das solltest du!"
-    },
-    "victory": {
-      "1": "Das kann nicht passieren! Wie habe ich verloren?!",
-      "2": "Du hast etwas Können, das muss ich zugeben.",
-      "3": "Besiegt... Das war ein teurer Fehler."
-    }
-  },
-  "jupiter": {
-    "encounter": {
-      "1": "Jupiter, Commander von Team Galaktik, zu Diensten.",
-      "2": "Widerstand ist zwecklos. Team Galaktik wird siegen!",
-      "3": "Du zitterst... Schon Angst?"
-    },
-    "victory": {
-      "1": "Unmöglich... Ich habe verloren?!",
-      "2": "Beeindruckend, du hast Mut!",
-      "3": "So zu verlieren... Wie peinlich."
-    }
-  },
-  "saturn": {
-    "encounter": {
-      "1": "Ich bin Saturn, Commander von Team Galaktik.",
-      "2": "Unsere Mission ist absolut. Jeder Widerstand wird vernichtet!",
-      "3": "Ist das Angst, die ich in deinen Augen sehe?"
-    },
-    "victory": {
-      "1": "Unmöglich... Von dir besiegt?!",
-      "2": "Du hast dich als würdiger Gegner erwiesen.",
-      "3": "Besiegt in der Niederlage... Das ist inakzeptabel."
-    }
-  },
-  "zinzolin": {
-    "encounter": {
-      "1": "Du könntest eine Bedrohung für Team Plasma werden, also werden wir dich hier und jetzt eliminieren!",
-      "2": "Oh, zum Heulen... Ich hatte nicht erwartet, in dieser eisigen Kälte kämpfen zu müssen!",
-      "3": "Du bist ein beeindruckender Trainer, dass du es so weit geschafft hast. Aber hier endet es."
-    },
-    "victory": {
-      "1": "G-Cis... Ich habe versagt...",
-      "2": "Es ist bitterkalt. Ich zittere. Ich leide. Doch ich stehe immer noch siegreich da.",
-      "3": "Hm. Du bist ein klügerer Trainer, als ich erwartet habe, aber nicht klug genug."
-    }
-  },
-  "rood": {
-    "encounter": {
-      "1": "Du bist eine Bedrohung für Team Plasma. Wir können dich hier und jetzt nicht laufen lassen!",
-      "2": "Oh, dieser eisige Wind... Ich hätte nie gedacht, dass ich hier kämpfen müsste!",
-      "3": "Du bist ein bemerkenswerter Trainer, dass du es bis hierher geschafft hast. Aber hier wird es enden."
-    },
-    "victory": {
-      "1": "G-Cis... Ich habe meine Mission nicht erfüllt...",
-      "2": "Die Kälte ist durchdringend. Ich zittere. Ich leide. Doch ich habe gesiegt.",
-      "3": "Hm. Du bist ein talentierter Trainer, aber leider nicht talentiert genug."
-    }
-  },
-  "xerosic": {
-    "encounter": {
-      "1": "Ah ha ha! Es wäre mir ein Vergnügen. Komm schon, kleiner Trainer! Zeig mir, was du drauf hast!",
-      "2": "Hm... Du bist mächtiger, als du aussiehst. Ich frage mich, wie viel Energie in dir steckt.",
-      "3": "Ich habe auf dich gewartet! Ich muss ein wenig Forschung an dir betreiben! Komm, lass uns beginnen!"
-    },
-    "victory": {
-      "1": "Ah, du bist ziemlich stark. Oh ja—sehr stark, in der Tat.",
-      "2": "Ding-ding-ding! Du hast es geschafft! Dem Sieger gebührt die Beute!",
-      "3": "Wunderbar! Erstaunlich! Du hast enorme Fähigkeiten und Mut!"
-    }
-  },
-  "bryony": {
-    "encounter": {
-      "1": "Ich bin Begonia, und es wäre mir ein Vergnügen, gegen dich zu kämpfen. Zeig mir, was du drauf hast.",
-      "2": "Beeindruckend... Du bist mächtiger, als du aussiehst. Zeig mir das wahre Ausmaß deiner Energie.",
-      "3": "Ich habe deine Ankunft erwartet. Es ist Zeit für einen kleinen Test. Sollen wir beginnen?"
-    },
-    "victory": {
-      "1": "Du bist ziemlich stark. Oh ja—sehr stark, in der Tat.",
-      "2": "Ding-ding-ding! Du hast dich gut geschlagen. Der Sieg gehört dir.",
-      "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…!",
-      "2": "Wir führen gerade eine große Operation durch. Hast du vor uns zu stören?",
-      "3": "Gib uns deine Pokémon, oder stelle dich dem Zorn von Team Rocket!",
-      "4": "Team Rocket wird seinen Plan zur Vollendung bringen, Aus dem Weg!",
-      "5": "Los, gib uns deine Pokémon. Wir brauchen sie für unseren Plan!"
-    },
-    "victory": {
-      "1": "Das war mal wieder ein Schuss in den Ofen!",
-      "2": "Dem Boss wird das aber nicht gefallen!",
-      "3": "Ich habe es vermasselt!",
-      "4": "Meine Kollegen werden das nicht tolerieren!",
-      "5": "Team Rocket wird wiederkehren! Das sage ich Jessie und James!"
-    }
-  },
-  "magma_grunt": {
-    "encounter": {
-      "1": "Keiner, der sich Team Magma in den Weg stellt, bekommt Gnade, nicht einmal Kinder!",
-      "2": "Störe besser nicht unsere Pläne! Wir formen die Welt nach unseren Vorstellungen!",
-      "3": "Du stehst uns im Weg! Team Magma hat keine Zeit für Störenfriede wie dich!",
-      "4": "Bereite dich auf die Hölle vor, denn es wird bald sehr heiß!",
-      "5": "Wir werden die Macht des Vulkans entfesseln! Es wird gewaltig sein! Mach dich bereit!"
-    },
-    "victory": {
-      "1": "Wie kann das sein? Ich bin Teil des mächtigen Team Magma! Wir streben nach der Verbesserung der Welt...",
-      "2": "Unglaublich, dass ich verloren habe! Mit meinen mächtigen Pokémon.",
-      "3": "Das kann nicht sein! Ich hab doch viel mehr Erfahrung als du!",
-      "4": "Verdammt... Ich hätte sofort in unser Versteck fliehen sollen...",
-      "5": "Du hast mich besiegt... Der Boss wird mich dafür zur Rechenschaft ziehen."
-    }
-  },
-  "aqua_grunt": {
-    "encounter": {
-      "1": "Du willst dich also mit Team Aqua anlegen? Du traust dich ja was… Dich werfe ich über Bord!",
-      "2": "Du hast ganz schön Mut, dich mit Team Aqua anzulegen!",
-      "3": "Ich hoffe du hast einen Regenschirm dabei. Hier wird es jetzt nass!",
-      "4": "Wir, Team Aqua, existieren zum Wohle aller!",
-      "5": "Bereite dich darauf vor, von den Fluten meiner Pokémon weggespült zu werden!"
-    },
-    "victory": {
-      "1": "Vielleicht sollte ich wohl lieber selber über die Planke gehen…",
-      "2": "Arrgh, ich habe nicht damit gerechnet, von einer Landratte gestört zu werden!",
-      "3": "Ich habe verloren?! Ich schätze, ich muss jetzt zurück zum Versteck schwimmen...",
-      "4": "Oh Mann, was für eine Katastrophe... Der Boss wird wütend sein...",
-      "5": "Du hast mich besiegt... Meinst du, der Boss wird mich dafür kielholen lassen?"
-    }
-  },
-  "galactic_grunt": {
-    "encounter": {
-      "1": "Team Galaktik wird die Welt in eine bessere verwandeln! Und du wirst uns nicht aufhalten!",
-      "2": "Erlebe die Macht unserer Technologie und die Zukunft, die wir uns vorstellen!",
-      "3": "Im Namen von Team Galaktik werde ich jeden beseitigen, der uns im Weg steht!",
-      "4": "Mach dich bereit zu verlieren!",
-      "5": "Hoffentlich bist du bereit für eine kosmische Niederlage!"
-    },
-    "victory": {
-      "1": "Zyrus wird uns für diese Niederlage bestrafen…",
-      "2": "Dieser Rückschlag bedeutet nichts in Hinsicht unseres großen Plans.",
-      "3": "Unsere Pläne sind größer als diese Niederlage.",
-      "4": "Wie ist das möglich?!",
-      "5": "Notiz an mich selbst: Pokémon-Kämpfe üben, so bald wie möglich."
-    }
-  },
-  "plasma_grunt": {
-    "encounter": {
-      "1": "Pokémon sollten frei sein! Team Plasma wird sie befreien!",
-      "2": "Wenn ich gegen dich gewinne, lass deine Pokémon frei!",
-      "3": "Wenn du Team Plasma im Weg stehst, werde ich mich um dich kümmern!",
-      "4": "Team Plasma wird Pokémon von egoistischen Menschen wie dir befreien!",
-      "5": "Lass dich von unserem Aussehen nicht täuschen. Unsere Kampffähigkeiten sind überragend!"
-    },
-    "victory": {
-      "1": "Wie konnte ich verlieren? Ich dachte, ich würde die Welt retten...",
-      "2": "Wie konnte ich nur verlieren...",
-      "3": "...Dieses Pokémon ist zu schwach, ich werde stärkere beschaffen müssen!",
-      "4": "Große Pläne stoßen immer auf Hindernisse.",
-      "5": "Das ist ein schwerer Rückschlag für Team Plasma..."
-    }
-  },
-  "flare_grunt": {
-    "encounter": {
-      "1": "Deine Pokémon haben keine Chance gegen die Überlegenheit von Team Flare.",
-      "2": "Mach dich bereit, denn gleich wird es hier lichterloh brennen!",
-      "3": "Team Flare wird die Welt von allen Makeln befreien!",
-      "4": "Bereite dich auf die unvergleichliche Macht von Team Flare vor!",
-      "5": "Unsere Mission steht über allem, sogar über der Mode!"
-    },
-    "victory": {
-      "1": "Diese Niederlage wirft einen Schatten auf meine Zukunft.",
-      "2": "Es scheint, dass ich meine Strategien überdenken muss. Zurück ans Reißbrett.",
-      "3": "Unglaublich?! Ich habe verloren?!",
-      "4": "Selbst in der Niederlage bleibt Team Flare unübertroffen in seiner Eleganz.",
-      "5": "Du hast mich besiegt, aber Team Flare wird immer in Glanz und Stil erstrahlen."
-    }
-  },
-  "rocket_boss_giovanni_1": {
-    "encounter": {
-      "1": "Ich bin beeindruckt, du hast es bis hierher geschafft!\n$Ich bin Giovanni, der Anführer von Team Rocket!\n$Wir regieren den Untergrund von Kanto!\n$Und wir lassen sicherlich nicht zu, dass ein Kind uns aufhält!"
-    },
-    "victory": {
-      "1": "Ich ziehe mich zurück, aber ich werde zurückkehren! Team Rocket wird niemals besiegt werden!"
-    },
-    "defeat": {
-      "1": "Merke dir meine Worte. Nicht in der Lage zu sein,\n$deine eigene Stärke zu messen, zeigt, dass du immer noch ein Kind bist."
-    }
-  },
-  "rocket_boss_giovanni_2": {
-    "encounter": {
-      "1": "Du schon wieder… Wie hast du mich gefunden? Team Rocket wird dich endlich aus der Welt schaffen!"
-    },
-    "victory": {
-      "1": "Wie ist das möglich...? Der kostbare Traum von Team Rocket ist nicht mehr als eine Illusion geworden..."
-    },
-    "defeat": {
-      "1": "Team Rocket wird niemals besiegt werden! Ich werde zurückkehren!"
-    }
-  },
-  "magma_boss_maxie_1": {
-    "encounter": {
-      "1": "Die Welt ist nicht perfekt. Ich werde sie verbessern, indem ich sie neu erschaffe!\n$Wir brauchen mehr Landmassen um zu leben! Team Magma wird dieses Ziel mit aller Macht erreichen!"
-    },
-    "victory": {
-      "1": "Ugh! Das entspricht nicht meinen Berechnungen! Wie konnte ich verlieren? Wir sehen uns wieder!"
-    },
-    "defeat": {
-      "1": "Team Magma wird weiterhin die Welt verbessern!"
-    }
-  },
-  "magma_boss_maxie_2": {
-    "encounter": {
-      "1": "Du bist das letzte Hindernis, das zwischen mir und meinen Zielen steht.\n$Mach dich bereit durch die Macht von Team Magma besiegt zu werden!"
-    },
-    "victory": {
-      "1": "Das... Das kann nicht sein..."
-    },
-    "defeat": {
-      "1": "Und jetzt werde ich diesen Planeten terraformen, um ihn ideal für die Menschheit zu machen."
-    }
-  },
-  "aqua_boss_archie_1": {
-    "encounter": {
-      "1": "Ich bin Adrian, der Anführer von Team Aqua! Wir werden die Welt mit Wasser überfluten!"
-    },
-    "victory": {
-      "1": "Lass uns mal wieder treffen. Ich werde mir sicher sein, dass ich dieses Gesicht wiedererkenne."
-    },
-    "defeat": {
-      "1": "Brilliant! Mein Team wird jetzt nicht zurückhalten!"
-    }
-  },
-  "aqua_boss_archie_2": {
-    "encounter": {
-      "1": "Ich habe lange auf diesen Tag gewartet. Das ist die wahre Macht von Team Aqua!"
-    },
-    "victory": {
-      "1": "So habe ich mir das nicht vorgestellt..."
-    },
-    "defeat": {
-      "1": "Ich werde alles in dieser Welt in seinen ursprünglichen, reinen Zustand zurückversetzen!!"
-    }
-  },
-  "galactic_boss_cyrus_1": {
-    "encounter": {
-      "1": "Du wurdest von leerer Gefühlsduselei hierher getrieben.\n$Ich werde dich bereuen lassen, auf dein Herz gehört zu haben!"
-    },
-    "victory": {
-      "1": "Interessant. Und ziemlich eigenartig."
-    },
-    "defeat": {
-      "1": "Ich werde meine neue Welt erschaffen..."
-    }
-  },
-  "galactic_boss_cyrus_2": {
-    "encounter": {
-      "1": "So sehen wir uns wieder. Es scheint, als wären unsere Schicksale miteinander verflochten.\n$Aber hier und jetzt werde ich diese Verbindung brechen!"
-    },
-    "victory": {
-      "1": "Wie? Wie? WIE?!"
-    },
-    "defeat": {
-      "1": "Bis bald."
-    }
-  },
-  "plasma_boss_ghetsis_1": {
-    "encounter": {
-      "1": "Ich werde nicht zulassen, dass mich jemand aufhält! Egal wer es auch sein mag!"
-    },
-    "victory": {
-      "1": "Wie kann das sein? Ich bin der Schöpfer von Team Plasma! Ich bin perfekt!"
-    },
-    "defeat": {
-      "1": "Ich bin der perfekte Herrscher einer perfekten neuen Welt! Mwa ha ha!"
-    }
-  },
-  "plasma_boss_ghetsis_2": {
-    "encounter": {
-      "1": "Komm schon! Ich will dein Gesicht sehen, in dem Moment, in dem du alle Hoffnung verlierst!"
-    },
-    "victory": {
-      "1": "Meine Berechnungen... Nein! Meine sorgfältigen Pläne! Die Welt sollte mir gehören!"
-    },
-    "defeat": {
-      "1": "Kyurem! Verwende Absorptionsfusion!"
-    }
-  },
-  "flare_boss_lysandre_1": {
-    "encounter": {
-      "1": "DU willst mich aufhalten? Dann zeig mir deine Stärke in einem Kampf!"
-    },
-    "victory": {
-      "1": "Du bist hier, um mich aufzuhalten. Aber ich bitte dich zu warten.\n$Ich bin so kurz davor, meine Vision zu verwirklichen."
-    },
-    "defeat": {
-      "1": "Pokémon... Sollten nicht mehr existieren."
-    }
-  },
-  "flare_boss_lysandre_2": {
-    "encounter": {
-      "1": "Die Zukunft, die du willst, oder die Zukunft, die ich will...\n$Lass uns sehen, welche mehr zu existieren verdient, sollen wir?"
-    },
-    "victory": {
-      "1": "Die Zukunft, die ich erschaffen wollte... Es ist vorbei..."
-    },
-    "defeat": {
-      "1": "Narren ohne Vision werden weiterhin diese wunderschöne Welt verunreinigen."
-    }
-  },
-  "brock": {
-    "encounter": {
-      "1": "Meine Expertise in Bezug auf Gesteins-Pokémon wird dich besiegen! Komm schon!",
-      "2": "Meine felsenfeste Entschlossenheit wird dich überwältigen!",
-      "3": "Ich bin ein harter Fels, der nicht so leicht zu brechen ist!"
-    },
-    "victory": {
-      "1": "Die Stärke deiner Pokémon hat meine steinharte Verteidigung überwunden!",
-      "2": "Die Welt ist riesig! Ich bin froh, dass ich die Chance hatte, gegen dich zu kämpfen.",
-      "3": "Perhaps I should go back to pursuing my dream as a Pokémon Breeder…"
-    },
-    "defeat": {
-      "1": "Der beste Angriff ist eine gute Verteidigung!\nDas ist meine Art, Dinge zu tun!",
-      "2": "Komm und studiere Felsen mit mir, um besser zu lernen wie man gegen sie kämpft!",
-      "3": "Meine Reisen durch die Regionen zahlen sich aus!"
-    }
-  },
-  "misty": {
-    "encounter": {
-      "1": "Meine Taktik ist ein Frontalangriff mit Wasser-Pokémon!",
-      "2": "Hiya! Ich zeige dir die Stärke meiner Wasser-Pokémon!",
-      "3": "Mein Traum war es, auf eine Reise zu gehen und gegen starke Trainer zu kämpfen… \n$Wirst du eine ausreichende Herausforderung sein?"
-    },
-    "victory": {
-      "1": "Du bist wirklich stark… Ich gebe zu, du hast es drauf…",
-      "2": "Du weißt, dass du nur Glück hattest, oder?",
-      "3": "Wow, ich kann nicht glauben, dass du mich besiegt hast!"
-    },
-    "defeat": {
-      "1": "War die mächtige Misty zu viel für dich?",
-      "2": "Ich hoffe, du hast die eleganten Schwimmtechniken meiner Pokémon gesehen!",
-      "3": "Deine Pokémon waren keine Herausforderung für meine geliebten Pokémon!"
-    }
-  },
-  "lt_surge": {
-    "encounter": {
-      "1": "Meine Elektro-Pokémon haben mich im Krieg gerettet! Ich werde dir zeigen, wie!",
-      "2": "Du wirst um Gnade winseln, wenn ich dich geschockt habe!",
-      "3": "Ich werde dich genau so zappen, wie ich es mit all meinen Feinden im Kampf mache!"
-    },
-    "victory": {
-      "1": "Whoa! Dein Team ist echt stark!",
-      "2": "Aaargh, du bist stark! Selbst meine elektrischen Tricks haben gegen dich verloren.",
-      "3": "Das war ein absolut schockierender Verlust!"
-    },
-    "defeat": {
-      "1": "Oh ja! Wenn es um Elektro-Pokémon geht, bin ich weltweit die Nummer eins!",
-      "2": "Hahaha! Das war ein elektrisierender Kampf!",
-      "3": "Ein Pokémon-Kampf ist Krieg, und ich habe dir den Nahkampf gezeigt!"
-    }
-  },
-  "erika": {
-    "encounter": {
-      "1": "Ah, das Wetter ist hier so schön…\nOh, ein Kampf? Nun gut.",
-      "2": "Meine Pokémon-Kampffähigkeiten stehen in Konkurrenz zu meinen Blumenarrangierfähigkeiten.",
-      "3": "Oh, ich hoffe, der angenehme Duft meiner Pokémon lässt mich nicht wieder einschlafen…",
-      "4": "Blumen in einem Garten zu sehen ist so beruhigend."
-    },
-    "victory": {
-      "1": "Oh! Ich gestehe meine Niederlage ein.",
-      "2": "Dieser Kampf war so entspannend.",
-      "3": "Ah, es scheint, dass ich verloren habe…",
-      "4": "Na immerhin habe ich noch meine Blumen."
-    },
-    "defeat": {
-      "1": "Ich hatte Angst, dass ich einschlafen würde…",
-      "2": "Es scheint, als hätten meine Pflanzen-Pokémon dich überwältigt.",
-      "3": "Dieser Kampf war eine so beruhigende Erfahrung.",
-      "4": "Das war alles?"
-    }
-  },
-  "janine": {
-    "encounter": {
-      "1": "Ich meistere die Kunst der giftigen Angriffe. Ich werde heute mit dir trainieren!",
-      "2": "Vater vertraut darauf, dass ich mich behaupten kann. Ich werde ihm recht geben!",
-      "3": "Meine Ninja-Techniken sind nur zweitrangig zu denen meines Vaters! Kannst du mithalten?"
-    },
-    "victory": {
-      "1": "Selbst jetzt brauche ich noch Training… Ich verstehe.",
-      "2": "Dein Kampfstil hat meinen überwältigt.",
-      "3": "Ich werde mich wirklich anstrengen und meine Fähigkeiten verbessern."
-    },
-    "defeat": {
-      "1": "Fufufu… das Gift hat dir all deine Kraft zum Kämpfen geraubt.",
-      "2": "Ha! Du hattest keine Chance gegen meine überlegenen Ninja-Fähigkeiten!",
-      "3": "Vaters Vertrauen in mich war nicht unbegründet."
-    }
-  },
-  "sabrina": {
-    "encounter": {
-      "1": "Ich habe deine Ankunft in einer Vision gesehen!",
-      "2": "Ich mag es nicht zu kämpfen, aber wenn du darauf bestehst, werde ich dir meine Kräfte zeigen!",
-      "3": "Ich spüre große Ambitionen in dir. Ich werde sehen, ob sie begründet sind."
-    },
-    "victory": {
-      "1": "Deine Kraft… Sie übertrifft bei weitem das, was ich vorausgesehen habe…",
-      "2": "Ich habe es nicht geschafft, deine Stärke genau vorherzusagen.",
-      "3": "Selbst mit meinen immensen psychischen Kräften kann ich niemanden spüren, der stärker ist als du."
-    },
-    "defeat": {
-      "1": "Dieser Sieg… Genau so habe ich ihn in meinen Visionen gesehen!",
-      "2": "Vielleicht war es jemand anderes, den ich spürte…",
-      "3": "Verfeinere deine Fähigkeiten, bevor du unüberlegt in den Kampf stürzt.\n$Du weißt nie, was die Zukunft bereithält, wenn du es tust…"
-    }
-  },
-  "blaine": {
-    "encounter": {
-      "1": "Hah! Ich hoffe, du hast Feuerheiler mitgebracht!",
-      "2": "Meine feurigen Pokémon werden alle Herausforderer verbrennen!",
-      "3": "Mach dich bereit, mit dem Feuer zu spielen!"
-    },
-    "victory": {
-      "1": "Ich habe mich bis auf die Knochen verbrannt! Nicht einmal Asche bleibt!",
-      "2": "Habe ich die Flammen nicht hoch genug geschürt?",
-      "3": "Ich bin komplett ausgebrannt… Aber das lässt meine Motivation, mich zu verbessern, noch heißer brennen!"
-    },
-    "defeat": {
-      "1": "Mein wütendes Inferno kann nicht gelöscht werden!",
-      "2": "Meine Pokémon sind durch die Hitze dieses Sieges gestärkt worden!",
-      "3": "Hah! Meine Leidenschaft brennt heller als deine!"
-    }
-  },
-  "giovanni": {
-    "encounter": {
-      "1": "Ich, der Anführer von Team Rocket, werde dir eine Welt voller Schmerz bereiten!",
-      "2": "Mein Training hier wird entscheidend sein, bevor ich mich wieder meinen alten Kollegen stelle.",
-      "3": "Ich denke dass du nicht auf die Ausmaße des Scheiterns vorbereitet bist, die du gleich erleben wirst!"
-    },
-    "victory": {
-      "1": "WAS! Ich, verlieren?! Es gibt nichts, was ich dir sagen möchte!",
-      "2": "Hmm… Du wirst nie verstehen können, was ich zu erreichen versuche.",
-      "3": "Diese Niederlage ist nur ein kleiner Rückschlag.\nTeam Rocket wird aus der Asche auferstehen."
-    },
-    "defeat": {
-      "1": "Das du nicht in der Lage bist, deine eigene Stärke einzuschätzen, zeigt, dass du noch ein Kind bist.",
-      "2": "Versuche nicht, dich wieder in meine Angelegenheiten einzumischen.",
-      "3": "Ich hoffe, du verstehst, wie dumm es war, mich herauszufordern."
-    }
-  },
-  "roxanne": {
-    "encounter": {
-      "1": "Wärs du so freundlich und würdest mir zeigen, wie du kämpfst?",
-      "2": "Man lernt so viel, wenn man gegen viele Trainer kämpft.",
-      "3": "Oh, du hast mich beim Strategie entwickeln erwischt. Möchtest du kämpfen?"
-    },
-    "victory": {
-      "1": "Oh, es scheint, als hätte ich verloren.",
-      "2": "Es scheint, als hätte ich noch so viel mehr zu lernen, wenn es um Kämpfe geht.",
-      "3": "Ich werde mir zu Herzen nehmen, was ich heute gelernt habe."
-    },
-    "defeat": {
-      "1": "Ich habe so viele Dinge aus unserem Kampf gelernt. Ich hoffe, du auch.",
-      "2": "Ich freue mich darauf, wieder gegen dich zu kämpfen.\n$Ich hoffe, du wirst das, was du hier gelernt hast, anwenden.",
-      "3": "Ich habe gewonnen, weil ich alles gelernt habe."
-    }
-  },
-  "brawly": {
-    "encounter": {
-      "1": "Oh man, ein Herausforderer!\nLass uns sehen, was du kannst!",
-      "2": "Du scheinst auf große Auftritte zu stehen.\nLass uns kämpfen",
-      "3": "Zeit, einen Sturm zu entfachen!\nLos geht's!"
-    },
-    "victory": {
-      "1": "Oh wow, du hast mich überrumpelt!",
-      "2": "Du hast meinen Flow übernommen und mich besiegt!",
-      "3": "Ich fühle mich als hätte ich mich in der Granithöhle verirrt!"
-    },
-    "defeat": {
-      "1": "Haha, ich surfe die große Welle! Fordere mich irgendwann wieder heraus.",
-      "2": "Surfe mal wieder mit mir!",
-      "3": "Genau wie die Gezeiten kommen und gehen, hoffe ich, dass du zurückkommst, um mich herauszufordern."
-    }
-  },
-  "wattson": {
-    "encounter": {
-      "1": "Zeit, geschockt zu werden! Wahahahaha!",
-      "2": "Ich lass die Funken fliegen! Wahahahaha!",
-      "3": "Ich hoffe, du hast Para-Heiler dabei! Wahahahaha!"
-    },
-    "victory": {
-      "1": "Scheint als wäre ich entladen! Wahahahaha!",
-      "2": "Du hast mich komplett geerdet! Wahahahaha!",
-      "3": "Danke für den Nervenkitzel! Wahahahaha!"
-    },
-    "defeat": {
-      "1": "Lade deine Batterien wieder auf und fordere mich irgendwann wieder heraus! Wahahahaha!",
-      "2": "Ich hoffe du fandest unseren Kampf elektrisierend! Wahahahaha!",
-      "3": "Bist du nicht geschockt, dass ich gewonnen habe? Wahahahaha!"
-    }
-  },
-  "flannery": {
-    "encounter": {
-      "1": "Nett dich zu kennenzulernen! Warte, nein… Ich werde dich zermalmen!",
-      "2": "Ich bin noch nicht lange Arenaleiterin, aber ich werde dich grillen!",
-      "3": "Es ist Zeit, dir die Kampftechniken zu zeigen, die mein Großvater mir beigebracht hat! Lass uns kämpfen!"
-    },
-    "victory": {
-      "1": "Du erinnerst mich an meinen Großvater… Kein Wunder, dass ich verloren habe.",
-      "2": "Strenge ich mich zu sehr an? Ich sollte mich entspannen, ich darf mich nicht zu sehr aufregen.",
-      "3": "Zu verlieren wird meine Flamme nicht ersticken. Zeit, das Training wieder zu entfachen!"
-    },
-    "defeat": {
-      "1": "Ich hoffe, ich habe meinen Großvater stolz gemacht… Lass uns irgendwann wieder kämpfen.",
-      "2": "Ich… Ich kann nicht glauben, dass ich gewonnen habe! Meine Art zu kämpfen hat funktioniert!",
-      "3": "Lass uns bald wieder heiße Moves austauschen!"
-    }
-  },
-  "norman": {
-    "encounter": {
-      "1": "Ich bin überrascht, dass du es bis hierher geschafft hast. Lass uns kämpfen.",
-      "2": "Ich werde alles in meiner Macht stehende tun, um als Arenaleiter zu gewinnen. Los geht's!",
-      "3": "Du solltest alles geben! Lasst uns kämpfen!"
-    },
-    "victory": {
-      "1": "Ich habe gegen dich verloren…? Das ist eine Überraschung.",
-      "2": "War der Umzug nach Hoenn die richtige Entscheidung? Ich bin mir nicht sicher.",
-      "3": "Ich kann es nicht fasen. Das war ein großartiger Kampf."
-    },
-    "defeat": {
-      "1": "Wir haben beide unser Bestes gegeben. Ich hoffe, wir können bald wieder kämpfen.",
-      "2": "Du solltest versuchen, mein Kind herauszufordern. Du könntest etwas lernen!",
-      "3": "Danke für den tollen Kampf. Viel Glück beim nächsten Mal."
-    }
-  },
-  "winona": {
-    "encounter": {
-      "1": "Ich bin durch die Lüfte geflogen und habe nach Beute gesucht… und du bist mein Ziel!",
-      "2": "Egal, wie unser Kampf ausgeht, meine Flug-Pokémon und ich werden mit Anmut triumphieren. Auf in den Kampf!",
-      "3": "Ich hoffe, du hast keine Höhenangst. Lasst uns aufsteigen!"
-    },
-    "victory": {
-      "1": "Du bist der erste Trainer, den ich gesehen habe, der mehr Anmut hat als ich. Ausgezeichnet",
-      "2": "Meine Flug-Pokémon sind abgestürzt! Na gut.",
-      "3": "Auch wenn ich gefallen sein mag, meine Pokémon werden weiter fliegen!"
-    },
-    "defeat": {
-      "1": "Meine Flug-Pokémon und ich werden für immer elegant tanzen!",
-      "2": "Ich hoffe du hast die Show genossen. Unser anmutiger Tanz ist beendet.",
-      "3": "Wirst du zurückkommen und unsere elegante Choreographie noch einmal sehen?"
-    }
-  },
-  "tate": {
-    "encounter": {
-      "1": "Hehehe… Bist du überrascht, mich ohne meine Schwester zu sehen?",
-      "2": "Ich kann sehen, was du denkst… Du willst kämpfen!",
-      "3": "Wie kannst du jemanden besiegen der deine Gedanken lesen kann?"
-    },
-    "victory": {
-      "1": "Ich kann es nicht ändern… Ich vermisse Svenja…",
-      "2": "Die Bande zwischen dir und deinen Pokémon ist stärker als meine.",
-      "3": "Zusammen mit Svenja wären wir unschlagbar gewesen. Wir können gegenseitig unsere Sätze beenden!"
-    },
-    "defeat": {
-      "1": "Meine Pokémon und ich sind siegreich.",
-      "2": "Wenn du mich nicht besiegen kannst, wirst du auch niemals Svenja besiegen können.",
-      "3": "All das verdanke ich meinem strengen Training mit Svenja. Meine Pokémon und ich sind eins."
-    }
-  },
-  "liza": {
-    "encounter": {
-      "1": "Hihihi… Bist du überrascht, mich ohne meinen Bruder zu sehen?",
-      "2": "Ich kann sehen, wonach du verlangst… Du willst kämpfen, oder?",
-      "3": "Wie kannst du jemanden besiegen, der eins mit seinen Pokémon ist?"
-    },
-    "victory": {
-      "1": "Ich kann es nicht ändern… Ich vermisse Ben…",
-      "2": "Das Band zwischen dir und deinen Pokémon ist stärker als meins.",
-      "3": "Zusammen mit Ben wären wir unschlagbar gewesen. Wir können gegenseitig unsere Sätze beenden!"
-    },
-    "defeat": {
-      "1": "Meine Pokémon und ich sind siegreich.",
-      "2": "Wenn du mich nicht besiegen kannst, wirst du auch niemals Ben besiegen können.",
-      "3": "All das verdanke ich meinem strengen Training mit Ben. Meine Pokémon und ich sind eins."
-    }
-  },
-  "juan": {
-    "encounter": {
-      "1": "Jetzt ist nicht die Zeit, schüchtern zu sein. Lass uns kämpfen!",
-      "2": "Ahahaha, Du wirst Zeuge meiner Kunstfertigkeit mit Wasser-Pokémon!",
-      "3": "Ein Taifun nähert sich! Wirst du mich testen können?",
-      "4": "Bitte, du wirst Zeuge unserer Kunstfertigkeit.\n$Eine großartige Illusion aus Wasser, die von meinen Pokémon und mir geschaffen wurde!"
-    },
-    "victory": {
-      "1": "Du bist ein Genie, das Wasilli herausfordern kann!",
-      "2": "Ich habe mich auf Eleganz konzentriert, während du trainiert hast.\n$Es kein Wunder, dass du gewonnen hast.",
-      "3": "Ahahaha! Nun gut, dieses Mal hast du gewonnen.",
-      "4": "Ich spüre den Glanz deines Könnens, der alles überwinden wird."
-    },
-    "defeat": {
-      "1": "Meine Pokémon und ich haben eine Illusion aus Wasser geschaffen und sind siegreich hervorgegangen.",
-      "2": "Ahahaha, Ich habe gewonnen, und du hast verloren.",
-      "3": "Soll ich dir mein Outfit leihen? Es könnte dir beim Kampf helfen! Ahahaha, ich scherze!",
-      "4": "Ich bin der Gewinner! Das heißt, du hast verloren."
-    }
-  },
-  "crasher_wake": {
-    "encounter": {
-      "1": "Aufgepasst! Wellenbrecher Marinus… ist… da!",
-      "2": "Brechende Wellen! Ich bin Wellenbrecher Marinus!",
-      "3": "Ich bin die Flutwelle der Macht, die dich wegspült!"
-    },
-    "victory": {
-      "1": "Das bringt ein Grinsen in mein Gesicht! Guhahaha! Das war ein Spaß!",
-      "2": "Hunwah! Es ist vorbei! Wie soll ich das sagen… Ich will mehr! Ich wollte viel mehr kämpfen!",
-      "3": "WAAAS?!"
-    },
-    "defeat": {
-      "1": "Yeeeeah! So muss das sein!",
-      "2": "Ich habe gewonnen, aber ich will mehr! Ich wollte viel mehr kämpfen!",
-      "3": "Bis bald! Ich freue mich auf den nächsten Kampf!"
-    }
-  },
-  "falkner": {
-    "encounter": {
-      "1": "Ich werde dir die wahre Kraft der prächtigen Flug-Pokémon zeigen!",
-      "2": "Winde, bleibt bei mir!",
-      "3": "Vater! Ich hoffe, du siehst mir beim Kampf von oben zu!"
-    },
-    "victory": {
-      "1": "Ich verstehe… Ich werde mich anmutig zurückziehen.",
-      "2": "Eine Niederlage ist eine Niederlage. Du bist wirklich stark.",
-      "3": "…Verdammt! Ich habe verloren!"
-    },
-    "defeat": {
-      "1": "Vater! Ich habe mit deinen geliebten Flug-Pokémon gewonnen…",
-      "2": "Flug-Pokémon sind die Besten!",
-      "3": "Ich habe das Gefühl, dass ich meinem Vater näher komme!"
-    }
-  },
-  "nessa": {
-    "encounter": {
-      "1": "Egal, welchen Plan dein raffinierter Verstand auch schmiedet,\n$mein Partner und ich werden ihn mit Sicherheit zu Fall bringen.",
-      "2": "Ich bin nicht hier, um zu plaudern. Ich bin hier, um zu gewinnen!",
-      "3": "Das ist ein kleines Geschenk von meinen Pokémon… Ich hoffe, du kannst es annehmen!"
-    },
-    "victory": {
-      "1": "Du und deine Pokémon sind einfach zu stark…",
-      "2": "Wie…? Wie kann das sein?",
-      "3": "Ich wurde total weggespült!"
-    },
-    "defeat": {
-      "1": "Die wütenede Welle schlägt wieder zu!",
-      "2": "Es ist Zeit, die Welle des Sieges zu reiten!",
-      "3": "Ehehe!"
-    }
-  },
-  "melony": {
-    "encounter": {
-      "1": "Ich halte mich nicht zurück!",
-      "2": "Okay, ich denke, wir sollten anfangen.",
-      "3": "Ich werde dich einfrieren!"
-    },
-    "victory": {
-      "1": "Du… Du bist ziemlich gut, oder?",
-      "2": "Wenn du Mac triffst, haue ihn für mich um, ja?",
-      "3": "Ich denke, du hast 'das Eis brechen' ein wenig zu wörtlich genommen…"
-    },
-    "defeat": {
-      "1": "Siehst du jetzt, wie ernst Kämpfe sein können?",
-      "2": "Hee! Es sieht so aus, als hätte ich wieder gewonnen!",
-      "3": "Hältst du dich zurück?"
-    }
-  },
-  "marlon": {
-    "encounter": {
-      "1": "Du siehst stark aus! Los geht's!",
-      "2": "Ich bin stark wie das weite Meer. Du wirst weggespült, das ist sicher.",
-      "3": "Oh ho, ich treffe auf dich! Das ist abgefahren."
-    },
-    "victory": {
-      "1": "Du hast total gerockt! Du ziehst einige krasse Pokémon groß. Du hast das Trainer-Ding drauf!",
-      "2": "Du siehst nicht nur stark aus, du bist auch stark! Eh, ich wurde auch weggespült!",
-      "3": "Du bist stark wie eine spektakuläre Welle!"
-    },
-    "defeat": {
-      "1": "Du bist stark, aber nicht stark genug, um das Meer zu beeinflussen, 'OK!",
-      "2": "Hee! Sieht so aus, als hätte ich wieder gewonnen!",
-      "3": "Süßer, süßer Sieg!"
-    }
-  },
-  "shauntal": {
-    "encounter": {
-      "1": "Entschuldigung. Du bist ein Herausforderer, oder?\nIch bin Anissa, die Geist-Pokémon-Nutzerin\n$der Top Vier. Ich werde dich in die Welt der Bücher entführen.",
-      "2": "Ich liebe es, über Trainer und deren Pokémon zu schreiben.\n$Könnte ich dich als Inspiration verwenden?",
-      "3": "Jeder, der mit Pokémon arbeitet, hat eine Geschichte zu erzählen. Welche Geschichte wird erzählt?"
-    },
-    "victory": {
-      "1": "Wow. Ich bin sprachlos!",
-      "2": "E-entschuldigung! Zuerst muss ich mich bei meinen Pokémon entschuldigen…\n$Es tut mir wirklich leid, dass ihr wegen mir eine schlechte Erfahrung gemacht habt.",
-      "3": "Selbst in Anbetracht dessen, bin ich immer noch eine der Top Vier!"
-    },
-    "defeat": {
-      "1": "Eheh.",
-      "2": "Das war exzellentes Material für meinen nächsten Roman!",
-      "3": "Und wenn sie nicht gestorben sind, dann leben sie noch heute…"
-    }
-  },
-  "marshal": {
-    "encounter": {
-      "1": "Mein Mentor, Lauro, sieht Potential in dir. Ich werde dich testen,\n$dich an die Grenzen deiner Stärke bringen. Kiai!",
-      "2": "Ein Sieg, ein entscheidender Sieg, das ist mein Ziel! Herausforderer, hier komme ich!",
-      "3": "Ich selber suche die Stärke eines Kämpfers zu entwickeln und jede Schwäche in mir zu brechen!"
-    },
-    "victory": {
-      "1": "Puh! Gut gemacht!",
-      "2": "Während deine Kämpfe weitergehen, strebe nach noch größeren Höhen!",
-      "3": "Die Stärke, die du und deine Pokémon gezeigt haben, hat mich tief beeindruckt..."
-    },
-    "defeat": {
-      "1": "Hmm.",
-      "2": "Das war ein guter Kampf.",
-      "3": "Haaah! Haaah! Haiyaaaah!"
-    }
-  },
-  "cheren": {
-    "encounter": {
-      "1": "Du erinnerst mich an einen alten Freund. Das macht mich gespannt auf diesen Pokémon-Kampf!",
-      "2": "Pokémon-Kämpfe haben keinen Sinn, wenn man nicht darüber nachdenkt, warum man kämpft.\n$Oder besser gesagt, es macht das Kämpfen mit Pokémon sinnlos.",
-      "3": "Ich heiße Cheren! Ich bin ein Arenaleiter und Lehrer! Freut mich, dich kennenzulernen."
-    },
-    "victory": {
-      "1": "Danke! Ich habe gesehen, was mir gefehlt hat.",
-      "2": "Danke! Ich habe das Gefühl, ein Stück meines Ideals entdeckt zu haben.",
-      "3": "Hmm… Das ist problematisch."
-    },
-    "defeat": {
-      "1": "Als Arenaleiter will ich eine Hürde für dich sein, die du überwinden musst.",
-      "2": "In Ordnung!",
-      "3": "Ich bin so weit gekommen, weil Pokémon an meiner Seite waren.\n$Vielleicht sollten wir darüber nachdenken, warum Pokémon uns helfen,\n$nicht als Pokémon und Trainer, sondern als Beziehung zwischen Lebewesen."
-    }
-  },
-  "chili": {
-    "encounter": {
-      "1": "Jaaaa! Zeit, mit dem Feuer zu spielen! Ich bin der Stärkste von uns Brüdern!",
-      "2": "Ta-da! Der Feuer-Typ-Kämpfer Maik --das bin ich-- wird dein Gegner sein!",
-      "3": "Ich werde dir zeigen, was ich und meine feurigen Pokémon draufhaben!"
-    },
-    "victory": {
-      "1": "Du hast mich besiegt. Ich bin... ausgebrannt...",
-      "2": "Whoa ho! Du brennst vor Energie!",
-      "3": "Autsch! Du hast mich erwischt!"
-    },
-    "defeat": {
-      "1": "Ich brenne! Spiel mit mir, und du wirst dich verbrennen!",
-      "2": "Wenn du mit Feuer spielst, wirst du verbrannt!",
-      "3": "Ich meine, komm schon, dein Gegner war ich! Du hattest keine Chance!"
-    }
-  },
-  "cilan": {
-    "encounter": {
-      "1": "Nichts Persönliches... Keine harten Gefühle... Ich und meine Pflanzen-Pokémon werden...\n$Ähm... Wir werden kämpfen, egal was passiert.",
-      "2": "Also, ähm, wenn es für dich in Ordnung ist, werde ich, ähm, alles geben, um, äh, dein Gegner zu sein.",
-      "3": "OK… Also, ähm, ich bin Benny, ich mag Pflanzen-Pokémon."
-    },
-    "victory": {
-      "1": "Ähm… Ist es jetzt vorbei?",
-      "2": "…Was für eine Überraschung. Du bist sehr stark, nicht wahr? \n$Ich glaube, meine Brüder hätten dich auch nicht besiegen können…",
-      "3": "…Hmm. Sieht aus, als wäre mein Timing, ähm, schlecht gewesen?"
-    },
-    "defeat": {
-      "1": "Huh? Habe ich gewonnen?",
-      "2": "Ich denke... Ich habe wohl gewonnen, weil ich mit meinen Brüdern Maik und Colin traniert habe,\n$und wir so alle stärker geworden sind.",
-      "3": "Es... es war ein ziemlich aufregendes Erlebnis..."
-    }
-  },
-  "roark": {
-    "encounter": {
-      "1": "Ich muss dein Potenzial als Trainer und die Stärke der Pokémon sehen, die mit dir kämpfen!",
-      "2": "Los geht's! Dies sind meine Gesteins-Pokémon, mein ganzer Stolz!",
-      "3": "Gesteins-Pokémon sind einfach die besten!",
-      "4": "Ich muss dein Potenzial als Trainer und die Stärke der Pokémon sehen, die mit dir kämpfen!"
-    },
-    "victory": {
-      "1": "W-was? Das kann nicht sein! Meine total tranierten Pokémon!",
-      "2": "…Wir haben die Kontrolle verloren. Beim nächsten Mal fordere ich dich\n$zu einem Fossilien-Ausgrabungswettbewerb heraus.",
-      "3": "Mit deinem Können ist es nur natürlich, dass du gewinnst.",
-      "4": "W-was?! Das kann nicht sein! Selbst das war nicht genug?",
-      "5": "Ich habe es vermasselt."
-    },
-    "defeat": {
-      "1": "Siehst du? Ich bin stolz auf meinen steinigen Kampfstil!",
-      "2": "Danke! Der Kampf hat mir Vertrauen gegeben, dass ich vielleicht meinen Vater besiegen kann!",
-      "3": "Ich fühle mich, als hätte ich gerade einen wirklich hartnäckigen Felsen durchbrochen!"
-    }
-  },
-  "morty": {
-    "encounter": {
-      "1": "Mit ein bisschen mehr könnte ich eine Zukunft sehen, in der ich das legendäre Pokémon treffe.\n$Du wirst mir helfen, dieses Level zu erreichen!",
-      "2": "Es heißt, dass ein regenbogenfarbenes Pokémon vor einem wirklich starken Trainer erscheinen wird.\n$Ich habe an diese Geschichte geglaubt, deshalb habe ich mein ganzes Leben lang heimlich trainiert.\n$Als Ergebnis kann ich jetzt Dinge sehen, die andere nicht sehen.\n$Ich sehe einen Schatten der Person, die das Pokémon erscheinen lassen wird.\n$Ich glaube, diese Person bin ich! Du wirst mir helfen, dieses Level zu erreichen!",
-      "3": "Ob du es glaubst oder nicht, mystische Kräfte existieren.",
-      "4": "Du kannst die Früchte meines Trainings bezeugen.",
-      "5": "Du musst deine Seele mit der eines Pokémon vereinen. Kannst du das?",
-      "6": "Sag mal, willst du an meinem Training teilnehmen?"
-    },
-    "victory": {
-      "1": "Ich bin noch nicht gut genug...",
-      "2": "Ich sehe... Deine Reise hat dich an weit entfernte Orte geführt und du hast viel mehr gesehen als ich.\n$Ich beneide dich darum...",
-      "3": "Wie ist das möglich...",
-      "4": "Ich glaube nicht, dass unser Potenzial so unterschiedlich ist.\n$Aber du scheinst etwas mehr zu haben... Sei es drum.",
-      "5": "Ich brauche wohl mehr Training.",
-      "6": "Das ist schade."
-    },
-    "defeat": {
-      "1": "Ich habe... einen weiteren Schritt nach vorne gemacht.",
-      "2": "Fufufu...",
-      "3": "W-was?! Das kann nicht sein! Selbst das war nicht genug?",
-      "4": "Ich fühle mich, als hätte ich gerade einen wirklich hartnäckigen Felsen durchbrochen!",
-      "5": "Ahahahah!",
-      "6": "Ich wusste, dass ich gewinnen würde!"
-    }
-  },
-  "crispin": {
-    "encounter": {
-      "1": "Ich will gewinnen, also werde ich genau das tun!",
-      "2": "Ich kämpfe, weil ich kämpfen will! Und weißt du was? So sollte es sein!"
-    },
-    "victory": {
-      "1": "Ich wollte gewinnen... aber ich habe verloren!",
-      "2": "Ich habe verloren... weil ich nicht gewinnen konnte!"
-    },
-    "defeat": {
-      "1": "Hey, warte mal. Habe ich gerade gewonnen? Ich glaube, ich habe gewonnen! Das ist befriedigend!",
-      "2": "Wooo! Das war unglaublich!"
-    }
-  },
-  "amarys": {
-    "encounter": {
-      "1": "Ich möchte jemandem helfen. Daher kann ich es mir nicht leisten, zu verlieren.\n$… Unser Kampf beginnt jetzt."
-    },
-    "victory": {
-      "1": "Ich bin... nicht genug, wie ich sehe."
-    },
-    "defeat": {
-      "1": "Der Sieg gehört mir. Gut gekämpft."
-    }
-  },
-  "lacey": {
-    "encounter": {
-      "1": "Ich werde dir mit meinem gewohnten Team, als Mitglied der Top Vier gegenüberstehen."
-    },
-    "victory": {
-      "1": "Das war ein großartiger Kampf!"
-    },
-    "defeat": {
-      "1": "Geben wir deinem Pokémon einen kräftigen Applaus für ihre Bemühungen!"
-    }
-  },
-  "drayton": {
-    "encounter": {
-      "1": "Mann, ich liebe Stühle. Liebst du nicht auch Stühle? Was für Lebensretter.\n$Ich verstehe nicht, warum nicht jeder einfach die ganze Zeit sitzt. Stehen ist anstrengend!"
-    },
-    "victory": {
-      "1": "Ich hätte damit rechnen sollen!"
-    },
-    "defeat": {
-      "1": "Heh heh! Macht nichts, ich habe hier nur einen Sieg eingefahren.\n$Ich verstehe, wenn du sauer bist, aber geh nicht völlig auf mich los, okay?"
-    }
-  },
-  "ramos": {
-    "encounter": {
-      "1": "Hast du den Garten-Spielplatz genossen, den ich mit all diesen kräftigen Pflanzen angelegt habe?\n$Ihre Stärke ist ein Zeichen meiner Stärke als Gärtner und Arenaleiter! \n$Bist du sicher, dass du bereit bist, dich dem zu stellen?"
-    },
-    "victory": {
-      "1": "Du glaubst an deine Pokémon... Und sie glauben an dich... Es war ein feiner Kampf, Sprössling."
-    },
-    "defeat": {
-      "1": "Hohoho... In der Tat. Schwache kleine Grashalme brechen selbst durch Beton."
-    }
-  },
-  "viola": {
-    "encounter": {
-      "1": "Ob es die Tränen der Frustration nach einer Niederlage sind\n$oder das Aufblühen der Freude nach einem Sieg...\n$Beides sind großartige Motive für meine Kamera! Fantastisch! Das wird einfach fantastisch!\n$Jetzt komm auf mich zu!",
-      "2": "Mein Objektiv ist immer auf den Sieg fokussiert - ich lasse mir diesen Moment nicht entgehen!"
-    },
-    "victory": {
-      "1": "Du und deine Pokémon haben mir eine ganz neue Tiefenschärfe gezeigt! Einfach fantastisch!",
-      "2": "Die Welt, die du durch ein Objektiv siehst, und die Welt,\n$die du mit einem Pokémon an deiner Seite siehst...\n$Die gleiche Welt kann völlig anders aussehen, je nach Blickwinkel."
-    },
-    "defeat": {
-      "1": "Das Foto vom Moment meines Sieges wird ein echter Gewinner sein!",
-      "2": "Ja! Ich habe einige großartige Fotos gemacht!"
-    }
-  },
-  "candice": {
-    "encounter": {
-      "1": "Du willst Frida herausfordern? Klar! Ich habe auf jemanden Starken gewartet!\n$Aber ich sollte dir sagen, ich bin stark, weil ich weiß, wie man sich konzentriert.",
-      "2": "Pokémon, Mode, Romantik... Es geht alles um Konzentration!\n$Ich werde dir zeigen, was ich meine. Mach dich bereit zu verlieren!"
-    },
-    "victory": {
-      "1": "Ich muss sagen, ich bin von dir angetan! Vielleicht bewundere ich dich sogar ein bisschen.",
-      "2": "Wow! Du bist großartig! Du hast meinen Respekt verdient!\n$Ich denke, dein Fokus und Wille haben uns völlig umgehauen."
-    },
-    "defeat": {
-      "1": "Ich habe deinen Siegeswillen gespürt, aber ich verliere nicht!",
-      "2": "Siehst du? Fridas Fokus! Der Fokus meiner Pokémon ist auch großartig!"
-    }
-  },
-  "gardenia": {
-    "encounter": {
-      "1": "Du hast eine Sieger-Aura. Also, das wird Spaß machen. Lass uns kämpfen!"
-    },
-    "victory": {
-      "1": "Unglaublich! Du bist sehr gut, nicht wahr?"
-    },
-    "defeat": {
-      "1": "Ja! Meine Pokémon und ich sind perfekt abgestimmt!"
-    }
-  },
-  "aaron": {
-    "encounter": {
-      "1": "Okay! Lass mich gegen dich antreten!"
-    },
-    "victory": {
-      "1": "Kämpfen ist eine tiefe und komplexe Angelegenheit..."
-    },
-    "defeat": {
-      "1": "Ein Sieg über ein Mitglied der Top Vier ist nicht leicht zu erringen."
-    }
-  },
-  "cress": {
-    "encounter": {
-      "1": "Das ist korrekt! Ich und meine geschätzten Wasser-Pokémon werden deine Gegner im Kampf sein!"
-    },
-    "victory": {
-      "1": "Verlieren? Ich? Das glaube ich nicht."
-    },
-    "defeat": {
-      "1": "Das ist das passende Ergebnis, wenn ich dein Gegner bin."
-    }
-  },
-  "allister": {
-    "encounter": {
-      "1": "'N-Nio.\nH-hier… g-geht's los…"
-    },
-    "victory": {
-      "1": "Ich hätte beinahe meine Maske vor Schock verloren... Das war...\n$Wow. Ich sehe dein Können, wie es wirklich ist."
-    },
-    "defeat": {
-      "1": "D-das war klasse!"
-    }
-  },
-  "clay": {
-    "encounter": {
-      "1": "Harrumph! Du hast mich warten lassen, oder? Gut, jetzt will ich sehen, was du drauf hast!"
-    },
-    "victory": {
-      "1": "Mann oh Mann... Es fühlt sich gut an, alles zu geben und trotzdem besiegt zu werden!"
-    },
-    "defeat": {
-      "1": "Was wichtig ist, ist wie du auf eine Niederlage reagierst.\n$Deshalb sind Leute, die Niederlagen als Ansporn nutzen, um besser zu werden, stark."
-    }
-  },
-  "kofu": {
-    "encounter": {
-      "1": "Ich werde dir ein ganzes Menü aus Wasser-Pokémon servieren! Aber versuch nicht, sie zu essen!"
-    },
-    "victory": {
-      "1": "Vaultin' Veluza! Du bist ein lebhafter Mensch, nicht wahr!\n$Ein bisschen ZU lebhaft, wenn ich das so sagen darf!"
-    },
-    "defeat": {
-      "1": "Komm bald wieder zu mir, hörst du?"
-    }
-  },
-  "tulip": {
-    "encounter": {
-      "1": "Erlaube mir, meine Fähigkeiten einzusetzen, um deine niedlichen kleinen Pokémon noch schöner zu machen!"
-    },
-    "victory": {
-      "1": "Deine Stärke hat eine Magie, die nicht wegzuwaschen ist."
-    },
-    "defeat": {
-      "1": "Weißt du, in meinem Beruf verschwinden Menschen,\n$die in einem Bereich kein Talent haben, oft schnell und werden nie wieder gesehen."
-    }
-  },
-  "sidney": {
-    "encounter": {
-      "1": "Mir gefällt der Blick, den du mir zuwirfst. Ich denke, du wirst mir einen guten Kampf liefern.\n$Das ist gut! Sieht wirklich gut aus! In Ordnung!\n$Du und ich, lass uns einen Kampf genießen, der nur hier stattfinden kann!"
-    },
-    "victory": {
-      "1": "Nun, wie gefällt dir das? Ich habe verloren! Eh, es hat Spaß gemacht, also ist es egal."
-    },
-    "defeat": {
-      "1": "Wir sind hier nicht nachtragend, okay?"
-    }
-  },
-  "phoebe": {
-    "encounter": {
-      "1": "Während meines Trainings habe ich die Fähigkeit erlangt, mit Geister-Pokémon zu kommunizieren.\n$Ja, die Bindung, die ich zu Pokémon entwickelt habe, ist extrem stark.\n$Also komm, versuche nur, meinen Pokémon Schaden zuzufügen!"
-    },
-    "victory": {
-      "1": "Oh, Mist. Ich habe verloren."
-    },
-    "defeat": {
-      "1": "Ich freue mich darauf, dich irgendwann wieder zu bekämpfen!"
-    }
-  },
-  "glacia": {
-    "encounter": {
-      "1": "Alles, was ich gesehen habe, sind Herausforderungen von schwachen Trainern und ihren Pokémon.\n$Und du? Es würde mich überaus freuen, wenn ich gegen dich alles geben könnte!"
-    },
-    "victory": {
-      "1": "Du und deine Pokémon… Wie heiß eure Geister brennen!\n$Die alles verzehrende Hitze überwältigt.\n$Es ist kein Wunder, dass meine eisigen Fähigkeiten dir nichts anhaben konnten."
-    },
-    "defeat": {
-      "1": "Ein leidenschaftlicher Kampf, in der Tat."
-    }
-  },
-  "drake": {
-    "encounter": {
-      "1": "Um mit Pokémon als Partner zu kämpfen, weißt du, was dafür nötig ist? Weißt du, was gebraucht wird?\n$Wenn nicht, wirst du nie gegen mich gewinnen!"
-    },
-    "victory": {
-      "1": "Hervorragend, muss ich sagen."
-    },
-    "defeat": {
-      "1": "Ich habe alles für diesen Kampf gegeben!"
-    }
-  },
-  "wallace": {
-    "encounter": {
-      "1": "Da ist etwas an dir… Eine Veränderung in deinem Auftreten.\n$Ich denke, ich spüre das bei dir. Zeig es mir. Zeig mir die Kraft, die du mit deinen Pokémon hast.\n$Und ich werde dir im Gegenzug eine Vorstellung von\n$Illusionen im Wasser von mir und meinen Pokémon präsentieren!"
-    },
-    "victory": {
-      "1": "Bravo. Ich erkenne jetzt deine Authentizität und Großartigkeit als Pokémon-Trainer.\n$Ich freue mich sehr, dich und deine Pokémon kennengelernt zu haben. Du hast dich als würdig erwiesen."
-    },
-    "defeat": {
-      "1": "Eine große Illusion!"
-    }
-  },
-  "lorelei": {
-    "encounter": {
-      "1": "Niemand kann mich bei eisigen Pokémon übertreffen! Gefrierende Angriffe sind mächtig!\n$Deine Pokémon werden mir ausgeliefert sein, wenn sie erst einmal eingefroren sind! Hahaha!\n$Bist du bereit?"
-    },
-    "victory": {
-      "1": "Wie kannst du es wagen!"
-    },
-    "defeat": {
-      "1": "Es gibt nichts, was du tun kannst, wenn du erst einmal eingefroren bist."
-    }
-  },
-  "will": {
-    "encounter": {
-      "1": "Ich habe auf der ganzen Welt trainiert und meine Psycho-Pokémon stark gemacht.\n$Ich kann nur besser werden! Verlieren ist keine Option!"
-    },
-    "victory": {
-      "1": "Ich... ich kann es nicht... glauben..."
-    },
-    "defeat": {
-      "1": "Das war knapp. Ich frage mich, was dir fehlt."
-    }
-  },
-  "malva": {
-    "encounter": {
-      "1": "Ich fühle mich, als könnte mein Herz in Flammen aufgehen.\n$Ich brenne vor Hass auf dich, Wicht!"
-    },
-    "victory": {
-      "1": "Was für Neuigkeiten... Ein neuer Herausforderer hat Pachira besiegt!"
-    },
-    "defeat": {
-      "1": "Ich bin begeistert! Ja, begeistert, dass ich dich unter meinen Fußsohlen zerquetschen konnte."
-    }
-  },
-  "hala": {
-    "encounter": {
-      "1": "Der alte Hala ist hier, um dich zum Schreien zu bringen!"
-    },
-    "victory": {
-      "1": "Ich konnte die Kraft spüren, die du auf deiner Reise gewonnen hast."
-    },
-    "defeat": {
-      "1": "Haha! Was für ein erfreulicher Kampf!"
-    }
-  },
-  "molayne": {
-    "encounter": {
-      "1": "Ich habe die Kapitänsposition meinem Cousin Chrys gegeben,\n$aber ich bin zuversichtlich in meine Fähigkeiten.\n$Meine Stärke ist wie die einer Supernova!"
-    },
-    "victory": {
-      "1": "Ich habe sicherlich einen interessanten Trainer zum Kämpfen gefunden!"
-    },
-    "defeat": {
-      "1": "Ahaha. Was für ein interessanter Kampf."
-    }
-  },
-  "rika": {
-    "encounter": {
-      "1": "Ich würde sagen, ich werde es dir leicht machen, aber... das wäre gelogen! Denke schnell!"
-    },
-    "victory": {
-      "1": "Nicht schlecht, wirklich!"
-    },
-    "defeat": {
-      "1": "Nahahaha! Du bist wirklich etwas Besonderes!"
-    }
-  },
-  "bruno": {
-    "encounter": {
-      "1": "Wir werden dich mit unserer überlegenen Kraft niederschmettern! Hoo hah!"
-    },
-    "victory": {
-      "1": "Warum? Wie konnte ich verlieren?"
-    },
-    "defeat": {
-      "1": "Du kannst mich herausfordern, so oft du willst, aber das Ergebnis wird sich nie ändern!"
-    }
-  },
-  "bugsy": {
-    "encounter": {
-      "1": "Ich bin Kai, der Arenaleiter von Azalea City. Ich bin ein großer Fan von Käfer-Pokémon."
-    },
-    "victory": {
-      "1": "Wow, erstaunlich! Du bist ein Experte für Pokémon!\n$Meine Forschung ist noch nicht abgeschlossen. OK, du gewinnst."
-    },
-    "defeat": {
-      "1": "Danke! Dank unseres Kampfes konnte ich auch Fortschritte in meiner Forschung machen!"
-    }
-  },
-  "koga_gym": {
-    "encounter": {
-      "1": "Fwahahahaha! Pokémon sind nicht nur rohe Gewalt - das wirst du bald genug sehen!"
-    },
-    "victory": {
-      "1": "Ah! Du hast deinen Wert bewiesen!"
-    },
-    "defeat": {
-      "1": "Hast du gelernt, die Techniken der Ninja zu fürchten?"
-    }
-  },
-  "bertha": {
-    "encounter": {
-      "1": "Nun, würdest du dieser alten Dame zeigen, wie viel du gelernt hast?"
-    },
-    "victory": {
-      "1": "Nun! Liebes Kind, ich muss sagen, das war sehr beeindruckend.\n$Deine Pokémon haben an dich geglaubt und ihr Bestes gegeben, um dir den Sieg zu sichern.\n$Obwohl ich verloren habe, finde ich mich mit einem dummen Grinsen wieder!"
-    },
-    "defeat": {
-      "1": "Hahahahah! Sieht so aus, als hätte diese alte Dame gewonnen!"
-    }
-  },
-  "lenora": {
-    "encounter": {
-      "1": "Nun denn, Herausforderer, ich werde erforschen,\n$wie du mit den Pokémon kämpfst, die du so liebevoll aufgezogen hast!"
-    },
-    "victory": {
-      "1": "Meine Theorie über dich war korrekt. Du bist mehr als nur talentiert... \n$Du bist motiviert! Ich salutier' dir!"
-    },
-    "defeat": {
-      "1": "Ah ha ha! Wenn du verlierst, analysiere warum und nutze dieses Wissen im nächsten Kampf!"
-    }
-  },
-  "siebold": {
-    "encounter": {
-      "1": "Solange ich lebe, werde ich danach streben, die ultimative Küche...\n$und die stärksten Gegner im Kampf zu finden!"
-    },
-    "victory": {
-      "1": "Ich werde die Erinnerung an dich und deine Pokémon für immer in meinem Herzen bewahren."
-    },
-    "defeat": {
-      "1": "Unser Pokémon-Kampf war wie Nahrung für meine Seele. Er wird mich weiter antreiben.\n$So werde ich dir meinen Respekt erweisen, dass du alles im Kampf gegeben hast!"
-    }
-  },
-  "roxie": {
-    "encounter": {
-      "1": "Mach dich bereit! Ich werde dir den Verstand aus dem Kopf schlagen!"
-    },
-    "victory": {
-      "1": "Wahnsinn! Deine Vernunft ist schon giftiger als meine!"
-    },
-    "defeat": {
-      "1": "Hey, komm schon! Sei ernst! Du musst mehr geben!"
-    }
-  },
-  "olivia": {
-    "encounter": {
-      "1": "Hier ist keine Einführung nötig. Zeit, gegen mich, Mayla, zu kämpfen!"
-    },
-    "victory": {
-      "1": "Wirklich lieblich... Sowohl du als auch deine Pokémon..."
-    },
-    "defeat": {
-      "1": "Mmm-hmm."
-    }
-  },
-  "poppy": {
-    "encounter": {
-      "1": "Oooh! Willst du einen Pokémon-Kampf mit mir führen?"
-    },
-    "victory": {
-      "1": "Uagh?! Mmmuuuggghhh..."
-    },
-    "defeat": {
-      "1": "Jaaa! Ich hab's geschafft! Ich hab dich besiegt! Du kannst kommen für... Für... Einen Revanchekampf?\n$Komm jederzeit für einen Revanchekampf!"
-    }
-  },
-  "agatha": {
-    "encounter": {
-      "1": "Pokémon sind zum Kämpfen da! Ich zeige dir, wie ein echter Trainer kämpft!"
-    },
-    "victory": {
-      "1": "Oh mein Gott! Du bist etwas Besonderes, Kind!"
-    },
-    "defeat": {
-      "1": "Bahaha. So wird ein richtiger Kampf geführt!"
-    }
-  },
-  "flint": {
-    "encounter": {
-      "1": "Hoffentlich bist du aufgewärmt, denn hier kommt der Urknall!"
-    },
-    "victory": {
-      "1": "Unglaublich! Deine Moves sind so heiß, dass meine im Vergleich lauwarm wirken!"
-    },
-    "defeat": {
-      "1": "Huh? War das alles? Ich denke, du brauchst etwas mehr Leidenschaft."
-    }
-  },
-  "grimsley": {
-    "encounter": {
-      "1": "Der Gewinner nimmt alles, und es bleibt nichts für den Verlierer."
-    },
-    "victory": {
-      "1": "Wenn man verliert, verliert man alles... Das nächste, wonach ich suche, wird auch der Sieg sein!"
-    },
-    "defeat": {
-      "1": "Wenn jemand gewinnt, verliert derjenige, der gegen diese Person gekämpft hat."
-    }
-  },
-  "caitlin": {
-    "encounter": {
-      "1": "Ich bin es, die erschien, als die Blume sich öffnete. Du, der du gewartet hast…\n$Du siehst aus wie ein Pokémon-Trainer mit verfeinerter Stärke und vertiefter Freundlichkeit.\n$Was ich in meinem Gegner suche, ist überlegene Stärke…\n$Bitte entfessle deine Kraft in vollem Umfang!"
-    },
-    "victory": {
-      "1": "Meine Pokémon und ich haben so viel gelernt! Ich danke dir."
-    },
-    "defeat": {
-      "1": "Ich strebe danach, mit Eleganz und Anmut zu siegen."
-    }
-  },
-  "diantha": {
-    "encounter": {
-      "1": "Gegen dich und deine Pokémon zu kämpfen, die alle voller Hoffnung für die Zukunft sind...\n$Ehrlich gesagt, es erfüllt mich mit der Energie, die ich brauche, um jeden neuen Tag anzugehen!\n$Wirklich!"
-    },
-    "victory": {
-      "1": "Den edlen Geist von dir und deinen Pokémon im Kampf zu erleben, hat mein Herz wirklich berührt..."
-    },
-    "defeat": {
-      "1": "Oh, fantastisch! Was denkst du? Mein Team war ziemlich cool, oder?"
-    }
-  },
-  "wikstrom": {
-    "encounter": {
-      "1": "Guten Tag, junger Herausforderer! Wahrlich, ich bin die berühmte Klinge aus gehärtetem Stahl,\n$Herzog Thymelot! Lasst den Kampf beginnen! En garde!"
-    },
-    "victory": {
-      "1": "Ruhmreich! Das Vertrauen, das du mit deinen ehrenvollen Pokémon teilst, übertrifft sogar meines!"
-    },
-    "defeat": {
-      "1": "Was für eine Magie ist das? Mein Herz, es hämmert unaufhörlich in meiner Brust!\n$Gegen einen so würdigen Gegner zu gewinnen, verleiht meiner Seele Flügel - so fliege ich!"
-    }
-  },
-  "acerola": {
-    "encounter": {
-      "1": "Kämpfen macht einfach Spaß! Komm schon, ich schaffe das!"
-    },
-    "victory": {
-      "1": "Ich bin... sprachlos! Wie hast du das gemacht?!"
-    },
-    "defeat": {
-      "1": "Ehaha! Was für ein erstaunlicher Sieg!"
-    }
-  },
-  "larry_elite": {
-    "encounter": {
-      "1": "Hallo... Ich bin's, Aoki.\n$Ich bin auch Mitglied der Top Vier, ja... Leider für mich."
-    },
-    "victory": {
-      "1": "Nun, das hat uns den Wind aus den Segeln genommen..."
-    },
-    "defeat": {
-      "1": "Es ist Zeit für ein Treffen mit dem Boss."
-    }
-  },
-  "lance": {
-    "encounter": {
-      "1": "Ich habe auf dich gewartet. Erlaube mir, deine Fähigkeiten zu testen.",
-      "2": "Ich dachte, du würdest es so weit schaffen. Lass uns anfangen."
-    },
-    "victory": {
-      "1": "Du hast mich besiegt. Du bist großartig!",
-      "2": "Ich hätte nie erwartet, dass ein anderer Trainer mich schlägt... Ich bin überrascht."
-    },
-    "defeat": {
-      "1": "Das war knapp. Willst du es nochmal versuchen?",
-      "2": "Es ist nicht so, dass du schwach bist. Lass dich davon nicht stören."
-    }
-  },
-  "karen": {
-    "encounter": {
-      "1": "Ich bin Melanie. Möchtest du einen Kampf mit meinen Unlicht-Pokémon?",
-      "2": "Ich bin anders als die, die du bereits getroffen hast.",
-      "3": "Du hast ein charmantes Team zusammengestellt. Unser Kampf wird sicher gut."
-    },
-    "victory": {
-      "1": "Nein! Ich kann nicht gewinnen. Wie bist du so stark geworden?",
-      "2": "Ich werde nicht von meinem gewählten Weg abweichen.",
-      "3": "Der Champion freut sich darauf, dich kennenzulernen."
-    },
-    "defeat": {
-      "1": "Das habe ich erwartet.",
-      "2": "Nun, das war relativ unterhaltsam.",
-      "3": "Komm mich jederzeit besuchen."
-    }
-  },
-  "milo": {
-    "encounter": {
-      "1": "Es scheint, als würdest du Pokémon wirklich gut verstehen.\n$Das wird ein harter Kampf!\n$Ich muss mein Pokémon Dynamaximieren, wenn ich gewinnen will!"
-    },
-    "victory": {
-      "1": "Die Kraft des Grases ist verwelkt... Was für ein unglaublicher Herausforderer!"
-    },
-    "defeat": {
-      "1": "Das wird dich wirklich schockieren und in Ehrfurcht versetzen."
-    }
-  },
-  "lucian": {
-    "encounter": {
-      "1": "Einen Moment, bitte. Das Buch, das ich lese, hat fast seinen spannenden Höhepunkt erreicht...\n$Der Held hat ein mystisches Schwert erlangt und steht vor seiner letzten Prüfung... Ah, egal.\n$Da du es so weit geschafft hast, lege ich das beiseite und kämpfe gegen dich.\n$Lass mich sehen, ob du genauso viel Ruhm erlangen wirst wie der Held meines Buches!"
-    },
-    "victory": {
-      "1": "Ich sehe... Es scheint, als hättest du mich schachmatt gesetzt."
-    },
-    "defeat": {
-      "1": "Ich habe einen Ruf zu wahren."
-    }
-  },
-  "drasna": {
-    "encounter": {
-      "1": "Du musst ein starker Trainer sein. Ja, ganz stark...\n$Das sind wunderbare Neuigkeiten! Gegen Gegner wie dich und dein Team zu kämpfen,\n$lässt meine Pokémon wie Unkraut wachsen!"
-    },
-    "victory": {
-      "1": "Oh, meine Güte. Das war wirklich ein schneller Kampf... Ich hoffe, du kommst bald wieder!"
-    },
-    "defeat": {
-      "1": "Wie kann das sein?"
-    }
-  },
-  "kahili": {
-    "encounter": {
-      "1": "Also, da bist du… Warum sehen wir nicht, wen die Winde heute begünstigen, dich… oder mich?"
-    },
-    "victory": {
-      "1": "Es frustriert mich als Mitglied der Top Vier, aber es scheint, dass deine Stärke echt ist."
-    },
-    "defeat": {
-      "1": "Das war ein Ass!"
-    }
-  },
-  "hassel": {
-    "encounter": {
-      "1": "Bereite dich darauf vor, aus erster Hand zu erfahren,\n$wie sich der feurige Atem eines erbitterten Kampfes anfühlt!"
-    },
-    "victory": {
-      "1": "Das Glück hat mir dieses Mal gelächelt, aber...\n$Angesichts des Verlaufs des Kampfes, wer weiß, ob ich das nächste Mal so viel Glück haben werde."
-    },
-    "defeat": {
-      "1": "Das war ein Ass!"
-    }
-  },
-  "blue": {
-    "encounter": {
-      "1": "Du musst ziemlich gut sein, um so weit zu kommen."
-    },
-    "victory": {
-      "1": "Ich habe nur gegen ihn und jetzt gegen dich verloren… Ihn? Haha..."
-    },
-    "defeat": {
-      "1": "Siehst du? Meine Stärke hat mich hierher gebracht."
-    }
-  },
-  "piers": {
-    "encounter": {
-      "1": "Mach dich bereit für einen Moshpit mit mir und meiner Truppe! Spikeford, es ist Zeit zu rocken!"
-    },
-    "victory": {
-      "1": "Ich und mein Team haben unser Bestes gegeben. Lass uns irgendwann wieder zu einem Kampf treffen..."
-    },
-    "defeat": {
-      "1": "Meine Kehle ist heiser vom Schreien... Aber das war ein aufregender Kampf!"
-    }
-  },
-  "red": {
-    "encounter": {
-      "1": "…!"
-    },
-    "victory": {
-      "1": "…?"
-    },
-    "defeat": {
-      "1": "…!"
-    }
-  },
-  "jasmine": {
-    "encounter": {
-      "1": "Oh... Deine Pokémon sind beeindruckend. Ich denke, ich werde das genießen."
-    },
-    "victory": {
-      "1": "Du bist wirklich stark. Ich muss mich auch viel mehr anstrengen."
-    },
-    "defeat": {
-      "1": "Ich habe nie erwartet zu gewinnen."
-    }
-  },
-  "lance_champion": {
-    "encounter": {
-      "1": "Ich bin immer noch der Champion. Ich werde nichts zurückhalten."
-    },
-    "victory": {
-      "1": "Dies ist das Aufkommen eines neuen Champions."
-    },
-    "defeat": {
-      "1": "Ich habe meinen Titel erfolgreich verteidigt."
-    }
-  },
-  "steven": {
-    "encounter": {
-      "1": "Erzähl mir... Was hast du auf deiner Reise mit deinen Pokémon gesehen?\n$Was hast du gefühlt, als du so viele andere Trainer getroffen hast?\n$Durch dieses reiche Land zu reisen... Hat es etwas in dir geweckt?\n$Ich möchte, dass du mir alles zeigst, was du gelernt hast.\n$Meine Pokémon und ich werden dir im Gegenzug mit allem antworten, was wir wissen!"
-    },
-    "victory": {
-      "1": "Also falle ich, der Champion, in der Niederlage..."
-    },
-    "defeat": {
-      "1": "Das war gut verbrachte Zeit! Danke!"
-    }
-  },
-  "cynthia": {
-    "encounter": {
-      "1": "Ich, Cynthia, akzeptiere deine Herausforderung! Es wird keine Pause von mir geben!"
-    },
-    "victory": {
-      "1": "Egal wie viel Spaß der Kampf macht, er wird irgendwann enden..."
-    },
-    "defeat": {
-      "1": "Selbst wenn du verlierst, verliere niemals deine Liebe zu Pokémon."
-    }
-  },
-  "iris": {
-    "encounter": {
-      "1": "Weißt du was? Ich freue mich wirklich darauf, ernsthafte Kämpfe mit starken Trainern zu führen!\n$Ich meine, komm schon! Die Trainer, die es hierher schaffen, sind Trainer,\n$die den Sieg mit jeder Faser ihres Seins anstreben!\n$Und sie kämpfen Seite an Seite mit Pokémon, die unzählige schwierige Kämpfe durchgemacht haben!\n$Wenn ich mit solchen Leuten kämpfe, werde nicht nur ich stärker, sondern auch meine Pokémon!\n$Und wir werden uns noch besser kennenlernen! OK! Mach dich bereit!\n$Ich bin Iris, die Champion der Pokémon-Liga, und ich werde dich besiegen!"
-    },
-    "victory": {
-      "1": "Aghhhh... Ich habe mein Bestes gegeben, aber wir haben verloren..."
-    },
-    "defeat": {
-      "1": "Juhu! Wir haben gewonnen!"
-    }
-  },
-  "hau": {
-    "encounter": {
-      "1": "Ich frage mich, ob ein Trainer anders kämpft,\n$je nachdem, ob er aus einer warmen oder einer kalten Region stammt.\n$Lass es uns testen!"
-    },
-    "victory": {
-      "1": "Das war großartig! Ich denke, ich verstehe dein Vibe jetzt ein bisschen besser!"
-    },
-    "defeat": {
-      "1": "Ma-an, das war eine Art Kampf!"
-    }
-  },
-  "geeta": {
-    "encounter": {
-      "1": "Ich habe mich entschieden, erneut meinen Hut in den Ring zu werfen.\n$Komm jetzt... Zeig mir die Früchte deines Trainings."
-    },
-    "victory": {
-      "1": "Ich freue mich auf Neuigkeiten über all deine Erfolge!"
-    },
-    "defeat": {
-      "1": "Was ist los? Das ist doch nicht alles, oder?"
-    }
-  },
-  "nemona": {
-    "encounter": {
-      "1": "Yesss! Ich bin so aufgeregt! Zeit, dass wir uns austoben!"
-    },
-    "victory": {
-      "1": "Na gut, das ist ärgerlich, aber ich hatte trotzdem Spaß! Ich werde dich nächstes Mal erwischen!"
-    },
-    "defeat": {
-      "1": "Das war ein großartiger Kampf! Definitiv fruchtbar."
-    }
-  },
-  "leon": {
-    "encounter": {
-      "1": "Wir werden eine absolut großartige Zeit haben!"
-    },
-    "victory": {
-      "1": "Meine Zeit als Champion ist vorbei...\n$Aber was für eine großartige Zeit war das!\n$Danke für den großartigsten Kampf, den ich je hatte!"
-    },
-    "defeat": {
-      "1": "Das war eine absolut großartige Zeit!"
-    }
-  },
-  "whitney": {
-    "encounter": {
-      "1": "Hey! Findest du nicht auch, dass Pokémon total süß sind?"
-    },
-    "victory": {
-      "1": "Waaah! Waaah! Du bist so gemein!"
-    },
-    "defeat": {
-      "1": "Und das war's!"
-    }
-  },
-  "chuck": {
-    "encounter": {
-      "1": "Ha! Du willst mich herausfordern? Bist du mutig oder einfach nur unwissend?"
-    },
-    "victory": {
-      "1": "Du bist stark! Würdest du mich bitte zu deinem Schüler machen?"
-    },
-    "defeat": {
-      "1": "Da. Merkst du, wie viel mächtiger ich bin als du?"
-    }
-  },
-  "katy": {
-    "encounter": {
-      "1": "Lass deine Wachsamkeit nicht nach, es sei denn, du willst von den Füßen gerissen werden!"
-    },
-    "victory": {
-      "1": "Alle meine süßen kleinen Pokémon fielen wie Fliegen!"
-    },
-    "defeat": {
-      "1": "Iss auf, mein süßes kleines Vivillon!"
-    }
-  },
-  "pryce": {
-    "encounter": {
-      "1": "Jugend allein garantiert keinen Sieg! Erfahrung ist, was zählt."
-    },
-    "victory": {
-      "1": "Hervorragend! Das war perfekt. Versuche nicht zu vergessen, was du jetzt fühlst."
-    },
-    "defeat": {
-      "1": "Genau wie ich es mir vorgestellt habe."
-    }
-  },
-  "clair": {
-    "encounter": {
-      "1": "Weißt du, wer ich bin? Und du wagst es trotzdem, mich herauszufordern?"
-    },
-    "victory": {
-      "1": "Ich frage mich, wie weit du mit deinem Können kommen wirst. Das sollte faszinierend sein."
-    },
-    "defeat": {
-      "1": "Das war's."
-    }
-  },
-  "maylene": {
-    "encounter": {
-      "1": "Ich bin gekommen, um dich jetzt herauszufordern, und ich werde nichts zurückhalten.\n$Bitte bereite dich auf den Kampf vor!"
-    },
-    "victory": {
-      "1": "Ich gestehe die Niederlage ein..."
-    },
-    "defeat": {
-      "1": "Das war großartig."
-    }
-  },
-  "fantina": {
-    "encounter": {
-      "1": "Du wirst mich herausfordern, ja? Aber ich werde gewinnen.\n$Das tut der Arenaleiter von Herzhofen, non?"
-    },
-    "victory": {
-      "1": "Du bist so fantastisch stark. Ich weiß, warum ich verloren habe."
-    },
-    "defeat": {
-      "1": "Ich bin so, so, sehr glücklich!"
-    }
-  },
-  "byron": {
-    "encounter": {
-      "1": "Trainer! Du bist jung, genau wie mein Sohn, Veit. \n$Mit mehr jungen Trainern, die das Kommando übernehmen, ist die Zukunft der Pokémon hell! \n$Also, als Hürde für junge Leute nehme ich deine Herausforderung an!"
-    },
-    "victory": {
-      "1": "Hmm! Meine robusten Pokémon - besiegt!"
-    },
-    "defeat": {
-      "1": "Gwahahaha! Wie waren meine robusten Pokémon?!"
-    }
-  },
-  "olympia": {
-    "encounter": {
-      "1": "Ein alter Brauch entscheidet über das Schicksal. Der Kampf beginnt!"
-    },
-    "victory": {
-      "1": "Schaffe deinen eigenen Weg. Lass dir nichts in den Weg stellen. Dein Schicksal, deine Zukunft."
-    },
-    "defeat": {
-      "1": "Unser Weg ist jetzt klar."
-    }
-  },
-  "volkner": {
-    "encounter": {
-      "1": "Da du so weit gekommen bist, musst du ziemlich stark sein…\n$Ich hoffe, du bist der Trainer, der mich daran erinnert, wie viel Spaß es macht zu kämpfen!"
-    },
-    "victory": {
-      "1": "Du hast mich besiegt…\n$Dein Verlangen und die edle Art, wie deine Pokémon für dich gekämpft haben…\n$Ich habe mich sogar während unseres Kampfes begeistert gefühlt. Das war ein sehr guter Kampf."
-    },
-    "defeat": {
-      "1": "Es war überhaupt nicht schockierend…\n$Das ist nicht das, was ich wollte!"
-    }
-  },
-  "burgh": {
-    "encounter": {
-      "1": "M'hm… Wenn ich diesen Kampf gewinne, habe ich das Gefühl,\n$dass ich ein Bild malen kann, das es so noch nie gegeben hat.\n$OK! Ich höre meine Kampf-Muse laut und deutlich. Lass uns gleich loslegen!",
-      "2": "Natürlich bin ich wirklich stolz auf all meine Pokémon! \n$Nun, dann... Lass uns gleich loslegen!"
-    },
-    "victory": {
-      "1": "Ist es vorbei? Hat mich meine Muse verlassen?",
-      "2": "Hmm… Es ist vorbei! Du bist unglaublich!"
-    },
-    "defeat": {
-      "1": "Wow… Irgendwie ist es doch schön, nicht wahr?",
-      "2": "Manchmal höre ich Leute sagen, es war ein hässlicher Sieg. \n$Ich denke, wenn du dein Bestes gibst, ist jeder Sieg schön."
-    }
-  },
-  "elesa": {
-    "encounter": {
-      "1": "C'est fini! Wenn ich mir dessen sicher bin,\n$fühle ich einen elektrischen Stoß durch meinen Körper laufen!\n$Ich möchte dieses Gefühl erleben, also werden meine geliebten Pokémon\n$jetzt deinen Kopf zum Drehen bringen!"
-    },
-    "victory": {
-      "1": "Ich wollte deinen Kopf zum Drehen bringen, aber du hast mich schockiert."
-    },
-    "defeat": {
-      "1": "Das war irgendwie unbefriedigend… Wirst du nächstes Mal alles geben?"
-    }
-  },
-  "skyla": {
-    "encounter": {
-      "1": "Es ist endlich Zeit für ein Duell! Das bedeutet den Pokémon-Kampf,\n$der entscheidet, wer an der Spitze steht, richtig? \n$Ich liebe es, auf dem Gipfel zu stehen! Weil man von hohen Orten aus für immer und ewig sehen kann! \n$Also, wie wäre es, wenn wir beide Spaß haben?"
-    },
-    "victory": {
-      "1": "Dein Gegner im Kampf zu sein, ist eine neue Kraftquelle für mich. Danke!"
-    },
-    "defeat": {
-      "1": "Gewinnen oder verlieren, man lernt immer etwas aus einem Kampf, richtig?"
-    }
-  },
-  "brycen": {
-    "encounter": {
-      "1": "Es gibt auch Stärke darin, mit anderen Menschen und Pokémon zusammen zu sein. \n$Ihre Unterstützung zu erhalten, macht dich stärker. Ich werde dir diese Kraft zeigen!"
-    },
-    "victory": {
-      "1": "Die wunderbare Kombination aus dir und deinen Pokémon! Was für eine schöne Freundschaft!"
-    },
-    "defeat": {
-      "1": "Extreme Bedingungen testen und trainieren dich wirklich!"
-    }
-  },
-  "drayden": {
-    "encounter": {
-      "1": "Was ich finden möchte, ist ein junger Trainer, der mir eine helle Zukunft zeigen kann.\n$Lass uns mit allem kämpfen, was wir haben: dein Können, meine Erfahrung und die Liebe,\n$mit der wir unsere Pokémon großgezogen haben!"
-    },
-    "victory": {
-      "1": "Dieses intensive Gefühl, das mich nach einer Niederlage überkommt…\n$Ich weiß nicht, wie ich es beschreiben soll."
-    },
-    "defeat": {
-      "1": "Harrumph! Ich weiß, dass deine Fähigkeit größer ist als das!"
-    }
-  },
-  "grant": {
-    "encounter": {
-      "1": "Es gibt nur eine Sache, die ich mir wünsche. \n$Dass wir, indem wir einander übertreffen, einen Weg zu noch größeren Höhen finden."
-    },
-    "victory": {
-      "1": "Du bist eine Mauer, die ich nicht überwinden kann!"
-    },
-    "defeat": {
-      "1": "Gib nicht auf.\n$Das ist wirklich alles, was es dazu gibt.\n$Die wichtigsten Lektionen im Leben sind einfach."
-    }
-  },
-  "korrina": {
-    "encounter": {
-      "1": "Zeit für Lady Connies großen Auftritt!"
-    },
-    "victory": {
-      "1": "Es ist dein Wesen, das es deinen Pokémon ermöglicht, sich zu entwickeln!"
-    },
-    "defeat": {
-      "1": "Was für ein explosiver Kampf!"
-    }
-  },
-  "clemont": {
-    "encounter": {
-      "1": "Oh! Ich bin froh, dass wir uns getroffen haben!"
-    },
-    "victory": {
-      "1": "Deine Leidenschaft für den Kampf inspiriert mich!"
-    },
-    "defeat": {
-      "1": "Es sieht so aus, als würde meine Trainer-Wachstumsmaschine, Mach 2, wirklich funktionieren!"
-    }
-  },
-  "valerie": {
-    "encounter": {
-      "1": "Oh, wenn das nicht ein junger Trainer ist… Es ist schön, dich so zu treffen.\n$Dann nehme ich an, du hast dir das Recht auf einen Kampf verdient, als Belohnung für deine Bemühungen.\n$Die schwer fassbare Fee mag zart wie eine Brise und empfindlich wie eine Blüte erscheinen,\n$aber sie ist stark."
-    },
-    "victory": {
-      "1": "Ich hoffe, dass du morgen Dinge finden wirst, über die du lächeln kannst…"
-    },
-    "defeat": {
-      "1": "Oh mein Gott, wie schade…"
-    }
-  },
-  "wulfric": {
-    "encounter": {
-      "1": "Weißt du was? Wir reden alle groß über das, was man vom Kämpfen und von Bindungen lernt und all das…\n$Aber eigentlich mache ich es nur, weil es Spaß macht. \n$Wen kümmert das Prahlen? Lass uns kämpfen!"
-    },
-    "victory": {
-      "1": "Hervorragend! Ich bin so hart wie ein Eisberg, aber du hast mich komplett durchschlagen!"
-    },
-    "defeat": {
-      "1": "Kämpfe mit mir, und das passiert!"
-    }
-  },
-  "kabu": {
-    "encounter": {
-      "1": "Jeder Trainer und jedes Pokémon trainiert hart, um den Sieg zu erringen.\n$Aber das bedeutet, dass auch dein Gegner hart arbeitet, um zu gewinnen.\n$Am Ende wird das Match von der Seite entschieden, die ihr wahres Potenzial entfesseln kann."
-    },
-    "victory": {
-      "1": "Ich bin froh, dass ich heute gegen dich kämpfen konnte!"
-    },
-    "defeat": {
-      "1": "Das ist eine großartige Möglichkeit für mich, mein eigenes Wachstum zu spüren!"
-    }
-  },
-  "bea": {
-    "encounter": {
-      "1": "Hast du einen unerschütterlichen Geist, der sich nicht bewegt, egal wie du angegriffen wirst? \n$Ich denke, ich werde das einfach mal testen, oder?"
-    },
-    "victory": {
-      "1": "Ich habe den Kampfgeist deiner Pokémon gespürt, als du sie in den Kampf geführt hast."
-    },
-    "defeat": {
-      "1": "Das war die beste Art von Match, die man sich je wünschen kann."
-    }
-  },
-  "opal": {
-    "encounter": {
-      "1": "Lass mich sehen, wie du und dein Partner-Pokémon euch verhalten!"
-    },
-    "victory": {
-      "1": "Dein Rosa fehlt noch, aber du bist ein ausgezeichneter Trainer mit ausgezeichneten Pokémon."
-    },
-    "defeat": {
-      "1": "Schade für dich, denke ich."
-    }
-  },
-  "bede": {
-    "encounter": {
-      "1": "Ich nehme an, ich sollte zweifelsfrei beweisen, wie erbärmlich du bist und wie stark ich bin."
-    },
-    "victory": {
-      "1": "Ich verstehe... Nun, das ist in Ordnung. Ich habe mich sowieso nicht wirklich angestrengt."
-    },
-    "defeat": {
-      "1": "Nicht schlecht, muss ich sagen."
-    }
-  },
-  "gordie": {
-    "encounter": {
-      "1": "Also, lass uns das hinter uns bringen."
-    },
-    "victory": {
-      "1": "Ich möchte einfach in ein Loch kriechen... Nun, ich denke, es wäre eher wie ein Sturz von hier."
-    },
-    "defeat": {
-      "1": "Kämpfe wie immer, der Sieg wird folgen!"
-    }
-  },
-  "marnie": {
-    "encounter": {
-      "1": "Die Wahrheit ist, am Ende des Tages... Ich möchte wirklich nur Champion für mich selbst werden!\n$Also nimm es nicht persönlich, wenn ich dir den Hintern versohle!"
-    },
-    "victory": {
-      "1": "OK, ich habe verloren... Aber ich habe viele gute Seiten von dir und deinen Pokémon gesehen!"
-    },
-    "defeat": {
-      "1": "Ich hoffe, du hast unsere Kampfstrategien genossen."
-    }
-  },
-  "raihan": {
-    "encounter": {
-      "1": "Ich werde den Champion besiegen, das ganze Turnier gewinnen und der Welt beweisen,\n$wie stark der großartige Roy wirklich ist!"
-    },
-    "victory": {
-      "1": "Ich sehe sogar gut aus, wenn ich verliere.\n$Es ist ein echter Fluch.\n$Ich denke, es ist Zeit für ein weiteres Selfie!"
-    },
-    "defeat": {
-      "1": "Lass uns ein Selfie zur Erinnerung machen."
-    }
-  },
-  "brassius": {
-    "encounter": {
-      "1": "Ich nehme an, du bist bereit? Lassen wir unser gemeinsames Kunstwerk beginnen!"
-    },
-    "victory": {
-      "1": "Ahhh... avant-garde!"
-    },
-    "defeat": {
-      "1": "Ich werde sofort mit einem neuen Stück beginnen!"
-    }
-  },
-  "iono": {
-    "encounter": {
-      "1": "Hey, Leute! Es ist Zeit für Enigmaras EnigmaTV!!! Naaaa, alles klärchen?\n$Hola, ciao und hallöle! Und schon bist du gefangen in meinem Elektronetz!\n$Wer ich bin, fragst du? Na, Enigmara natürlich! Ich bin hier die Arenaleiterin."
-    },
-    "victory": {
-      "1": "Du leuchtest ja so hell wie ein tausendfacher Donnerblitz!"
-    },
-    "defeat": {
-      "1": "Deine Augen gehören MIR!"
-    }
-  },
-  "larry": {
-    "encounter": {
-      "1": "Wenn alles gesagt und getan ist, ist Einfachheit am stärksten."
-    },
-    "victory": {
-      "1": "Eine Portion Niederlage, hm?"
-    },
-    "defeat": {
-      "1": "Ich mache Schluss für heute."
-    }
-  },
-  "ryme": {
-    "encounter": {
-      "1": "Komm schon, Baby! Bring mich zum Zittern bis auf die Knochen!"
-    },
-    "victory": {
-      "1": "Du bist cool, mein Freund - du bewegst meine SEELE!"
-    },
-    "defeat": {
-      "1": "Bis später, Baby!"
-    }
-  },
-  "grusha": {
-    "encounter": {
-      "1": "Alles, was ich tun muss, ist sicherzustellen, dass die Kraft meiner Pokémon dich bis auf die Knochen kühlt!"
-    },
-    "victory": {
-      "1": "Deine brennende Leidenschaft... Ich mag sie ehrlich gesagt irgendwie."
-    },
-    "defeat": {
-      "1": "Es hat nicht für dich gereicht."
-    }
-  },
-  "marnie_elite": {
-    "encounter": {
-      "1": "Du hast es so weit geschafft, hm? Mal sehen, ob du mit meinen Pokémon umgehen kannst!",
-      "2": "Ich werde mein Bestes geben, aber denke nicht, dass ich es dir leicht machen werde!"
-    },
-    "victory": {
-      "1": "Ich kann nicht glauben, dass ich verloren habe... Aber du hast den Sieg verdient. Gut gemacht!",
-      "2": "Es sieht so aus, als hätte ich noch viel zu lernen. Toller Kampf trotzdem!"
-    },
-    "defeat": {
-      "1": "Du hast gut gekämpft, aber ich habe den Vorteil! Viel Glück beim nächsten Mal!",
-      "2": "Es scheint, als hätte sich mein Training ausgezahlt. Danke für den Kampf!"
-    }
-  },
-  "nessa_elite": {
-    "encounter": {
-      "1": "Die Gezeiten wenden sich zu meinen Gunsten. Bereit, weggespült zu werden?",
-      "2": "Lass uns mit diesem Kampf Wellen schlagen! Ich hoffe, du bist vorbereitet!"
-    },
-    "victory": {
-      "1": "Du hast diese Gewässer perfekt navigiert... Gut gemacht!",
-      "2": "Es sieht so aus, als wären meine Strömungen kein Match für dich. Tolle Arbeit!"
-    },
-    "defeat": {
-      "1": "Wasser findet immer einen Weg. Das war ein erfrischender Kampf!",
-      "2": "Du hast gut gekämpft, aber die Macht des Ozeans ist unaufhaltsam!"
-    }
-  },
-  "bea_elite": {
-    "encounter": {
-      "1": "Bereite dich vor! Mein Kampfgeist brennt hell!",
-      "2": "Mal sehen, ob du mit meinem unaufhaltsamen Tempo mithalten kannst!"
-    },
-    "victory": {
-      "1": "Deine Stärke... Sie ist beeindruckend. Du hast diesen Sieg wirklich verdient.",
-      "2": "Ich habe diese Intensität noch nie zuvor gespürt. Unglaubliche Leistung!"
-    },
-    "defeat": {
-      "1": "Ein weiterer Sieg für mein intensives Trainingsprogramm! Gut gemacht!",
-      "2": "Du hast Stärke, aber ich habe härter trainiert. Toller Kampf!"
-    }
-  },
-  "allister_elite": {
-    "encounter": {
-      "1": "Die Schatten fallen... Bist du bereit, dich deinen Ängsten zu stellen?",
-      "2": "Mal sehen, ob du mit der Dunkelheit, die ich befehle, umgehen kannst."
-    },
-    "victory": {
-      "1": "Du hast die Schatten vertrieben... Für jetzt. Gut gemacht.",
-      "2": "Dein Licht hat meine Dunkelheit durchdrungen. Tolle Leistung."
-    },
-    "defeat": {
-      "1": "Die Schatten haben gesprochen... Deine Stärke reicht nicht aus.",
-      "2": "Die Dunkelheit triumphiert... Vielleicht wirst du nächstes Mal das Licht sehen."
-    }
-  },
-  "raihan_elite": {
-    "encounter": {
-      "1": "Ein Sturm zieht auf! Mal sehen, ob du diesen Kampf überstehst!",
-      "2": "Mach dich bereit, dem Auge des Sturms zu begegnen!"
-    },
-    "victory": {
-      "1": "Du hast den Sturm bezwungen... Unglaubliche Leistung!",
-      "2": "Du hast die Winde perfekt geritten... Toller Kampf!"
-    },
-    "defeat": {
-      "1": "Ein weiterer Sturm überstanden, ein weiterer Sieg errungen! Gut gekämpft!",
-      "2": "Du bist in meinen Sturm geraten! Viel Glück beim nächsten Mal!"
-    }
-  },
-  "alder": {
-    "encounter": {
-      "1": "Mach dich bereit für einen Kampf gegen den stärksten Trainer in Einall! Mich - Lauro!"
-    },
-    "victory": {
-      "1": "Gut gemacht! Du hast wirklich ein unvergleichliches Talent."
-    },
-    "defeat": {
-      "1": "Ein frischer Wind weht durch mein Herz...\n$Was für ein außergewöhnliches Gefühl!"
-    }
-  },
-  "kieran": {
-    "encounter": {
-      "1": "Durch harte Arbeit werde ich immer stärker und stärker!\n$Ich verliere nicht."
-    },
-    "victory": {
-      "1": "Ich kann es nicht glauben...\n$Was für ein lustiger und herzzerreißender Kampf!"
-    },
-    "defeat": {
-      "1": "Wow, was für ein Kampf!\n$Es ist Zeit für dich, noch härter zu trainieren."
-    }
-  },
-  "rival": {
-    "encounter": {
-      "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!"
-    }
-  },
-  "rival_female": {
-    "encounter": {
-      "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!"
-    }
-  },
-  "rival_2": {
-    "encounter": {
-      "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!"
-    }
-  },
-  "rival_2_female": {
-    "encounter": {
-      "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!"
-    },
-    "defeat": {
-      "1": "Es ist Ok manchmal zu verlieren…"
-    }
-  },
-  "rival_3": {
-    "encounter": {
-      "1": "@c{smile}Hey, schau mal wen wir hier haben! Ist schon eine Weile her.\n@c{neutral}Du bist… immernoch ungeschlagen?\n$@c{neutral_eclosed}Die Dinge waren irgendwie... seltsam.\nEs ist Zuhause einfach nicht das Gleiche ohne dich.\n$@c{serious}Ich weiß es ist selbstsüchtig, aber ich musste das einfach mal loswerden.\n$@c{neutral_eclosed}Denkst du nicht, dass du dich etwas übernommen hast?\n$@c{serious}Es ist nicht realistisch immer zu gewinnen\nWir müssen manchmal verlieren. Um daran zu wachsen.\n$@c{neutral_eclosed}Du hattest einen guten Lauf, aber es liegt noch so viel vor dir. Es wird nicht gerade einfacher. @c{neutral}Bist du bereit dafür?\n$@c{serious_mopen_fists}Falls ja, beweise es mir!"
-    },
-    "victory": {
-      "1": "@c{angry_mhalf}Das ist doch Schwachsinn… Ich habe kaum aufgehört zu tranieren…\n$Warum bin ich immernoch so viel schwächer?"
-    }
-  },
-  "rival_3_female": {
-    "encounter": {
-      "1": "@c{smile_wave}Lange nicht gesehen! Immernoch nicht verloren?\n@c{angry}Du fängst mich an zu nerven. @c{smile_wave_wink}Ich mach nur Spaß!\n$@c{smile_ehalf}Aber ehrlich, vermisst du dein Zuhause garnicht? Oder mich?\n$Ich… Ich meine, wir vermissen dich wirklich.\n$@c{smile_eclosed}Ich unterstütze dich bei deinem Traum, aber die Realität ist, du wirst früher oder später verlieren.\n$@c{smile}Und ich bin für dich da falls du es tust, wie immer.\n@c{angry_mopen}Also, zeig mir wie stark du geworden bist!"
-    },
-    "victory": {
-      "1": "@c{shock}Nach allem was ich getan habe… war es immernoch nicht genug…?\n$Wenn es so weiter geht hole ich nie auf…"
-    },
-    "defeat": {
-      "1": "Du hast dein Bestes gegeben. Lass uns nach Hause gehen."
-    }
-  },
-  "rival_4": {
-    "encounter": {
-      "1": "@c{neutral}Hey.\n$Ich werde jetzt keine Gefälligkeiten mit dir austauschen.\n@c{neutral_eclosed}Ich bin hier um zu gewinnen. Mehr nicht.\n$@c{serious_mhalf_fists}Durch mein Traning habe ich gelernt mein Potenzial zu maximieren.\n$@c{smile}Man hat deutlich mehr Zeit, wenn man auf Schlaf und unnötige soziale Interaktionen verzichtet. \n$@c{serious_mopen_fists}Das ist alles nicht mehr wichtig, nicht solange ich nicht gewonnen habe.\n$@c{neutral_eclosed}Ich bin an dem Punkt an dem ich nicht mehr verliere.\n@c{smile_eclosed}Ich schätze deine Einstellung war doch nicht so falsch.\n$@c{angry_mhalf}Nur die Schwachen verlieren, und ich bin nicht mehr schwach.\n$@c{serious_mopen_fists}Bereite dich vor zu verlieren."
-    },
-    "victory": {
-      "1": "@c{neutral}Was…@d{64} Was bist du?"
-    }
-  },
-  "rival_4_female": {
-    "encounter": {
-      "1": "@c{neutral}Ich bins! Du hast mich doch nicht vergessen, oder?\n$@c{smile}Du solltest stolz auf dich sein. Du hast es soweit gebracht. Glückwunsch!\n$Aber hier endet deine Reise jetzt.\n$@c{smile_eclosed}Du hast etwas in mir erwachen lassen, etwas von dem ich nicht wusste, dass es da war.\n$Alles was ich jetzt mache ist tranieren. @c{smile_ehalf}Ich esse oder schlafe kaum. \n$Ich traniere meine Pokémon den ganzen Tag. Und werde immer stärker.\n$@c{neutral}Genau genommen, erkenne ich mich garnicht wieder.\n$Und jetzt habe ich endlich meinen Höhepunkt erreicht.\nNiemand kann mich jetzt noch schlagen.\n$Und weißt du was? Das ist alles wegen dir.\n@c{smile_ehalf}Ich weiß nicht ob ich dir danken, oder dich hassen soll!\n$@c{angry_mopen}Mach dich bereit!"
-    },
-    "victory": {
-      "1": "@c{neutral}Was…@d{64} Was bist du?"
-    },
-    "defeat": {
-      "1": "$@c{smile}Du solltest stolz darauf sein wie weit du es geschafft hast."
-    }
-  },
-  "rival_5": {
-    "encounter": {
-      "1": "@c{neutral}…"
-    },
-    "victory": {
-      "1": "@c{neutral}…"
-    }
-  },
-  "rival_5_female": {
-    "encounter": {
-      "1": "@c{neutral}…"
-    },
-    "victory": {
-      "1": "@c{neutral}…"
-    },
-    "defeat": {
-      "1": "$@c{smile_ehalf}…"
-    }
-  },
-  "rival_6": {
-    "encounter": {
-      "1": "@c{smile_eclosed}So sehen wir uns wieder.\n$@c{neutral}Ich hatte Zeit über alles nachzudenken.\nÜber den Grund, warum alles so merkwürdig erscheint.\n$@c{neutral_eclosed}Dein Traum, mein Antrieb dich besiegen zu wollen…\nEs ist alles Teil von etwas Größerem.\n$@c{serious}Es geht nicht um dich, oder mich… Es geht um diese Welt.\n@c{serious_mhalf_fists}Es ist mein Schicksal dich an deine Grenzen zu treiben.\n$@c{neutral_eclosed}Ob ich meine Aufgabe erfüllt habe kann ich nicht sagen, aber ich habe alles getan was ich konnte.\n$@c{neutral}Der Ort an dem wir uns befinden ist angsteinflößend… \n$Trotzdem fühlt es sich so an, als würde mich das nicht stören, als wäre ich bereits schonmal hier gewesen.\n$@c{serious_mhalf_fists}Dir geht es doch genauso, oder?\n$@c{serious}…und irgendwas hier spricht zu mir.\nDas ist alles was die Welt seit langem kennt.\n$Die Zeiten die wir zusammen verbracht haben, die so nah erscheinen, sind nichts als eine ferne Erinnerung.\n$@c{neutral_eclosed}Wer weiß, ob sie jemals real waren?\n$@c{serious_mopen_fists}Du musst weiter gehen, denn wenn du es nicht tust, wird es nie enden. Du bist der Einzige, der das schaffen kann.\n$@c{serious_smile_fists}Ich… Ich weiß nicht was das alles bedeutet, aber ich fühle, dass es wahr ist.\n$@c{serious_mopen_fists}Wenn du mich nicht hier und jetzt besiegen kannst, hast du keine Chance."
-    },
-    "victory": {
-      "1": "@c{smile_eclosed}Es sieht so aus, als wäre meine Arbeit getan.\n$Ich will dass du mir eine Sache versprichst.\n@c{smile}Komm bitte nach Hause nachdem du die Welt gerettet hast."
-    }
-  },
-  "rival_6_female": {
-    "encounter": {
-      "1": "@c{smile_ehalf}Jetzt sind es wieder nur wir zwei.\n$@c{smile_eclosed}Weißt du, egal wie ich es drehe und wende…\n$@c{smile_ehalf}Irgendwas stört mich an der ganzen Sache, es erscheint mir irgendwie komisch…\n$@c{smile}Du hast deinen Traum, und ich habe diesen Antrieb…\n$Ich kann nicht anders, als zu glauben, dass es einen größeren Zweck gibt.\n$@c{smile_eclosed}Ich denke, ich sollte dich an deine Grenzen treiben.\n$@c{smile_ehalf}Ich bin mir nicht sicher, ob ich meine Aufgabe erfüllt habe, aber ich habe mein Bestes gegeben.\n$Irgendwas an diesem komischen und furchteinflößenden Ort… All das scheint so klar…\n$Es… ist alles was die Welt seit langem kennt.\n$@c{smile_eclosed}Es kommt mir so vor als könnte ich mich kaum an die Erinnerungen erinnern, die wir zusammen hatten.\n$@c{smile_ehalf}Waren sie jemals real? Sie scheinen so weit weg…\n$@c{angry_mopen}Du musst weiter gehen, denn wenn du es nicht tust, wird es nie enden. Du bist der Einzige, der das schaffen kann.\n$@c{smile_ehalf}Ich… Ich weiß nicht was das alles bedeutet, aber ich fühle, dass es wahr ist.\n$@c{neutral}Wenn du mich nicht hier und jetzt besiegen kannst, hast du keine Chance."
-    },
-    "victory": {
-      "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-misc-female.json b/src/locales/de/dialogue-misc-female.json
deleted file mode 100644
index a28a5524b4f..00000000000
--- a/src/locales/de/dialogue-misc-female.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "ending": "@c{smile}Oh? Du hast gewonnen?@d{96} @c{smile_eclosed}Ich schätze, das hätte ich wissen sollen.\n$Aber, du bist jetzt zurück.\n$@c{smile}Es ist vorbei.@d{64} Du hast die Schleife beendet.\n$@c{serious_smile_fists}Du hast auch deinen Traum erfüllt, nicht wahr?\nDu hast nicht einmal verloren.\n$@c{neutral}Ich bin der Einzige, der sich daran erinnern wird, was du getan hast.@d{96}\n$Ich schätze, das ist in Ordnung, oder?\n$@c{serious_smile_fists}Deine Legende wird immer in unseren Herzen weiterleben.\n$@c{smile_eclosed}Wie auch immer, ich habe genug von diesem Ort, oder nicht? Lass uns nach Hause gehen.\n$@c{serious_smile_fists}Vielleicht können wir, wenn wir zurück sind, noch einen Kampf haben?\n$Wenn du dazu bereit bist.",
-  "ending_female": "@c{shock}Du bist zurück?@d{32} Bedeutet das…@d{96} du hast gewonnen?!\n$@c{smile_ehalf}Ich hätte wissen sollen, dass du es in dir hast.\n$@c{smile_eclosed}Natürlich… ich hatte immer dieses Gefühl.\n$@c{smile}Es ist jetzt vorbei, richtig? Du hast die Schleife beendet.\n$@c{smile_ehalf}Du hast auch deinen Traum erfüllt, nicht wahr?\n$Du hast nicht einmal verloren.\n$Ich werde die Einzige sein, die sich daran erinnert, was du getan hast.\n$@c{angry_mopen}Ich werde versuchen, es nicht zu vergessen!\n$@c{smile_wave_wink}Nur ein Scherz!@d{64} @c{smile}Ich würde es nie vergessen.@d{32}\n$Deine Legende wird in unseren Herzen weiterleben.\n$@c{smile_wave}Wie auch immer,@d{64} es wird spät…@d{96} denke ich?\nEs ist schwer zu sagen an diesem Ort.\n$Lass uns nach Hause gehen. \n$@c{smile_wave_wink}Vielleicht können wir morgen noch einen Kampf haben, der alten Zeiten willen?"
-}
\ No newline at end of file
diff --git a/src/locales/de/dialogue-misc-male.json b/src/locales/de/dialogue-misc.json
similarity index 91%
rename from src/locales/de/dialogue-misc-male.json
rename to src/locales/de/dialogue-misc.json
index a28a5524b4f..1529831d7c5 100644
--- a/src/locales/de/dialogue-misc-male.json
+++ b/src/locales/de/dialogue-misc.json
@@ -1,4 +1,6 @@
 {
   "ending": "@c{smile}Oh? Du hast gewonnen?@d{96} @c{smile_eclosed}Ich schätze, das hätte ich wissen sollen.\n$Aber, du bist jetzt zurück.\n$@c{smile}Es ist vorbei.@d{64} Du hast die Schleife beendet.\n$@c{serious_smile_fists}Du hast auch deinen Traum erfüllt, nicht wahr?\nDu hast nicht einmal verloren.\n$@c{neutral}Ich bin der Einzige, der sich daran erinnern wird, was du getan hast.@d{96}\n$Ich schätze, das ist in Ordnung, oder?\n$@c{serious_smile_fists}Deine Legende wird immer in unseren Herzen weiterleben.\n$@c{smile_eclosed}Wie auch immer, ich habe genug von diesem Ort, oder nicht? Lass uns nach Hause gehen.\n$@c{serious_smile_fists}Vielleicht können wir, wenn wir zurück sind, noch einen Kampf haben?\n$Wenn du dazu bereit bist.",
-  "ending_female": "@c{shock}Du bist zurück?@d{32} Bedeutet das…@d{96} du hast gewonnen?!\n$@c{smile_ehalf}Ich hätte wissen sollen, dass du es in dir hast.\n$@c{smile_eclosed}Natürlich… ich hatte immer dieses Gefühl.\n$@c{smile}Es ist jetzt vorbei, richtig? Du hast die Schleife beendet.\n$@c{smile_ehalf}Du hast auch deinen Traum erfüllt, nicht wahr?\n$Du hast nicht einmal verloren.\n$Ich werde die Einzige sein, die sich daran erinnert, was du getan hast.\n$@c{angry_mopen}Ich werde versuchen, es nicht zu vergessen!\n$@c{smile_wave_wink}Nur ein Scherz!@d{64} @c{smile}Ich würde es nie vergessen.@d{32}\n$Deine Legende wird in unseren Herzen weiterleben.\n$@c{smile_wave}Wie auch immer,@d{64} es wird spät…@d{96} denke ich?\nEs ist schwer zu sagen an diesem Ort.\n$Lass uns nach Hause gehen. \n$@c{smile_wave_wink}Vielleicht können wir morgen noch einen Kampf haben, der alten Zeiten willen?"
-}
\ No newline at end of file
+  "ending_female": "@c{shock}Du bist zurück?@d{32} Bedeutet das…@d{96} du hast gewonnen?!\n$@c{smile_ehalf}Ich hätte wissen sollen, dass du es in dir hast.\n$@c{smile_eclosed}Natürlich… ich hatte immer dieses Gefühl.\n$@c{smile}Es ist jetzt vorbei, richtig? Du hast die Schleife beendet.\n$@c{smile_ehalf}Du hast auch deinen Traum erfüllt, nicht wahr?\n$Du hast nicht einmal verloren.\n$Ich werde die Einzige sein, die sich daran erinnert, was du getan hast.\n$@c{angry_mopen}Ich werde versuchen, es nicht zu vergessen!\n$@c{smile_wave_wink}Nur ein Scherz!@d{64} @c{smile}Ich würde es nie vergessen.@d{32}\n$Deine Legende wird in unseren Herzen weiterleben.\n$@c{smile_wave}Wie auch immer,@d{64} es wird spät…@d{96} denke ich?\nEs ist schwer zu sagen an diesem Ort.\n$Lass uns nach Hause gehen. \n$@c{smile_wave_wink}Vielleicht können wir morgen noch einen Kampf haben, der alten Zeiten willen?",
+  "ending_endless": "Glückwunsch! Du hast das aktuelle Ende erreicht!\nWir arbeiten an mehr Spielinhalten.",
+  "ending_name": "Entwickler"
+}
diff --git a/src/locales/de/dialogue-female.json b/src/locales/de/dialogue.json
similarity index 93%
rename from src/locales/de/dialogue-female.json
rename to src/locales/de/dialogue.json
index b88364947f3..d231db0f5a9 100644
--- a/src/locales/de/dialogue-female.json
+++ b/src/locales/de/dialogue.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!",
@@ -417,7 +441,7 @@
   },
   "courtney": {
     "encounter": {
-      "1": "Das Ding... Das Ding, das du hältst... Das ist es, was...\n$Das ist es, wonach wir von Team Magma suchen...",
+      "1": "Stellt euch...Mir NICHT...IN DEN WEEEG...!!",
       "2": "... Nun dann... Auslöschen...",
       "3": "...?! Du... Hm... ♪ Das trifft sich ausgezeichnet... ♪\n$Dann hole ich mir eben zuerst deine Pokémon... Her damit..."
     },
@@ -446,7 +470,7 @@
       "3": "Was machst du hier? Bist du uns gefolgt?"
     },
     "victory": {
-      "1": "Na gut, bis der Boss Zeit für dich hat, werde ich dein Gegner sein!",
+      "1": "Bwaarharharharhar!! Ich hab zwar verloren, aber das hat Spaß gemacht!",
       "2": "Ich kann es fühlen! Ich kann es spüren, das ist klar! Die Stärke, die von dir ausgeht!\n$Mehr! Ich will noch mehr! Aber es sieht so aus, als hätten wir keine Zeit mehr...",
       "3": "Das war Spaß! Ich wusste, dass du mir eine gute Zeit bieten würdest!\n$Ich freue mich darauf, dich eines Tages wieder zu treffen!"
     }
@@ -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…!",
@@ -655,6 +655,86 @@
       "5": "Du hast mich besiegt, aber Team Flare wird immer in Glanz und Stil erstrahlen."
     }
   },
+  "aether_grunt": {
+    "encounter": {
+      "1": "Ich werde dich mit allem, was ich habe, bekämpfen. Ich werde dich auslöschen!",
+      "2": "Mir ist egal, ob du ein simpler Trainer bist oder nicht.\n$Ich werde dich hochkant rauswerfen, wenn du uns bedrohst!",
+      "3": "Mir wurde gesagt, Trainer abzuweisen, egal wer sie sind!",
+      "4": "Ich zeige dir die Macht des Æther-Paradies",
+      "5": "Jetzt da du die Wahre Natur des Æther-Paradies kennst, müssen wir dich leider beseitigen!"
+    },
+    "victory": {
+      "1": "Hmph! Du scheinst ziemlich geschickt zu sein.",
+      "2": "Was hat das zu bedeuten? Was hat das zu bedeuten!",
+      "3": "Hey, du bist so stark, dass ich dich nicht abweisen kann!",
+      "4": "Hmm... Es scheint, als hätte ich verloren.",
+      "5": "Ich hätte das Blitzdings benutzen sollen..."
+    }
+  },
+  "faba": {
+    "encounter": {
+      "1": "Ich bin Regionalleiter Fabian und ich werde dir zeigen, wie hart die Welt sein kann!",
+      "2": "Die letzte Verteidigungslinie des Æther-Paradieses kämpft gegen einen simplen Trainer?",
+      "3": "Ich Fabian, bin der Regionalleiter der Æther Foundation.\n$Der einzige auf der Welt, ich bin unersetzlich."
+    },
+    "victory": {
+      "1": "Aiyee!",
+      "2": "W-w-wie kann das sein?! Wie konnte dieser Trainer...",
+      "3": "Das ist der Grund... warum ich andere Menschen nicht ausstehen kann."
+    }
+  },
+  "skull_grunt": {
+    "encounter": {
+      "1": "Wir sind nicht böse, wir sind einfach nur nicht nett!",
+      "2": "Willst du Stress, oder was? Das ist unsere Art, Hallo zu sagen! Tschüss, du Punk!",
+      "3": "Wir sind nur ein paar Typen und Mädels mit großem Interesse an den Pokémon anderer Leute!",
+      "4": "Wieso machst du einen auf hart, wenn wir schon hart wie Knochen sind, Homie?",
+      "5": "Yo, platz hier nich’ rein, ♪ wie’n wildes Kleinstein! ♪ Wenn du meinst, dass Team Skull ♪\n$an nix denkt als Krawall, ♪ hast du leider ’nen Knall, ♪ denn das is’ nich’ der Fall! ♪\n$Wir woll’n hier nur gammeln ♪ und gechillt Staub ansammeln! ♪"
+    },
+    "victory": {
+      "1": "Wie jetzt? Schon vorbei?",
+      "2": "Woah, lass uns lieber die Kurve kratzen, yo! Kein Bock, hier meinen Schädel zu riskieren...",
+      "3": "Wir brauchen deine schwachen Pokémon eh nicht!",
+      "4": "Was? Deine Stärke spür ich bis in die Knochen...",
+      "5": "Mein Homie und ich sind also weniger wert als Pokémon? Willste uns dissen, oder was?"
+    }
+  },
+  "plumeria": {
+    "encounter": {
+      "1": "..Hmph. Du siehst nicht so aus, als wärst du etwas Besonderes.",
+      "2": "Die blöden Rüpel brauchen viel zu lange, um mit euch gewöhnlichen Trainern fertig zu werden...",
+      "3": "Lege dich mit irgendjemandem in Team Skull an, und ich zeige dir, wie ernst ich werden kann."
+    },
+    "victory": {
+      "1": "Du bist ziemlich stark. Das muss ich zugeben.",
+      "2": "Jetzt versteh ich, warum meine Rüpel so viel Zeit damit verschwenden...",
+      "3": "Ich denke, ich muss diese Niederlage einfach hinnehmen."
+    }
+  },
+  "macro_grunt": {
+    "encounter": {
+      "1": "Achtung hier ist Endstation für dich!",
+      "2": "Du bist ein Trainer, oder? Wir von MC Wertpapiere wissen so etwas.\n$Ich fürchte, das gibt dir trotzdem nicht das Recht, sich in unsere Arbeit einzumischen.",
+      "3": "Ich bin von MC Versicherungen! Hast du eine Lebensversicherung?"
+    },
+    "victory": {
+      "1": "Ich habe keine andere Wahl, als respektvoll zurückzutreten.",
+      "2": "Mein Erspartes aufzugeben bringt mich in die roten Zahlen...",
+      "3": "Okay zurück an die Arbeit. Versicherungen verkauft sich nicht von alleine."
+    }
+  },
+  "oleana": {
+    "encounter": {
+      "1": "Ich werde keine Störung von Präsident Roses Plänen zulassen!",
+      "2": "Du hast es also durch die Mitarbeiter der Tochterunternehmen geschafft,\n$die ich beauftragt habe, um dich aufzuhalten. Ich hätte nichts anderes erwartet.",
+      "3": "Für den Präsidenten! Ich werde nicht verlieren! \n$Mach dich bereit mit Macro Cosmos Airlines nach Hause zu fliegen!"
+    },
+    "victory": {
+      "1": "Ich habe es nicht geschafft... Olivia... du bist wirklich eine hoffnungslose Frau.",
+      "2": "Arghhh! Das ist unentschuldbar... Was habe ich mir dabei gedacht...\n$Jeder Trainer, der es so weit geschafft hat, muss ein harter Brocken sein...",
+      "3": "Ich bin eine müde Olivia... Ob es Macro Cosmos Betten gibt?"
+    }
+  },
   "rocket_boss_giovanni_1": {
     "encounter": {
       "1": "Ich bin beeindruckt, du hast es bis hierher geschafft!\n$Ich bin Giovanni, der Anführer von Team Rocket!\n$Wir regieren den Untergrund von Kanto!\n$Und wir lassen sicherlich nicht zu, dass ein Kind uns aufhält!"
@@ -787,6 +867,72 @@
       "1": "Narren ohne Vision werden weiterhin diese wunderschöne Welt verunreinigen."
     }
   },
+  "aether_boss_lusamine_1": {
+    "encounter": {
+      "1": "Du wirst mein süßes Biest erschrecken! Wie kannst du nur? Ultra-Bestien sind so niedlich!\n$Es sieht so aus, als müsste ich dich zuerst zum Schweigen bringen."
+    },
+    "victory": {
+      "1": "Wie kann eine Person nur so grausam sein?!"
+    },
+    "defeat": {
+      "1": "Und jetzt, mein süßes Biest, komm zu Mama!"
+    }
+  },
+  "aether_boss_lusamine_2": {
+    "encounter": {
+      "1": "Wieso musst du mich weiterhin belästigen?! Ich habe die Nase voll von dir.\n$Du machst mich krank! Genug mit diesem nutzlosen Gerede... \n$Mit der Kraft von Anego, von uns als UB-01 Schmarotzer klassifiziert,\n$werde ich dir zeigen, wie falsch du warst, hierher zu kommen!"
+    },
+    "victory": {
+      "1": "Aaauuuggghhhhhhhhh!!!"
+    },
+    "defeat": {
+      "1": "Alles, was ich will, ist mein kostbares Biest! Der Rest von euch ist mir egal!"
+    }
+  },
+  "skull_boss_guzma_1": {
+    "encounter": {
+      "1": "Kein Erbarmen! Keine Gnade! Ich bin dein schlimmster Alptraum! \n$Oh yeah, ich bin der große, böse Bromley!"
+    },
+    "victory": {
+      "1": "Irgendwann mach ich dich platt! Ich hab noch ein Ass im Ärmel. Du wirst schon sehen."
+    },
+    "defeat": {
+      "1": "Du hast den langen Weg hierher DAFÜR aufgenommen? Pah!"
+    }
+  },
+  "skull_boss_guzma_2": {
+    "encounter": {
+      "1": "Mir ist egal, wer du bist. Ich mach dich platt!! Das schreibt mir mein Ego vor. Ich bin Bromley!"
+    },
+    "victory": {
+      "1": "Bromley!!! Was ist falsch mit dir?!"
+    },
+    "defeat": {
+      "1": "Ihr seid wirklich selten dämlich."
+    }
+  },
+  "macro_boss_rose_1": {
+    "encounter": {
+      "1": "Mein Name ist Rose. Ich bin der Präsident der Galar Pokémon-Liga und Geschäftsführer von Macro Cosmos\n$Ich habe eine Aufgabe, eine Berufung! Ich muss die Galar-Region mit unbegrenzter Energie versorgen,\n$damit sie sich bis in alle Ewigkeit in Frieden fortentwickeln kann!"
+    },
+    "victory": {
+      "1": "Du versteht es einfach nicht...So können wir die Geschichte nicht verändern!"
+    },
+    "defeat": {
+      "1": "Ohne deine Einmischung kann ich jetzt endlich weiterarbeiten!"
+    }
+  },
+  "macro_boss_rose_2": {
+    "encounter": {
+      "1": "Ich bin fest entschlossen, das Energieproblem in der Galar-Region\n$und natürlich auf der ganzen Welt zu lösen.\n$Meine Erfahrungen und Erfolge, die Macro Cosmos zu einem Erfolg gemacht haben,\n$sind der Beweis, dass meine Methoden funktionieren.\n$Ich habe nicht vor, meine Meinung zu ändern, selbst wenn ich verliere."
+    },
+    "victory": {
+      "1": "Ich hatte vergessen, wie großartig Pokémon-Kämpfe sind! Es ist so lange her, dass ich gekämpft habe...\n$Das war wirklich befriedigend, ich akzeptiere die Niederlage für diesen Kampf."
+    },
+    "defeat": {
+      "1": "Ich nehme an, es muss den Anschein haben, dass ich etwas Schreckliches tue.\n$Ich erwarte nicht, dass du es verstehst. Aber ich muss der Galar-Region grenzenlose Energie\n$bereitstellen, um ewigen Wohlstand zu gewährleisten."
+    }
+  },
   "brock": {
     "encounter": {
       "1": "Meine Expertise in Bezug auf Gesteins-Pokémon wird dich besiegen! Komm schon!",
@@ -2455,7 +2601,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 +2609,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 +2688,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/menu-ui-handler.json b/src/locales/de/menu-ui-handler.json
index 149bb6c0467..56c03102b9c 100644
--- a/src/locales/de/menu-ui-handler.json
+++ b/src/locales/de/menu-ui-handler.json
@@ -3,7 +3,6 @@
   "ACHIEVEMENTS": "Erfolge",
   "STATS": "Statistiken",
   "RUN_HISTORY": "Laufhistorie",
-  "VOUCHERS": "Gutscheine",
   "EGG_LIST": "Eierliste",
   "EGG_GACHA": "Eier-Gacha",
   "MANAGE_DATA": "Daten verwalten",
diff --git a/src/locales/de/move.json b/src/locales/de/move.json
index 3cf7c747826..3c81ccfd7df 100644
--- a/src/locales/de/move.json
+++ b/src/locales/de/move.json
@@ -2913,7 +2913,7 @@
   },
   "zippyZap": {
     "name": "Britzelturbo",
-    "effect": "Ein stürmischer Blitz-Angriff mit hoher Erstschlag- und Volltrefferquote."
+    "effect": "Ein stürmischer Blitz-Angriff mit garantierter Erstschlag- und Volltrefferquote.\n"
   },
   "splishySplash": {
     "name": "Plätschersurfer",
@@ -3807,4 +3807,4 @@
     "name": "Giftkettung",
     "effect": "Der Anwender umwickelt das Ziel mit einer Kette aus Toxinen, die in dessen Körper eindringen und ihm schaden. Das Ziel wird eventuell schwer vergiftet."
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/de/pokemon-form.json b/src/locales/de/pokemon-form.json
index de2e80154fe..d621e3165fa 100644
--- a/src/locales/de/pokemon-form.json
+++ b/src/locales/de/pokemon-form.json
@@ -64,6 +64,7 @@
   "landorusIncarnate": "Inkarnationsform",
   "keldeoOrdinary": "Standardform",
   "meloettaAria": "Gesangsform",
+  "meloettaPirouette": "Tanzform",
   "froakieBattleBond": "Ash-Form",
   "scatterbugMeadow": "Blumenmeermuster",
   "scatterbugIcySnow": "Frostmuster",
diff --git a/src/locales/de/pokemon-summary.json b/src/locales/de/pokemon-summary.json
index deb4a69f248..1790c6878b9 100644
--- a/src/locales/de/pokemon-summary.json
+++ b/src/locales/de/pokemon-summary.json
@@ -13,5 +13,32 @@
   "metFragment": {
     "normal": "Herkunft: {{biome}}\nMit Lv. {{level}} erhalten.",
     "apparently": "Herkunft: {{biome}}\nOffenbar mit Lv. {{level}} erhalten."
+  },
+  "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}}"
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/de/run-history-ui-handler.json b/src/locales/de/run-history.json
similarity index 55%
rename from src/locales/de/run-history-ui-handler.json
rename to src/locales/de/run-history.json
index 43342c61908..0a36afe9adc 100644
--- a/src/locales/de/run-history-ui-handler.json
+++ b/src/locales/de/run-history.json
@@ -1,15 +1,15 @@
 {
   "victory": "Sieg!",
-  "defeatedWildM": "Besiegt durch ",
-  "defeatedTrainerM": "Besiegt durch ",
-  "defeatedTrainerDoubleM": "Besiegt durch Doppelkampf",
-  "defeatedRivalM": "Besiegt durch Rivalin",
-  "defeatedM": "Besiegt",
-  "defeatedWildF": "Besiegt durch ",
-  "defeatedTrainerF": "Besiegt durch ",
-  "defeatedTrainerDoubleF": "Besiegt durch Doppelkampf",
-  "defeatedRivalF": "Besiegt durch Rivale",
-  "defeatedF": "Besiegt",
+  "defeatedWild": "Besiegt durch ",
+  "defeatedTrainer": "Besiegt durch ",
+  "defeatedTrainerDouble": "Besiegt durch Doppelkampf",
+  "defeatedRival": "Besiegt durch Rivalin",
+  "defeated": "Besiegt",
+  "defeatedWild_female": "Besiegt durch ",
+  "defeatedTrainer_female": "Besiegt durch ",
+  "defeatedTrainerDouble_female": "Besiegt durch Doppelkampf",
+  "defeatedRival_female": "Besiegt durch Rivale",
+  "defeated_female": "Besiegt",
   "luck": "Glück",
   "score": "Punkte",
   "mode": "Modus",
@@ -25,13 +25,14 @@
   "challengeMonoGen9": "Gen IX",
   "playerItems": "Spielergegenstände",
   "personalBest": "Persönlicher Bestwert!",
-  "SPDshortened": "Geschw.",
+  "SPDshortened": "Init.",
   "runInfo": "Durchlauf Informationen",
   "money": "Geld",
   "runLength": "Durchlauf Dauer",
   "viewHeldItems": "Getragene Items",
-  "hallofFameTextM": "Willkommen in der Ruhmeshalle",
-  "hallofFameTextF": "Willkommen in der Ruhmeshalle",
+  "hallofFameText": "Willkommen in der Ruhmeshalle!",
+  "hallofFameText_female": "Willkommen in der Ruhmeshalle",
   "viewHallOfFame": "Ruhmeshalle ansehen!",
   "viewEndingSplash": "Endgrafik anzeigen!"
-}
\ No newline at end of file
+}
+
diff --git a/src/locales/de/settings.json b/src/locales/de/settings.json
index 1b25f5972ee..d72a026cf5a 100644
--- a/src/locales/de/settings.json
+++ b/src/locales/de/settings.json
@@ -61,7 +61,9 @@
   "typeHints": "Typhinweise",
   "masterVolume": "Gesamtlautstärke",
   "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.",
@@ -96,5 +98,10 @@
   "gamepadSupport": "Controllerunterstützung",
   "showBgmBar": "Musiknamen anzeigen",
   "moveTouchControls": "Bewegung Touch Steuerung",
-  "shopOverlayOpacity": "Shop Overlay Deckkraft"
+  "shopOverlayOpacity": "Shop Overlay Deckkraft",
+  "shopCursorTarget": "Shop-Cursor Ziel",
+  "items": "Items",
+  "reroll": "Neu rollen",
+  "shop": "Shop",
+  "checkTeam": "Team überprüfen"
 }
diff --git a/src/locales/de/trainer-classes.json b/src/locales/de/trainer-classes.json
index 96382dcc3db..45826fcd310 100644
--- a/src/locales/de/trainer-classes.json
+++ b/src/locales/de/trainer-classes.json
@@ -117,5 +117,14 @@
   "plasma_grunts": "Rüpel von Team Plasma",
   "flare_grunt": "Rüpel von Team Flare",
   "flare_grunt_female": "Rüpel von Team Flare",
-  "flare_grunts": "Rüpel von Team Flare"
-}
\ No newline at end of file
+  "flare_grunts": "Rüpel von Team Flare",
+  "aether_grunt": "Æther Foundation Personal",
+  "aether_grunt_female": "Æther Foundation Personal",
+  "aether_grunts": "Æther Foundation Personal",
+  "skull_grunt": "Rüpel von Team Skull",
+  "skull_grunt_female": "Rüpel von Team Skull",
+  "skull_grunts": "Rüpel von Team Skull",
+  "macro_grunt": "Angestellter von Macro Cosmos",
+  "macro_grunt_female": "Angestellte von Macro Cosmos",
+  "macro_grunts": "Angestellte von Macro Cosmos"
+}
diff --git a/src/locales/de/trainer-names.json b/src/locales/de/trainer-names.json
index 013613fd399..ffbb772234c 100644
--- a/src/locales/de/trainer-names.json
+++ b/src/locales/de/trainer-names.json
@@ -139,12 +139,18 @@
   "rood": "Rubius",
   "xerosic": "Xeros",
   "bryony": "Begonia",
+  "faba": "Fabian",
+  "plumeria": "Fran",
+  "oleana": "Olivia",
 
   "maxie": "Marc",
   "archie": "Adrian",
   "cyrus": "Zyrus",
   "ghetsis": "G-Cis",
   "lysandre": "Flordelis",
+  "lusamine": "Samantha",
+  "guzma": "Bromley",
+  "rose": "Rose",
 
   "blue_red_double": "Blau & Rot",
   "red_blue_double": "Rot & Blau",
@@ -156,4 +162,4 @@
   "iris_alder_double": "Lilia & Lauro",
   "piers_marnie_double": "Nezz & Mary",
   "marnie_piers_double": "Mary & Nezz"
-}
\ No newline at end of file
+}
diff --git a/src/locales/de/trainer-titles.json b/src/locales/de/trainer-titles.json
index 25618c1b8f6..21a4b2fa7b6 100644
--- a/src/locales/de/trainer-titles.json
+++ b/src/locales/de/trainer-titles.json
@@ -16,6 +16,9 @@
   "galactic_boss": "Galaktik-Boss",
   "plasma_boss": "Weiser von Team Plasma",
   "flare_boss": "Flare-Boss",
+  "aether_boss": "Æther-Präsidentin",
+  "skull_boss": "Skull-Boss",
+  "macro_boss": "Geschäftsführer von Macro Cosmos",
   "rocket_admin": "Team Rocket Vorstand",
   "rocket_admin_female": "Team Rocket Vorstand",
   "magma_admin": "Team Magma Vorstand",
@@ -27,5 +30,9 @@
   "plasma_sage": "Weiser von Team Plasma",
   "plasma_admin": "Team Plasma Vorstand",
   "flare_admin": "Team Flare Vorstand",
-  "flare_admin_female": "Team Flare Vorstand"
-}
\ No newline at end of file
+  "flare_admin_female": "Team Flare Vorstand",
+  "aether_admin": "Æther-Regionalleiter",
+  "skull_admin": "Team Skull Vorstand",
+  "macro_admin": "Vizepräsidentin von Macro Cosmos"
+
+}
diff --git a/src/locales/en/achv-female.json b/src/locales/en/achv-female.json
index ec695c3ed2a..edcd8c53fb7 100644
--- a/src/locales/en/achv-female.json
+++ b/src/locales/en/achv-female.json
@@ -260,5 +260,9 @@
   "FRESH_START": {
     "name": "First Try!",
     "description": "Complete the Fresh Start challenge."
+  },
+  "INVERSE_BATTLE": {
+    "name": "Mirror rorriM",
+    "description": "Complete the Inverse Battle challenge.\n.egnellahc elttaB esrevnI eht etelpmoC"
   }
 }
\ No newline at end of file
diff --git a/src/locales/en/achv-male.json b/src/locales/en/achv.json
similarity index 83%
rename from src/locales/en/achv-male.json
rename to src/locales/en/achv.json
index ec695c3ed2a..0ed746c77b3 100644
--- a/src/locales/en/achv-male.json
+++ b/src/locales/en/achv.json
@@ -9,16 +9,20 @@
     "description": "Accumulate a total of ₽{{moneyAmount}}"
   },
   "10K_MONEY": {
-    "name": "Money Haver"
+    "name": "Money Haver",
+    "name_female": null
   },
   "100K_MONEY": {
-    "name": "Rich"
+    "name": "Rich",
+    "name_female": null
   },
   "1M_MONEY": {
-    "name": "Millionaire"
+    "name": "Millionaire",
+    "name_female": null
   },
   "10M_MONEY": {
-    "name": "One Percenter"
+    "name": "One Percenter",
+    "name_female": null
   },
   "DamageAchv": {
     "description": "Inflict {{damageAmount}} damage in one hit"
@@ -27,28 +31,35 @@
     "name": "Hard Hitter"
   },
   "1000_DMG": {
-    "name": "Harder Hitter"
+    "name": "Harder Hitter",
+    "name_female": null
   },
   "2500_DMG": {
-    "name": "That's a Lotta Damage!"
+    "name": "That's a Lotta Damage!",
+    "name_female": null
   },
   "10000_DMG": {
-    "name": "One Punch Man"
+    "name": "One Punch Man",
+    "name_female": "One Punch Woman"
   },
   "HealAchv": {
     "description": "Heal {{healAmount}} {{HP}} at once with a move, ability, or held item"
   },
   "250_HEAL": {
-    "name": "Novice Healer"
+    "name": "Novice Healer",
+    "name_female": null
   },
   "1000_HEAL": {
-    "name": "Big Healer"
+    "name": "Big Healer",
+    "name_female": null
   },
   "2500_HEAL": {
-    "name": "Cleric"
+    "name": "Cleric",
+    "name_female": null
   },
   "10000_HEAL": {
-    "name": "Recovery Master"
+    "name": "Recovery Master",
+    "name_female": null
   },
   "LevelAchv": {
     "description": "Level up a Pokémon to Lv{{level}}"
@@ -57,7 +68,8 @@
     "name": "But Wait, There's More!"
   },
   "LV_250": {
-    "name": "Elite"
+    "name": "Elite",
+    "name_female": null
   },
   "LV_1000": {
     "name": "To Go Even Further Beyond"
@@ -66,19 +78,24 @@
     "description": "Accumulate a total of {{ribbonAmount}} Ribbons"
   },
   "10_RIBBONS": {
-    "name": "Pokémon League Champion"
+    "name": "Pokémon League Champion",
+    "name_female": null
   },
   "25_RIBBONS": {
-    "name": "Great League Champion"
+    "name": "Great League Champion",
+    "name_female": null
   },
   "50_RIBBONS": {
-    "name": "Ultra League Champion"
+    "name": "Ultra League Champion",
+    "name_female": null
   },
   "75_RIBBONS": {
-    "name": "Rogue League Champion"
+    "name": "Rogue League Champion",
+    "name_female": null
   },
   "100_RIBBONS": {
-    "name": "Master League Champion"
+    "name": "Master League Champion",
+    "name_female": null
   },
   "TRANSFER_MAX_BATTLE_STAT": {
     "name": "Teamwork",
@@ -130,6 +147,7 @@
   },
   "SHINY_PARTY": {
     "name": "That's Dedication",
+    "name_female": null,
     "description": "Have a full party of shiny Pokémon"
   },
   "HATCH_MYTHICAL": {
@@ -158,6 +176,7 @@
   },
   "CLASSIC_VICTORY": {
     "name": "Undefeated",
+    "name_female": null,
     "description": "Beat the game in classic mode"
   },
   "UNEVOLVED_CLASSIC_VICTORY": {
@@ -260,5 +279,9 @@
   "FRESH_START": {
     "name": "First Try!",
     "description": "Complete the Fresh Start challenge."
+  },
+  "INVERSE_BATTLE": {
+    "name": "Mirror rorriM",
+    "description": "Complete the Inverse Battle challenge.\n.egnellahc elttaB esrevnI eht etelpmoC"
   }
 }
\ No newline at end of file
diff --git a/src/locales/en/battle.json b/src/locales/en/battle.json
index e5ca8f77bb1..662678e7673 100644
--- a/src/locales/en/battle.json
+++ b/src/locales/en/battle.json
@@ -38,7 +38,7 @@
   "learnMoveNotLearned": "{{pokemonName}} did not learn the\nmove {{moveName}}.",
   "learnMoveForgetQuestion": "Which move should be forgotten?",
   "learnMoveForgetSuccess": "{{pokemonName}} forgot how to\nuse {{moveName}}.",
-  "countdownPoof": "@d{32}1, @d{15}2, and@d{15}… @d{15}… @d{15}… @d{15}@s{pb_bounce_1}Poof!",
+  "countdownPoof": "@d{32}1, @d{15}2, and@d{15}… @d{15}… @d{15}… @d{15}@s{se/pb_bounce_1}Poof!",
   "learnMoveAnd": "And…",
   "levelCapUp": "The level cap\nhas increased to {{levelCap}}!",
   "moveNotImplemented": "{{moveName}} is not yet implemented and cannot be selected.",
diff --git a/src/locales/en/bgm-name.json b/src/locales/en/bgm-name.json
index 9be8a4b28c7..8838942c8a6 100644
--- a/src/locales/en/bgm-name.json
+++ b/src/locales/en/bgm-name.json
@@ -45,6 +45,7 @@
   "battle_legendary_lake_trio": "ORAS Lake Guardians Battle",
   "battle_legendary_sinnoh": "ORAS Sinnoh Legendary Battle",
   "battle_legendary_dia_pal": "ORAS Dialga & Palkia Battle",
+  "battle_legendary_origin_forme": "LA Origin Dialga & Palkia Battle",
   "battle_legendary_giratina": "ORAS Giratina Battle",
   "battle_legendary_arceus": "HGSS Arceus Battle",
   "battle_legendary_unova": "BW Unova Legendary Battle",
@@ -59,6 +60,7 @@
   "battle_legendary_zac_zam": "SWSH Zacian & Zamazenta Battle",
   "battle_legendary_glas_spec": "SWSH Glastrier & Spectrier Battle",
   "battle_legendary_calyrex": "SWSH Calyrex Battle",
+  "battle_legendary_riders": "SWSH Ice & Shadow Rider Calyrex Battle",
   "battle_legendary_birds_galar": "SWSH Galarian Legendary Birds Battle",
   "battle_legendary_ruinous": "SV Treasures of Ruin Battle",
   "battle_legendary_kor_mir": "SV Depths of Area Zero Battle",
@@ -78,11 +80,21 @@
   "battle_galactic_grunt": "BDSP Team Galactic Battle",
   "battle_plasma_grunt": "BW Team Plasma Battle",
   "battle_flare_grunt": "XY Team Flare Battle",
+  "battle_aether_grunt": "SM Aether Foundation Battle",
+  "battle_skull_grunt": "SM Team Skull Battle",
+  "battle_macro_grunt": "SWSH Trainer Battle",
+  "battle_galactic_admin": "BDSP Team Galactic Admin Battle",
+  "battle_skull_admin": "SM Team Skull Admin Battle",
+  "battle_oleana": "SWSH Oleana Battle",
   "battle_rocket_boss": "USUM Giovanni Battle",
   "battle_aqua_magma_boss": "ORAS Archie & Maxie Battle",
   "battle_galactic_boss": "BDSP Cyrus Battle",
   "battle_plasma_boss": "B2W2 Ghetsis Battle",
   "battle_flare_boss": "XY Lysandre Battle",
+  "battle_aether_boss": "SM Lusamine Battle",
+  "battle_skull_boss": "SM Guzma Battle",
+  "battle_macro_boss": "SWSH Rose Battle",
+
   "abyss": "PMD EoS Dark Crater",
   "badlands": "PMD EoS Barren Valley",
   "beach": "PMD EoS Drenched Bluff",
@@ -135,4 +147,4 @@
   "heal": "BW Pokémon Heal",
   "menu": "PMD EoS Welcome to the World of Pokémon!",
   "title": "PMD EoS Top Menu Theme"
-}
\ No newline at end of file
+}
diff --git a/src/locales/en/challenges.json b/src/locales/en/challenges.json
index c89fa7a21bf..f189266cea2 100644
--- a/src/locales/en/challenges.json
+++ b/src/locales/en/challenges.json
@@ -25,5 +25,12 @@
     "desc": "You can only use the original starters, and only as if you had just started PokéRogue.",
     "value.0": "Off",
     "value.1": "On"
+  },
+  "inverseBattle": {
+    "name": "Inverse Battle",
+    "shortName": "Inverse",
+    "desc": "Type matchups are reversed and no type is immune to any other type.\nDisables other challenges' achievements.",
+    "value.0": "Off",
+    "value.1": "On"
   }
 }
\ No newline at end of file
diff --git a/src/locales/en/config.ts b/src/locales/en/config.ts
index f1827b5152d..024f7f10108 100644
--- a/src/locales/en/config.ts
+++ b/src/locales/en/config.ts
@@ -4,8 +4,7 @@ import ability from "./ability.json";
 import abilityTriggers from "./ability-trigger.json";
 import arenaFlyout from "./arena-flyout.json";
 import arenaTag from "./arena-tag.json";
-import achvMale from "./achv-male.json";
-import achvFemale from "./achv-female.json";
+import achv from "./achv.json";
 import battle from "./battle.json";
 import battleScene from "./battle-scene.json";
 import battleInfo from "./battle-info.json";
@@ -16,14 +15,10 @@ import bgmName from "./bgm-name.json";
 import biome from "./biome.json";
 import challenges from "./challenges.json";
 import commandUiHandler from "./command-ui-handler.json";
-import dialogueMale from "./dialogue-male.json";
-import dialogueFemale from "./dialogue-female.json";
-import dialogueEndbossMale from "./dialogue-final-boss-male.json";
-import dialogueEndbossFemale from "./dialogue-final-boss-female.json";
-import dialogueMiscMale from "./dialogue-misc-male.json";
-import dialogueMiscFemale from "./dialogue-misc-female.json";
-import dialogueDoubleBattleMale from "./dialogue-double-battle-male.json";
-import dialogueDoubleBattleFemale from "./dialogue-double-battle-female.json";
+import dialogue from "./dialogue.json";
+import battleSpecDialogue from "./dialogue-final-boss.json";
+import miscDialogue from "./dialogue-misc.json";
+import doubleBattleDialogue from "./dialogue-double-battle.json";
 import egg from "./egg.json";
 import fightUiHandler from "./fight-ui-handler.json";
 import filterBar from "./filter-bar.json";
@@ -76,16 +71,11 @@ export const enConfig = {
   challenges,
   commandUiHandler,
   common,
-  PGMachv: achvMale,
-  PGFachv: achvFemale,
-  PGMdialogue: dialogueMale,
-  PGFdialogue: dialogueFemale,
-  PGMbattleSpecDialogue: dialogueEndbossMale,
-  PGFbattleSpecDialogue: dialogueEndbossFemale,
-  PGMmiscDialogue: dialogueMiscMale,
-  PGFmiscDialogue: dialogueMiscFemale,
-  PGMdoubleBattleDialogue: dialogueDoubleBattleMale,
-  PGFdoubleBattleDialogue: dialogueDoubleBattleFemale,
+  achv,
+  dialogue,
+  battleSpecDialogue,
+  miscDialogue,
+  doubleBattleDialogue,
   egg,
   fightUiHandler,
   filterBar,
diff --git a/src/locales/en/dialogue-double-battle-male.json b/src/locales/en/dialogue-double-battle-male.json
deleted file mode 100644
index 8e8e1d813fb..00000000000
--- a/src/locales/en/dialogue-double-battle-male.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "blue_red_double": {
-    "encounter": {
-      "1": "Blue: Hey Red, let's show them what we're made of!\n$Red: ...\n$Blue: This is Pallet Town Power!"
-    },
-    "victory": {
-      "1": "Blue: That was a great battle!\n$Red: ..."
-    }
-  },
-  "red_blue_double": {
-    "encounter": {
-      "1": "Red: ...!\n$Blue: He never talks much.\n$Blue: But dont let that fool you! He is a champ after all!"
-    },
-    "victory": {
-      "1": "Red: ...!\n$Blue: Next time we will beat you!"
-    }
-  },
-  "tate_liza_double": {
-    "encounter": {
-      "1": "Tate: Are you surprised?\n$Liza: We are two gym leaders at once!\n$Tate: We are twins!\n$Liza: We dont need to talk to understand each other!\n$Tate: Twice the power...\n$Liza: Can you handle it?"
-    },
-    "victory": {
-      "1": "Tate: What? Our combination was perfect!\n$Liza: Looks like we need to train more..."
-    }
-  },
-  "liza_tate_double": {
-    "encounter": {
-      "1": "Liza: Hihihi... Are you surprised?\n$Tate: Yes, we are really two gym leaders at once!\n$Liza: This is my twin brother Tate!\n$Tate: And this is my twin sister Liza!\n$Liza: Don't you think we are a perfect combination?"
-    },
-    "victory": {
-      "1": "Liza: Are we...\n$Tate: ...not as strong as we thought?"
-    }
-  },
-  "wallace_steven_double": {
-    "encounter": {
-      "1": "Steven: Wallace, let's show them the power of the champions!\n$Wallace: We will show you the power of Hoenn!\n$Steven: Let's go!"
-    },
-    "victory": {
-      "1": "Steven: That was a great battle!\n$Wallace: We will win next time!"
-    }
-  },
-  "steven_wallace_double": {
-    "encounter": {
-      "1": "Steven: Do you have any rare Pokémon?\n$Wallace: Steven... We are here for a battle, not to show off our Pokémon.\n$Steven: Oh... I see... Let's go then!"
-    },
-    "victory": {
-      "1": "Steven: Now that we are done with the battle, let's show off our Pokémon!\n$Wallace: Steven..."
-    }
-  },
-  "alder_iris_double": {
-    "encounter": {
-      "1": "Alder: We are the strongest trainers in Unova!\n$Iris: Fights against strong trainers are the best!"
-    },
-    "victory": {
-      "1": "Alder: Wow! You are super strong!\n$Iris: We will win next time!"
-    }
-  },
-  "iris_alder_double": {
-    "encounter": {
-      "1": "Iris: Welcome Challenger! I am THE Unova Champion!\n$Alder: Iris, aren't you a bit too excited?"
-    },
-    "victory": {
-      "1": "Iris: A loss like this is not easy to take...\n$Alder: But we will only get stronger with every loss!"
-    }
-  },
-  "piers_marnie_double": {
-    "encounter": {
-      "1": "Marnie: Brother, let's show them the power of Spikemuth!\n$Piers: We bring darkness!"
-    },
-    "victory": {
-      "1": "Marnie: You brought light to our darkness!\n$Piers: Its too bright..."
-    }
-  },
-  "marnie_piers_double": {
-    "encounter": {
-      "1": "Piers: Ready for a concert?\n$Marnie: Brother... They are here to fight, not to sing..."
-    },
-    "victory": {
-      "1": "Piers: Now that was a great concert!\n$Marnie: Brother..."
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/locales/en/dialogue-double-battle-female.json b/src/locales/en/dialogue-double-battle.json
similarity index 95%
rename from src/locales/en/dialogue-double-battle-female.json
rename to src/locales/en/dialogue-double-battle.json
index 8e8e1d813fb..9484aa2edcc 100644
--- a/src/locales/en/dialogue-double-battle-female.json
+++ b/src/locales/en/dialogue-double-battle.json
@@ -57,7 +57,8 @@
   },
   "iris_alder_double": {
     "encounter": {
-      "1": "Iris: Welcome Challenger! I am THE Unova Champion!\n$Alder: Iris, aren't you a bit too excited?"
+      "1": "Iris: Welcome Challenger! I am THE Unova Champion!\n$Alder: Iris, aren't you a bit too excited?",
+      "1_female": null
     },
     "victory": {
       "1": "Iris: A loss like this is not easy to take...\n$Alder: But we will only get stronger with every loss!"
@@ -73,7 +74,8 @@
   },
   "marnie_piers_double": {
     "encounter": {
-      "1": "Piers: Ready for a concert?\n$Marnie: Brother... They are here to fight, not to sing..."
+      "1": "Piers: Ready for a concert?\n$Marnie: Brother... They are here to fight, not to sing...",
+      "1_female": null
     },
     "victory": {
       "1": "Piers: Now that was a great concert!\n$Marnie: Brother..."
diff --git a/src/locales/en/dialogue-female.json b/src/locales/en/dialogue-female.json
deleted file mode 100644
index c9eff7f4798..00000000000
--- a/src/locales/en/dialogue-female.json
+++ /dev/null
@@ -1,2556 +0,0 @@
-{
-  "youngster": {
-    "encounter": {
-      "1": "Hey, wanna battle?",
-      "2": "Are you a new trainer too?",
-      "3": "Hey, I haven't seen you before. Let's battle!",
-      "4": "I just lost, so I'm trying to find more Pokémon.\nWait! You look weak! Come on, let's battle!",
-      "5": "Have we met or not? I don't really remember. Well, I guess it's nice to meet you anyway!",
-      "6": "All right! Let's go!",
-      "7": "All right! Here I come! I'll show you my power!",
-      "8": "Haw haw haw... I'll show you how hawesome my Pokémon are!",
-      "9": "No need to waste time saying hello. Bring it on whenever you're ready!",
-      "10": "Don't let your guard down, or you may be crying when a kid beats you.",
-      "11": "I've raised my Pokémon with great care. You're not allowed to hurt them!",
-      "12": "Glad you made it! It won't be an easy job from here.",
-      "13": "The battles continue forever! Welcome to the world with no end!"
-    },
-    "victory": {
-      "1": "Wow! You're strong!",
-      "2": "I didn't stand a chance, huh?",
-      "3": "I'll find you again when I'm older and beat you!",
-      "4": "Ugh. I don't have any more Pokémon.",
-      "5": "No way… NO WAY! How could I lose again…",
-      "6": "No! I lost!",
-      "7": "Whoa! You are incredible! I'm amazed and surprised!",
-      "8": "Could it be… How… My Pokémon and I are the strongest, though…",
-      "9": "I won't lose next time! Let's battle again sometime!",
-      "10": "Sheesh! Can't you see that I'm just a kid! It wasn't fair of you to go all out like that!",
-      "11": "Your Pokémon are more amazing! Trade with me!",
-      "12": "I got a little carried away earlier, but what job was I talking about?",
-      "13": "Ahaha! There it is! That's right! You're already right at home in this world!"
-    }
-  },
-  "lass": {
-    "encounter": {
-      "1": "Let's have a battle, shall we?",
-      "2": "You look like a new trainer. Let's have a battle!",
-      "3": "I don't recognize you. How about a battle?",
-      "4": "Let's have a fun Pokémon battle!",
-      "5": "I'll show you the ropes of how to really use Pokémon!",
-      "6": "A serious battle starts from a serious beginning! Are you sure you're ready?",
-      "7": "You're only young once. And you only get one shot at a given battle. Soon, you'll be nothing but a memory.",
-      "8": "You'd better go easy on me, OK? Though I'll be seriously fighting!",
-      "9": "School is boring. I've got nothing to do. Yawn. I'm only battling to kill the time."
-    },
-    "victory": {
-      "1": "That was impressive! I've got a lot to learn.",
-      "2": "I didn't think you'd beat me that bad…",
-      "3": "I hope we get to have a rematch some day.",
-      "4": "That was pretty amazingly fun! You've totally exhausted me…",
-      "5": "You actually taught me a lesson! You're pretty amazing!",
-      "6": "Seriously, I lost. That is, like, seriously depressing, but you were seriously cool.",
-      "7": "I don't need memories like this. Deleting memory…",
-      "8": "Hey! I told you to go easy on me! Still, you're pretty cool when you're serious.",
-      "9": "I'm actually getting tired of battling… There's gotta be something new to do…"
-    }
-  },
-  "breeder": {
-    "encounter": {
-      "1": "Obedient Pokémon, selfish Pokémon… Pokémon have unique characteristics.",
-      "2": "Even though my upbringing and behavior are poor, I've raised my Pokémon well.",
-      "3": "Hmm, do you discipline your Pokémon? Pampering them too much is no good."
-    },
-    "victory": {
-      "1": "It is important to nurture and train each Pokémon's characteristics.",
-      "2": "Unlike my diabolical self, these are some good Pokémon.",
-      "3": "Too much praise can spoil both Pokémon and people."
-    },
-    "defeat": {
-      "1": "You should not get angry at your Pokémon, even if you lose a battle.",
-      "2": "Right? Pretty good Pokémon, huh? I'm suited to raising things.",
-      "3": "No matter how much you love your Pokémon, you still have to discipline them when they misbehave."
-    }
-  },
-  "breeder_female": {
-    "encounter": {
-      "1": "Pokémon never betray you. They return all the love you give them.",
-      "2": "Shall I give you a tip for training good Pokémon?",
-      "3": "I have raised these very special Pokémon using a special method."
-    },
-    "victory": {
-      "1": "Ugh… It wasn't supposed to be like this. Did I administer the wrong blend?",
-      "2": "How could that happen to my Pokémon… What are you feeding your Pokémon?",
-      "3": "If I lose, that tells you I was just killing time. It doesn't damage my ego at all."
-    },
-    "defeat": {
-      "1": "This proves my Pokémon have accepted my love.",
-      "2": "The real trick behind training good Pokémon is catching good Pokémon.",
-      "3": "Pokémon will be strong or weak depending on how you raise them."
-    }
-  },
-  "fisherman": {
-    "encounter": {
-      "1": "Aack! You made me lose a bite!\nWhat are you going to do about it?",
-      "2": "Go away! You're scaring the Pokémon!",
-      "3": "Let's see if you can reel in a victory!"
-    },
-    "victory": {
-      "1": "Just forget about it.",
-      "2": "Next time, I'll be reelin' in the triumph!",
-      "3": "Guess I underestimated the currents this time."
-    }
-  },
-  "fisherman_female": {
-    "encounter": {
-      "1": "Woah! I've hooked a big one!",
-      "2": "Line's in, ready to reel in success!",
-      "3": "Ready to make waves!"
-    },
-    "victory": {
-      "1": "I'll be back with a stronger hook.",
-      "2": "I'll reel in victory next time.",
-      "3": "I'm just sharpening my hooks for the comeback!"
-    }
-  },
-  "swimmer": {
-    "encounter": {
-      "1": "Time to dive in!",
-      "2": "Let's ride the waves of victory!",
-      "3": "Ready to make a splash!"
-    },
-    "victory": {
-      "1": "Drenched in defeat!",
-      "2": "A wave of defeat!",
-      "3": "Back to shore, I guess."
-    }
-  },
-  "backpacker": {
-    "encounter": {
-      "1": "Pack up, game on!",
-      "2": "Let's see if you can keep pace!",
-      "3": "Gear up, challenger!",
-      "4": "I've spent 20 years trying to find myself… But where am I?"
-    },
-    "victory": {
-      "1": "Tripped up this time!",
-      "2": "Oh, I think I'm lost.",
-      "3": "Dead end!",
-      "4": "Wait up a second! Hey! Don't you know who I am?"
-    }
-  },
-  "ace_trainer": {
-    "encounter": {
-      "1": "You seem quite confident.",
-      "2": "Your Pokémon… Show them to me…",
-      "3": "Because I'm an Ace Trainer, people think I'm strong.",
-      "4": "Are you aware of what it takes to be an Ace Trainer?"
-    },
-    "victory": {
-      "1": "Yes… You have good Pokémon…",
-      "2": "What?! But I'm a battling genius!",
-      "3": "Of course, you are the main character!",
-      "4": "OK! OK! You could be an Ace Trainer!"
-    },
-    "defeat": {
-      "1": "I am devoting my body and soul to Pokémon battles!",
-      "2": "All within my expectations… Nothing to be surprised about…",
-      "3": "I thought I'd grow up to be a frail person who looked like they would break if you squeezed them too hard.",
-      "4": "Of course I'm strong and don't lose. It's important that I win gracefully."
-    }
-  },
-  "parasol_lady": {
-    "encounter": {
-      "1": "Time to grace the battlefield with elegance and poise!"
-    },
-    "victory": {
-      "1": "My elegance remains unbroken!"
-    }
-  },
-  "twins": {
-    "encounter": {
-      "1": "Get ready, because when we team up, it's double the trouble!",
-      "2": "Two hearts, one strategy – let's see if you can keep up with our twin power!",
-      "3": "Hope you're ready for double trouble, because we're about to bring the heat!"
-    },
-    "victory": {
-      "1": "We may have lost this round, but our bond remains unbreakable!",
-      "2": "Our twin spirit won't be dimmed for long.",
-      "3": "We'll come back stronger as a dynamic duo!"
-    },
-    "defeat": {
-      "1": "Twin power reigns supreme!",
-      "2": "Two hearts, one triumph!",
-      "3": "Double the smiles, double the victory dance!"
-    }
-  },
-  "cyclist": {
-    "encounter": {
-      "1": "Get ready to eat my dust!",
-      "2": "Gear up, challenger! I'm about to leave you in the dust!",
-      "3": "Pedal to the metal, let's see if you can keep pace!"
-    },
-    "victory": {
-      "1": "Spokes may be still, but determination pedals on.",
-      "2": "Outpaced!",
-      "3": "The road to victory has many twists and turns yet to explore."
-    }
-  },
-  "black_belt": {
-    "encounter": {
-      "1": "I praise your courage in challenging me! For I am the one with the strongest kick!",
-      "2": "Oh, I see. Would you like to be cut to pieces? Or do you prefer the role of punching bag?"
-    },
-    "victory": {
-      "1": "Oh. The Pokémon did the fighting. My strong kick didn't help a bit.",
-      "2": "Hmmm… If I was going to lose anyway, I was hoping to get totally messed up in the process."
-    }
-  },
-  "battle_girl": {
-    "encounter": {
-      "1": "You don't have to try to impress me. You can lose against me."
-    },
-    "victory": {
-      "1": "It's hard to say good-bye, but we are running out of time…"
-    }
-  },
-  "hiker": {
-    "encounter": {
-      "1": "My middle-age spread has given me as much gravitas as the mountains I hike!",
-      "2": "I inherited this big-boned body from my parents… I'm like a living mountain range…"
-    },
-    "victory": {
-      "1": "At least I cannot lose when it comes to BMI!",
-      "2": "It's not enough… It's never enough. My bad cholesterol isn't high enough…"
-    }
-  },
-  "ranger": {
-    "encounter": {
-      "1": "When I am surrounded by nature, most other things cease to matter.",
-      "2": "When I'm living without nature in my life, sometimes I'll suddenly feel an anxiety attack coming on."
-    },
-    "victory": {
-      "1": "It doesn't matter to the vastness of nature whether I win or lose…",
-      "2": "Something like this is pretty trivial compared to the stifling feelings of city life."
-    },
-    "defeat": {
-      "1": "I won the battle. But victory is nothing compared to the vastness of nature…",
-      "2": "I'm sure how you feel is not so bad if you compare it to my anxiety attacks…"
-    }
-  },
-  "scientist": {
-    "encounter": {
-      "1": "My research will lead this world to peace and joy."
-    },
-    "victory": {
-      "1": "I am a genius… I am not supposed to lose against someone like you…"
-    }
-  },
-  "school_kid": {
-    "encounter": {
-      "1": "…Heehee. I'm confident in my calculations and analysis.",
-      "2": "I'm gaining as much experience as I can because I want to be a Gym Leader someday."
-    },
-    "victory": {
-      "1": "Ohhhh… Calculation and analysis are perhaps no match for chance…",
-      "2": "Even difficult, trying experiences have their purpose, I suppose."
-    }
-  },
-  "artist": {
-    "encounter": {
-      "1": "I used to be popular, but now I am all washed up."
-    },
-    "victory": {
-      "1": "As times change, values also change. I realized that too late."
-    }
-  },
-  "guitarist": {
-    "encounter": {
-      "1": "Get ready to feel the rhythm of defeat as I strum my way to victory!"
-    },
-    "victory": {
-      "1": "Silenced for now, but my melody of resilience will play on."
-    }
-  },
-  "worker": {
-    "encounter": {
-      "1": "It bothers me that people always misunderstand me. I'm a lot more pure than everyone thinks."
-    },
-    "victory": {
-      "1": "I really don't want my skin to burn, so I want to stay in the shade while I work."
-    }
-  },
-  "worker_female": {
-    "encounter": {
-      "1": "It bothers me that people always misunderstand me.\n$I'm a lot more pure than everyone thinks."
-    },
-    "victory": {
-      "1": "I really don't want my skin to burn, so I want to stay in the shade while I work."
-    },
-    "defeat": {
-      "1": "My body and mind aren't necessarily always in sync."
-    }
-  },
-  "worker_double": {
-    "encounter": {
-      "1": "I'll show you we can break you. We've been training in the field!"
-    },
-    "victory": {
-      "1": "How strange… How could this be… I shouldn't have been outmuscled."
-    }
-  },
-  "hex_maniac": {
-    "encounter": {
-      "1": "I normally only ever listen to classical music, but if I lose, I think I shall try a bit of new age!",
-      "2": "I grow stronger with each tear I cry."
-    },
-    "victory": {
-      "1": "Is this the dawning of the age of Aquarius?",
-      "2": "Now I can get even stronger. I grow with every grudge."
-    },
-    "defeat": {
-      "1": "New age simply refers to twentieth century classical composers, right?",
-      "2": "Don't get hung up on sadness or frustration. You can use your grudges to motivate yourself."
-    }
-  },
-  "psychic": {
-    "encounter": {
-      "1": "Hi! Focus!"
-    },
-    "victory": {
-      "1": "Eeeeek!"
-    }
-  },
-  "officer": {
-    "encounter": {
-      "1": "Brace yourself, because justice is about to be served!",
-      "2": "Ready to uphold the law and serve justice on the battlefield!"
-    },
-    "victory": {
-      "1": "The weight of justice feels heavier than ever…",
-      "2": "The shadows of defeat linger in the precinct."
-    }
-  },
-  "beauty": {
-    "encounter": {
-      "1": "My last ever battle… That's the way I'd like us to view this match…"
-    },
-    "victory": {
-      "1": "It's been fun… Let's have another last battle again someday…"
-    }
-  },
-  "baker": {
-    "encounter": {
-      "1": "Hope you're ready to taste defeat!"
-    },
-    "victory": {
-      "1": "I'll bake a comeback."
-    }
-  },
-  "biker": {
-    "encounter": {
-      "1": "Time to rev up and leave you in the dust!"
-    },
-    "victory": {
-      "1": "I'll tune up for the next race."
-    }
-  },
-  "firebreather": {
-    "encounter": {
-      "1": "My flames shall devour you!",
-      "2": "My soul is on fire. I'll show you how hot it burns!",
-      "3": "Step right up and take a look!"
-    },
-    "victory": {
-      "1": "I burned down to ashes...",
-      "2": "Yow! That's hot!",
-      "3": "Ow! I scorched the tip of my nose!"
-    }
-  },
-  "sailor": {
-    "encounter": {
-      "1": "Matey, you're walking the plank if you lose!",
-      "2": "Come on then! My sailor's pride is at stake!",
-      "3": "Ahoy there! Are you seasick?"
-    },
-    "victory": {
-      "1": "Argh! Beaten by a kid!",
-      "2": "Your spirit sank me!",
-      "3": "I think it's me that's seasick..."
-    }
-  },
-  "archer": {
-    "encounter": {
-      "1": "Before you go any further, let's see how you far against us, Team Rocket!",
-      "2": "I have received reports that your skills are not insignificant. Let's see if they are true.",
-      "3": "I am Archer, an Admin of Team Rocket. And I do not go easy on enemies of our organization."
-    },
-    "victory": {
-      "1": "What a blunder!",
-      "2": "With my current skills, I was not up to the task after all.",
-      "3": "F-forgive me, Giovanni... For me to be defeated by a mere trainer..."
-    }
-  },
-  "ariana": {
-    "encounter": {
-      "1": "Hold it right there! We can't someone on the loose.\n$It's harmful to Team Rocket's pride, you see.",
-      "2": "I don't know or care if what I'm doing is right or wrong...\n$I just put my faith in Giovanni and do as I am told",
-      "3": "Your trip ends here. I'm going to take you down!"
-    },
-    "victory": {
-      "1": "Tch, you really are strong. It's too bad.\n$If you were to join Team Rocket, you could become an Executive.",
-      "2": "I... I'm shattered...",
-      "3": "Aaaieeeee! This can't be happening! I fought hard, but I still lost…"
-    }
-  },
-  "proton": {
-    "encounter": {
-      "1": "What do you want? If you interrupt our work, don't expect any mercy!",
-      "2": "What do we have here? I am often labeled as the scariest and cruelest guy in Team Rocket…\n$I strongly urge you not to interfere with our business!",
-      "3": "I am Proton, an Admin of Team Rocket. I am here to put an end to your meddling!"
-    },
-    "victory": {
-      "1": "The fortress came down!",
-      "2": "You may have won this time… But all you did was make Team Rocket's wrath grow…",
-      "3": "I am defeated… But I will not forget this!"
-    }
-  },
-  "petrel": {
-    "encounter": {
-      "1": "Muhahaha, we've been waiting for you. Me? You don't know who I am? It is me, Giovanni.\n$The majestic Giovanni himself! Wahahaha! …Huh? I don't sound anything like Giovanni?\n$I don't even look like Giovanni? How come? I've worked so hard to mimic him!",
-      "2": "I am Petrel, an Admin of Team Rocket. I will not allow you to interfere with our plans!",
-      "3": "Rocket Executive Petrel will deal with this intruder!"
-    },
-    "victory": {
-      "1": "OK, OK. I'll tell you where he is.",
-      "2": "I… I couldn't do a thing… Giovanni, please forgive me…",
-      "3": "No, I can't let this affect me. I have to inform the others…"
-    }
-  },
-  "tabitha": {
-    "encounter": {
-      "1": "Hehehe! So you've come all the way here! But you're too late!",
-      "2": "Hehehe... Got here already, did you? We underestimated you! But this is it! \n$I'm a cut above the Grunts you've seen so far. I'm not stalling for time.\n$I'm going to pulverize you!",
-      "3": "I'm going to give you a little taste of pain! Resign yourself to it!"
-    },
-    "victory": {
-      "1": "Hehehe! You might have beaten me, but you don't stand a chance against the Boss!\n$If you get lost now, you won't have to face a sound whipping!",
-      "2": "Hehehe... So, I lost, too...",
-      "3": "Ahya! How could this be? For an Admin like me to lose to some random trainer..."
-    }
-  },
-  "courtney": {
-    "encounter": {
-      "1": "The thing...The thing that you hold...That is what... That's what we of Team Magma seek...",
-      "2": "... Well then...Deleting...",
-      "3": "...Ha. ...Analyzing... ...Hah♪"
-    },
-    "victory": {
-      "1": "... ...Change...the world.",
-      "2": "As anticipated. Unanticipated. You. Target lock...completed.\n$Commencing...experiment. You. Forever. Aha... ♪",
-      "3": "...Again? That's unanticipated. ...I knew it. You...are interesting! ...Haha. ♪"
-    }
-  },
-  "shelly": {
-    "encounter": {
-      "1": "Ahahahaha! You're going to meddle in Team Aqua's affairs?\n$You're either absolutely fearless, simply ignorant, or both!\n$You're so cute, you're disgusting! I'll put you down",
-      "2": "What's this? Who's this spoiled brat?",
-      "3": "Cool your jets. Be patient. I'll crush you shortly."
-    },
-    "victory": {
-      "1": "Ahahahaha! We got meddled with unexpectedly! We're out of options.\n$We'll have to pull out. But this isn't the last you'll see of Team Aqua!\n$We have other plans! Don't you forget it!",
-      "2": "Ahhh?! Did I go too easy on you?!",
-      "3": "Uh. Are you telling me you've upped your game even more during the fight?\n$You're a brat with a bright future… My Pokémon and I don't have any strength left to fight…\n$Go on… Go and be destroyed by Archie."
-    }
-  },
-  "matt": {
-    "encounter": {
-      "1": "Hoohahaha! What, you got a screw loose or something? Look at you, little Makuhita person!",
-      "2": "Oho! You! You're that funny kid!",
-      "3": "What are you doing here? Did you follow us?"
-    },
-    "victory": {
-      "1": "All right then, until the Boss has time for you, I'll be your opponent!",
-      "2": "I can feel it! I can feel it, all right! The strength coming offa you!\n$More! I still want more! But looks like we're outta time...",
-      "3": "That was fun! I knew you'd show me a good time! I look forward to facing you again someday!"
-    }
-  },
-  "mars": {
-    "encounter": {
-      "1": "I'm Mars, one of Team Galactic's top Commanders.",
-      "2": "Team Galactic's vision for the future is unwavering. Opposition will be crushed without mercy!",
-      "3": "Feeling nervous? You should be!"
-    },
-    "victory": {
-      "1": "This can't be happening! How did I lose?!",
-      "2": "You have some skill, I'll give you that.",
-      "3": "Defeated... This was a costly mistake."
-    }
-  },
-  "jupiter": {
-    "encounter": {
-      "1": "Jupiter, Commander of Team Galactic, at your service.",
-      "2": "Resistance is futile. Team Galactic will prevail!",
-      "3": "You're trembling... scared already?"
-    },
-    "victory": {
-      "1": "No way... I lost?!",
-      "2": "Impressive, you've got guts!",
-      "3": "Losing like this... How embarrassing."
-    }
-  },
-  "saturn": {
-    "encounter": {
-      "1": "I am Saturn, Commander of Team Galactic.",
-      "2": "Our mission is absolute. Any hindrance will be obliterated!",
-      "3": "Is that fear I see in your eyes?"
-    },
-    "victory": {
-      "1": "Impossible... Defeated by you?!",
-      "2": "You have proven yourself a worthy adversary.",
-      "3": "Bestowed in defeat... This is unacceptable."
-    }
-  },
-  "zinzolin": {
-    "encounter": {
-      "1": "You could become a threat to Team Plasma, so we will eliminate you here and now!",
-      "2": "Oh, for crying out loud... I didn't expect to have to battle in this freezing cold!",
-      "3": "You're an impressive Trainer to have made it this far. But it ends here."
-    },
-    "victory": {
-      "1": "Ghetsis... I have failed you...",
-      "2": "It's bitter cold. I'm shivering. I'm suffering. Yet, I still stand victorious.",
-      "3": "Hmph. You're a smarter Trainer than I expected, but not smart enough."
-    }
-  },
-  "rood": {
-    "encounter": {
-      "1": "You are a threat to Team Plasma. We cannot let you walk away from here and now!",
-      "2": "Oh, this icy wind... I never thought I'd have to fight here!",
-      "3": "You are a remarkable Trainer to have made it this far. But this is where it ends."
-    },
-    "victory": {
-      "1": "Ghetsis... I have failed my mission...",
-      "2": "The cold is piercing. I'm shivering. I'm suffering. Yet, I have triumphed.",
-      "3": "Hm. You are a talented Trainer, but unfortunately not talented enough."
-    }
-  },
-  "xerosic": {
-    "encounter": {
-      "1": "Ah ha ha! It would be my pleasure. Come on, little Trainer! Let's see what you've got!",
-      "2": "Hmm... You're more powerful than you look. I wonder how much energy there is inside you.",
-      "3": "I've been waiting for you! I need to do a little research on you! Come, let us begin!"
-    },
-    "victory": {
-      "1": "Ah, you're quite strong. Oh yes—very strong, indeed.",
-      "2": "Ding-ding-ding! You did it! To the victor go the spoils!",
-      "3": "Wonderful! Amazing! You have tremendous skill and bravery!"
-    }
-  },
-  "bryony": {
-    "encounter": {
-      "1": "I am Bryony, and it would be my pleasure to battle you. Show me what you've got.",
-      "2": "Impressive... You're more powerful than you appear. Let's see the true extent of your energy.",
-      "3": "I've anticipated your arrival. It's time for a little test. Shall we begin?"
-    },
-    "victory": {
-      "1": "You're quite strong. Oh yes—very strong, indeed.",
-      "2": "Ding-ding-ding! You've done well. Victory is yours.",
-      "3": "Wonderful! Remarkable! Your skill and bravery are commendable."
-    }
-  },
-  "rocket_grunt": {
-    "encounter": {
-      "1": "Prepare for trouble!",
-      "2": "We're pulling a big job here! Get lost, kid!",
-      "3": "Hand over your Pokémon, or face the wrath of Team Rocket!",
-      "4": "You're about to experience the true terror of Team Rocket!",
-      "5": "Hey, kid! Me am a Team Rocket member kind of guy!"
-    },
-    "victory": {
-      "1": "Team Rocket blasting off again!",
-      "2": "Oh no! I dropped the Lift Key!",
-      "3": "I blew it!",
-      "4": "My associates won't stand for this!",
-      "5": "You say what? Team Rocket bye-bye a go-go? Broken it is says you?"
-    }
-  },
-  "magma_grunt": {
-    "encounter": {
-      "1": "If you get in the way of Team Magma, don’t expect any mercy!",
-      "2": "You'd better not interfere with our plans! We're making the world a better place!",
-      "3": "You're in the way! Team Magma has no time for kids like you!",
-      "4": "I hope you brought marshmallows because things are about to heat up!",
-      "5": "We're going to use the power of a volcano! It's gonna be... explosive! Get it? Heh heh!"
-    },
-    "victory": {
-      "1": "Huh? I lost?!",
-      "2": "I can't believe I lost! I even skipped lunch for this",
-      "3": "No way! You're just a kid!",
-      "4": "Urrrgh... I should've ducked into our hideout right away...",
-      "5": "You beat me... Do you think the boss will dock my pay for this?"
-    }
-  },
-  "aqua_grunt": {
-    "encounter": {
-      "1": "No one who crosses Team Aqua gets any mercy, not even kids!",
-      "2": "Grrr... You've got some nerve meddling with Team Aqua!",
-      "3": "You're about to get soaked! And not just from my water Pokémon!",
-      "4": "We, Team Aqua, exist for the good of all!",
-      "5": "Prepare to be washed away by the tides of my... uh, Pokémon! Yeah, my Pokémon!"
-    },
-    "victory": {
-      "1": "You're kidding me!",
-      "2": "Arrgh, I didn't count on being meddled with by some meddling kid!",
-      "3": "I lost?! Guess I'll have to swim back to the hideout now...",
-      "4": "Oh, man, what a disaster... The boss is going to be furious...",
-      "5": "You beat me... Do you think the boss will make me walk the plank for this?"
-    }
-  },
-  "galactic_grunt": {
-    "encounter": {
-      "1": "Don't mess with Team Galactic!",
-      "2": "Witness the power of our technology and the future we envision!",
-      "3": "In the name of Team Galactic, I'll eliminate anyone who stands in our way!",
-      "4": "Get ready to lose!",
-      "5": "Hope you're ready for a cosmic beatdown!"
-    },
-    "victory": {
-      "1": "Shut down...",
-      "2": "This setback means nothing in the grand scheme.",
-      "3": "Our plans are bigger than this defeat.",
-      "4": "How?!",
-      "5": "Note to self: practice Pokémon battling, ASAP."
-    }
-  },
-  "plasma_grunt": {
-    "encounter": {
-      "1": "We won't tolerate people who have different ideas!",
-      "2": "If I win against you, release your Pokémon!",
-      "3": "If you get in the way of Team Plasma, I'll take care of you!",
-      "4": "Team Plasma will liberate Pokémon from selfish humans like you!",
-      "5": "Our hairstyles are out of this world... but our battling skills? You'll find out soon enough."
-    },
-    "victory": {
-      "1": "Plasmaaaaaaaaa!",
-      "2": "How could I lose...",
-      "3": "...What a weak Pokémon, I'll just have to go steal some better ones!",
-      "4": "Great plans are always interrupted.",
-      "5": "This is bad... Badbadbadbadbadbadbad! Bad for Team Plasma! Or Plasbad, for short!"
-    }
-  },
-  "flare_grunt": {
-    "encounter": {
-      "1": "Your Pokémon are no match for the elegance of Team Flare.",
-      "2": "Hope you brought your sunglasses, because things are about to get bright!",
-      "3": "Team Flare will cleanse the world of imperfection!",
-      "4": "Prepare to face the brilliance of Team Flare!",
-      "5": "Fashion is most important to us!"
-    },
-    "victory": {
-      "1": "The future doesn't look bright for me.",
-      "2": "Perhaps there's more to battling than I thought. Back to the drawing board.",
-      "3": "Gahh?! I lost?!",
-      "4": "Even in defeat, Team Flare's elegance shines through.",
-      "5": "You may have beaten me, but when I lose, I go out in style!"
-    }
-  },
-  "rocket_boss_giovanni_1": {
-    "encounter": {
-      "1": "So! I must say, I am impressed you got here!"
-    },
-    "victory": {
-      "1": "WHAT! This cannot be!"
-    },
-    "defeat": {
-      "1": "Mark my words. Not being able to measure your own strength shows that you are still a child."
-    }
-  },
-  "rocket_boss_giovanni_2": {
-    "encounter": {
-      "1": "My old associates need me... Are you going to get in my way?"
-    },
-    "victory": {
-      "1": "How is this possible...? The precious dream of Team Rocket has become little more than an illusion..."
-    },
-    "defeat": {
-      "1": "Team Rocket will be reborn again, and I will rule the world!"
-    }
-  },
-  "magma_boss_maxie_1": {
-    "encounter": {
-      "1": "I will bury you by my own hand. I hope you appreciate this honor!"
-    },
-    "victory": {
-      "1": "Ugh! You are... quite capable...\nI fell behind, but only by an inch..."
-    },
-    "defeat": {
-      "1": "Team Magma will prevail!"
-    }
-  },
-  "magma_boss_maxie_2": {
-    "encounter": {
-      "1": "You are the final obstacle remaining between me and my goals.\n$Brace yourself for my ultimate attack! Fuhahaha!"
-    },
-    "victory": {
-      "1": "This... This is not.. Ngh..."
-    },
-    "defeat": {
-      "1": "And now... I will transform this planet to a land ideal for humanity."
-    }
-  },
-  "aqua_boss_archie_1": {
-    "encounter": {
-      "1": "I'm the leader of Team Aqua, so I'm afraid it's the rope's end for you."
-    },
-    "victory": {
-      "1": "Let's meet again somewhere. I'll be sure to remember that face."
-    },
-    "defeat": {
-      "1": "Brilliant! My team won't hold back now!"
-    }
-  },
-  "aqua_boss_archie_2": {
-    "encounter": {
-      "1": "I've been waiting so long for this day to come.\nThis is the true power of my team!"
-    },
-    "victory": {
-      "1": "Like I figured..."
-    },
-    "defeat": {
-      "1": "I'll return everything in this world to its original, pure state!!"
-    }
-  },
-  "galactic_boss_cyrus_1": {
-    "encounter": {
-      "1": "You were compelled to come here by such vacuous sentimentality.\n$I will make you regret paying heed to your heart!"
-    },
-    "victory": {
-      "1": "Interesting. And quite curious."
-    },
-    "defeat": {
-      "1": "I will create my new world..."
-    }
-  },
-  "galactic_boss_cyrus_2": {
-    "encounter": {
-      "1": "So we meet again. It seems our fates have become intertwined.\n$But here and now, I will finally break that bond!"
-    },
-    "victory": {
-      "1": "How? How? HOW?!"
-    },
-    "defeat": {
-      "1": "Farewell."
-    }
-  },
-  "plasma_boss_ghetsis_1": {
-    "encounter": {
-      "1": "I won't allow anyone to stop me! No matter who does what!"
-    },
-    "victory": {
-      "1": "How can this be? I'm the creator of Team Plasma! I'm perfect!"
-    },
-    "defeat": {
-      "1": "I am the perfect ruler of a perfect new world! Mwa ha ha!"
-    }
-  },
-  "plasma_boss_ghetsis_2": {
-    "encounter": {
-      "1": "Come now! I want to see your face at the moment you lose all hope!"
-    },
-    "victory": {
-      "1": "My calculations... No! My careful schemes! The world should be mine!"
-    },
-    "defeat": {
-      "1": "Kyurem! Use Absofusion!"
-    }
-  },
-  "flare_boss_lysandre_1": {
-    "encounter": {
-      "1": "Do you want to stop me? Show me in battle."
-    },
-    "victory": {
-      "1": "You are here to stop me. But I ask you to wait. "
-    },
-    "defeat": {
-      "1": "Pokemon...Shall no longer exist."
-    }
-  },
-  "flare_boss_lysandre_2": {
-    "encounter": {
-      "1": "The future you want, or the future I want... Let us see which one is more deserving, shall we?"
-    },
-    "victory": {
-      "1": "Whaugh!"
-    },
-    "defeat": {
-      "1": "Fools with no vision will continue to befoul this beautiful world."
-    }
-  },
-  "brock": {
-    "encounter": {
-      "1": "My expertise on Rock-type Pokémon will take you down! Come on!",
-      "2": "My rock-hard willpower will overwhelm you!",
-      "3": "Allow me to show you the true strength of my Pokémon!"
-    },
-    "victory": {
-      "1": "Your Pokémon's strength have overcome my rock-hard defenses!",
-      "2": "The world is huge! I'm glad to have had a chance to battle you.",
-      "3": "Perhaps I should go back to pursuing my dream as a Pokémon Breeder…"
-    },
-    "defeat": {
-      "1": "The best offense is a good defense!\nThat's my way of doing things!",
-      "2": "Come study rocks with me next time to better learn how to fight them!",
-      "3": "Hah, all my traveling around the regions is paying off!"
-    }
-  },
-  "misty": {
-    "encounter": {
-      "1": "My policy is an all out offensive with Water-type Pokémon!",
-      "2": "Hiya, I'll show you the strength of my aquatic Pokémon!",
-      "3": "My dream was to go on a journey and battle powerful trainers…\nWill you be a sufficient challenge?"
-    },
-    "victory": {
-      "1": "You really are strong… I'll admit that you are skilled…",
-      "2": "Grrr… You know you just got lucky, right?!",
-      "3": "Wow, you're too much! I can't believe you beat me!"
-    },
-    "defeat": {
-      "1": "Was the mighty Misty too much for you?",
-      "2": "I hope you saw my Pokémon's elegant swimming techniques!",
-      "3": "Your Pokémon were no match for my pride and joys!"
-    }
-  },
-  "lt_surge": {
-    "encounter": {
-      "1": "My Electric Pokémon saved me during the war! I'll show you how!",
-      "2": "Ten-hut! I'll shock you into surrender!",
-      "3": "I'll zap you just like I do to all my enemies in battle!"
-    },
-    "victory": {
-      "1": "Whoa! Your team's the real deal, kid!",
-      "2": "Aaargh, you're strong! Even my electric tricks lost against you.",
-      "3": "That was an absolutely shocking loss!"
-    },
-    "defeat": {
-      "1": "Oh yeah! When it comes to Electric-type Pokémon, I'm number one in the world!",
-      "2": "Hahaha! That was an electrifying battle, kid!",
-      "3": "A Pokémon battle is war, and I have showed you first-hand combat!"
-    }
-  },
-  "erika": {
-    "encounter": {
-      "1": "Ah, the weather is lovely here…\nOh, a battle? Very well then.",
-      "2": "My Pokémon battling skills rival that of my flower arranging skills.",
-      "3": "Oh, I hope the pleasant aroma of my Pokémon doesn't put me to sleep again…",
-      "4": "Seeing flowers in a garden is so soothing."
-    },
-    "victory": {
-      "1": "Oh! I concede defeat.",
-      "2": "That match was most delightful.",
-      "3": "Ah, it appears it is my loss…",
-      "4": "Oh, my goodness."
-    },
-    "defeat": {
-      "1": "I was afraid I would doze off…",
-      "2": "Oh my, it seems my Grass Pokémon overwhelmed you.",
-      "3": "That battle was such a soothing experience.",
-      "4": "Oh… Is that all?"
-    }
-  },
-  "janine": {
-    "encounter": {
-      "1": "I am mastering the art of poisonous attacks.\nI shall spar with you today!",
-      "2": "Father trusts that I can hold my own.\nI will prove him right!",
-      "3": "My ninja techniques are only second to my Father's!\nCan you keep up?"
-    },
-    "victory": {
-      "1": "Even now, I still need training… I understand.",
-      "2": "Your battle technique has outmatched mine.",
-      "3": "I'm going to really apply myself and improve my skills."
-    },
-    "defeat": {
-      "1": "Fufufu… the poison has sapped all your strength to battle.",
-      "2": "Ha! You didn't stand a chance against my superior ninja skills!",
-      "3": "Father's faith in me has proven to not be misplaced."
-    }
-  },
-  "sabrina": {
-    "encounter": {
-      "1": "Through my psychic ability, I had a vision of your arrival!",
-      "2": "I dislike fighting, but if you wish, I will show you my powers!",
-      "3": "I can sense great ambition in you. I shall see if it not unfounded."
-    },
-    "victory": {
-      "1": "Your power… It far exceeds what I foresaw…",
-      "2": "I failed to accurately predict your power.",
-      "3": "Even with my immense psychic powers, I cannot sense another as strong as you."
-    },
-    "defeat": {
-      "1": "This victory… It is exactly as I foresaw in my visions!",
-      "2": "Perhaps it was another I sensed a great desire in…",
-      "3": "Hone your abilities before recklessly charging into battle.\nYou never know what the future may hold if you do…"
-    }
-  },
-  "blaine": {
-    "encounter": {
-      "1": "Hah! Hope you brought a Burn Heal!",
-      "2": "My fiery Pokémon will incinerate all challengers!",
-      "3": "Get ready to play with fire!"
-    },
-    "victory": {
-      "1": "I have burned down to nothing! Not even ashes remain!",
-      "2": "Didn't I stoke the flames high enough?",
-      "3": "I'm all burned out… But this makes my motivation to improve burn even hotter!"
-    },
-    "defeat": {
-      "1": "My raging inferno cannot be quelled!",
-      "2": "My Pokémon have been powered up with the heat from this victory!",
-      "3": "Hah! My passion burns brighter than yours!"
-    }
-  },
-  "giovanni": {
-    "encounter": {
-      "1": "I, the leader of Team Rocket, will make you feel a world of pain!",
-      "2": "My training here will be vital before I am to face my old associates again.",
-      "3": "I do not think you are prepared for the level of failure you are about to experience!"
-    },
-    "victory": {
-      "1": "WHAT! Me, lose?! There is nothing I wish to say to you!",
-      "2": "Hmph… You could never understand what I hope to achieve.",
-      "3": "This defeat is merely delaying the inevitable.\nI will rise Team Rocket from the ashes in due time."
-    },
-    "defeat": {
-      "1": "Not being able to measure your own strength shows that you are still but a child.",
-      "2": "Do not try to interfere with me again.",
-      "3": "I hope you understand how foolish challenging me was."
-    }
-  },
-  "roxanne": {
-    "encounter": {
-      "1": "Would you kindly demonstrate how you battle?",
-      "2": "You can learn many things by battling many trainers.",
-      "3": "Oh, you caught me strategizing.\nWould you like to battle?"
-    },
-    "victory": {
-      "1": "Oh, I appear to have lost.\nI understand.",
-      "2": "It seems that I still have so much more to learn when it comes to battle.",
-      "3": "I'll take what I learned here today to heart."
-    },
-    "defeat": {
-      "1": "I have learned many things from our battle.\nI hope you have too.",
-      "2": "I look forward to battling you again.\nI hope you'll use what you've learned here.",
-      "3": "I won due to everything I have learned."
-    }
-  },
-  "brawly": {
-    "encounter": {
-      "1": "Oh man, a challenger!\nLet's see what you can do!",
-      "2": "You seem like a big splash.\nLet's battle!",
-      "3": "Time to create a storm!\nLet's go!"
-    },
-    "victory": {
-      "1": "Oh woah, you've washed me out!",
-      "2": "You surfed my wave and crashed me down!",
-      "3": "I feel like I'm lost in Granite Cave!"
-    },
-    "defeat": {
-      "1": "Haha, I surfed the big wave!\nChallenge me again sometime.",
-      "2": "Surf with me again some time!",
-      "3": "Just like the tides come in and out, I hope you return to challenge me again."
-    }
-  },
-  "wattson": {
-    "encounter": {
-      "1": "Time to get shocked!\nWahahahaha!",
-      "2": "I'll make sparks fly!\nWahahahaha!",
-      "3": "I hope you brought Paralyz Heal!\nWahahahaha!"
-    },
-    "victory": {
-      "1": "Seems like I'm out of charge!\nWahahahaha!",
-      "2": "You've completely grounded me!\nWahahahaha!",
-      "3": "Thanks for the thrill!\nWahahahaha!"
-    },
-    "defeat": {
-      "1": "Recharge your batteries and challenge me again sometime!\nWahahahaha!",
-      "2": "I hope you found our battle electrifying!\nWahahahaha!",
-      "3": "Aren't you shocked I won?\nWahahahaha!"
-    }
-  },
-  "flannery": {
-    "encounter": {
-      "1": "Nice to meet you! Wait, no…\nI will crush you!",
-      "2": "I've only been a leader for a little while, but I'll smoke you!",
-      "3": "It's time to demonstrate the moves my grandfather has taught me! Let's battle!"
-    },
-    "victory": {
-      "1": "You remind me of my grandfather…\nNo wonder I lost.",
-      "2": "Am I trying too hard?\nI should relax, can't get too heated.",
-      "3": "Losing isn't going to smother me out.\nTime to reignite training!"
-    },
-    "defeat": {
-      "1": "I hope I've made my grandfather proud…\nLet's battle again some time.",
-      "2": "I…I can't believe I won!\nDoing things my way worked!",
-      "3": "Let's exchange burning hot moves again soon!"
-    }
-  },
-  "norman": {
-    "encounter": {
-      "1": "I'm surprised you managed to get here.\nLet's battle.",
-      "2": "I'll do everything in my power as a Gym Leader to win.\nLet's go!",
-      "3": "You better give this your all.\nIt's time to battle!"
-    },
-    "victory": {
-      "1": "I lost to you…?\nRules are rules, though.",
-      "2": "Was moving from Olivine a mistake…?",
-      "3": "I can't believe it.\nThat was a great match."
-    },
-    "defeat": {
-      "1": "We both tried our best.\nI hope we can battle again soon.",
-      "2": "You should try challenging my kid instead.\nYou might learn something!",
-      "3": "Thank you for the excellent battle.\nBetter luck next time."
-    }
-  },
-  "winona": {
-    "encounter": {
-      "1": "I've been soaring the skies looking for prey…\nAnd you're my target!",
-      "2": "No matter how our battle is, my Flying Pokémon and I will triumph with grace. Let's battle!",
-      "3": "I hope you aren't scared of heights.\nLet's ascend!"
-    },
-    "victory": {
-      "1": "You're the first Trainer I've seen with more grace than I.\nExcellently played.",
-      "2": "Oh, my Flying Pokémon have plummeted!\nVery well.",
-      "3": "Though I may have fallen, my Pokémon will continue to fly!"
-    },
-    "defeat": {
-      "1": "My Flying Pokémon and I will forever dance elegantly!",
-      "2": "I hope you enjoyed our show.\nOur graceful dance is finished.",
-      "3": "Won't you come see our elegant choreography again?"
-    }
-  },
-  "tate": {
-    "encounter": {
-      "1": "Hehehe…\nWere you surprised to see me without my sister?",
-      "2": "I can see what you're thinking…\nYou want to battle!",
-      "3": "How can you defeat someone…\nWho knows your every move?"
-    },
-    "victory": {
-      "1": "It can't be helped…\nI miss Liza…",
-      "2": "Your bond with your Pokémon was stronger than mine.",
-      "3": "If I were with Liza, we would have won.\nWe can finish each other's thoughts!"
-    },
-    "defeat": {
-      "1": "My Pokémon and I are superior!",
-      "2": "If you can't even defeat me, you'll never be able to defeat Liza either.",
-      "3": "It's all thanks to my strict training with Liza.\nI can make myself one with Pokémon."
-    }
-  },
-  "liza": {
-    "encounter": {
-      "1": "Fufufu…\nWere you surprised to see me without my brother?",
-      "2": "I can determine what you desire…\nYou want to battle, don't you?",
-      "3": "How can you defeat someone…\nWho's one with their Pokémon?"
-    },
-    "victory": {
-      "1": "It can't be helped…\nI miss Tate…",
-      "2": "Your bond with your Pokémon…\nIt's stronger than mine.",
-      "3": "If I were with Tate, we would have won.\nWe can finish each other's sentences!"
-    },
-    "defeat": {
-      "1": "My Pokémon and I are victorious.",
-      "2": "If you can't even defeat me, you'll never be able to defeat Tate either.",
-      "3": "It's all thanks to my strict training with Tate.\nI can synchronize myself with my Pokémon."
-    }
-  },
-  "juan": {
-    "encounter": {
-      "1": "Now's not the time to act coy.\nLet's battle!",
-      "2": "Ahahaha, You'll be witness to my artistry with Water Pokémon!",
-      "3": "A typhoon approaches!\nWill you be able to test me?",
-      "4": "Please, you shall bear witness to our artistry.\nA grand illusion of water sculpted by my Pokémon and myself!"
-    },
-    "victory": {
-      "1": "You may be a genius who can take on Wallace!",
-      "2": "I focused on elegance while you trained.\nIt's only natural that you defeated me.",
-      "3": "Ahahaha!\nVery well, You have won this time.",
-      "4": "From you, I sense the brilliant shine of skill that will overcome all."
-    },
-    "defeat": {
-      "1": "My Pokémon and I have sculpted an illusion of Water and come out victorious.",
-      "2": "Ahahaha, I have won, and you have lost.",
-      "3": "Shall I loan you my outfit? It may help you battle!\nAhahaha, I jest!",
-      "4": "I'm the winner! Which is to say, you lost."
-    }
-  },
-  "crasher_wake": {
-    "encounter": {
-      "1": "Crash! Crash! Watch out!\nCrasher Wake…is…heeere!",
-      "2": "Crash! Crash! Crasher Wake!",
-      "3": "I'm the tidal wave of power to wash you away!"
-    },
-    "victory": {
-      "1": "That puts a grin on my face!\nGuhahaha! That was a blast!",
-      "2": "Hunwah! It's gone and ended!\nHow will I say this…\nI want more! I wanted to battle a lot more!",
-      "3": "WHAAAAT!?"
-    },
-    "defeat": {
-      "1": "Yeeeeah! That's right!",
-      "2": "I won, but I want more! I wanted to battle a lot more!",
-      "3": "So long!"
-    }
-  },
-  "falkner": {
-    "encounter": {
-      "1": "I'll show you the real power of the magnificent bird Pokémon!",
-      "2": "Winds, stay with me!",
-      "3": "Dad! I hope you're watching me battle from above!"
-    },
-    "victory": {
-      "1": "I understand… I'll bow out gracefully.",
-      "2": "A defeat is a defeat. You are strong indeed.",
-      "3": "…Shoot! Yeah, I lost."
-    },
-    "defeat": {
-      "1": "Dad! I won with your cherished bird Pokémon…",
-      "2": "Bird Pokémon are the best after all!",
-      "3": "Feels like I'm catching up to my dad!"
-    }
-  },
-  "nessa": {
-    "encounter": {
-      "1": "No matter what kind of plan your refined mind may be plotting, my partner and I will be sure to sink it.",
-      "2": "I'm not here to chat. I'm here to win!",
-      "3": "This is a little gift from my Pokémon… I hope you can take it!"
-    },
-    "victory": {
-      "1": "You and your Pokémon are just too much…",
-      "2": "How…? How can this be?!",
-      "3": "I was totally washed away!"
-    },
-    "defeat": {
-      "1": "The raging wave crashes again!",
-      "2": "Time to ride the wave of victory!",
-      "3": "Ehehe!"
-    }
-  },
-  "melony": {
-    "encounter": {
-      "1": "I'm not going to hold back!",
-      "2": "All righty, I suppose we should get started.",
-      "3": "I'll freeze you solid!"
-    },
-    "victory": {
-      "1": "You… You're pretty good, huh?",
-      "2": "If you find Gordie around, be sure to give him a right trashing, would you?",
-      "3": "I think you took breaking the ice a little too literally…"
-    },
-    "defeat": {
-      "1": "Now do you see how severe battles can be?",
-      "2": "Hee! Looks like I went and won again!",
-      "3": "Are you holding back?"
-    }
-  },
-  "marlon": {
-    "encounter": {
-      "1": "You look strong! Shoots! Let's start!",
-      "2": "I'm strong like the ocean's wide. You're gonna get swept away, fo' sho'.",
-      "3": "Oh ho, so I'm facing you! That's off the wall."
-    },
-    "victory": {
-      "1": "You totally rocked that! You're raising some wicked Pokémon. You got this Trainer thing down!",
-      "2": "You don't just look strong, you're strong fo' reals! Eh, I was swept away, too!",
-      "3": "You're strong as a gnarly wave!"
-    },
-    "defeat": {
-      "1": "You're tough, but it's not enough to sway the sea, 'K!",
-      "2": "Hee! Looks like I went and won again!",
-      "3": "Sweet, sweet victory!"
-    }
-  },
-  "shauntal": {
-    "encounter": {
-      "1": "Excuse me. You're a challenger, right?\nI'm the Elite Four's Ghost-type Pokémon user, Shauntal, and I shall be your opponent.",
-      "2": "I absolutely love writing about Trainers who come here and the Pokémon they train.\nCould I use you and your Pokémon as a subject?",
-      "3": "Every person who works with Pokémon has a story to tell.\nWhat story is about to be told?"
-    },
-    "victory": {
-      "1": "Wow. I'm dumbstruck!",
-      "2": "S-sorry! First, I must apologize to my Pokémon…\n\nI'm really sorry you had a bad experience because of me!",
-      "3": "Even in light of that, I'm still one of the Elite Four!"
-    },
-    "defeat": {
-      "1": "Eheh.",
-      "2": "That gave me excellent material for my next novel!",
-      "3": "And so, another tale ends…"
-    }
-  },
-  "marshal": {
-    "encounter": {
-      "1": "My mentor, Alder, sees your potential as a Trainer and is taking an interest in you.\nIt is my intention to test you--to take you to the limits of your strength. Kiai!",
-      "2": "Victory, decisive victory, is my intention! Challenger, here I come!",
-      "3": "In myself, I seek to develop the strength of a fighter and shatter any weakness in myself!\nPrevailing with the force of my convictions!"
-    },
-    "victory": {
-      "1": "Whew! Well done!",
-      "2": "As your battles continue, aim for even greater heights!",
-      "3": "The strength shown by you and your Pokémon has deeply impressed me…"
-    },
-    "defeat": {
-      "1": "Hmm.",
-      "2": "That was good battle.",
-      "3": "Haaah! Haaah! Haiyaaaah!"
-    }
-  },
-  "cheren": {
-    "encounter": {
-      "1": "You remind me of an old friend. That makes me excited about this Pokémon battle!",
-      "2": "Pokémon battles have no meaning if you don't think why you battle.\n$Or better said, it makes battling together with Pokémon meaningless.",
-      "3": "My name's Cheren! I'm a Gym Leader and a teacher! Pleasure to meet you."
-    },
-    "victory": {
-      "1": "Thank you! I saw what was missing in me.",
-      "2": "Thank you! I feel like I saw a little of the way toward my ideals.",
-      "3": "Hmm… This is problematic."
-    },
-    "defeat": {
-      "1": "As a Gym Leader, I aim to be a wall for you to overcome.",
-      "2": "All right!",
-      "3": "I made it where I am because Pokémon were by my side.\nPerhaps we need to think about why Pokémon help us not in terms of Pokémon and Trainers but as a relationship between living beings."
-    }
-  },
-  "chili": {
-    "encounter": {
-      "1": "Yeeeeooow! Time to play with FIRE!! I'm the strongest of us brothers!",
-      "2": "Ta-da! The Fire-type scorcher Chili--that's me--will be your opponent!",
-      "3": "I'm going to show you what me and my blazing Fire types can do!"
-    },
-    "victory": {
-      "1": "You got me. I am… burned… out…",
-      "2": "Whoa ho! You're on fire!",
-      "3": "Augh! You got me!"
-    },
-    "defeat": {
-      "1": "I'm on fire! Play with me, and you'll get burned!",
-      "2": "When you play with fire, you get burned!",
-      "3": "I mean, c'mon, your opponent was me! You didn't have a chance!"
-    }
-  },
-  "cilan": {
-    "encounter": {
-      "1": "Nothing personal... No hard feelings... Me and my Grass-type Pokémon will...\n$Um... We're gonna battle come what may.",
-      "2": "So, um, if you're OK with me, I'll, um, put everything I've got into being, er, you know, your opponent.",
-      "3": "OK… So, um, I'm Cilan, I like Grass-type Pokémon."
-    },
-    "victory": {
-      "1": "Er… Is it over now?",
-      "2": "…What a surprise. You are very strong, aren't you? \n$I guess my brothers wouldn't have been able to defeat you either…",
-      "3": "…Huh. Looks like my timing was, um, off?"
-    },
-    "defeat": {
-      "1": "Huh? Did I win?",
-      "2": "I guess… \n$I suppose I won, because I've been competing with my brothers Chili and Cress, and we all were able to get tougher.",
-      "3": "It…it was quite a thrilling experience…"
-    }
-  },
-  "roark": {
-    "encounter": {
-      "1": "I need to see your potential as a Trainer. And, I'll need to see the toughness of the Pokémon that battle with you!",
-      "2": "Here goes! These are my rocking Pokémon, my pride and joy!",
-      "3": "Rock-type Pokémon are simply the best!",
-      "4": "I need to see your potential as a Trainer. And, I'll need to see the toughness of the Pokémon that battle with you!"
-    },
-    "victory": {
-      "1": "W-what? That can't be! My buffed-up Pokémon!",
-      "2": "…We lost control there. Next time I'd like to challenge you to a Fossil-digging race underground.",
-      "3": "With skill like yours, it's natural for you to win.",
-      "4": "Wh-what?! It can't be! Even that wasn't enough?",
-      "5": "I blew it."
-    },
-    "defeat": {
-      "1": "See? I'm proud of my rocking battle style!",
-      "2": "Thanks! The battle gave me confidence that I may be able to beat my dad!",
-      "3": "I feel like I just smashed through a really stubborn boulder!"
-    }
-  },
-  "morty": {
-    "encounter": {
-      "1": "With a little more, I could see a future in which I meet the legendary Pokémon.\n$You're going to help me reach that level!",
-      "2": "It's said that a rainbow-hued Pokémon will come down to appear before a truly powerful Trainer. \n$I believed that tale, so I have secretly trained here all my life. As a result, I can now see what others cannot. \n$I see a shadow of the person who will make the Pokémon appear. \n$I believe that person is me! You're going to help me reach that level!",
-      "3": "Whether you choose to believe or not, mystic power does exist.",
-      "4": "You can bear witness to the fruits of my training.",
-      "5": "You must make your soul one with that of Pokémon. Can you do this?",
-      "6": "Say, do you want to be part of my training?"
-    },
-    "victory": {
-      "1": "I'm not good enough yet…",
-      "2": "I see… Your journey has taken you to far-away places and you have witnessed much more than I.\n$I envy you for that…",
-      "3": "How is this possible…",
-      "4": "I don't think our potentials are so different.\n$But you seem to have something more than that… So be it.",
-      "5": "Guess I need more training.",
-      "6": "That's a shame."
-    },
-    "defeat": {
-      "1": "I moved… one step ahead again.",
-      "2": "Fufufu…",
-      "3": "Wh-what?! It can't be! Even that wasn't enough?",
-      "4": "I feel like I just smashed through a really stubborn boulder!",
-      "5": "Ahahahah!",
-      "6": "I knew I would win!"
-    }
-  },
-  "crispin": {
-    "encounter": {
-      "1": "I wanna win, so that's exactly what I'll do!",
-      "2": "I battle because I wanna battle! And you know what? That's how it should be!"
-    },
-    "victory": {
-      "1": "I wanted to win…but I lost!",
-      "2": "I lost…'cause I couldn't win!"
-    },
-    "defeat": {
-      "1": "Hey, wait a sec. Did I just win? I think I just won! Talk about satisfying!",
-      "2": "Wooo! That was amazing!"
-    }
-  },
-  "amarys": {
-    "encounter": {
-      "1": "I want to be the one to help a certain person. That being the case, I cannot afford to lose.\n$… Our battle starts now."
-    },
-    "victory": {
-      "1": "I am… not enough, I see."
-    },
-    "defeat": {
-      "1": "Victory belongs to me. Well fought."
-    }
-  },
-  "lacey": {
-    "encounter": {
-      "1": "I'll be facing you with my usual party as a member of the Elite Four."
-    },
-    "victory": {
-      "1": "That was a great battle!"
-    },
-    "defeat": {
-      "1": "Let's give your Pokémon a nice round of applause for their efforts!"
-    }
-  },
-  "drayton": {
-    "encounter": {
-      "1": "Man, I love chairs. Don't you love chairs? What lifesavers. \n$I don't get why everyone doesn't just sit all the time. Standing up's tiring work!"
-    },
-    "victory": {
-      "1": "Guess I should've expected that!"
-    },
-    "defeat": {
-      "1": "Heh heh! Don't mind me, just scooping up a W over here. I get it if you're upset, but don't go full Kieran on me, OK?"
-    }
-  },
-  "ramos": {
-    "encounter": {
-      "1": "Did yeh enjoy the garden playground I made with all these sturdy plants o' mine?\n$Their strength is a sign o' my strength as a gardener and a Gym Leader! Yeh sure yer up to facing all that?"
-    },
-    "victory": {
-      "1": "Yeh believe in yer Pokémon… And they believe in yeh, too… It was a fine battle, sprout."
-    },
-    "defeat": {
-      "1": "Hohoho… Indeed. Frail little blades o' grass'll break through even concrete."
-    }
-  },
-  "viola": {
-    "encounter": {
-      "1": "Whether it's the tears of frustration that follow a loss or the blossoming of joy that comes with victory…\n$They're both great subjects for my camera! Fantastic! This'll be just fantastic! \n$Now come at me!",
-      "2": "My lens is always focused on victory--I won't let anything ruin this shot!"
-    },
-    "victory": {
-      "1": "You and your Pokémon have shown me a whole new depth of field! Fantastic! Just fantastic!",
-      "2": "The world you see through a lens, and the world you see with a Pokémon by your side…\n$The same world can look entirely different depending on your view."
-    },
-    "defeat": {
-      "1": "The photo from the moment of my victory will be a real winner, all right!",
-      "2": "Yes! I took some great photos!"
-    }
-  },
-  "candice": {
-    "encounter": {
-      "1": "You want to challenge Candice? Sure thing! I was waiting for someone tough! \n$But I should tell you, I'm tough because I know how to focus.",
-      "2": "Pokémon, fashion, romance… It's all about focus! \n$I'll show you just what I mean. Get ready to lose!"
-    },
-    "victory": {
-      "1": "I must say, I'm warmed up to you! I might even admire you a little.",
-      "2": "Wow! You're great! You've earned my respect! \n$I think your focus and will bowled us over totally. "
-    },
-    "defeat": {
-      "1": "I sensed your will to win, but I don't lose!",
-      "2": "See? Candice's focus! My Pokémon's focus is great, too!"
-    }
-  },
-  "gardenia": {
-    "encounter": {
-      "1": "You have a winning aura about you. So, anyway, this will be fun. Let's have our battle!"
-    },
-    "victory": {
-      "1": "Amazing! You're very good, aren't you?"
-    },
-    "defeat": {
-      "1": "Yes! My Pokémon and I are perfectly good!"
-    }
-  },
-  "aaron": {
-    "encounter": {
-      "1": "Ok! Let me take you on!"
-    },
-    "victory": {
-      "1": "Battling is a deep and complex affair…"
-    },
-    "defeat": {
-      "1": "Victory over an Elite Four member doesn't come easily."
-    }
-  },
-  "cress": {
-    "encounter": {
-      "1": "That is correct! It shall be I and my esteemed Water types that you must face in battle!"
-    },
-    "victory": {
-      "1": "Lose? Me? I don't believe this."
-    },
-    "defeat": {
-      "1": "This is the appropriate result when I'm your opponent."
-    }
-  },
-  "allister": {
-    "encounter": {
-      "1": "'M Allister.\nH-here… I go…"
-    },
-    "victory": {
-      "1": "I nearly lost my mask from the shock… That was…\n$Wow. I can see your skill for what it is."
-    },
-    "defeat": {
-      "1": "Th-that was ace!"
-    }
-  },
-  "clay": {
-    "encounter": {
-      "1": "Harrumph! Kept me waitin', didn't ya, kid? All right, time to see what ya can do!"
-    },
-    "victory": {
-      "1": "Man oh man… It feels good to go all out and still be defeated!"
-    },
-    "defeat": {
-      "1": "What's important is how ya react to losin'. \n$That's why folks who use losin' as fuel to get better are tough."
-    }
-  },
-  "kofu": {
-    "encounter": {
-      "1": "I'mma serve you a full course o' Water-type Pokémon! Don't try to eat 'em, though!"
-    },
-    "victory": {
-      "1": "Vaultin' Veluza! Yer a lively one, aren't ya! A little TOO lively, if I do say so myself!"
-    },
-    "defeat": {
-      "1": "You come back to see me again now, ya hear?"
-    }
-  },
-  "tulip": {
-    "encounter": {
-      "1": "Allow me to put my skills to use to make your cute little Pokémon even more beautiful!"
-    },
-    "victory": {
-      "1": "Your strength has a magic to it that cannot be washed away."
-    },
-    "defeat": {
-      "1": "You know, in my line of work, people who lack talent in one area or the other often fade away quickly—never to be heard of again."
-    }
-  },
-  "sidney": {
-    "encounter": {
-      "1": "I like that look you're giving me. I guess you'll give me a good match.\n$That's good! Looking real good! All right!\n$You and me, let's enjoy a battle that can only be staged here!"
-    },
-    "victory": {
-      "1": "Well, how do you like that? I lost! Eh, it was fun, so it doesn't matter."
-    },
-    "defeat": {
-      "1": "No hard feelings, alright?"
-    }
-  },
-  "phoebe": {
-    "encounter": {
-      "1": "While I trained, I gained the ability to commune with Ghost-type Pokémon. \n$Yes, the bond I developed with Pokémon is extremely tight. \n$So, come on, just try and see if you can even inflict damage on my Pokémon!"
-    },
-    "victory": {
-      "1": "Oh, darn. I've gone and lost."
-    },
-    "defeat": {
-      "1": "I look forward to battling you again sometime!"
-    }
-  },
-  "glacia": {
-    "encounter": {
-      "1": "All I have seen are challenges by weak Trainers and their Pokémon. \n$What about you? It would please me to no end if I could go all out against you!"
-    },
-    "victory": {
-      "1": "You and your Pokémon… How hot your spirits burn!\n$The all-consuming heat overwhelms. \n$It's no surprise that my icy skills failed to harm you."
-    },
-    "defeat": {
-      "1": "A fiercely passionate battle, indeed."
-    }
-  },
-  "drake": {
-    "encounter": {
-      "1": "For us to battle with Pokémon as partners, do you know what it takes? Do you know what is needed? \n$If you don't, then you will never prevail over me!"
-    },
-    "victory": {
-      "1": "Superb, it should be said."
-    },
-    "defeat": {
-      "1": "I gave my all for that battle!"
-    }
-  },
-  "wallace": {
-    "encounter": {
-      "1": "There's something about you… A difference in your demeanor. \n$I think I sense that in you. Now, show me. Show me the power you wield with your Pokémon. \n$And I, in turn, shall present you with a performance of illusions in water by me and my Pokémon!"
-    },
-    "victory": {
-      "1": "Bravo. I realize now your authenticity and magnificence as a Pokémon Trainer. \n$I find much joy in having met you and your Pokémon. You have proven yourself worthy."
-    },
-    "defeat": {
-      "1": "A grand illusion!"
-    }
-  },
-  "lorelei": {
-    "encounter": {
-      "1": "No one can best me when it comes to icy Pokémon! Freezing moves are powerful!\n$Your Pokémon will be at my mercy when they are frozen solid! Hahaha! Are you ready?"
-    },
-    "victory": {
-      "1": "How dare you!"
-    },
-    "defeat": {
-      "1": "There's nothing you can do once you're frozen."
-    }
-  },
-  "will": {
-    "encounter": {
-      "1": "I have trained all around the world, making my psychic Pokémon powerful.\n$I can only keep getting better! Losing is not an option!"
-    },
-    "victory": {
-      "1": "I… I can't… believe it…"
-    },
-    "defeat": {
-      "1": "That was close. I wonder what it is that you lack."
-    }
-  },
-  "malva": {
-    "encounter": {
-      "1": "I feel like my heart might just burst into flames. \n$I'm burning up with my hatred for you, runt!"
-    },
-    "victory": {
-      "1": "What news… So a new challenger has defeated Malva!"
-    },
-    "defeat": {
-      "1": "I am delighted! Yes, delighted that I could squash you beneath my heel."
-    }
-  },
-  "hala": {
-    "encounter": {
-      "1": "Old Hala is here to make you holler!"
-    },
-    "victory": {
-      "1": "I could feel the power you gained on your journey."
-    },
-    "defeat": {
-      "1": "Haha! What a delightful battle!"
-    }
-  },
-  "molayne": {
-    "encounter": {
-      "1": "I gave the captain position to my cousin Sophocles, but I'm confident in my ability. \n$My strength is like that of a supernova!"
-    },
-    "victory": {
-      "1": "I certainly found an interesting Trainer to face!"
-    },
-    "defeat": {
-      "1": "Ahaha. What an interesting battle."
-    }
-  },
-  "rika": {
-    "encounter": {
-      "1": "I'd say I'll go easy on you, but… I'd be lying! Think fast!"
-    },
-    "victory": {
-      "1": "Not bad, kiddo."
-    },
-    "defeat": {
-      "1": "Nahahaha! You really are something else, kiddo!"
-    }
-  },
-  "bruno": {
-    "encounter": {
-      "1": "We will grind you down with our superior power! Hoo hah!"
-    },
-    "victory": {
-      "1": "Why? How could I lose?"
-    },
-    "defeat": {
-      "1": "You can challenge me all you like, but the results will never change!"
-    }
-  },
-  "bugsy": {
-    "encounter": {
-      "1": "I'm Bugsy! I never lose when it comes to bug Pokémon!"
-    },
-    "victory": {
-      "1": "Whoa, amazing! You're an expert on Pokémon!\nMy research isn't complete yet. OK, you win."
-    },
-    "defeat": {
-      "1": "Thanks! Thanks to our battle, I was also able to make progress in my research!"
-    }
-  },
-  "koga_gym": {
-    "encounter": {
-      "1": "Fwahahaha! Very well, I shall show you true terror as a ninja master!"
-    },
-    "victory": {
-      "1": "Humph! You've proven your worth!"
-    },
-    "defeat": {
-      "1": "Despair to the creeping horror of Poison-type Pokémon!"
-    }
-  },
-  "koga": {
-    "encounter": {
-      "1": "Fwahahahaha! Pokémon are not merely about brute force--you shall see soon enough!"
-    },
-    "victory": {
-      "1": "Ah! You've proven your worth!"
-    },
-    "defeat": {
-      "1": "Have you learned to fear the techniques of the ninja?"
-    }
-  },
-  "bertha": {
-    "encounter": {
-      "1": "Well, would you show this old lady how much you've learned?"
-    },
-    "victory": {
-      "1": "Well! Dear child, I must say, that was most impressive. \n$Your Pokémon believed in you and did their best to earn you the win. \n$Even though I've lost, I find myself with this silly grin!"
-    },
-    "defeat": {
-      "1": "Hahahahah! Looks like this old lady won!"
-    }
-  },
-  "lenora": {
-    "encounter": {
-      "1": "Well then, challenger, I'm going to research how you battle with the Pokémon you've so lovingly raised!"
-    },
-    "victory": {
-      "1": "My theory about you was correct. You're more than just talented… You're motivated! I salute you!"
-    },
-    "defeat": {
-      "1": "Ah ha ha! If you lose, make sure to analyze why, and use that knowledge in your next battle!"
-    }
-  },
-  "siebold": {
-    "encounter": {
-      "1": "As long as I am alive, I shall strive onward to seek the ultimate cuisine... and the strongest opponents in battle!"
-    },
-    "victory": {
-      "1": "I shall store my memory of you and your Pokémon forever away within my heart."
-    },
-    "defeat": {
-      "1": "Our Pokémon battle was like food for my soul. It shall keep me going. \n$That is how I will pay my respects to you for giving your all in battle!"
-    }
-  },
-  "roxie": {
-    "encounter": {
-      "1": "Get ready! I'm gonna knock some sense outta ya!"
-    },
-    "victory": {
-      "1": "Wild! Your reason's already more toxic than mine!"
-    },
-    "defeat": {
-      "1": "Hey, c'mon! Get serious! You gotta put more out there!"
-    }
-  },
-  "olivia": {
-    "encounter": {
-      "1": "No introduction needed here. Time to battle me, Olivia!"
-    },
-    "victory": {
-      "1": "Really lovely… Both you and your Pokémon…"
-    },
-    "defeat": {
-      "1": "Mmm-hmm."
-    }
-  },
-  "poppy": {
-    "encounter": {
-      "1": "Oooh! Do you wanna have a Pokémon battle with me?"
-    },
-    "victory": {
-      "1": "Uagh?! Mmmuuuggghhh…"
-    },
-    "defeat": {
-      "1": "Yaaay! I did it! I de-feet-ed you! You can come for… For… An avenge match? \n$Come for an avenge match anytime you want!"
-    }
-  },
-  "agatha": {
-    "encounter": {
-      "1": "Pokémon are for battling! I'll show you how a real Trainer battles!"
-    },
-    "victory": {
-      "1": "Oh my! You're something special, child!"
-    },
-    "defeat": {
-      "1": "Bahaha. That's how a proper battle's done!"
-    }
-  },
-  "flint": {
-    "encounter": {
-      "1": "Hope you're warmed up, cause here comes the Big Bang!"
-    },
-    "victory": {
-      "1": "Incredible! Your moves are so hot, they make mine look lukewarm!"
-    },
-    "defeat": {
-      "1": "Huh? Is that it? I think you need a bit more passion."
-    }
-  },
-  "grimsley": {
-    "encounter": {
-      "1": "The winner takes everything, and there's nothing left for the loser."
-    },
-    "victory": {
-      "1": "When one loses, they lose everything… The next thing I'll look for will be victory, too!"
-    },
-    "defeat": {
-      "1": "If somebody wins, the person who fought against that person will lose."
-    }
-  },
-  "caitlin": {
-    "encounter": {
-      "1": "It's me who appeared when the flower opened up. You who have been waiting…\n$You look like a Pokémon Trainer with refined strength and deepened kindness. \n$What I look for in my opponent is superb strength… \n$Please unleash your power to the fullest!"
-    },
-    "victory": {
-      "1": "My Pokémon and I learned so much! I offer you my thanks."
-    },
-    "defeat": {
-      "1": "I aspire to claim victory with elegance and grace."
-    }
-  },
-  "diantha": {
-    "encounter": {
-      "1": "Battling against you and your Pokémon, all of you brimming with hope for the future… \n$Honestly, it just fills me up with energy I need to keep facing each new day! It does!"
-    },
-    "victory": {
-      "1": "Witnessing the noble spirits of you and your Pokémon in battle has really touched my heart…"
-    },
-    "defeat": {
-      "1": "Oh, fantastic! What did you think? My team was pretty cool, right?"
-    }
-  },
-  "wikstrom": {
-    "encounter": {
-      "1": "Well met, young challenger! Verily am I the famed blade of hardened steel, Duke Wikstrom! \n$Let the battle begin! En garde!"
-    },
-    "victory": {
-      "1": "Glorious! The trust that you share with your honorable Pokémon surpasses even mine!"
-    },
-    "defeat": {
-      "1": "What manner of magic is this? My heart, it doth hammer ceaselessly in my breast! \n$Winning against such a worthy opponent doth give my soul wings--thus do I soar!"
-    }
-  },
-  "acerola": {
-    "encounter": {
-      "1": "Battling is just plain fun! Come on, I can take you!"
-    },
-    "victory": {
-      "1": "I'm… I'm speechless! How did you do it?!"
-    },
-    "defeat": {
-      "1": "Ehaha! What an amazing victory!"
-    }
-  },
-  "larry_elite": {
-    "encounter": {
-      "1": "Hello there… It's me, Larry.\n$I serve as a member of the Elite Four too, yes… Unfortunately for me."
-    },
-    "victory": {
-      "1": "Well, that took the wind from under our wings…"
-    },
-    "defeat": {
-      "1": "It's time for a meeting with the boss."
-    }
-  },
-  "lance": {
-    "encounter": {
-      "1": "I've been waiting for you. Allow me to test your skill.",
-      "2": "I thought that you would be able to get this far. Let's get this started."
-    },
-    "victory": {
-      "1": "You got me. You are magnificent!",
-      "2": "I never expected another trainer to beat me… I'm surprised."
-    },
-    "defeat": {
-      "1": "That was close. Want to try again?",
-      "2": "It's not that you are weak. Don't let it bother you."
-    }
-  },
-  "karen": {
-    "encounter": {
-      "1": "I am Karen. Would you care for a showdown with my Dark-type Pokémon?",
-      "2": "I am unlike those you've already met.",
-      "3": "You've assembled a charming team. Our battle should be a good one."
-    },
-    "victory": {
-      "1": "No! I can't win. How did you become so strong?",
-      "2": "I will not stray from my chosen path.",
-      "3": "The Champion is looking forward to meeting you."
-    },
-    "defeat": {
-      "1": "That's about what I expected.",
-      "2": "Well, that was relatively entertaining.",
-      "3": "Come visit me anytime."
-    }
-  },
-  "milo": {
-    "encounter": {
-      "1": "Sure seems like you understand Pokémon real well. \n$This is gonna be a doozy of a battle! \n$I'll have to Dynamax my Pokémon if I want to win!"
-    },
-    "victory": {
-      "1": "The power of Grass has wilted… What an incredible Challenger!"
-    },
-    "defeat": {
-      "1": "This'll really leave you in shock and awe."
-    }
-  },
-  "lucian": {
-    "encounter": {
-      "1": "Just a moment, please. The book I'm reading has nearly reached its thrilling climax… \n$The hero has obtained a mystic sword and is about to face their final trial… Ah, never mind. \n$Since you've made it this far, I'll put that aside and battle you. \n$Let me see if you'll achieve as much glory as the hero of my book!"
-    },
-    "victory": {
-      "1": "I see… It appears you've put me in checkmate."
-    },
-    "defeat": {
-      "1": "I have a reputation to uphold."
-    }
-  },
-  "drasna": {
-    "encounter": {
-      "1": "You must be a strong Trainer. Yes, quite strong indeed…\n$That's just wonderful news! Facing opponents like you and your team will make my Pokémon grow like weeds!"
-    },
-    "victory": {
-      "1": "Oh, dear me. That sure was a quick battle… I do hope you'll come back again sometime!"
-    },
-    "defeat": {
-      "1": "How can this be?"
-    }
-  },
-  "kahili": {
-    "encounter": {
-      "1": "So, here you are… Why don't we see who the winds favor today, you… Or me?"
-    },
-    "victory": {
-      "1": "It's frustrating to me as a member of the Elite Four, but it seems your strength is the real deal."
-    },
-    "defeat": {
-      "1": "That was an ace!"
-    }
-  },
-  "hassel": {
-    "encounter": {
-      "1": "Prepare to learn firsthand how the fiery breath of ferocious battle feels!"
-    },
-    "victory": {
-      "1": "Fortune smiled on me this time, but… \n$Judging from how the match went, who knows if I will be so lucky next time."
-    },
-    "defeat": {
-      "1": "That was an ace!"
-    }
-  },
-  "blue": {
-    "encounter": {
-      "1": "You must be pretty good to get this far."
-    },
-    "victory": {
-      "1": "I've only lost to him and now to you… Him? Hee, hee…"
-    },
-    "defeat": {
-      "1": "See? My power is what got me here."
-    }
-  },
-  "piers": {
-    "encounter": {
-      "1": "Get ready for a mosh pit with me and my party! Spikemuth, it's time to rock!"
-    },
-    "victory": {
-      "1": "Me an' my team gave it our best. Let's meet up again for a battle some time…"
-    },
-    "defeat": {
-      "1": "My throat's ragged from shoutin'… But 'at was an excitin' battle!"
-    }
-  },
-  "red": {
-    "encounter": {
-      "1": "…!"
-    },
-    "victory": {
-      "1": "…?"
-    },
-    "defeat": {
-      "1": "…!"
-    }
-  },
-  "jasmine": {
-    "encounter": {
-      "1": "Oh… Your Pokémon are impressive. I think I will enjoy this."
-    },
-    "victory": {
-      "1": "You are truly strong. I'll have to try much harder, too."
-    },
-    "defeat": {
-      "1": "I never expected to win."
-    }
-  },
-  "lance_champion": {
-    "encounter": {
-      "1": "I am still the Champion. I won't hold anything back."
-    },
-    "victory": {
-      "1": "This is the emergence of a new Champion."
-    },
-    "defeat": {
-      "1": "I successfully defended my Championship."
-    }
-  },
-  "steven": {
-    "encounter": {
-      "1": "Tell me… What have you seen on your journey with your Pokémon? \n$What have you felt, meeting so many other Trainers out there? \n$Traveling this rich land… Has it awoken something inside you? \n$I want you to come at me with all that you've learned. \n$My Pokémon and I will respond in turn with all that we know!"
-    },
-    "victory": {
-      "1": "So I, the Champion, fall in defeat…"
-    },
-    "defeat": {
-      "1": "That was time well spent! Thank you!"
-    }
-  },
-  "cynthia": {
-    "encounter": {
-      "1": "I, Cynthia, accept your challenge! There won't be any letup from me!"
-    },
-    "victory": {
-      "1": "No matter how fun the battle is, it will always end sometime…"
-    },
-    "defeat": {
-      "1": "Even if you lose, never lose your love of Pokémon."
-    }
-  },
-  "iris": {
-    "encounter": {
-      "1": "Know what? I really look forward to having serious battles with strong Trainers! \n$I mean, come on! The Trainers who make it here are Trainers who desire victory with every fiber of their being! \n$And they are battling alongside Pokémon that have been through countless difficult battles! \n$If I battle with people like that, not only will I get stronger, my Pokémon will, too! \n$And we'll get to know each other even better! OK! Brace yourself! \n$I'm Iris, the Pokémon League Champion, and I'm going to defeat you!"
-    },
-    "victory": {
-      "1": "Aghhhh… I did my best, but we lost…"
-    },
-    "defeat": {
-      "1": "Yay! We won!"
-    }
-  },
-  "hau": {
-    "encounter": {
-      "1": "I wonder if a Trainer battles differently depending on whether they're from a warm region or a cold region.\n$Let's test it out!"
-    },
-    "victory": {
-      "1": "That was awesome! I think I kinda understand your vibe a little better now!"
-    },
-    "defeat": {
-      "1": "Ma-an, that was some kinda battle!"
-    }
-  },
-  "geeta": {
-    "encounter": {
-      "1": "I decided to throw my hat in the ring once more. \n$Come now… Show me the fruits of your training."
-    },
-    "victory": {
-      "1": "I eagerly await news of all your achievements!"
-    },
-    "defeat": {
-      "1": "What's the matter? This isn't all, is it?"
-    }
-  },
-  "nemona": {
-    "encounter": {
-      "1": "Yesss! I'm so psyched! Time for us to let loose!"
-    },
-    "victory": {
-      "1": "Well, that stinks, but I still had fun! I'll getcha next time!"
-    },
-    "defeat": {
-      "1": "Well, that was a great battle! Fruitful for sure."
-    }
-  },
-  "leon": {
-    "encounter": {
-      "1": "We're gonna have an absolutely champion time!"
-    },
-    "victory": {
-      "1": "My time as Champion is over… \n$But what a champion time it's been! \n$Thank you for the greatest battle I've ever had!"
-    },
-    "defeat": {
-      "1": "An absolute champion time, that was!"
-    }
-  },
-  "whitney": {
-    "encounter": {
-      "1": "Hey! Don't you think Pokémon are, like, super cute?"
-    },
-    "victory": {
-      "1": "Waaah! Waaah! You're so mean!"
-    },
-    "defeat": {
-      "1": "And that's that!"
-    }
-  },
-  "chuck": {
-    "encounter": {
-      "1": "Hah! You want to challenge me? Are you brave or just ignorant?"
-    },
-    "victory": {
-      "1": "You're strong! Would you please make me your apprentice?"
-    },
-    "defeat": {
-      "1": "There. Do you realize how much more powerful I am than you?"
-    }
-  },
-  "katy": {
-    "encounter": {
-      "1": "Don't let your guard down unless you would like to find yourself knocked off your feet!"
-    },
-    "victory": {
-      "1": "All of my sweet little Pokémon dropped like flies!"
-    },
-    "defeat": {
-      "1": "Eat up, my cute little Vivillon!"
-    }
-  },
-  "pryce": {
-    "encounter": {
-      "1": "Youth alone does not ensure victory! Experience is what counts."
-    },
-    "victory": {
-      "1": "Outstanding! That was perfect. Try not to forget what you feel now."
-    },
-    "defeat": {
-      "1": "Just as I envisioned."
-    }
-  },
-  "clair": {
-    "encounter": {
-      "1": "Do you know who I am? And you still dare to challenge me?"
-    },
-    "victory": {
-      "1": "I wonder how far you can get with your skill level. This should be fascinating."
-    },
-    "defeat": {
-      "1": "That's that."
-    }
-  },
-  "maylene": {
-    "encounter": {
-      "1": "I've come to challenge you now, and I won't hold anything back. \n$Please prepare yourself for battle!"
-    },
-    "victory": {
-      "1": "I admit defeat…"
-    },
-    "defeat": {
-      "1": "That was awesome."
-    }
-  },
-  "fantina": {
-    "encounter": {
-      "1": "You shall challenge me, yes? But I shall win. \n$That is what the Gym Leader of Hearthome does, non?"
-    },
-    "victory": {
-      "1": "You are so fantastically strong. I know why I have lost."
-    },
-    "defeat": {
-      "1": "I am so, so, very happy!"
-    }
-  },
-  "byron": {
-    "encounter": {
-      "1": "Trainer! You're young, just like my son, Roark. \n$With more young Trainers taking charge, the future of Pokémon is bright! \n$So, as a wall for young people, I'll take your challenge!"
-    },
-    "victory": {
-      "1": "Hmm! My sturdy Pokémon--defeated!"
-    },
-    "defeat": {
-      "1": "Gwahahaha! How were my sturdy Pokémon?!"
-    }
-  },
-  "olympia": {
-    "encounter": {
-      "1": "An ancient custom deciding one's destiny. The battle begins!"
-    },
-    "victory": {
-      "1": "Create your own path. Let nothing get in your way. Your fate, your future."
-    },
-    "defeat": {
-      "1": "Our path is clear now."
-    }
-  },
-  "volkner": {
-    "encounter": {
-      "1": "Since you've come this far, you must be quite strong…\n$I hope you're the Trainer who'll make me remember how fun it is to battle!"
-    },
-    "victory": {
-      "1": "You've got me beat…\n$Your desire and the noble way your Pokémon battled for you… \n$I even felt thrilled during our match. That was a very good battle."
-    },
-    "defeat": {
-      "1": "It was not shocking at all… \n$That is not what I wanted!"
-    }
-  },
-  "burgh": {
-    "encounter": {
-      "1": "M'hm… If I win this battle, I feel like I can draw a picture unlike any before it. \n$OK! I can hear my battle muse loud and clear. Let's get straight to it!",
-      "2": "Of course, I'm really proud of all of my Pokémon! \n$Well now… Let's get right to it!"
-    },
-    "victory": {
-      "1": "Is it over? Has my muse abandoned me?",
-      "2": "Hmm… It's over! You're incredible!"
-    },
-    "defeat": {
-      "1": "Wow… It's beautiful somehow, isn't it…",
-      "2": "Sometimes I hear people say something was an ugly win. \n$I think if you're trying your best, any win is beautiful."
-    }
-  },
-  "elesa": {
-    "encounter": {
-      "1": "C'est fini! When I'm certain of that, I feel an electric jolt run through my body! \n$I want to feel the sensation, so now my beloved Pokémon are going to make your head spin!"
-    },
-    "victory": {
-      "1": "I meant to make your head spin, but you shocked me instead."
-    },
-    "defeat": {
-      "1": "That was unsatisfying somehow… Will you give it your all next time?"
-    }
-  },
-  "skyla": {
-    "encounter": {
-      "1": "It's finally time for a showdown! That means the Pokémon battle that decides who's at the top, right? \n$I love being on the summit! 'Cause you can see forever and ever from high places! \n$So, how about you and I have some fun?"
-    },
-    "victory": {
-      "1": "Being your opponent in battle is a new source of strength to me. Thank you!"
-    },
-    "defeat": {
-      "1": "Win or lose, you always gain something from a battle, right?"
-    }
-  },
-  "brycen": {
-    "encounter": {
-      "1": "There is also strength in being with other people and Pokémon. \n$Receiving their support makes you stronger. I'll show you this power!"
-    },
-    "victory": {
-      "1": "The wonderful combination of you and your Pokémon! What a beautiful friendship!"
-    },
-    "defeat": {
-      "1": "Extreme conditions really test you and train you!"
-    }
-  },
-  "drayden": {
-    "encounter": {
-      "1": "What I want to find is a young Trainer who can show me a bright future. \n$Let's battle with everything we have: your skill, my experience, and the love we've raised our Pokémon with!"
-    },
-    "victory": {
-      "1": "This intense feeling that floods me after a defeat… I don't know how to describe it."
-    },
-    "defeat": {
-      "1": "Harrumph! I know your ability is greater than that!"
-    }
-  },
-  "grant": {
-    "encounter": {
-      "1": "There is only one thing I wish for. \n$That by surpassing one another, we find a way to even greater heights."
-    },
-    "victory": {
-      "1": "You are a wall that I am unable to surmount!"
-    },
-    "defeat": {
-      "1": "Do not give up. \n$That is all there really is to it. \n$The most important lessons in life are simple."
-    }
-  },
-  "korrina": {
-    "encounter": {
-      "1": "Time for Lady Korrina's big appearance!"
-    },
-    "victory": {
-      "1": "It's your very being that allows your Pokémon to evolve!"
-    },
-    "defeat": {
-      "1": "What an explosive battle!"
-    }
-  },
-  "clemont": {
-    "encounter": {
-      "1": "Oh! I'm glad that we got to meet!"
-    },
-    "victory": {
-      "1": "Your passion for battle inspires me!"
-    },
-    "defeat": {
-      "1": "Looks like my Trainer-Grow-Stronger Machine, Mach 2 is really working!"
-    }
-  },
-  "valerie": {
-    "encounter": {
-      "1": "Oh, if it isn't a young Trainer… It is lovely to get to meet you like this. \n$Then I suppose you have earned yourself the right to a battle, as a reward for your efforts. \n$The elusive Fairy may appear frail as the breeze and delicate as a bloom, but it is strong."
-    },
-    "victory": {
-      "1": "I hope that you will find things worth smiling about tomorrow…"
-    },
-    "defeat": {
-      "1": "Oh goodness, what a pity…"
-    }
-  },
-  "wulfric": {
-    "encounter": {
-      "1": "You know what? We all talk big about what you learn from battling and bonds and all that…\n$But really, I just do it 'cause it's fun. \n$Who cares about the grandstanding? Let's get to battling!"
-    },
-    "victory": {
-      "1": "Outstanding! I'm tough as an iceberg, but you smashed me through and through!"
-    },
-    "defeat": {
-      "1": "Tussle with me and this is what happens!"
-    }
-  },
-  "kabu": {
-    "encounter": {
-      "1": "Every Trainer and Pokémon trains hard in pursuit of victory. \n$But that means your opponent is also working hard to win. \n$In the end, the match is decided by which side is able to unleash their true potential."
-    },
-    "victory": {
-      "1": "I'm glad I could battle you today!"
-    },
-    "defeat": {
-      "1": "That's a great way for me to feel my own growth!"
-    }
-  },
-  "bea": {
-    "encounter": {
-      "1": "Do you have an unshakable spirit that won't be moved, no matter how you are attacked? \n$I think I'll just test that out, shall I?"
-    },
-    "victory": {
-      "1": "I felt the fighting spirit of your Pokémon as you led them in battle."
-    },
-    "defeat": {
-      "1": "That was the best sort of match anyone could ever hope for."
-    }
-  },
-  "opal": {
-    "encounter": {
-      "1": "Let me have a look at how you and your partner Pokémon behave!"
-    },
-    "victory": {
-      "1": "Your pink is still lacking, but you're an excellent Trainer with excellent Pokémon."
-    },
-    "defeat": {
-      "1": "Too bad for you, I guess."
-    }
-  },
-  "bede": {
-    "encounter": {
-      "1": "I suppose I should prove beyond doubt just how pathetic you are and how strong I am."
-    },
-    "victory": {
-      "1": "I see… Well, that's fine. I wasn't really trying all that hard anyway."
-    },
-    "defeat": {
-      "1": "Not a bad job, I suppose."
-    }
-  },
-  "gordie": {
-    "encounter": {
-      "1": "So, let's get this over with."
-    },
-    "victory": {
-      "1": "I just want to climb into a hole… Well, I guess it'd be more like falling from here."
-    },
-    "defeat": {
-      "1": "Battle like you always do, victory will follow!"
-    }
-  },
-  "marnie": {
-    "encounter": {
-      "1": "The truth is, when all's said and done… I really just wanna become Champion for myself! \n$So don't take it personal when I kick your butt!"
-    },
-    "victory": {
-      "1": "OK, so I lost… But I got to see a lot of the good points of you and your Pokémon!"
-    },
-    "defeat": {
-      "1": "Hope you enjoyed our battle tactics."
-    }
-  },
-  "raihan": {
-    "encounter": {
-      "1": "I'm going to defeat the Champion, win the whole tournament, and prove to the world just how strong the great Raihan really is!"
-    },
-    "victory": {
-      "1": "I look this good even when I lose. \n$It's a real curse. \n$Guess it's time for another selfie!"
-    },
-    "defeat": {
-      "1": "Let's take a selfie to remember this."
-    }
-  },
-  "brassius": {
-    "encounter": {
-      "1": "I assume you are ready? Let our collaborative work of art begin!"
-    },
-    "victory": {
-      "1": "Ahhh…vant-garde!"
-    },
-    "defeat": {
-      "1": "I will begin on a new piece at once!"
-    }
-  },
-  "iono": {
-    "encounter": {
-      "1": "How're ya feelin' about this battle?\n$...\n$Let's get this show on the road! How strong is our challenger? \n$I 'unno! Let's find out together!"
-    },
-    "victory": {
-      "1": "You're as flashy and bright as a 10,000,000-volt Thunderbolt, friendo!"
-    },
-    "defeat": {
-      "1": "Your eyeballs are MINE!"
-    }
-  },
-  "larry": {
-    "encounter": {
-      "1": "When all's said and done, simplicity is strongest."
-    },
-    "victory": {
-      "1": "A serving of defeat, huh?"
-    },
-    "defeat": {
-      "1": "I'll call it a day."
-    }
-  },
-  "ryme": {
-    "encounter": {
-      "1": "Come on, baby! Rattle me down to the bone!"
-    },
-    "victory": {
-      "1": "You're cool, my friend—you move my SOUL!"
-    },
-    "defeat": {
-      "1": "Later, baby!"
-    }
-  },
-  "grusha": {
-    "encounter": {
-      "1": "All I need to do is make sure the power of my Pokémon chills you to the bone!"
-    },
-    "victory": {
-      "1": "Your burning passion… I kinda like it, to be honest."
-    },
-    "defeat": {
-      "1": "Things didn't heat up for you."
-    }
-  },
-  "marnie_elite": {
-    "encounter": {
-      "1": "You've made it this far, huh? Let's see if you can handle my Pokémon!",
-      "2": "I'll give it my best shot, but don't think I'll go easy on you!"
-    },
-    "victory": {
-      "1": "I can't believe I lost... But you deserved that win. Well done!",
-      "2": "Looks like I've still got a lot to learn. Great battle, though!"
-    },
-    "defeat": {
-      "1": "You put up a good fight, but I've got the edge! Better luck next time!",
-      "2": "Seems like my training's paid off. Thanks for the battle!"
-    }
-  },
-  "nessa_elite": {
-    "encounter": {
-      "1": "The tides are turning in my favor. Ready to get swept away?",
-      "2": "Let's make some waves with this battle! I hope you're prepared!"
-    },
-    "victory": {
-      "1": "You navigated those waters perfectly... Well done!",
-      "2": "Looks like my currents were no match for you. Great job!"
-    },
-    "defeat": {
-      "1": "Water always finds a way. That was a refreshing battle!",
-      "2": "You fought well, but the ocean's power is unstoppable!"
-    }
-  },
-  "bea_elite": {
-    "encounter": {
-      "1": "Prepare yourself! My fighting spirit burns bright!",
-      "2": "Let's see if you can keep up with my relentless pace!"
-    },
-    "victory": {
-      "1": "Your strength... It's impressive. You truly deserve this win.",
-      "2": "I've never felt this intensity before. Amazing job!"
-    },
-    "defeat": {
-      "1": "Another victory for my intense training regimen! Well done!",
-      "2": "You've got strength, but I trained harder. Great battle!"
-    }
-  },
-  "allister_elite": {
-    "encounter": {
-      "1": "Shadows fall... Are you ready to face your fears?",
-      "2": "Let's see if you can handle the darkness that I command."
-    },
-    "victory": {
-      "1": "You've dispelled the shadows... For now. Well done.",
-      "2": "Your light pierced through my darkness. Great job."
-    },
-    "defeat": {
-      "1": "The shadows have spoken... Your strength isn't enough.",
-      "2": "Darkness triumphs... Maybe next time you'll see the light."
-    }
-  },
-  "raihan_elite": {
-    "encounter": {
-      "1": "Storm's brewing! Let's see if you can weather this fight!",
-      "2": "Get ready to face the eye of the storm!"
-    },
-    "victory": {
-      "1": "You've bested the storm... Incredible job!",
-      "2": "You rode the winds perfectly... Great battle!"
-    },
-    "defeat": {
-      "1": "Another storm weathered, another victory claimed! Well fought!",
-      "2": "You got caught in my storm! Better luck next time!"
-    }
-  },
-  "alder": {
-    "encounter": {
-      "1": "Prepare yourself for a match against the strongest Trainer in Unova!"
-    },
-    "victory": {
-      "1": "Well done! You certainly are an unmatched talent."
-    },
-    "defeat": {
-      "1": "A fresh wind blows through my heart...\n$What an extraordinary effort!"
-    }
-  },
-  "kieran": {
-    "encounter": {
-      "1": "Through hard work, I become stronger and stronger!\n$I don't lose."
-    },
-    "victory": {
-      "1": "I don't believe it...\n$What a fun and heart-pounding battle!"
-    },
-    "defeat": {
-      "1": "Wowzers, what a battle!\n$Time for you to train even harder."
-    }
-  },
-  "rival": {
-    "encounter": {
-      "1": "@c{smile}Hey, I was looking for you! I knew you were eager to get going but I expected at least a goodbye…$@c{smile_eclosed}So you're really pursuing your dream after all? I almost can't believe it.$@c{serious_smile_fists}Since we're here, how about a battle?After all, I want to make sure you're ready.$@c{serious_mopen_fists}Don't hold back, I want you to give me everything you've got!"
-    },
-    "victory": {
-      "1": "@c{shock}Wow… You cleaned me out.Are you actually a beginner?$@c{smile}Maybe it was a bit of luck but…Who knows you might just be able to go all the way.$By the way, the professor asked me to give you these items. They look pretty cool.$@c{serious_smile_fists}Good luck out there!"
-    }
-  },
-  "rival_female": {
-    "encounter": {
-      "1": "@c{smile_wave}There you are! I've been looking everywhere for you!\n@c{angry_mopen}Did you forget to say goodbye to your best friend?\n$@c{smile_ehalf}You're going after your dream, huh?\nThat day is really today isn't it…\n$@c{smile}Anyway, I'll forgive you for forgetting me, but on one condition. @c{smile_wave_wink}You have to battle me!\n$@c{angry_mopen}Give it your all! Wouldn't want your adventure to be over before it started, right?"
-    },
-    "victory": {
-      "1": "@c{shock}You just started and you're already this strong?!@d{96}\n@c{angry}You totally cheated, didn't you?\n$@c{smile_wave_wink}Just kidding!@d{64} @c{smile_eclosed}I lost fair and square… I have a feeling you're going to do really well out there.\n$@c{smile}By the way, the professor wanted me to give you some items. Hopefully they're helpful!\n$@c{smile_wave}Do your best like always! I believe in you!\n"
-    }
-  },
-  "rival_2": {
-    "encounter": {
-      "1": "@c{smile}Hey, you're here too?\n@c{smile_eclosed}Still a perfect record, huh…?\n$@c{serious_mopen_fists}I know it kind of looks like I followed you here, but that's mostly not true.\n$@c{serious_smile_fists}Honestly though, I've been itching for a rematch since you beat me back at home.\n$I've been doing a lot of my own training so I'll definitely put up a fight this time.\n$@c{serious_mopen_fists}Don't hold back, just like before!\nLet's go!"
-    },
-    "victory": {
-      "1": "@c{neutral_eclosed}Oh. I guess I was overconfident.\n$@c{smile}That's alright, though. I figured this might happen.\n@c{serious_mopen_fists}It just means I need to try harder for next time!\n\n$@c{smile}Oh, not that you really need the help, but I had an extra one of each of these lying around and figured you might want them.\n\n$@c{serious_smile_fists}Don't expect another one after this, though!\nI can't keep giving my opponent an advantage after all."
-    }
-  },
-  "rival_2_female": {
-    "encounter": {
-      "1": "@c{smile_wave}Oh, fancy meeting you here. Looks like you're still undefeated. @c{angry_mopen}Huh… Not bad!\n$@c{angry_mopen}I know what you're thinking, and no, I wasn't creeping on you. @c{smile_eclosed}I just happened to be in the area.\n$@c{smile_ehalf}I'm happy for you but I just want to let you know that it's OK to lose sometimes.\n$@c{smile}We learn from our mistakes, often more than we would if we kept succeeding.\n$@c{angry_mopen}In any case, I've been training hard for our rematch, so you'd better give it your all!"
-    },
-    "victory": {
-      "1": "@c{neutral}I… wasn't supposed to lose that time…\n$@c{smile}Aw well. That just means I'll have to train even harder for next time!\n$@c{smile_wave}I also got you another two of these!\n@c{smile_wave_wink}No need to thank me~.\n$@c{angry_mopen}This is the last one, though! You won't be getting anymore freebies from me after this!"
-    },
-    "defeat": {
-      "1": "It's OK to lose sometimes…"
-    }
-  },
-  "rival_3": {
-    "encounter": {
-      "1": "@c{smile}Hey, look who it is! It's been a while.\n@c{neutral}You're… still undefeated? Huh.\n$@c{neutral_eclosed}Things have been kind of… strange.\nIt's not the same back home without you.\n$@c{serious}I know it's selfish, but I need to get this off my chest.\n@c{neutral_eclosed}I think you're in over your head here.\n$@c{serious}Never losing once is just unrealistic.\nWe need to lose sometimes in order to grow.\n$@c{neutral_eclosed}You've had a great run but there's still so much ahead, and it only gets harder. @c{neutral}Are you prepared for that?\n$@c{serious_mopen_fists}If so, prove it to me."
-    },
-    "victory": {
-      "1": "@c{angry_mhalf}This is ridiculous… I've hardly stopped training…\nHow are we still so far apart?"
-    }
-  },
-  "rival_3_female": {
-    "encounter": {
-      "1": "@c{smile_wave}Long time no see! Still haven't lost, huh.\n@c{angry}You're starting to get on my nerves. @c{smile_wave_wink}Just kidding!\n$@c{smile_ehalf}But really, don't you miss home by now? Or… me?\nI… I mean, we've really missed you.\n$@c{smile_eclosed}I support you in your dream and everything, but the reality is you're going to lose sooner or later.\n$@c{smile}And when you do, I'll be there for you like always.\n@c{angry_mopen}Now, let me show you how strong I've become!"
-    },
-    "victory": {
-      "1": "@c{shock}After all that… it wasn't enough…?\nYou'll never come back at this rate…"
-    },
-    "defeat": {
-      "1": "You gave it your best, now let's go home."
-    }
-  },
-  "rival_4": {
-    "encounter": {
-      "1": "@c{neutral}Hey.\n$I won't mince words or pleasantries with you.\n@c{neutral_eclosed}I'm here to win, plain and simple.\n$@c{serious_mhalf_fists}I've learned to maximize my potential by putting all my time into training.\n$@c{smile}You get a lot of extra time when you cut out the unnecessary sleep and social interaction.\n$@c{serious_mopen_fists}None of that matters anymore, not until I win.\n$@c{neutral_eclosed}I've even reached the point where I don't lose anymore.\n@c{smile_eclosed}I suppose your philosophy wasn't so wrong after all.\n$@c{angry_mhalf}Losing is for the weak, and I'm not weak anymore.\n$@c{serious_mopen_fists}Prepare yourself."
-    },
-    "victory": {
-      "1": "@c{neutral}What…@d{64} What are you?"
-    }
-  },
-  "rival_4_female": {
-    "encounter": {
-      "1": "@c{neutral}It's me! You didn't forget about me again… did you?\n$@c{smile}You should be proud of how far you made it. Congrats!\nBut it looks like it's the end of your journey.\n$@c{smile_eclosed}You've awoken something in me I never knew was there.\nIt seems like all I do now is train.\n$@c{smile_ehalf}I hardly even eat or sleep now, I just train my Pokémon all day, getting stronger every time.\n$@c{neutral}In fact, I… hardly recognize myself.\n$And now, I've finally reached peak performance.\nI don't think anyone could beat me now.\n$And you know what? It's all because of you.\n@c{smile_ehalf}I don't know whether to thank you or hate you.\n$@c{angry_mopen}Prepare yourself."
-    },
-    "victory": {
-      "1": "@c{neutral}What…@d{64} What are you?"
-    },
-    "defeat": {
-      "1": "$@c{smile}You should be proud of how far you made it."
-    }
-  },
-  "rival_5": {
-    "encounter": {
-      "1": "@c{neutral}…"
-    },
-    "victory": {
-      "1": "@c{neutral}…"
-    }
-  },
-  "rival_5_female": {
-    "encounter": {
-      "1": "@c{neutral}…"
-    },
-    "victory": {
-      "1": "@c{neutral}…"
-    },
-    "defeat": {
-      "1": "$@c{smile_ehalf}…"
-    }
-  },
-  "rival_6": {
-    "encounter": {
-      "1": "@c{smile_eclosed}We meet again.\n$@c{neutral}I've had some time to reflect on all this.\nThere's a reason this all seems so strange.\n$@c{neutral_eclosed}Your dream, my drive to beat you…\nIt's all a part of something greater.\n$@c{serious}This isn't about me, or about you… This is about the world, @c{serious_mhalf_fists}and it's my purpose to push you to your limits.\n$@c{neutral_eclosed}Whether I've fulfilled that purpose I can't say, but I've done everything in my power.\n$@c{neutral}This place we ended up in is terrifying… Yet somehow I feel unphased, like I've been here before.\n$@c{serious_mhalf_fists}You feel the same, don't you?\n$@c{serious}…and it's like something here is speaking to me.\nThis is all the world's known for a long time now.\n$Those times we cherished together that seem so recent are nothing but a distant memory.\n$@c{neutral_eclosed}Who can say whether they were ever even real in the first place.\n$@c{serious_mopen_fists}You need to keep pushing, because if you don't, it will never end. You're the only one who can do this.\n$@c{serious_smile_fists}I hardly know what any of this means, I just know that it's true.\n$@c{serious_mopen_fists}If you can't defeat me here and now, you won't stand a chance."
-    },
-    "victory": {
-      "1": "@c{smile_eclosed}It looks like my work is done here.\n$I want you to promise me one thing.\n@c{smile}After you heal the world, please come home."
-    }
-  },
-  "rival_6_female": {
-    "encounter": {
-      "1": "@c{smile_ehalf}So it's just us again.\n$@c{smile_eclosed}You know, I keep going around and around in my head…\n$@c{smile_ehalf}There's something to all this, why everything seems so strange now…\n$@c{smile}You have your dream, and I have this ambition in me…\n$I just can't help but feel there's a greater purpose to all this, to what we're doing, you and I.\n$@c{smile_eclosed}I think I'm supposed to push you… to your limits.\n$@c{smile_ehalf}I'm not sure if I've been doing a good job at that, but I've tried my best up to now.\n$It's something about this strange and dreadful place… Everything seems so clear…\n$This… is all the world's known for a long time now.\n$@c{smile_eclosed}It's like I can barely remember the memories we cherished together.\n$@c{smile_ehalf}Were they even real? They seem so far away now…\n$@c{angry_mopen}You need to keep pushing, because if you don't, it will never end. You're the only one who can do this.\n$@c{smile_ehalf}I… don't know what all this means… but I feel it's true.\n$@c{neutral}If you can't defeat me here and now, you won't stand a chance."
-    },
-    "victory": {
-      "1": "@c{smile_ehalf}I… I think I fulfilled my purpose…\n$@c{smile_eclosed}Promise me… After you heal the world… Please… come home safe.\n$@c{smile_ehalf}…Thank you."
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/locales/en/dialogue-final-boss-male.json b/src/locales/en/dialogue-final-boss-male.json
deleted file mode 100644
index 2e03b6e15e3..00000000000
--- a/src/locales/en/dialogue-final-boss-male.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "encounter": "It appears the time has finally come once again.\nYou know why you have come here, do you not?\n$You were drawn here, because you have been here before.\nCountless times.\n$Though, perhaps it can be counted.\nTo be precise, this is in fact your {{cycleCount}} cycle.\n$Each cycle your mind reverts to its former state.\nEven so, somehow, remnants of your former selves remain.\n$Until now you have yet to succeed, but I sense a different presence in you this time.\n\n$You are the only one here, though it is as if there is… another.\n$Will you finally prove a formidable challenge to me?\nThe challenge I have longed after for millennia?\n$We begin.",
-  "firstStageWin": "I see. The presence I felt was indeed real.\nIt appears I no longer need to hold back.\n$Do not disappoint me.",
-  "secondStageWin": "…Magnificent."
-}
\ No newline at end of file
diff --git a/src/locales/en/dialogue-final-boss-female.json b/src/locales/en/dialogue-final-boss.json
similarity index 96%
rename from src/locales/en/dialogue-final-boss-female.json
rename to src/locales/en/dialogue-final-boss.json
index 2e03b6e15e3..48a5aa439f3 100644
--- a/src/locales/en/dialogue-final-boss-female.json
+++ b/src/locales/en/dialogue-final-boss.json
@@ -1,5 +1,6 @@
 {
   "encounter": "It appears the time has finally come once again.\nYou know why you have come here, do you not?\n$You were drawn here, because you have been here before.\nCountless times.\n$Though, perhaps it can be counted.\nTo be precise, this is in fact your {{cycleCount}} cycle.\n$Each cycle your mind reverts to its former state.\nEven so, somehow, remnants of your former selves remain.\n$Until now you have yet to succeed, but I sense a different presence in you this time.\n\n$You are the only one here, though it is as if there is… another.\n$Will you finally prove a formidable challenge to me?\nThe challenge I have longed after for millennia?\n$We begin.",
+  "encounter_female": null,
   "firstStageWin": "I see. The presence I felt was indeed real.\nIt appears I no longer need to hold back.\n$Do not disappoint me.",
   "secondStageWin": "…Magnificent."
 }
\ No newline at end of file
diff --git a/src/locales/en/dialogue-misc-male.json b/src/locales/en/dialogue-misc-male.json
deleted file mode 100644
index f5c63a85410..00000000000
--- a/src/locales/en/dialogue-misc-male.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "ending": "@c{smile}Oh? You won?@d{96} @c{smile_eclosed}I guess I should've known.\nBut, you're back now.\n$@c{smile}It's over.@d{64} You ended the loop.\n$@c{serious_smile_fists}You fulfilled your dream too, didn't you?\nYou didn't lose even once.\n$@c{neutral}I'm the only one who'll remember what you did.@d{96}\nI guess that's okay, isn't it?\n$@c{serious_smile_fists}Your legend will always live on in our hearts.\n$@c{smile_eclosed}Anyway, I've had about enough of this place, haven't you? Let's head home.\n$@c{serious_smile_fists}Maybe when we get back, we can have another battle?\nIf you're up to it.",
-  "ending_female": "@c{shock}You're back?@d{32} Does that mean…@d{96} you won?!\n@c{smile_ehalf}I should have known you had it in you.\n$@c{smile_eclosed}Of course… I always had that feeling.\n@c{smile}It's over now, right? You ended the loop.\n$@c{smile_ehalf}You fulfilled your dream too, didn't you?\nYou didn't lose even once.\n$I'll be the only one to remember what you did.\n@c{angry_mopen}I'll try not to forget!\n$@c{smile_wave_wink}Just kidding!@d{64} @c{smile}I'd never forget.@d{32}\nYour legend will live on in our hearts.\n$@c{smile_wave}Anyway,@d{64} it's getting late…@d{96} I think?\nIt's hard to tell in this place.\n$Let's go home. @c{smile_wave_wink}Maybe tomorrow, we can have another battle, for old time's sake?",
-  "ending_endless": "Congratulations on reaching the current end!\nMore content is coming soon.",
-  "ending_name": "Devs"
-}
\ No newline at end of file
diff --git a/src/locales/en/dialogue-misc-female.json b/src/locales/en/dialogue-misc.json
similarity index 100%
rename from src/locales/en/dialogue-misc-female.json
rename to src/locales/en/dialogue-misc.json
diff --git a/src/locales/en/dialogue-male.json b/src/locales/en/dialogue.json
similarity index 88%
rename from src/locales/en/dialogue-male.json
rename to src/locales/en/dialogue.json
index 9eb1d100404..d65397ee4f3 100644
--- a/src/locales/en/dialogue-male.json
+++ b/src/locales/en/dialogue.json
@@ -3,24 +3,31 @@
     "encounter": {
       "1": "Hey, wanna battle?",
       "2": "Are you a new trainer too?",
+      "2_female": null,
       "3": "Hey, I haven't seen you before. Let's battle!",
       "4": "I just lost, so I'm trying to find more Pokémon.\nWait! You look weak! Come on, let's battle!",
+      "4_female": null,
       "5": "Have we met or not? I don't really remember. Well, I guess it's nice to meet you anyway!",
       "6": "All right! Let's go!",
       "7": "All right! Here I come! I'll show you my power!",
       "8": "Haw haw haw... I'll show you how hawesome my Pokémon are!",
       "9": "No need to waste time saying hello. Bring it on whenever you're ready!",
+      "9_female": null,
       "10": "Don't let your guard down, or you may be crying when a kid beats you.",
       "11": "I've raised my Pokémon with great care. You're not allowed to hurt them!",
       "12": "Glad you made it! It won't be an easy job from here.",
-      "13": "The battles continue forever! Welcome to the world with no end!"
+      "12_female": null,
+      "13": "The battles continue forever! Welcome to the world with no end!",
+      "13_female": null
     },
     "victory": {
       "1": "Wow! You're strong!",
+      "1_female": null,
       "2": "I didn't stand a chance, huh?",
       "3": "I'll find you again when I'm older and beat you!",
       "4": "Ugh. I don't have any more Pokémon.",
       "5": "No way… NO WAY! How could I lose again…",
+      "5_female": null,
       "6": "No! I lost!",
       "7": "Whoa! You are incredible! I'm amazed and surprised!",
       "8": "Could it be… How… My Pokémon and I are the strongest, though…",
@@ -35,10 +42,12 @@
     "encounter": {
       "1": "Let's have a battle, shall we?",
       "2": "You look like a new trainer. Let's have a battle!",
+      "2_female": null,
       "3": "I don't recognize you. How about a battle?",
       "4": "Let's have a fun Pokémon battle!",
       "5": "I'll show you the ropes of how to really use Pokémon!",
       "6": "A serious battle starts from a serious beginning! Are you sure you're ready?",
+      "6_female": null,
       "7": "You're only young once. And you only get one shot at a given battle. Soon, you'll be nothing but a memory.",
       "8": "You'd better go easy on me, OK? Though I'll be seriously fighting!",
       "9": "School is boring. I've got nothing to do. Yawn. I'm only battling to kill the time."
@@ -46,12 +55,15 @@
     "victory": {
       "1": "That was impressive! I've got a lot to learn.",
       "2": "I didn't think you'd beat me that bad…",
+      "2_female": null,
       "3": "I hope we get to have a rematch some day.",
       "4": "That was pretty amazingly fun! You've totally exhausted me…",
       "5": "You actually taught me a lesson! You're pretty amazing!",
       "6": "Seriously, I lost. That is, like, seriously depressing, but you were seriously cool.",
+      "6_female": null,
       "7": "I don't need memories like this. Deleting memory…",
       "8": "Hey! I told you to go easy on me! Still, you're pretty cool when you're serious.",
+      "8_female": null,
       "9": "I'm actually getting tired of battling… There's gotta be something new to do…"
     }
   },
@@ -142,6 +154,7 @@
   "ace_trainer": {
     "encounter": {
       "1": "You seem quite confident.",
+      "1_female": null,
       "2": "Your Pokémon… Show them to me…",
       "3": "Because I'm an Ace Trainer, people think I'm strong.",
       "4": "Are you aware of what it takes to be an Ace Trainer?"
@@ -150,7 +163,9 @@
       "1": "Yes… You have good Pokémon…",
       "2": "What?! But I'm a battling genius!",
       "3": "Of course, you are the main character!",
-      "4": "OK! OK! You could be an Ace Trainer!"
+      "3_female": null,
+      "4": "OK! OK! You could be an Ace Trainer!",
+      "4_female": null
     },
     "defeat": {
       "1": "I am devoting my body and soul to Pokémon battles!",
@@ -171,7 +186,8 @@
     "encounter": {
       "1": "Get ready, because when we team up, it's double the trouble!",
       "2": "Two hearts, one strategy – let's see if you can keep up with our twin power!",
-      "3": "Hope you're ready for double trouble, because we're about to bring the heat!"
+      "3": "Hope you're ready for double trouble, because we're about to bring the heat!",
+      "3_female": null
     },
     "victory": {
       "1": "We may have lost this round, but our bond remains unbreakable!",
@@ -199,7 +215,8 @@
   "black_belt": {
     "encounter": {
       "1": "I praise your courage in challenging me! For I am the one with the strongest kick!",
-      "2": "Oh, I see. Would you like to be cut to pieces? Or do you prefer the role of punching bag?"
+      "2": "Oh, I see. Would you like to be cut to pieces? Or do you prefer the role of punching bag?",
+      "2_female": null
     },
     "victory": {
       "1": "Oh. The Pokémon did the fighting. My strong kick didn't help a bit.",
@@ -310,7 +327,8 @@
     },
     "defeat": {
       "1": "New age simply refers to twentieth century classical composers, right?",
-      "2": "Don't get hung up on sadness or frustration. You can use your grudges to motivate yourself."
+      "2": "Don't get hung up on sadness or frustration. You can use your grudges to motivate yourself.",
+      "2_female": null
     }
   },
   "psychic": {
@@ -341,7 +359,8 @@
   },
   "baker": {
     "encounter": {
-      "1": "Hope you're ready to taste defeat!"
+      "1": "Hope you're ready to taste defeat!",
+      "1_female": null
     },
     "victory": {
       "1": "I'll bake a comeback."
@@ -371,7 +390,8 @@
     "encounter": {
       "1": "Matey, you're walking the plank if you lose!",
       "2": "Come on then! My sailor's pride is at stake!",
-      "3": "Ahoy there! Are you seasick?"
+      "3": "Ahoy there! Are you seasick?",
+      "3_female": null
     },
     "victory": {
       "1": "Argh! Beaten by a kid!",
@@ -381,7 +401,7 @@
   },
   "archer": {
     "encounter": {
-      "1": "Before you go any further, let's see how you far against us, Team Rocket!",
+      "1": "Before you go any further, let's see how you fare against us, Team Rocket!",
       "2": "I have received reports that your skills are not insignificant. Let's see if they are true.",
       "3": "I am Archer, an Admin of Team Rocket. And I do not go easy on enemies of our organization."
     },
@@ -399,6 +419,7 @@
     },
     "victory": {
       "1": "Tch, you really are strong. It's too bad.\n$If you were to join Team Rocket, you could become an Executive.",
+      "1_female": null,
       "2": "I... I'm shattered...",
       "3": "Aaaieeeee! This can't be happening! I fought hard, but I still lost…"
     }
@@ -434,52 +455,57 @@
       "3": "I'm going to give you a little taste of pain! Resign yourself to it!"
     },
     "victory": {
-      "1": "Hehehe! You might have beaten me, but you don't stand a chance against the Boss!\n$If you get lost now, you won't have to face a sound whipping!",
+      "1": "Hehehe! You might have beaten me, but you don't stand a chance against the boss!\n$If you get lost now, you won't have to face a sound whipping!",
       "2": "Hehehe... So, I lost, too...",
-      "3": "Ahya! How could this be? For an Admin like me to lose to some random trainer..."
+      "3": "Ahya! How could this be? For an Admin like me to lose to some random trainer...",
+      "3_female": null
     }
   },
   "courtney": {
     "encounter": {
-      "1": "The thing...The thing that you hold...That is what... That's what we of Team Magma seek...",
-      "2": "... Well then...Deleting...",
-      "3": "...Ha. ...Analyzing... ...Hah♪"
+      "1": "Don't. Get. In. My. Way.",
+      "2": "You... ...I want to...analyze. Ahahaha",
+      "3": "... Well then...Deleting..."
     },
     "victory": {
-      "1": "... ...Change...the world.",
+      "1": "Hah hah... Uhn...hah hah...",
       "2": "As anticipated. Unanticipated. You. Target lock...completed.\n$Commencing...experiment. You. Forever. Aha... ♪",
-      "3": "...Again? That's unanticipated. ...I knew it. You...are interesting! ...Haha. ♪"
+      "3": "That's unanticipated. ...I knew it. You...are interesting! ...Haha. ♪"
     }
   },
   "shelly": {
     "encounter": {
       "1": "Ahahahaha! You're going to meddle in Team Aqua's affairs?\n$You're either absolutely fearless, simply ignorant, or both!\n$You're so cute, you're disgusting! I'll put you down",
       "2": "What's this? Who's this spoiled brat?",
-      "3": "Cool your jets. Be patient. I'll crush you shortly."
+      "3": "Cool your jets. Be patient. I'll crush you shortly.",
+      "3_female": null
     },
     "victory": {
       "1": "Ahahahaha! We got meddled with unexpectedly! We're out of options.\n$We'll have to pull out. But this isn't the last you'll see of Team Aqua!\n$We have other plans! Don't you forget it!",
       "2": "Ahhh?! Did I go too easy on you?!",
-      "3": "Uh. Are you telling me you've upped your game even more during the fight?\n$You're a brat with a bright future… My Pokémon and I don't have any strength left to fight…\n$Go on… Go and be destroyed by Archie."
+      "3": "Uh. Are you telling me you've upped your game even more during the fight?\n$You're a brat with a bright future… My Pokémon and I don't have any strength left to fight…\n$Go on… Go and be destroyed by Archie.",
+      "3_female": null
     }
   },
   "matt": {
     "encounter": {
-      "1": "Hoohahaha! What, you got a screw loose or something? Look at you, little Makuhita person!",
-      "2": "Oho! You! You're that funny kid!",
-      "3": "What are you doing here? Did you follow us?"
+      "1": "All right then, until the boss has time for you, I'll be your opponent!",
+      "2": "Hooah! Full on! I'm burning up! Well! Welll! Wellllll! Let's battle it out until we've got nothing left!",
+      "3": "Hoo hah! I'm gonna smash you up!"
     },
     "victory": {
-      "1": "All right then, until the Boss has time for you, I'll be your opponent!",
+      "1": "Muwuhahaha! That battle was fun even though I lost!",
       "2": "I can feel it! I can feel it, all right! The strength coming offa you!\n$More! I still want more! But looks like we're outta time...",
-      "3": "That was fun! I knew you'd show me a good time! I look forward to facing you again someday!"
+      "3": "Oho! That's a loss I can be proud of!",
+      "3_female": null
     }
   },
   "mars": {
     "encounter": {
       "1": "I'm Mars, one of Team Galactic's top Commanders.",
       "2": "Team Galactic's vision for the future is unwavering. Opposition will be crushed without mercy!",
-      "3": "Feeling nervous? You should be!"
+      "3": "Feeling nervous? You should be!",
+      "3_female": null
     },
     "victory": {
       "1": "This can't be happening! How did I lose?!",
@@ -514,36 +540,44 @@
   "zinzolin": {
     "encounter": {
       "1": "You could become a threat to Team Plasma, so we will eliminate you here and now!",
-      "2": "Oh, for crying out loud... I didn't expect to have to battle in this freezing cold!",
-      "3": "You're an impressive Trainer to have made it this far. But it ends here."
+      "1_female": null,
+      "2": "You don't have the sense to know when to quit, it seems. It's an act of mercy on my part to bring an end to this now!",
+      "3": "You're an impressive Trainer to have made it this far. But it ends here.",
+      "3_female": null
     },
     "victory": {
       "1": "Ghetsis... I have failed you...",
-      "2": "It's bitter cold. I'm shivering. I'm suffering. Yet, I still stand victorious.",
-      "3": "Hmph. You're a smarter Trainer than I expected, but not smart enough."
+      "2": "It's bitter cold. I'm shivering. I'm suffering. Yet, we will stand victorious.",
+      "3": "Hmph. You're a smarter Trainer than I expected, but not smart enough.",
+      "3_female": null
     }
   },
   "rood": {
     "encounter": {
       "1": "You are a threat to Team Plasma. We cannot let you walk away from here and now!",
-      "2": "Oh, this icy wind... I never thought I'd have to fight here!",
-      "3": "You are a remarkable Trainer to have made it this far. But this is where it ends."
+      "1_female": null,
+      "2": "It seems you don't know when to give up. I'll make sure no one interferes with our plans!",
+      "3": "You are a remarkable Trainer to have made it this far. But this is where it ends.",
+      "3_female": null
     },
     "victory": {
       "1": "Ghetsis... I have failed my mission...",
-      "2": "The cold is piercing. I'm shivering. I'm suffering. Yet, I have triumphed.",
+      "2": "The cold is piercing. I'm shivering. I'm suffering. Yet, we will stand triumphant.",
       "3": "Hm. You are a talented Trainer, but unfortunately not talented enough."
     }
   },
   "xerosic": {
     "encounter": {
       "1": "Ah ha ha! It would be my pleasure. Come on, little Trainer! Let's see what you've got!",
+      "1_female": null,
       "2": "Hmm... You're more powerful than you look. I wonder how much energy there is inside you.",
+      "2_female": null,
       "3": "I've been waiting for you! I need to do a little research on you! Come, let us begin!"
     },
     "victory": {
       "1": "Ah, you're quite strong. Oh yes—very strong, indeed.",
       "2": "Ding-ding-ding! You did it! To the victor go the spoils!",
+      "2_female": null,
       "3": "Wonderful! Amazing! You have tremendous skill and bravery!"
     }
   },
@@ -551,6 +585,7 @@
     "encounter": {
       "1": "I am Bryony, and it would be my pleasure to battle you. Show me what you've got.",
       "2": "Impressive... You're more powerful than you appear. Let's see the true extent of your energy.",
+      "2_female": null,
       "3": "I've anticipated your arrival. It's time for a little test. Shall we begin?"
     },
     "victory": {
@@ -563,9 +598,11 @@
     "encounter": {
       "1": "Prepare for trouble!",
       "2": "We're pulling a big job here! Get lost, kid!",
+      "2_female": null,
       "3": "Hand over your Pokémon, or face the wrath of Team Rocket!",
       "4": "You're about to experience the true terror of Team Rocket!",
-      "5": "Hey, kid! Me am a Team Rocket member kind of guy!"
+      "5": "Hey, kid! Me am a Team Rocket member kind of guy!",
+      "5_female": null
     },
     "victory": {
       "1": "Team Rocket blasting off again!",
@@ -587,6 +624,7 @@
       "1": "Huh? I lost?!",
       "2": "I can't believe I lost! I even skipped lunch for this",
       "3": "No way! You're just a kid!",
+      "3_female": null,
       "4": "Urrrgh... I should've ducked into our hideout right away...",
       "5": "You beat me... Do you think the boss will dock my pay for this?"
     }
@@ -613,7 +651,8 @@
       "2": "Witness the power of our technology and the future we envision!",
       "3": "In the name of Team Galactic, I'll eliminate anyone who stands in our way!",
       "4": "Get ready to lose!",
-      "5": "Hope you're ready for a cosmic beatdown!"
+      "5": "Hope you're ready for a cosmic beatdown!",
+      "5_female": null
     },
     "victory": {
       "1": "Shut down...",
@@ -643,6 +682,7 @@
     "encounter": {
       "1": "Your Pokémon are no match for the elegance of Team Flare.",
       "2": "Hope you brought your sunglasses, because things are about to get bright!",
+      "2_female": null,
       "3": "Team Flare will cleanse the world of imperfection!",
       "4": "Prepare to face the brilliance of Team Flare!",
       "5": "Fashion is most important to us!"
@@ -655,6 +695,86 @@
       "5": "You may have beaten me, but when I lose, I go out in style!"
     }
   },
+  "aether_grunt": {
+    "encounter": {
+      "1": "I'll fight you with all I have to wipe you out!",
+      "2": "I don't care if you're a kid or what. I'll send you flying if you threaten us!",
+      "3": "I was told to turn away Trainers, whomever they might be!",
+      "4": "I'll show you the power of Aether Paradise!",
+      "5": "Now that you've learned of the darkness at the heart of Aether Paradise, we'll need you to conveniently disappear!"
+    },
+    "victory": {
+      "1": "Hmph! You seem to have a lot of skill.",
+      "2": "What does this mean? What does this mean!",
+      "3": "Hey! You're so strong that there's no way I can turn you away!",
+      "4": "Hmm... It seems as though I may have lost.",
+      "5": "Here's an impression for you: Aiyee!"
+    }
+  },
+  "faba": {
+    "encounter": {
+      "1": "I, Branch Chief Faba, shall show you the harshness of the real world!",
+      "2": "The man who is called Aether Paradise's last line of defense is to battle a mere child?",
+      "3": "I, Faba, am the Aether Branch Chief. The only one in the world, I'm irreplaceable."
+    },
+    "victory": {
+      "1": "Aiyee!",
+      "2": "H-h-how can this be?! How could this child...",
+      "3": "This is why... This is why I can't bring myself to like children."
+    }
+  },
+  "skull_grunt": {
+    "encounter": {
+      "1": "We're not bad-we're just hard!",
+      "2": "You want some? That's how we say hello! Nice knowing you, punks!",
+      "3": "We're just a bunch of guys and gals with a great interest in other people's Pokémon!",
+      "4": "Why you trying to act hard when we're already hard as bones out here, homie?",
+      "5": "Team Skull represent! We can't pay the rent! Had a lot of fun, but our youth was misspent!"
+    },
+    "victory": {
+      "1": "Huh? Is it over already?",
+      "2": "Time for us to break out, yo! Gotta tell y'all peace out, yo!",
+      "3": "We don't need your wack Pokémon anyway!",
+      "4": "Wha-?! This kid's way too strong-no bones about it!",
+      "5": "So, what? I'm lower than a Pokémon?! I already got self-esteem issues, man."
+    }
+  },
+  "plumeria": {
+    "encounter": {
+      "1": " ...Hmph. You don't look like anything special to me.",
+      "2": "It takes these dumb Grunts way too long to deal with you kids..",
+      "3": "Mess with anyone in Team Skull, and I'll show you how serious I can get."
+    },
+    "victory": {
+      "1": "Hmmph! You're pretty strong. I'll give you that.",
+      "2": "Hmmph. Guess you are pretty tough. Now I understand why my Grunts waste so much time battling kids.",
+      "3": "Hmmph! I guess I just have to hold that loss."
+    }
+  },
+  "macro_grunt": {
+    "encounter": {
+      "1": "It looks like this is the end of the line for you!",
+      "2": "You are a trainer aren't you? I'm afraid that doesn't give you the right to interfere in our work.",
+      "3": "I'm from Macro Cosmos Insurance! Do you have a life insurance policy?"
+    },
+    "victory": {
+      "1": "I have little choice but to respectfully retreat.",
+      "2": "Having to give up my pocket money... Losing means I'm back in the red...",
+      "3": "Nobody can beat Macro Cosmos when it comes to our dedication to our work!"
+    }
+  },
+  "oleana": {
+    "encounter": {
+      "1": "I won't let anyone interfere with Mr. Rose's plan!",
+      "2": "So, you got through all of the special staff that I had ordered to stop you. I would expect nothing less.",
+      "3": "For the chairman! I won't lose!"
+    },
+    "victory": {
+      "1": "*sigh* I wasn't able to win... Oleana...you really are a hopeless woman.",
+      "2": "Arghhh! This is inexcusable... What was I thinking... Any trainer who's made it this far would be no pushover..",
+      "3": "*sigh* I am one tired Oleana..."
+    }
+  },
   "rocket_boss_giovanni_1": {
     "encounter": {
       "1": "So! I must say, I am impressed you got here!"
@@ -663,7 +783,8 @@
       "1": "WHAT! This cannot be!"
     },
     "defeat": {
-      "1": "Mark my words. Not being able to measure your own strength shows that you are still a child."
+      "1": "Mark my words. Not being able to measure your own strength shows that you are still a child.",
+      "1_female": null
     }
   },
   "rocket_boss_giovanni_2": {
@@ -723,7 +844,8 @@
   },
   "galactic_boss_cyrus_1": {
     "encounter": {
-      "1": "You were compelled to come here by such vacuous sentimentality.\n$I will make you regret paying heed to your heart!"
+      "1": "You were compelled to come here by such vacuous sentimentality.\n$I will make you regret paying heed to your heart!",
+      "1_female": null
     },
     "victory": {
       "1": "Interesting. And quite curious."
@@ -787,6 +909,72 @@
       "1": "Fools with no vision will continue to befoul this beautiful world."
     }
   },
+  "aether_boss_lusamine_1": {
+    "encounter": {
+      "1": "You're going to startle my sweet beast! It looks like I'll need to silence you first."
+    },
+    "victory": {
+      "1": "How... how can you be so awful!"
+    },
+    "defeat": {
+      "1": "Hmph..."
+    }
+  },
+  "aether_boss_lusamine_2": {
+    "encounter": {
+      "1": "Why must you continue to pester me?! I am sick of you. Sick through and through!\n$Enough with this useless talk.. with Nihilego's power I will show you how wrong you were to come here!"
+    },
+    "victory": {
+      "1": "Aaauuuggghhhhhhhhh!!!"
+    },
+    "defeat": {
+      "1": "All that I want is my precious beast! I don't care about any of the rest of you!"
+    }
+  },
+  "skull_boss_guzma_1": {
+    "encounter": {
+      "1": "The hated boss who beats you down and beats you down and never lets up...\n$Yeah. Big bad Guzma is here!"
+    },
+    "victory": {
+      "1": "Tch. I'm gonna beat you down one of these days!"
+    },
+    "defeat": {
+      "1": "And you came all the way out here just for that, huh?"
+    }
+  },
+  "skull_boss_guzma_2": {
+    "encounter": {
+      "1": "Doesn't matter who I'm up against, I'm gonna beat them down!\n$That's what big bad Guzma is all about!"
+    },
+    "victory": {
+      "1": "Guzma!!! What is wrong with you?!"
+    },
+    "defeat": {
+      "1": "Y'all are stupid!"
+    }
+  },
+  "macro_boss_rose_1": {
+    "encounter": {
+      "1": "I must provide limitless energy to ensure everlasting prosperity for everyone...\n$It is my purpose, my duty, my destiny!"
+    },
+    "victory": {
+      "1": "You still don't understand, trainer...\n$We... No, I am going to change the course of history!"
+    },
+    "defeat": {
+      "1": "You still don't understand a thing!"
+    }
+  },
+  "macro_boss_rose_2": {
+    "encounter": {
+      "1": "I'm committed to solving the energy problem in the Galar region—and, of course, around the world.\n$My experience and accomplishments that made Macro Cosmos a success are proof my methods work.\n$I don't intend to change my mind, even if I lose."
+    },
+    "victory": {
+      "1": "I'd forgotten how great Pokémon battles are! It's been so long since I battled...\n$That sure was satisfying, I accept defeat for this battle."
+    },
+    "defeat": {
+      "1": "I suppose it must seem that I am doing something terrible. I don't expect you to understand.\n$But I must provide the Galar region with limitless energy to ensure everlasting prosperity."
+    }
+  },
   "brock": {
     "encounter": {
       "1": "My expertise on Rock-type Pokémon will take you down! Come on!",
@@ -807,6 +995,7 @@
   "misty": {
     "encounter": {
       "1": "My policy is an all out offensive with Water-type Pokémon!",
+      "1_female": null,
       "2": "Hiya, I'll show you the strength of my aquatic Pokémon!",
       "3": "My dream was to go on a journey and battle powerful trainers…\nWill you be a sufficient challenge?"
     },
@@ -824,12 +1013,14 @@
   "lt_surge": {
     "encounter": {
       "1": "My Electric Pokémon saved me during the war! I'll show you how!",
+      "1_female": null,
       "2": "Ten-hut! I'll shock you into surrender!",
       "3": "I'll zap you just like I do to all my enemies in battle!"
     },
     "victory": {
       "1": "Whoa! Your team's the real deal, kid!",
       "2": "Aaargh, you're strong! Even my electric tricks lost against you.",
+      "2_female": null,
       "3": "That was an absolutely shocking loss!"
     },
     "defeat": {
@@ -854,6 +1045,7 @@
     "defeat": {
       "1": "I was afraid I would doze off…",
       "2": "Oh my, it seems my Grass Pokémon overwhelmed you.",
+      "2_female": null,
       "3": "That battle was such a soothing experience.",
       "4": "Oh… Is that all?"
     }
@@ -913,7 +1105,8 @@
     "encounter": {
       "1": "I, the leader of Team Rocket, will make you feel a world of pain!",
       "2": "My training here will be vital before I am to face my old associates again.",
-      "3": "I do not think you are prepared for the level of failure you are about to experience!"
+      "3": "I do not think you are prepared for the level of failure you are about to experience!",
+      "3_female": null
     },
     "victory": {
       "1": "WHAT! Me, lose?! There is nothing I wish to say to you!",
@@ -946,6 +1139,7 @@
   "brawly": {
     "encounter": {
       "1": "Oh man, a challenger!\nLet's see what you can do!",
+      "1_female": null,
       "2": "You seem like a big splash.\nLet's battle!",
       "3": "Time to create a storm!\nLet's go!"
     },
@@ -973,6 +1167,7 @@
     },
     "defeat": {
       "1": "Recharge your batteries and challenge me again sometime!\nWahahahaha!",
+      "1_female": null,
       "2": "I hope you found our battle electrifying!\nWahahahaha!",
       "3": "Aren't you shocked I won?\nWahahahaha!"
     }
@@ -1019,6 +1214,7 @@
     },
     "victory": {
       "1": "You're the first Trainer I've seen with more grace than I.\nExcellently played.",
+      "1_female": null,
       "2": "Oh, my Flying Pokémon have plummeted!\nVery well.",
       "3": "Though I may have fallen, my Pokémon will continue to fly!"
     },
@@ -1031,6 +1227,7 @@
   "tate": {
     "encounter": {
       "1": "Hehehe…\nWere you surprised to see me without my sister?",
+      "1_female": null,
       "2": "I can see what you're thinking…\nYou want to battle!",
       "3": "How can you defeat someone…\nWho knows your every move?"
     },
@@ -1048,6 +1245,7 @@
   "liza": {
     "encounter": {
       "1": "Fufufu…\nWere you surprised to see me without my brother?",
+      "1_female": null,
       "2": "I can determine what you desire…\nYou want to battle, don't you?",
       "3": "How can you defeat someone…\nWho's one with their Pokémon?"
     },
@@ -1119,8 +1317,10 @@
   "nessa": {
     "encounter": {
       "1": "No matter what kind of plan your refined mind may be plotting, my partner and I will be sure to sink it.",
+      "1_female": null,
       "2": "I'm not here to chat. I'm here to win!",
-      "3": "This is a little gift from my Pokémon… I hope you can take it!"
+      "3": "This is a little gift from my Pokémon… I hope you can take it!",
+      "3_female": null
     },
     "victory": {
       "1": "You and your Pokémon are just too much…",
@@ -1141,6 +1341,7 @@
     },
     "victory": {
       "1": "You… You're pretty good, huh?",
+      "1_female": null,
       "2": "If you find Gordie around, be sure to give him a right trashing, would you?",
       "3": "I think you took breaking the ice a little too literally…"
     },
@@ -1154,10 +1355,12 @@
     "encounter": {
       "1": "You look strong! Shoots! Let's start!",
       "2": "I'm strong like the ocean's wide. You're gonna get swept away, fo' sho'.",
+      "2_female": null,
       "3": "Oh ho, so I'm facing you! That's off the wall."
     },
     "victory": {
       "1": "You totally rocked that! You're raising some wicked Pokémon. You got this Trainer thing down!",
+      "1_female": null,
       "2": "You don't just look strong, you're strong fo' reals! Eh, I was swept away, too!",
       "3": "You're strong as a gnarly wave!"
     },
@@ -1170,6 +1373,7 @@
   "shauntal": {
     "encounter": {
       "1": "Excuse me. You're a challenger, right?\nI'm the Elite Four's Ghost-type Pokémon user, Shauntal, and I shall be your opponent.",
+      "1_female": null,
       "2": "I absolutely love writing about Trainers who come here and the Pokémon they train.\nCould I use you and your Pokémon as a subject?",
       "3": "Every person who works with Pokémon has a story to tell.\nWhat story is about to be told?"
     },
@@ -1187,6 +1391,7 @@
   "marshal": {
     "encounter": {
       "1": "My mentor, Alder, sees your potential as a Trainer and is taking an interest in you.\nIt is my intention to test you--to take you to the limits of your strength. Kiai!",
+      "1_female": null,
       "2": "Victory, decisive victory, is my intention! Challenger, here I come!",
       "3": "In myself, I seek to develop the strength of a fighter and shatter any weakness in myself!\nPrevailing with the force of my convictions!"
     },
@@ -1205,7 +1410,8 @@
     "encounter": {
       "1": "You remind me of an old friend. That makes me excited about this Pokémon battle!",
       "2": "Pokémon battles have no meaning if you don't think why you battle.\n$Or better said, it makes battling together with Pokémon meaningless.",
-      "3": "My name's Cheren! I'm a Gym Leader and a teacher! Pleasure to meet you."
+      "3": "My name's Cheren! I'm a Gym Leader and a teacher! Pleasure to meet you.",
+      "3_female": null
     },
     "victory": {
       "1": "Thank you! I saw what was missing in me.",
@@ -1221,47 +1427,65 @@
   "chili": {
     "encounter": {
       "1": "Yeeeeooow! Time to play with FIRE!! I'm the strongest of us brothers!",
+      "1_female": null,
       "2": "Ta-da! The Fire-type scorcher Chili--that's me--will be your opponent!",
-      "3": "I'm going to show you what me and my blazing Fire types can do!"
+      "2_female": null,
+      "3": "I'm going to show you what me and my blazing Fire types can do!",
+      "3_female": null
     },
     "victory": {
       "1": "You got me. I am… burned… out…",
+      "1_female": null,
       "2": "Whoa ho! You're on fire!",
+      "2_female": null,
       "3": "Augh! You got me!"
     },
     "defeat": {
       "1": "I'm on fire! Play with me, and you'll get burned!",
+      "1_female": null,
       "2": "When you play with fire, you get burned!",
-      "3": "I mean, c'mon, your opponent was me! You didn't have a chance!"
+      "3": "I mean, c'mon, your opponent was me! You didn't have a chance!",
+      "3_female": null
     }
   },
   "cilan": {
     "encounter": {
       "1": "Nothing personal... No hard feelings... Me and my Grass-type Pokémon will...\n$Um... We're gonna battle come what may.",
+      "1_female": null,
       "2": "So, um, if you're OK with me, I'll, um, put everything I've got into being, er, you know, your opponent.",
-      "3": "OK… So, um, I'm Cilan, I like Grass-type Pokémon."
+      "2_female": null,
+      "3": "OK… So, um, I'm Cilan, I like Grass-type Pokémon.",
+      "3_female": null
     },
     "victory": {
       "1": "Er… Is it over now?",
+      "1_female": null,
       "2": "…What a surprise. You are very strong, aren't you? \n$I guess my brothers wouldn't have been able to defeat you either…",
+      "2_female": null,
       "3": "…Huh. Looks like my timing was, um, off?"
     },
     "defeat": {
       "1": "Huh? Did I win?",
+      "1_female": null,
       "2": "I guess… \n$I suppose I won, because I've been competing with my brothers Chili and Cress, and we all were able to get tougher.",
-      "3": "It…it was quite a thrilling experience…"
+      "2_female": null,
+      "3": "It…it was quite a thrilling experience…",
+      "3_female": null
     }
   },
   "roark": {
     "encounter": {
       "1": "I need to see your potential as a Trainer. And, I'll need to see the toughness of the Pokémon that battle with you!",
+      "1_female": null,
       "2": "Here goes! These are my rocking Pokémon, my pride and joy!",
       "3": "Rock-type Pokémon are simply the best!",
-      "4": "I need to see your potential as a Trainer. And, I'll need to see the toughness of the Pokémon that battle with you!"
+      "4": "I need to see your potential as a Trainer. And, I'll need to see the toughness of the Pokémon that battle with you!",
+      "4_female": null
     },
     "victory": {
       "1": "W-what? That can't be! My buffed-up Pokémon!",
       "2": "…We lost control there. Next time I'd like to challenge you to a Fossil-digging race underground.",
+      "2_female": null,
       "3": "With skill like yours, it's natural for you to win.",
       "4": "Wh-what?! It can't be! Even that wasn't enough?",
       "5": "I blew it."
@@ -1284,6 +1508,7 @@
     "victory": {
       "1": "I'm not good enough yet…",
       "2": "I see… Your journey has taken you to far-away places and you have witnessed much more than I.\n$I envy you for that…",
+      "2_female": null,
       "3": "How is this possible…",
       "4": "I don't think our potentials are so different.\n$But you seem to have something more than that… So be it.",
       "5": "Guess I need more training.",
@@ -1342,12 +1567,14 @@
       "1": "Guess I should've expected that!"
     },
     "defeat": {
-      "1": "Heh heh! Don't mind me, just scooping up a W over here. I get it if you're upset, but don't go full Kieran on me, OK?"
+      "1": "Heh heh! Don't mind me, just scooping up a W over here. I get it if you're upset, but don't go full Kieran on me, OK?",
+      "1_female": null
     }
   },
   "ramos": {
     "encounter": {
-      "1": "Did yeh enjoy the garden playground I made with all these sturdy plants o' mine?\n$Their strength is a sign o' my strength as a gardener and a Gym Leader! Yeh sure yer up to facing all that?"
+      "1": "Did yeh enjoy the garden playground I made with all these sturdy plants o' mine?\n$Their strength is a sign o' my strength as a gardener and a Gym Leader! Yeh sure yer up to facing all that?",
+      "1_female": null
     },
     "victory": {
       "1": "Yeh believe in yer Pokémon… And they believe in yeh, too… It was a fine battle, sprout."
@@ -1377,7 +1604,8 @@
     },
     "victory": {
       "1": "I must say, I'm warmed up to you! I might even admire you a little.",
-      "2": "Wow! You're great! You've earned my respect! \n$I think your focus and will bowled us over totally. "
+      "2": "Wow! You're great! You've earned my respect! \n$I think your focus and will bowled us over totally. ",
+      "2_female": null
     },
     "defeat": {
       "1": "I sensed your will to win, but I don't lose!",
@@ -1389,7 +1617,8 @@
       "1": "You have a winning aura about you. So, anyway, this will be fun. Let's have our battle!"
     },
     "victory": {
-      "1": "Amazing! You're very good, aren't you?"
+      "1": "Amazing! You're very good, aren't you?",
+      "1_female": null
     },
     "defeat": {
       "1": "Yes! My Pokémon and I are perfectly good!"
@@ -1430,7 +1659,8 @@
   },
   "clay": {
     "encounter": {
-      "1": "Harrumph! Kept me waitin', didn't ya, kid? All right, time to see what ya can do!"
+      "1": "Harrumph! Kept me waitin', didn't ya, kid? All right, time to see what ya can do!",
+      "1_female": null
     },
     "victory": {
       "1": "Man oh man… It feels good to go all out and still be defeated!"
@@ -1444,7 +1674,8 @@
       "1": "I'mma serve you a full course o' Water-type Pokémon! Don't try to eat 'em, though!"
     },
     "victory": {
-      "1": "Vaultin' Veluza! Yer a lively one, aren't ya! A little TOO lively, if I do say so myself!"
+      "1": "Vaultin' Veluza! Yer a lively one, aren't ya! A little TOO lively, if I do say so myself!",
+      "1_female": null
     },
     "defeat": {
       "1": "You come back to see me again now, ya hear?"
@@ -1510,7 +1741,8 @@
       "1": "There's something about you… A difference in your demeanor. \n$I think I sense that in you. Now, show me. Show me the power you wield with your Pokémon. \n$And I, in turn, shall present you with a performance of illusions in water by me and my Pokémon!"
     },
     "victory": {
-      "1": "Bravo. I realize now your authenticity and magnificence as a Pokémon Trainer. \n$I find much joy in having met you and your Pokémon. You have proven yourself worthy."
+      "1": "Bravo. I realize now your authenticity and magnificence as a Pokémon Trainer. \n$I find much joy in having met you and your Pokémon. You have proven yourself worthy.",
+      "1_female": null
     },
     "defeat": {
       "1": "A grand illusion!"
@@ -1518,13 +1750,15 @@
   },
   "lorelei": {
     "encounter": {
-      "1": "No one can best me when it comes to icy Pokémon! Freezing moves are powerful!\n$Your Pokémon will be at my mercy when they are frozen solid! Hahaha! Are you ready?"
+      "1": "No one can best me when it comes to icy Pokémon! Freezing moves are powerful!\n$Your Pokémon will be at my mercy when they are frozen solid! Hahaha! Are you ready?",
+      "1_female": null
     },
     "victory": {
       "1": "How dare you!"
     },
     "defeat": {
-      "1": "There's nothing you can do once you're frozen."
+      "1": "There's nothing you can do once you're frozen.",
+      "1_female": null
     }
   },
   "will": {
@@ -1540,10 +1774,12 @@
   },
   "malva": {
     "encounter": {
-      "1": "I feel like my heart might just burst into flames. \n$I'm burning up with my hatred for you, runt!"
+      "1": "I feel like my heart might just burst into flames. \n$I'm burning up with my hatred for you, runt!",
+      "1_female": null
     },
     "victory": {
-      "1": "What news… So a new challenger has defeated Malva!"
+      "1": "What news… So a new challenger has defeated Malva!",
+      "1_female": null
     },
     "defeat": {
       "1": "I am delighted! Yes, delighted that I could squash you beneath my heel."
@@ -1565,7 +1801,8 @@
       "1": "I gave the captain position to my cousin Sophocles, but I'm confident in my ability. \n$My strength is like that of a supernova!"
     },
     "victory": {
-      "1": "I certainly found an interesting Trainer to face!"
+      "1": "I certainly found an interesting Trainer to face!",
+      "1_female": null
     },
     "defeat": {
       "1": "Ahaha. What an interesting battle."
@@ -1576,10 +1813,12 @@
       "1": "I'd say I'll go easy on you, but… I'd be lying! Think fast!"
     },
     "victory": {
-      "1": "Not bad, kiddo."
+      "1": "Not bad, kiddo.",
+      "1_female": null
     },
     "defeat": {
-      "1": "Nahahaha! You really are something else, kiddo!"
+      "1": "Nahahaha! You really are something else, kiddo!",
+      "1_female": null
     }
   },
   "bruno": {
@@ -1598,7 +1837,8 @@
       "1": "I'm Bugsy! I never lose when it comes to bug Pokémon!"
     },
     "victory": {
-      "1": "Whoa, amazing! You're an expert on Pokémon!\nMy research isn't complete yet. OK, you win."
+      "1": "Whoa, amazing! You're an expert on Pokémon!\nMy research isn't complete yet. OK, you win.",
+      "1_female": null
     },
     "defeat": {
       "1": "Thanks! Thanks to our battle, I was also able to make progress in my research!"
@@ -1639,10 +1879,12 @@
   },
   "lenora": {
     "encounter": {
-      "1": "Well then, challenger, I'm going to research how you battle with the Pokémon you've so lovingly raised!"
+      "1": "Well then, challenger, I'm going to research how you battle with the Pokémon you've so lovingly raised!",
+      "1_female": null
     },
     "victory": {
-      "1": "My theory about you was correct. You're more than just talented… You're motivated! I salute you!"
+      "1": "My theory about you was correct. You're more than just talented… You're motivated! I salute you!",
+      "1_female": null
     },
     "defeat": {
       "1": "Ah ha ha! If you lose, make sure to analyze why, and use that knowledge in your next battle!"
@@ -1667,7 +1909,8 @@
       "1": "Wild! Your reason's already more toxic than mine!"
     },
     "defeat": {
-      "1": "Hey, c'mon! Get serious! You gotta put more out there!"
+      "1": "Hey, c'mon! Get serious! You gotta put more out there!",
+      "1_female": null
     }
   },
   "olivia": {
@@ -1705,7 +1948,8 @@
   },
   "flint": {
     "encounter": {
-      "1": "Hope you're warmed up, cause here comes the Big Bang!"
+      "1": "Hope you're warmed up, cause here comes the Big Bang!",
+      "1_female": null
     },
     "victory": {
       "1": "Incredible! Your moves are so hot, they make mine look lukewarm!"
@@ -1727,7 +1971,8 @@
   },
   "caitlin": {
     "encounter": {
-      "1": "It's me who appeared when the flower opened up. You who have been waiting…\n$You look like a Pokémon Trainer with refined strength and deepened kindness. \n$What I look for in my opponent is superb strength… \n$Please unleash your power to the fullest!"
+      "1": "It's me who appeared when the flower opened up. You who have been waiting…\n$You look like a Pokémon Trainer with refined strength and deepened kindness. \n$What I look for in my opponent is superb strength… \n$Please unleash your power to the fullest!",
+      "1_female": null
     },
     "victory": {
       "1": "My Pokémon and I learned so much! I offer you my thanks."
@@ -1749,13 +1994,16 @@
   },
   "wikstrom": {
     "encounter": {
-      "1": "Well met, young challenger! Verily am I the famed blade of hardened steel, Duke Wikstrom! \n$Let the battle begin! En garde!"
+      "1": "Well met, young challenger! Verily am I the famed blade of hardened steel, Duke Wikstrom! \n$Let the battle begin! En garde!",
+      "1_female": null
     },
     "victory": {
-      "1": "Glorious! The trust that you share with your honorable Pokémon surpasses even mine!"
+      "1": "Glorious! The trust that you share with your honorable Pokémon surpasses even mine!",
+      "1_female": null
     },
     "defeat": {
-      "1": "What manner of magic is this? My heart, it doth hammer ceaselessly in my breast! \n$Winning against such a worthy opponent doth give my soul wings--thus do I soar!"
+      "1": "What manner of magic is this? My heart, it doth hammer ceaselessly in my breast! \n$Winning against such a worthy opponent doth give my soul wings--thus do I soar!",
+      "1_female": null
     }
   },
   "acerola": {
@@ -1787,11 +2035,14 @@
     },
     "victory": {
       "1": "You got me. You are magnificent!",
-      "2": "I never expected another trainer to beat me… I'm surprised."
+      "1_female": null,
+      "2": "I never expected another trainer to beat me… I'm surprised.",
+      "2_female": null
     },
     "defeat": {
       "1": "That was close. Want to try again?",
-      "2": "It's not that you are weak. Don't let it bother you."
+      "2": "It's not that you are weak. Don't let it bother you.",
+      "2_female": null
     }
   },
   "karen": {
@@ -1816,7 +2067,8 @@
       "1": "Sure seems like you understand Pokémon real well. \n$This is gonna be a doozy of a battle! \n$I'll have to Dynamax my Pokémon if I want to win!"
     },
     "victory": {
-      "1": "The power of Grass has wilted… What an incredible Challenger!"
+      "1": "The power of Grass has wilted… What an incredible Challenger!",
+      "1_female": null
     },
     "defeat": {
       "1": "This'll really leave you in shock and awe."
@@ -1835,7 +2087,8 @@
   },
   "drasna": {
     "encounter": {
-      "1": "You must be a strong Trainer. Yes, quite strong indeed…\n$That's just wonderful news! Facing opponents like you and your team will make my Pokémon grow like weeds!"
+      "1": "You must be a strong Trainer. Yes, quite strong indeed…\n$That's just wonderful news! Facing opponents like you and your team will make my Pokémon grow like weeds!",
+      "1_female": null
     },
     "victory": {
       "1": "Oh, dear me. That sure was a quick battle… I do hope you'll come back again sometime!"
@@ -1868,7 +2121,8 @@
   },
   "blue": {
     "encounter": {
-      "1": "You must be pretty good to get this far."
+      "1": "You must be pretty good to get this far.",
+      "1_female": null
     },
     "victory": {
       "1": "I've only lost to him and now to you… Him? Hee, hee…"
@@ -1915,7 +2169,8 @@
       "1": "I am still the Champion. I won't hold anything back."
     },
     "victory": {
-      "1": "This is the emergence of a new Champion."
+      "1": "This is the emergence of a new Champion.",
+      "1_female": null
     },
     "defeat": {
       "1": "I successfully defended my Championship."
@@ -2003,7 +2258,8 @@
       "1": "Hey! Don't you think Pokémon are, like, super cute?"
     },
     "victory": {
-      "1": "Waaah! Waaah! You're so mean!"
+      "1": "Waaah! Waaah! You're so mean!",
+      "1_female": null
     },
     "defeat": {
       "1": "And that's that!"
@@ -2011,7 +2267,8 @@
   },
   "chuck": {
     "encounter": {
-      "1": "Hah! You want to challenge me? Are you brave or just ignorant?"
+      "1": "Hah! You want to challenge me? Are you brave or just ignorant?",
+      "1_female": null
     },
     "victory": {
       "1": "You're strong! Would you please make me your apprentice?"
@@ -2022,7 +2279,8 @@
   },
   "katy": {
     "encounter": {
-      "1": "Don't let your guard down unless you would like to find yourself knocked off your feet!"
+      "1": "Don't let your guard down unless you would like to find yourself knocked off your feet!",
+      "1_female": null
     },
     "victory": {
       "1": "All of my sweet little Pokémon dropped like flies!"
@@ -2055,7 +2313,8 @@
   },
   "maylene": {
     "encounter": {
-      "1": "I've come to challenge you now, and I won't hold anything back. \n$Please prepare yourself for battle!"
+      "1": "I've come to challenge you now, and I won't hold anything back. \n$Please prepare yourself for battle!",
+      "1_female": null
     },
     "victory": {
       "1": "I admit defeat…"
@@ -2077,7 +2336,8 @@
   },
   "byron": {
     "encounter": {
-      "1": "Trainer! You're young, just like my son, Roark. \n$With more young Trainers taking charge, the future of Pokémon is bright! \n$So, as a wall for young people, I'll take your challenge!"
+      "1": "Trainer! You're young, just like my son, Roark. \n$With more young Trainers taking charge, the future of Pokémon is bright! \n$So, as a wall for young people, I'll take your challenge!",
+      "1_female": null
     },
     "victory": {
       "1": "Hmm! My sturdy Pokémon--defeated!"
@@ -2099,7 +2359,8 @@
   },
   "volkner": {
     "encounter": {
-      "1": "Since you've come this far, you must be quite strong…\n$I hope you're the Trainer who'll make me remember how fun it is to battle!"
+      "1": "Since you've come this far, you must be quite strong…\n$I hope you're the Trainer who'll make me remember how fun it is to battle!",
+      "1_female": null
     },
     "victory": {
       "1": "You've got me beat…\n$Your desire and the noble way your Pokémon battled for you… \n$I even felt thrilled during our match. That was a very good battle."
@@ -2201,7 +2462,8 @@
   },
   "valerie": {
     "encounter": {
-      "1": "Oh, if it isn't a young Trainer… It is lovely to get to meet you like this. \n$Then I suppose you have earned yourself the right to a battle, as a reward for your efforts. \n$The elusive Fairy may appear frail as the breeze and delicate as a bloom, but it is strong."
+      "1": "Oh, if it isn't a young Trainer… It is lovely to get to meet you like this. \n$Then I suppose you have earned yourself the right to a battle, as a reward for your efforts. \n$The elusive Fairy may appear frail as the breeze and delicate as a bloom, but it is strong.",
+      "1_female": null
     },
     "victory": {
       "1": "I hope that you will find things worth smiling about tomorrow…"
@@ -2248,7 +2510,8 @@
       "1": "Let me have a look at how you and your partner Pokémon behave!"
     },
     "victory": {
-      "1": "Your pink is still lacking, but you're an excellent Trainer with excellent Pokémon."
+      "1": "Your pink is still lacking, but you're an excellent Trainer with excellent Pokémon.",
+      "1_female": null
     },
     "defeat": {
       "1": "Too bad for you, I guess."
@@ -2256,7 +2519,8 @@
   },
   "bede": {
     "encounter": {
-      "1": "I suppose I should prove beyond doubt just how pathetic you are and how strong I am."
+      "1": "I suppose I should prove beyond doubt just how pathetic you are and how strong I am.",
+      "1_female": null
     },
     "victory": {
       "1": "I see… Well, that's fine. I wasn't really trying all that hard anyway."
@@ -2300,7 +2564,8 @@
   },
   "brassius": {
     "encounter": {
-      "1": "I assume you are ready? Let our collaborative work of art begin!"
+      "1": "I assume you are ready? Let our collaborative work of art begin!",
+      "1_female": null
     },
     "victory": {
       "1": "Ahhh…vant-garde!"
@@ -2311,10 +2576,12 @@
   },
   "iono": {
     "encounter": {
-      "1": "How're ya feelin' about this battle?\n$...\n$Let's get this show on the road! How strong is our challenger? \n$I 'unno! Let's find out together!"
+      "1": "How're ya feelin' about this battle?\n$...\n$Let's get this show on the road! How strong is our challenger? \n$I 'unno! Let's find out together!",
+      "1_female": null
     },
     "victory": {
-      "1": "You're as flashy and bright as a 10,000,000-volt Thunderbolt, friendo!"
+      "1": "You're as flashy and bright as a 10,000,000-volt Thunderbolt, friendo!",
+      "1_female": null
     },
     "defeat": {
       "1": "Your eyeballs are MINE!"
@@ -2336,7 +2603,8 @@
       "1": "Come on, baby! Rattle me down to the bone!"
     },
     "victory": {
-      "1": "You're cool, my friend—you move my SOUL!"
+      "1": "You're cool, my friend—you move my SOUL!",
+      "1_female": null
     },
     "defeat": {
       "1": "Later, baby!"
@@ -2370,7 +2638,9 @@
   "nessa_elite": {
     "encounter": {
       "1": "The tides are turning in my favor. Ready to get swept away?",
-      "2": "Let's make some waves with this battle! I hope you're prepared!"
+      "1_female": null,
+      "2": "Let's make some waves with this battle! I hope you're prepared!",
+      "2_female": null
     },
     "victory": {
       "1": "You navigated those waters perfectly... Well done!",
@@ -2398,6 +2668,7 @@
   "allister_elite": {
     "encounter": {
       "1": "Shadows fall... Are you ready to face your fears?",
+      "1_female": null,
       "2": "Let's see if you can handle the darkness that I command."
     },
     "victory": {
@@ -2420,7 +2691,8 @@
     },
     "defeat": {
       "1": "Another storm weathered, another victory claimed! Well fought!",
-      "2": "You got caught in my storm! Better luck next time!"
+      "2": "You got caught in my storm! Better luck next time!",
+      "2_female": null
     }
   },
   "alder": {
@@ -2447,10 +2719,10 @@
   },
   "rival": {
     "encounter": {
-      "1": "@c{smile}Hey, I was looking for you! I knew you were eager to get going but I expected at least a goodbye…$@c{smile_eclosed}So you're really pursuing your dream after all? I almost can't believe it.$@c{serious_smile_fists}Since we're here, how about a battle?After all, I want to make sure you're ready.$@c{serious_mopen_fists}Don't hold back, I want you to give me everything you've got!"
+      "1": "@c{smile}Hey, I was looking for you! I knew you were eager to get going but I expected at least a goodbye…$@c{smile_eclosed}So you're really pursuing your dream after all? I almost can't believe it.$@c{serious_smile_fists}Since we're here, how about a battle?\nAfter all, I want to make sure you're ready.$@c{serious_mopen_fists}Don't hold back, I want you to give me everything you've got!"
     },
     "victory": {
-      "1": "@c{shock}Wow… You cleaned me out.Are you actually a beginner?$@c{smile}Maybe it was a bit of luck but…Who knows you might just be able to go all the way.$By the way, the professor asked me to give you these items. They look pretty cool.$@c{serious_smile_fists}Good luck out there!"
+      "1": "@c{shock}Wow… You cleaned me out.\nAre you actually a beginner?$@c{smile}Maybe it was a bit of luck but…Who knows you might just be able to go all the way.$By the way, the professor asked me to give you these items. They look pretty cool.$@c{serious_smile_fists}Good luck out there!"
     }
   },
   "rival_female": {
@@ -2553,4 +2825,4 @@
       "1": "@c{smile_ehalf}I… I think I fulfilled my purpose…\n$@c{smile_eclosed}Promise me… After you heal the world… Please… come home safe.\n$@c{smile_ehalf}…Thank you."
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/en/menu-ui-handler.json b/src/locales/en/menu-ui-handler.json
index 00bf89f127a..8230a675b39 100644
--- a/src/locales/en/menu-ui-handler.json
+++ b/src/locales/en/menu-ui-handler.json
@@ -3,7 +3,6 @@
   "ACHIEVEMENTS": "Achievements",
   "STATS": "Stats",
   "RUN_HISTORY": "Run History",
-  "VOUCHERS": "Vouchers",
   "EGG_LIST": "Egg List",
   "EGG_GACHA": "Egg Gacha",
   "MANAGE_DATA": "Manage Data",
diff --git a/src/locales/en/move.json b/src/locales/en/move.json
index e6c8b718e17..7a10335ed06 100644
--- a/src/locales/en/move.json
+++ b/src/locales/en/move.json
@@ -2913,7 +2913,7 @@
   },
   "zippyZap": {
     "name": "Zippy Zap",
-    "effect": "The user attacks the target with bursts of electricity at high speed. This move always goes first and raises the user's evasiveness."
+    "effect": "The user attacks the target with bursts of electricity at high speed. This move always goes first and results in a critical hit."
   },
   "splishySplash": {
     "name": "Splishy Splash",
@@ -3807,4 +3807,4 @@
     "name": "Malignant Chain",
     "effect": "The user pours toxins into the target by wrapping them in a toxic, corrosive chain. This may also leave the target badly poisoned."
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/en/pokemon-form.json b/src/locales/en/pokemon-form.json
index 1b2992cd6b3..ea7e0f60c90 100644
--- a/src/locales/en/pokemon-form.json
+++ b/src/locales/en/pokemon-form.json
@@ -64,6 +64,7 @@
   "landorusIncarnate": "Incarnate",
   "keldeoOrdinary": "Ordinary",
   "meloettaAria": "Aria",
+  "meloettaPirouette": "Pirouette",
   "froakieBattleBond": "Battle Bond",
   "scatterbugMeadow": "Meadow",
   "scatterbugIcySnow": "Icy Snow",
diff --git a/src/locales/en/pokemon-summary.json b/src/locales/en/pokemon-summary.json
index 8d266999084..80e0cdab010 100644
--- a/src/locales/en/pokemon-summary.json
+++ b/src/locales/en/pokemon-summary.json
@@ -13,5 +13,32 @@
   "metFragment": {
     "normal": "met at Lv{{level}},\n{{biome}}.",
     "apparently": "apparently met at Lv{{level}},\n{{biome}}."
+  },
+  "natureFragment": {
+    "Hardy": "{{nature}}",
+    "Lonely": "{{nature}}",
+    "Brave": "{{nature}}",
+    "Adamant": "{{nature}}",
+    "Naughty": "{{nature}}",
+    "Bold": "{{nature}}",
+    "Docile": "{{nature}}",
+    "Relaxed": "{{nature}}",
+    "Impish": "{{nature}}",
+    "Lax": "{{nature}}",
+    "Timid": "{{nature}}",
+    "Hasty": "{{nature}}",
+    "Serious": "{{nature}}",
+    "Jolly": "{{nature}}",
+    "Naive": "{{nature}}",
+    "Modest": "{{nature}}",
+    "Mild": "{{nature}}",
+    "Quiet": "{{nature}}",
+    "Bashful": "{{nature}}",
+    "Rash": "{{nature}}",
+    "Calm": "{{nature}}",
+    "Gentle": "{{nature}}",
+    "Sassy": "{{nature}}",
+    "Careful": "{{nature}}",
+    "Quirky": "{{nature}}"
   }
 }
\ No newline at end of file
diff --git a/src/locales/en/run-history.json b/src/locales/en/run-history.json
index 0099a4a3ff4..53596bdf629 100644
--- a/src/locales/en/run-history.json
+++ b/src/locales/en/run-history.json
@@ -1,15 +1,15 @@
 {
   "victory":  "Victory!",
-  "defeatedWildM": "Defeated by ",
-  "defeatedTrainerM": "Defeated by ",
-  "defeatedTrainerDoubleM": "Defeated by Duo",
-  "defeatedRivalM": "Defeated by Rival",
-  "defeatedM": "Defeated",
-  "defeatedWildF": "Defeated by ",
-  "defeatedTrainerF": "Defeated by ",
-  "defeatedTrainerDoubleF": "Defeated by Duo",
-  "defeatedRivalF": "Defeated by Rival",
-  "defeatedF": "Defeated",
+  "defeatedWild": "Defeated by ",
+  "defeatedTrainer": "Defeated by ",
+  "defeatedTrainerDouble": "Defeated by Duo",
+  "defeatedRival": "Defeated by Rival",
+  "defeated": "Defeated",
+  "defeatedWild_female": "Defeated by ",
+  "defeatedTrainer_female": "Defeated by ",
+  "defeatedTrainerDouble_female": "Defeated by Duo",
+  "defeatedRival_female": "Defeated by Rival",
+  "defeated_female": "Defeated",
   "luck": "Luck",
   "score": "Score",
   "mode": "Mode",
@@ -30,8 +30,8 @@
   "money": "Money",
   "runLength": "Run Length",
   "viewHeldItems": "Held Items",
-  "hallofFameTextM": "Welcome to the Hall of Fame!",
-  "hallofFameTextF": "Welcome to the Hall of Fame!",
+  "hallofFameText": "Welcome to the Hall of Fame!",
+  "hallofFameText_female": "Welcome to the Hall of Fame!",
   "viewHallOfFame": "View Hall of Fame!",
   "viewEndingSplash": "View ending art!"
 }
diff --git a/src/locales/en/settings.json b/src/locales/en/settings.json
index 314e4f89dd8..6528f0368fe 100644
--- a/src/locales/en/settings.json
+++ b/src/locales/en/settings.json
@@ -61,7 +61,9 @@
   "typeHints": "Type Hints",
   "masterVolume": "Master Volume",
   "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/en/trainer-classes.json b/src/locales/en/trainer-classes.json
index 1b827281a6a..9e30915dee6 100644
--- a/src/locales/en/trainer-classes.json
+++ b/src/locales/en/trainer-classes.json
@@ -117,5 +117,14 @@
   "plasma_grunts": "Plasma Grunts",
   "flare_grunt": "Flare Grunt",
   "flare_grunt_female": "Flare Grunt",
-  "flare_grunts": "Flare Grunts"
-}
\ No newline at end of file
+  "flare_grunts": "Flare Grunts",
+  "aether_grunt": "Aether Foundation Employee",
+  "aether_grunt_female": "Aether Foundation Employee",
+  "aether_grunts": "Aether Foundation Employees",
+  "skull_grunt": "Team Skull Grunt",
+  "skull_grunt_female": "Team Skull Grunt",
+  "skull_grunts": "Team Skull Grunts",
+  "macro_grunt": "Macro Cosmos Trainer",
+  "macro_grunt_female": "Macro Cosmos Trainer",
+  "macro_grunts": "Macro Cosmos Trainers"
+}
diff --git a/src/locales/en/trainer-names.json b/src/locales/en/trainer-names.json
index 1d4cddf3411..50a2ce18f34 100644
--- a/src/locales/en/trainer-names.json
+++ b/src/locales/en/trainer-names.json
@@ -138,11 +138,19 @@
   "rood": "Rood",
   "xerosic": "Xerosic",
   "bryony": "Bryony",
+  "faba": "Faba",
+  "plumeria": "Plumeria",
+  "oleana": "Oleana",
+
   "maxie": "Maxie",
   "archie": "Archie",
   "cyrus": "Cyrus",
   "ghetsis": "Ghetsis",
   "lysandre": "Lysandre",
+  "lusamine": "Lusamine",
+  "guzma": "Guzma",
+  "rose": "Rose",
+
   "blue_red_double": "Blue & Red",
   "red_blue_double": "Red & Blue",
   "tate_liza_double": "Tate & Liza",
@@ -153,4 +161,4 @@
   "iris_alder_double": "Iris & Alder",
   "marnie_piers_double": "Marnie & Piers",
   "piers_marnie_double": "Piers & Marnie"
-}
\ No newline at end of file
+}
diff --git a/src/locales/en/trainer-titles.json b/src/locales/en/trainer-titles.json
index 888b3780b8d..b9c919022be 100644
--- a/src/locales/en/trainer-titles.json
+++ b/src/locales/en/trainer-titles.json
@@ -16,6 +16,10 @@
   "galactic_boss": "Team Galactic Boss",
   "plasma_boss": "Team Plasma Boss",
   "flare_boss": "Team Flare Boss",
+  "aether_boss": "Aether President",
+  "skull_boss": "Team Skull Boss",
+  "macro_boss": "Macro Cosmos President",
+
   "rocket_admin": "Team Rocket Admin",
   "rocket_admin_female": "Team Rocket Admin",
   "magma_admin": "Team Magma Admin",
@@ -27,5 +31,8 @@
   "plasma_sage": "Team Plasma Sage",
   "plasma_admin": "Team Plasma Admin",
   "flare_admin": "Team Flare Admin",
-  "flare_admin_female": "Team Flare Admin"
-}
\ No newline at end of file
+  "flare_admin_female": "Team Flare Admin",
+  "aether_admin": "Aether Foundation Admin",
+  "skull_admin": "Team Skull Admin",
+  "macro_admin": "Macro Cosmos"
+}
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/es/achv-female.json b/src/locales/es/achv-female.json
deleted file mode 100644
index f14e0f9a4be..00000000000
--- a/src/locales/es/achv-female.json
+++ /dev/null
@@ -1,163 +0,0 @@
-{
-  "Achievements": {
-    "name": "Logros"
-  },
-  "Locked": {
-    "name": "Bloqueado"
-  },
-  "MoneyAchv": {
-    "description": "Acumula un total de ₽{{moneyAmount}}."
-  },
-  "10K_MONEY": {
-    "name": "Ahorradora"
-  },
-  "100K_MONEY": {
-    "name": "Rica"
-  },
-  "1M_MONEY": {
-    "name": "Millonaria"
-  },
-  "10M_MONEY": {
-    "name": "Elusión Fiscal"
-  },
-  "DamageAchv": {
-    "description": "Inflige {{damageAmount}} daño en un solo golpe."
-  },
-  "250_DMG": {
-    "name": "Golpe Maestro"
-  },
-  "1000_DMG": {
-    "name": "Golpe Devastador"
-  },
-  "2500_DMG": {
-    "name": "¡Eso es un montón de daño!"
-  },
-  "10000_DMG": {
-    "name": "One Punch Man"
-  },
-  "HealAchv": {
-    "description": "Cura {{healAmount}} {{HP}} de una, con un movimiento, habilidad o objeto equipado."
-  },
-  "250_HEAL": {
-    "name": "Sanadora Novata"
-  },
-  "1000_HEAL": {
-    "name": "Gran Sanadora"
-  },
-  "2500_HEAL": {
-    "name": "Clériga"
-  },
-  "10000_HEAL": {
-    "name": "Centro Pokémon"
-  },
-  "LevelAchv": {
-    "description": "Sube a un Pokémon al nivel {{level}}."
-  },
-  "LV_100": {
-    "name": "¡Pero espera, aún hay mas!"
-  },
-  "LV_250": {
-    "name": "Élite"
-  },
-  "LV_1000": {
-    "name": "Supera tus límites"
-  },
-  "RibbonAchv": {
-    "description": "Acumula un total de {{ribbonAmount}} Cintas."
-  },
-  "10_RIBBONS": {
-    "name": "Campeona Liga Pokémon"
-  },
-  "25_RIBBONS": {
-    "name": "Campeona Liga Super"
-  },
-  "50_RIBBONS": {
-    "name": "Campeona Liga Ultra"
-  },
-  "75_RIBBONS": {
-    "name": "Campeona Liga Rogue"
-  },
-  "100_RIBBONS": {
-    "name": "Campeona Liga Master"
-  },
-  "TRANSFER_MAX_BATTLE_STAT": {
-    "name": "Trabajo en Equipo",
-    "description": "Haz relevo a otro miembro del equipo con al menos una estadística al máximo."
-  },
-  "MAX_FRIENDSHIP": {
-    "name": "Amistad Total",
-    "description": "Alcanza con un Pokémon la amistad al máximo."
-  },
-  "MEGA_EVOLVE": {
-    "name": "Megamorfosis",
-    "description": "Megaevoluciona a un Pokémon."
-  },
-  "GIGANTAMAX": {
-    "name": "Criatura Colosal",
-    "description": "Haz Gigantamax a un Pokémon."
-  },
-  "TERASTALLIZE": {
-    "name": "Entusiasta del STAB",
-    "description": "Teracristaliza a un Pokémon."
-  },
-  "STELLAR_TERASTALLIZE": {
-    "name": "El Tipo Oculto",
-    "description": "Teracristaliza a un Pokémon al tipo Astral."
-  },
-  "SPLICE": {
-    "name": "Infinite Fusion",
-    "description": "Fusiona dos Pokémon con la Punta ADN."
-  },
-  "MINI_BLACK_HOLE": {
-    "name": "Devorador de Objetos",
-    "description": "Adquiere un Mini Agujero Negro."
-  },
-  "CATCH_MYTHICAL": {
-    "name": "Singular",
-    "description": "Captura a un Pokémon Singular."
-  },
-  "CATCH_SUB_LEGENDARY": {
-    "name": "(Sub)Legendario",
-    "description": "Captura a un Pokémon Sublegendario."
-  },
-  "CATCH_LEGENDARY": {
-    "name": "Legendario",
-    "description": "Captura a un Pokémon Legendario."
-  },
-  "SEE_SHINY": {
-    "name": "Shiny",
-    "description": "Encuentra a un Pokémon Shiny salvaje."
-  },
-  "SHINY_PARTY": {
-    "name": "Eso es dedicación",
-    "description": "Tener un equipo completo de Pokémon shiny."
-  },
-  "HATCH_MYTHICAL": {
-    "name": "Huevo Singular",
-    "description": "Hacer eclosionar un Pokémon Singular de un huevo."
-  },
-  "HATCH_SUB_LEGENDARY": {
-    "name": "Huevo Sublegendario",
-    "description": "Hacer eclosionar un Pokémon Sublegendario de un huevo."
-  },
-  "HATCH_LEGENDARY": {
-    "name": "Huevo Legendario",
-    "description": "Hacer eclosionar un Pokémon Legendario de un huevo."
-  },
-  "HATCH_SHINY": {
-    "name": "Huevo Shiny",
-    "description": "Hacer eclosionar un Pokémon Shiny de un huevo."
-  },
-  "HIDDEN_ABILITY": {
-    "name": "Potencial Oculto",
-    "description": "Captura un Pokémon con una habilidad oculta."
-  },
-  "PERFECT_IVS": {
-    "name": "Certificado de Autenticidad",
-    "description": "Consigue IVs perfectos en un Pokémon."
-  },
-  "CLASSIC_VICTORY": {
-    "name": "Imbatible",
-    "description": "Completa el juego en modo clásico."
-  }
-}
\ No newline at end of file
diff --git a/src/locales/es/achv-male.json b/src/locales/es/achv.json
similarity index 80%
rename from src/locales/es/achv-male.json
rename to src/locales/es/achv.json
index 7faaa387e89..c94b8858233 100644
--- a/src/locales/es/achv-male.json
+++ b/src/locales/es/achv.json
@@ -9,13 +9,16 @@
     "description": "Acumula un total de ₽{{moneyAmount}}."
   },
   "10K_MONEY": {
-    "name": "Ahorrador"
+    "name": "Ahorrador",
+    "name_female": "Ahorradora"
   },
   "100K_MONEY": {
-    "name": "Rico"
+    "name": "Rico",
+    "name_female": "Rica"
   },
   "1M_MONEY": {
-    "name": "Millonario"
+    "name": "Millonario",
+    "name_female": "Millonaria"
   },
   "10M_MONEY": {
     "name": "Elusión Fiscal"
@@ -39,13 +42,16 @@
     "description": "Cura {{healAmount}} {{HP}} de una, con un movimiento, habilidad o objeto equipado."
   },
   "250_HEAL": {
-    "name": "Sanador Novato"
+    "name": "Sanador Novato",
+    "name_female": "Sanadora Novata"
   },
   "1000_HEAL": {
-    "name": "Gran Sanador"
+    "name": "Gran Sanador",
+    "name_female": "Gran Sanadora"
   },
   "2500_HEAL": {
-    "name": "Clérigo"
+    "name": "Clérigo",
+    "name_female": "Clériga"
   },
   "10000_HEAL": {
     "name": "Centro Pokémon"
@@ -66,19 +72,24 @@
     "description": "Acumula un total de {{ribbonAmount}} Cintas."
   },
   "10_RIBBONS": {
-    "name": "Campeón Liga Pokémon"
+    "name": "Campeón Liga Pokémon",
+    "name_female": "Campeona Liga Pokémon"
   },
   "25_RIBBONS": {
-    "name": "Campeón Liga Super"
+    "name": "Campeón Liga Super",
+    "name_female": "Campeona Liga Super"
   },
   "50_RIBBONS": {
-    "name": "Campeón Liga Ultra"
+    "name": "Campeón Liga Ultra",
+    "name_female": "Campeona Liga Ultra"
   },
   "75_RIBBONS": {
-    "name": "Campeón Liga Rogue"
+    "name": "Campeón Liga Rogue",
+    "name_female": "Campeona Liga Rogue"
   },
   "100_RIBBONS": {
-    "name": "Campeón Liga Master"
+    "name": "Campeón Liga Master",
+    "name_female": "Campeona Liga Master"
   },
   "TRANSFER_MAX_BATTLE_STAT": {
     "name": "Trabajo en Equipo",
@@ -159,5 +170,9 @@
   "CLASSIC_VICTORY": {
     "name": "Imbatible",
     "description": "Completa el juego en modo clásico."
+  },
+  "INVERSE_BATTLE": {
+    "name": "Espejo ojepsE",
+    "description": "Completa el reto de Combate Inverso.\n.osrevnI etabmoC ed oter le atelpmoC"
   }
 }
\ No newline at end of file
diff --git a/src/locales/es/battle.json b/src/locales/es/battle.json
index 648f738b179..8573f74a94e 100644
--- a/src/locales/es/battle.json
+++ b/src/locales/es/battle.json
@@ -36,7 +36,7 @@
   "learnMoveNotLearned": "{{pokemonName}} no ha aprendido {{moveName}}.",
   "learnMoveForgetQuestion": "¿Qué movimiento quieres que olvide?",
   "learnMoveForgetSuccess": "{{pokemonName}} ha olvidado cómo utilizar {{moveName}}.",
-  "countdownPoof": "@d{32}1, @d{15}2, @d{15}y@d{15}… @d{15}… @d{15}… @d{15}@s{pb_bounce_1}¡Puf!",
+  "countdownPoof": "@d{32}1, @d{15}2, @d{15}y@d{15}… @d{15}… @d{15}… @d{15}@s{se/pb_bounce_1}¡Puf!",
   "learnMoveAnd": "Y…",
   "levelCapUp": "¡Se ha incrementado el\nnivel máximo a {{levelCap}}!",
   "moveNotImplemented": "{{moveName}} aún no está implementado y no se puede seleccionar.",
diff --git a/src/locales/es/bgm-name.json b/src/locales/es/bgm-name.json
index 9aa09da3704..be617b79567 100644
--- a/src/locales/es/bgm-name.json
+++ b/src/locales/es/bgm-name.json
@@ -78,11 +78,18 @@
   "battle_galactic_grunt": "BDSP Team Galactic Battle",
   "battle_plasma_grunt": "BW - ¡Vs Equipo Plasma!",
   "battle_flare_grunt": "XY Team Flare Battle",
+  "battle_aether_grunt": "SM Aether Foundation Battle",
+  "battle_skull_grunt": "SM Team Skull Battle",
+  "battle_macro_grunt": "SWSH Trainer Battle",
+  "battle_galactic_admin": "BDSP Team Galactic Admin Battle",
+  "battle_skull_admin": "SM Team Skull Admin Battle",
+  "battle_oleana": "SWSH Oleana Battle",
   "battle_rocket_boss": "USUM Giovanni Battle",
   "battle_aqua_magma_boss": "ORAS Archie & Maxie Battle",
   "battle_galactic_boss": "BDSP Cyrus Battle",
   "battle_plasma_boss": "B2W2 Ghetsis Battle",
   "battle_flare_boss": "XY Lysandre Battle",
+
   "abyss": "PMD EoS - Cráter Oscuro",
   "badlands": "PMD EoS - Valle Desolado",
   "beach": "PMD EoS - Risco Calado",
@@ -135,4 +142,4 @@
   "heal": "BW - Cura Pokémon",
   "menu": "PMD EoS - ¡Bienvenidos al mundo de los Pokémon!",
   "title": "PMD EoS - Tema del menú principal"
-}
\ No newline at end of file
+}
diff --git a/src/locales/es/challenges.json b/src/locales/es/challenges.json
index a855f3dbc2b..6a7db8c10c3 100644
--- a/src/locales/es/challenges.json
+++ b/src/locales/es/challenges.json
@@ -18,5 +18,12 @@
     "name": "Monotipo",
     "desc": "Solo puedes usar Pokémon with the {{type}} type.",
     "desc_default": "Solo puedes usar Pokémon del tipo elegido."
+  },
+  "inverseBattle": {
+    "name": "Combate Inverso",
+    "shortName": "Inverso",
+    "desc": "La efectividad de los tipos es invertida. No hay inmunidades entre tipos.\nEste reto deshabilita logros de otros retos.",
+    "value.0": "Desactivado",
+    "value.1": "Activado"
   }
 }
\ No newline at end of file
diff --git a/src/locales/es/config.ts b/src/locales/es/config.ts
index a34a05cecf0..8f75c08f3f6 100644
--- a/src/locales/es/config.ts
+++ b/src/locales/es/config.ts
@@ -4,8 +4,7 @@ import ability from "./ability.json";
 import abilityTriggers from "./ability-trigger.json";
 import arenaFlyout from "./arena-flyout.json";
 import arenaTag from "./arena-tag.json";
-import achvMale from "./achv-male.json";
-import achvFemale from "./achv-female.json";
+import achv from "./achv.json";
 import battle from "./battle.json";
 import battleScene from "./battle-scene.json";
 import battleInfo from "./battle-info.json";
@@ -16,14 +15,10 @@ import bgmName from "./bgm-name.json";
 import biome from "./biome.json";
 import challenges from "./challenges.json";
 import commandUiHandler from "./command-ui-handler.json";
-import dialogueMale from "./dialogue-male.json";
-import dialogueFemale from "./dialogue-female.json";
-import dialogueEndbossMale from "./dialogue-final-boss-male.json";
-import dialogueEndbossFemale from "./dialogue-final-boss-female.json";
-import dialogueMiscMale from "./dialogue-misc-male.json";
-import dialogueMiscFemale from "./dialogue-misc-female.json";
-import dialogueDoubleBattleMale from "./dialogue-double-battle-male.json";
-import dialogueDoubleBattleFemale from "./dialogue-double-battle-female.json";
+import dialogue from "./dialogue.json";
+import battleSpecDialogue from "./dialogue-final-boss.json";
+import miscDialogue from "./dialogue-misc.json";
+import doubleBattleDialogue from "./dialogue-double-battle.json";
 import egg from "./egg.json";
 import fightUiHandler from "./fight-ui-handler.json";
 import filterBar from "./filter-bar.json";
@@ -76,16 +71,11 @@ export const esConfig = {
   challenges,
   commandUiHandler,
   common,
-  PGMachv: achvMale,
-  PGFachv: achvFemale,
-  PGMdialogue: dialogueMale,
-  PGFdialogue: dialogueFemale,
-  PGMbattleSpecDialogue: dialogueEndbossMale,
-  PGFbattleSpecDialogue: dialogueEndbossFemale,
-  PGMmiscDialogue: dialogueMiscMale,
-  PGFmiscDialogue: dialogueMiscFemale,
-  PGMdoubleBattleDialogue: dialogueDoubleBattleMale,
-  PGFdoubleBattleDialogue: dialogueDoubleBattleFemale,
+  achv,
+  dialogue,
+  battleSpecDialogue,
+  miscDialogue,
+  doubleBattleDialogue,
   egg,
   fightUiHandler,
   filterBar,
diff --git a/src/locales/ca_ES/dialogue-final-boss-male.json b/src/locales/es/dialogue-double-battle.json
similarity index 100%
rename from src/locales/ca_ES/dialogue-final-boss-male.json
rename to src/locales/es/dialogue-double-battle.json
diff --git a/src/locales/ca_ES/dialogue-male.json b/src/locales/es/dialogue-final-boss.json
similarity index 100%
rename from src/locales/ca_ES/dialogue-male.json
rename to src/locales/es/dialogue-final-boss.json
diff --git a/src/locales/es/dialogue-misc-female.json b/src/locales/es/dialogue-misc-female.json
deleted file mode 100644
index 9e26dfeeb6e..00000000000
--- a/src/locales/es/dialogue-misc-female.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/src/locales/es/dialogue-misc-male.json b/src/locales/es/dialogue-misc-male.json
deleted file mode 100644
index 9e26dfeeb6e..00000000000
--- a/src/locales/es/dialogue-misc-male.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/src/locales/ca_ES/dialogue-misc-female.json b/src/locales/es/dialogue-misc.json
similarity index 100%
rename from src/locales/ca_ES/dialogue-misc-female.json
rename to src/locales/es/dialogue-misc.json
diff --git a/src/locales/es/dialogue.json b/src/locales/es/dialogue.json
new file mode 100644
index 00000000000..cbd7dbf39ad
--- /dev/null
+++ b/src/locales/es/dialogue.json
@@ -0,0 +1,52 @@
+{
+  "aether_grunt": {
+    "encounter": {
+      "1": "¡Lucharé con toda mi fuerza para detenerte!",
+      "2": "Me da igual que seas un crío. Eres una amenaza y debes irte.",
+      "3": "Me dijeron que mandara a todos los entrenadores por donde venían, ¡sin excepciones!",
+      "4": "¡Te mostraré el poder del Paraíso Æther!",
+      "5": "Ahora que conoces la oscuridad en lo profundo del Paraíso Æther, es hora de que vayas desapareciendo..."
+    },
+    "victory": {
+      "1": "¡Vaya! Demuestras habilidad.",
+      "2": "¿Qué quiere decir esto? ¿Eh?",
+      "3": "¡Vaya! Con esa fuerza, ¡no creo que pueda detenerte!",
+      "4": "Vaya... parece que puede que haya perdido.",
+      "5": "¡Mira, te hago una mueca!: ¡Aiyee!"
+    }
+  },
+  "faba": {
+    "encounter": {
+      "1": "¡Yo, Subdirector Fabio, te mostraré la cruda realidad del mundo!",
+      "2": "¿Yo, la última línea de defensa de Æther, battallando a un mero crío?",
+      "3": "Yo, Fabio, soy el Subdirector de la Fundación Æther. Soy el único en el mundo, soy irremplazable."
+    },
+    "victory": {
+      "1": "¡Aaaah!",
+      "2": "¿C-c-cómo puede ser? Eres tan solo un niño...",
+      "3": "Este... este es el motivo por el que odio a los niños."
+    }
+  },
+  "aether_boss_lusamine_1": {
+    "encounter": {
+      "1": "¡Vas a asustar a mi pobre criatura! Parece que tendré que silenciarte cuanto antes."
+    },
+    "victory": {
+      "1": "¿Cómo?¿Cómo puedes ser tan terrible?"
+    },
+    "defeat": {
+      "1": "Buff."
+    }
+  },
+  "aether_boss_lusamine_2": {
+    "encounter": {
+      "1": "¡¿Por qué me sigues molestando?! Estoy cansada de ti. ¡Hasta las narices!\n$Se acabó esta charla innecesaria. Este es el poder de Nihilego, ¡te demostraré cuánto te equivocas al venir aquí!"
+    },
+    "victory": {
+      "1": "¡¡¡Aaauuuggghhhhhhhhh!!!"
+    },
+    "defeat": {
+      "1": "¡Todo lo que quiero es a esta preciosa criatura! ¡Los demás no me importáis!"
+    }
+  }
+}
diff --git a/src/locales/es/menu-ui-handler.json b/src/locales/es/menu-ui-handler.json
index 0b18ba5d343..c906324cdbf 100644
--- a/src/locales/es/menu-ui-handler.json
+++ b/src/locales/es/menu-ui-handler.json
@@ -3,7 +3,6 @@
   "ACHIEVEMENTS": "Logros",
   "STATS": "Estadísticas",
   "RUN_HISTORY": "Historial de partida",
-  "VOUCHERS": "Vales",
   "EGG_LIST": "Lista de Huevos",
   "EGG_GACHA": "Gacha de Huevos",
   "MANAGE_DATA": "Gestionar Datos",
diff --git a/src/locales/es/menu.json b/src/locales/es/menu.json
index 3c6587fa462..bd2479a02df 100644
--- a/src/locales/es/menu.json
+++ b/src/locales/es/menu.json
@@ -16,7 +16,7 @@
   "invalidLoginUsername": "El usuario no es válido",
   "invalidRegisterUsername": "El usuario solo puede contener letras, números y guiones bajos",
   "invalidLoginPassword": "La contraseña no es válida",
-  "invalidRegisterPassword": "Contraseña debe tener 6 o más caracter.",
+  "invalidRegisterPassword": "La contraseña debe tener 6 o más caracteres.",
   "usernameAlreadyUsed": "El usuario ya está en uso",
   "accountNonExistent": "El usuario no existe",
   "unmatchingPassword": "La contraseña no coincide",
@@ -37,12 +37,19 @@
   "weeklyRankings": "Rankings Semanales",
   "noRankings": "Sin Rankings",
   "positionIcon": "#",
+  "usernameScoreboard": "Usuario",
+  "score": "Puntos",
+  "wave": "Oleada",
   "loading": "Cargando…",
   "loadingAsset": "Cargando recurso: {{assetName}}",
   "playersOnline": "Jugadores en Línea",
   "yes": "Sí",
   "no": "No",
   "disclaimer": "AVISO",
-  "disclaimerDescription": "Este juego es un producto inacabado; puede tener problemas de jugabilidad (incluyendo la posible pérdida\n de datos de guardado),cambiar sin avisar, y puede o no puede ser actualizado hasta ser completado.",
-  "errorServerDown": "¡Ups! Ha habido un problema al contactar con el servidor.\n\nPuedes mantener esta ventana abierta,\nel juego se reconectará automáticamente."
-}
\ No newline at end of file
+  "disclaimerDescription": "Este juego es un producto inacabado; puede tener problemas de jugabilidad (incluyendo la posible pérdida\n de datos de guardado), cambiar sin avisar, y puede o no puede ser actualizado hasta ser completado.",
+  "choosePokemon": "Elige un Pokémon.",
+  "renamePokemon": "Renombrar Pokémon.",
+  "rename": "Renombrar",
+  "nickname": "Apodo",
+  "errorServerDown": "¡Ups! Ha habido un problema al contactar con el servidor.\n\nPuedes mantener esta ventana abierta, el juego se reconectará automáticamente."
+}
diff --git a/src/locales/es/modifier-type.json b/src/locales/es/modifier-type.json
index ef6d5acbfa2..95325788bf4 100644
--- a/src/locales/es/modifier-type.json
+++ b/src/locales/es/modifier-type.json
@@ -97,6 +97,10 @@
       "name": "MT{{moveId}} - {{moveName}}",
       "description": "Enseña {{moveName}} a un Pokémon."
     },
+    "TmModifierTypeWithInfo": {
+      "name": "MT{{moveId}} - {{moveName}}",
+      "description": "Enseña {{moveName}} a un Pokémon\n(Mantén pulsado C o Shift para más info)."
+    },
     "EvolutionItemModifierType": {
       "description": "Hace que ciertos Pokémon evolucionen."
     },
@@ -129,12 +133,12 @@
       "name": "Caramelorarísimo"
     },
     "MEGA_BRACELET": {
-      "name": "Mega-aro",
-      "description": "Las Megapiedras están disponibles."
+      "name": "Megapulsera",
+      "description": "Las megapiedras se vuelven disponibles."
     },
     "DYNAMAX_BAND": {
       "name": "Maximuñequera",
-      "description": "Las Maxisetas están disponibles."
+      "description": "Las maxisetas se vuelven disponibles."
     },
     "TERA_ORB": {
       "name": "Orbe Teracristal",
@@ -154,42 +158,42 @@
       "name": "Hiperpoción"
     },
     "MAX_POTION": {
-      "name": "Máx. Poción"
+      "name": "Máx. poción"
     },
     "FULL_RESTORE": {
-      "name": "Restau. Todo"
+      "name": "Restau. todo"
     },
     "REVIVE": {
       "name": "Revivir"
     },
     "MAX_REVIVE": {
-      "name": "Máx. Revivir"
+      "name": "Máx. revivir"
     },
     "FULL_HEAL": {
-      "name": "Cura Total"
+      "name": "Cura total"
     },
     "SACRED_ASH": {
-      "name": "Cen. Sagrada"
+      "name": "Ceniza sagrada"
     },
     "REVIVER_SEED": {
-      "name": "Semilla Revivir",
+      "name": "Semilla revivir",
       "description": "Revive al portador con la mitad de sus PS al debilitarse por un golpe directo."
     },
     "WHITE_HERB": {
-      "name": "White Herb",
-      "description": "An item to be held by a Pokémon. It will restore any lowered stat in battle."
+      "name": "Hierba blanca",
+      "description": "Un objeto que puede llevar un Pokémon. Restaurará cualquier estadística reducida en combate."
     },
     "ETHER": {
       "name": "Éter"
     },
     "MAX_ETHER": {
-      "name": "Éter Máx."
+      "name": "Éter máx."
     },
     "ELIXIR": {
       "name": "Elixir"
     },
     "MAX_ELIXIR": {
-      "name": "Elixir Máx."
+      "name": "Elixir máx."
     },
     "PP_UP": {
       "name": "Más PP"
@@ -204,10 +208,10 @@
       "name": "Superincienso"
     },
     "MAX_LURE": {
-      "name": "Incienso Máximo"
+      "name": "Incienso máximo"
     },
     "MEMORY_MUSHROOM": {
-      "name": "Seta Recuerdo",
+      "name": "Seta recuerdo",
       "description": "Recuerda un movimiento olvidado de un Pokémon."
     },
     "EXP_SHARE": {
@@ -215,8 +219,8 @@
       "description": "Los que no combatan reciben el 20% de la EXP."
     },
     "EXP_BALANCE": {
-      "name": "Equilibrar EXP",
-      "description": "Da mayor parte de la EXP recibida a los miembros del equipo que tengan menos nivel."
+      "name": "Equilibrador EXP",
+      "description": "Da una mayor parte de la EXP recibida a los miembros del equipo que tengan menos nivel."
     },
     "OVAL_CHARM": {
       "name": "Amuleto Oval",
@@ -232,13 +236,13 @@
       "name": "Amuleto EXP Dorado"
     },
     "LUCKY_EGG": {
-      "name": "Huevo Suerte"
+      "name": "Huevo suerte"
     },
     "GOLDEN_EGG": {
-      "name": "Huevo Dorado"
+      "name": "Huevo dorado"
     },
     "SOOTHE_BELL": {
-      "name": "Camp. Alivio"
+      "name": "Camp. alivio"
     },
     "SCOPE_LENS": {
       "name": "Periscopio",
@@ -249,7 +253,7 @@
       "description": "Puerro muy largo y duro que aumenta la probabilidad de asestar un golpe crítico. Debe llevarlo Farfetch'd."
     },
     "EVIOLITE": {
-      "name": "Mineral Evolutivo",
+      "name": "Mineral evolutivo",
       "description": "Roca misteriosa. El Pokémon portador aumentará su Defensa y su Defensa Especial si aún puede evolucionar."
     },
     "SOUL_DEW": {
@@ -266,7 +270,7 @@
       "name": "Real de oro"
     },
     "AMULET_COIN": {
-      "name": "Moneda Amuleto",
+      "name": "Moneda amuleto",
       "description": "Aumenta el dinero ganado en un 20%."
     },
     "GOLDEN_PUNCH": {
@@ -279,10 +283,10 @@
     },
     "LOCK_CAPSULE": {
       "name": "Cápsula candado",
-      "description": "Le permite bloquear las rarezas de los objetos al cambiar de objetos."
+      "description": "Permite bloquear las rarezas de los objetos al refrescar objetos."
     },
     "GRIP_CLAW": {
-      "name": "Garra Garfio"
+      "name": "Garra garfio"
     },
     "WIDE_LENS": {
       "name": "Lupa"
@@ -294,20 +298,24 @@
       "name": "Amuleto curación",
       "description": "Aumenta la efectividad de los movimientos y objetos de curacion de PS en un 10% (excepto revivir)."
     },
+    "CANDY_JAR": {
+      "name": "Tarrón de caramelos",
+      "description": "Aumenta la cantidad de niveles otorgados por los ítems Caramelos Raros en 1."
+    },
     "BERRY_POUCH": {
-      "name": "Saco Bayas",
-      "description": "Agrega un 30% de posibilidades de que una baya usada no se consuma."
+      "name": "Saco bayas",
+      "description": "Añade un 30% de posibilidades de que una baya no se gaste al usarla."
     },
     "FOCUS_BAND": {
-      "name": "Cinta Focus",
+      "name": "Banda aguante",
       "description": "Agrega un 10% de probabilidad de resistir un ataque que lo debilitaría."
     },
     "QUICK_CLAW": {
-      "name": "Garra Rápida",
+      "name": "Garra rápida",
       "description": "Agrega un 10% de probabilidad de atacar primero independientemente de la velocidad (después de la prioridad)."
     },
     "KINGS_ROCK": {
-      "name": "Roca del Rey",
+      "name": "Roca del rey",
       "description": "Agrega un 10% de probabilidad de que un ataque haga que el oponente retroceda."
     },
     "LEFTOVERS": {
@@ -315,7 +323,7 @@
       "description": "Cura 1/16 de los PS máximo de un Pokémon cada turno."
     },
     "SHELL_BELL": {
-      "name": "Camp Concha",
+      "name": "Cascabel concha",
       "description": "Cura 1/8 del daño infligido por un Pokémon."
     },
     "TOXIC_ORB": {
@@ -327,15 +335,15 @@
       "description": "Extraña esfera que causa quemaduras a quien la usa en combate."
     },
     "BATON": {
-      "name": "Relevo",
+      "name": "Testigo",
       "description": "Permite pasar los efectos al cambiar de Pokémon, también evita las trampas."
     },
     "SHINY_CHARM": {
-      "name": "Amuleto Iris",
+      "name": "Amuleto iris",
       "description": "Aumenta drásticamente la posibilidad de que un Pokémon salvaje sea Shiny."
     },
     "ABILITY_CHARM": {
-      "name": "Amuleto Habilidad",
+      "name": "Amuleto habilidad",
       "description": "Aumenta drásticamente la posibilidad de que un Pokémon salvaje tenga una habilidad oculta."
     },
     "IV_SCANNER": {
@@ -346,60 +354,60 @@
       "name": "Punta ADN"
     },
     "MINI_BLACK_HOLE": {
-      "name": "Mini Agujero Negro"
+      "name": "Mini agujero negro"
     },
     "GOLDEN_POKEBALL": {
       "name": "Poké Ball Dorada",
       "description": "Agrega 1 opción de objeto extra al final de cada combate."
     },
     "ENEMY_DAMAGE_BOOSTER": {
-      "name": "Ficha Daño",
+      "name": "Ficha de daño",
       "description": "Aumenta el daño en un 5%."
     },
     "ENEMY_DAMAGE_REDUCTION": {
-      "name": "Ficha Protección",
+      "name": "Ficha de protección",
       "description": "Reduce el daño recibido en un 2,5%."
     },
     "ENEMY_HEAL": {
-      "name": "Ficha Curación",
+      "name": "Ficha de curación",
       "description": "Cura el 2% de los PS máximo en cada turno."
     },
     "ENEMY_ATTACK_POISON_CHANCE": {
-      "name": "Ficha Veneno"
+      "name": "Ficha veneno"
     },
     "ENEMY_ATTACK_PARALYZE_CHANCE": {
-      "name": "Ficha Parálisis"
+      "name": "Ficha parálisis"
     },
     "ENEMY_ATTACK_BURN_CHANCE": {
-      "name": "Ficha Quemadura"
+      "name": "Ficha quemadura"
     },
     "ENEMY_STATUS_EFFECT_HEAL_CHANCE": {
-      "name": "Ficha Cura Total",
+      "name": "Ficha cura total",
       "description": "Agrega un 2.5% de probabilidad cada turno de curar un problema de estado."
     },
     "ENEMY_ENDURE_CHANCE": {
-      "name": "Ficha Aguante"
+      "name": "Ficha aguante"
     },
     "ENEMY_FUSED_CHANCE": {
-      "name": "Ficha Fusión",
+      "name": "Ficha fusión",
       "description": "Agrega un 1% de probabilidad de que un Pokémon salvaje sea una fusión."
     }
   },
   "SpeciesBoosterItem": {
     "LIGHT_BALL": {
-      "name": "Bola Luminosa",
+      "name": "Bola luminosa",
       "description": "Asombrosa esfera que aumenta el Ataque y el Ataque Especial. Debe llevarla Pikachu."
     },
     "THICK_CLUB": {
-      "name": "Hueso Grueso",
+      "name": "Hueso grueso",
       "description": "Extraño tipo de hueso que potencia los ataques físicos. Debe llevarlo Cubone o Marowak."
     },
     "METAL_POWDER": {
-      "name": "Polvo Metálico",
+      "name": "Polvo metálico",
       "description": "Polvo muy fino, pero a la vez poderoso, que aumenta la Defensa. Debe llevarlo Ditto."
     },
     "QUICK_POWDER": {
-      "name": "Polvo Veloz",
+      "name": "Polvo veloz",
       "description": "Polvo muy fino, pero a la vez poderoso, que aumenta la Velocidad. Debe llevarlo Ditto."
     }
   },
@@ -413,35 +421,35 @@
     "dire_hit": "Crítico X"
   },
   "TempBattleStatBoosterStatName": {
-    "ATK": "Attack",
-    "DEF": "Defense",
-    "SPATK": "Sp. Atk",
-    "SPDEF": "Sp. Def",
-    "SPD": "Speed",
-    "ACC": "Accuracy",
-    "CRIT": "Critical Hit Ratio",
-    "EVA": "Evasiveness",
+    "ATK": "Ataque",
+    "DEF": "Defensa",
+    "SPATK": "Ataq. Esp.",
+    "SPDEF": "Def. Esp.",
+    "SPD": "Velocidad",
+    "ACC": "Precisión",
+    "CRIT": "Tasa de crítico",
+    "EVA": "Evasión",
     "DEFAULT": "???"
   },
   "AttackTypeBoosterItem": {
-    "silk_scarf": "Pañuelo Seda",
-    "black_belt": "Cinturón Negro",
-    "sharp_beak": "Pico Afilado",
-    "poison_barb": "Flecha Venenosa",
-    "soft_sand": "Arena Fina",
-    "hard_stone": "Piedra Dura",
-    "silver_powder": "Polvo Plata",
+    "silk_scarf": "Pañuelo seda",
+    "black_belt": "Cinturón negro",
+    "sharp_beak": "Pico afilado",
+    "poison_barb": "Flecha venenosa",
+    "soft_sand": "Arena fina",
+    "hard_stone": "Piedra dura",
+    "silver_powder": "Polvo plata",
     "spell_tag": "Hechizo",
-    "metal_coat": "Rev. Metálico",
+    "metal_coat": "Revest. metálico",
     "charcoal": "Carbón",
-    "mystic_water": "Agua Mística",
-    "miracle_seed": "Semilla Milagro",
+    "mystic_water": "Agua mística",
+    "miracle_seed": "Semilla milagro",
     "magnet": "Imán",
-    "twisted_spoon": "Cuchara Torcida",
+    "twisted_spoon": "Cuchara torcida",
     "never_melt_ice": "Antiderretir",
-    "dragon_fang": "Colmillo Dragón",
-    "black_glasses": "Gafas de Sol",
-    "fairy_feather": "Pluma Hada"
+    "dragon_fang": "Colmillo dragón",
+    "black_glasses": "Gafas de sol",
+    "fairy_feather": "Pluma feérica"
   },
   "BaseStatBoosterItem": {
     "hp_up": "Más PS",
@@ -452,38 +460,38 @@
     "carbos": "Carburante"
   },
   "EvolutionItem": {
-    "NONE": "None",
-    "LINKING_CORD": "Cordón Unión",
-    "SUN_STONE": "Piedra Solar",
-    "MOON_STONE": "Piedra Lunar",
-    "LEAF_STONE": "Piedra Hoja",
-    "FIRE_STONE": "Piedra Fuego",
-    "WATER_STONE": "Piedra Agua",
-    "THUNDER_STONE": "Piedra Trueno",
-    "ICE_STONE": "Piedra Hielo",
-    "DUSK_STONE": "Piedra Noche",
-    "DAWN_STONE": "Piedra Alba",
-    "SHINY_STONE": "Piedra Día",
-    "CRACKED_POT": "Tetera Agrietada",
-    "SWEET_APPLE": "Manzana Dulce",
-    "TART_APPLE": "Manzana Ácida",
-    "STRAWBERRY_SWEET": "Confite Fresa",
-    "UNREMARKABLE_TEACUP": "Cuenco Mediocre",
-    "CHIPPED_POT": "Tetera Rota",
-    "BLACK_AUGURITE": "Mineral Negro",
-    "GALARICA_CUFF": "Brazal Galanuez",
-    "GALARICA_WREATH": "Corona Galanuez",
-    "PEAT_BLOCK": "Bloque de Turba",
-    "AUSPICIOUS_ARMOR": "Armadura Auspiciosa",
-    "MALICIOUS_ARMOR": "Armadura Maldita",
-    "MASTERPIECE_TEACUP": "Cuenco Exquisito",
-    "METAL_ALLOY": "Metal Compuesto",
-    "SCROLL_OF_DARKNESS": "Manuscrito Sombras",
-    "SCROLL_OF_WATERS": "Manuscrito Aguas",
-    "SYRUPY_APPLE": "Manzana Melosa"
+    "NONE": "Ninguno",
+    "LINKING_CORD": "Cordón unión",
+    "SUN_STONE": "Piedra solar",
+    "MOON_STONE": "Piedra lunar",
+    "LEAF_STONE": "Piedra hoja",
+    "FIRE_STONE": "Piedra fuego",
+    "WATER_STONE": "Piedra agua",
+    "THUNDER_STONE": "Piedra trueno",
+    "ICE_STONE": "Piedra hielo",
+    "DUSK_STONE": "Piedra noche",
+    "DAWN_STONE": "Piedra alba",
+    "SHINY_STONE": "Piedra día",
+    "CRACKED_POT": "Tetera agrietada",
+    "SWEET_APPLE": "Manzana dulce",
+    "TART_APPLE": "Manzana ácida",
+    "STRAWBERRY_SWEET": "Confite fresa",
+    "UNREMARKABLE_TEACUP": "Cuenco mediocre",
+    "CHIPPED_POT": "Tetera rota",
+    "BLACK_AUGURITE": "Mineral negro",
+    "GALARICA_CUFF": "Brazal galanuez",
+    "GALARICA_WREATH": "Corona galanuez",
+    "PEAT_BLOCK": "Bloque de turba",
+    "AUSPICIOUS_ARMOR": "Armadura auspiciosa",
+    "MALICIOUS_ARMOR": "Armadura maldita",
+    "MASTERPIECE_TEACUP": "Cuenco exquisito",
+    "METAL_ALLOY": "Metal compuesto",
+    "SCROLL_OF_DARKNESS": "Manuscrito sombras",
+    "SCROLL_OF_WATERS": "Manuscrito aguas",
+    "SYRUPY_APPLE": "Manzana melosa"
   },
   "FormChangeItem": {
-    "NONE": "None",
+    "NONE": "Ninguno",
     "ABOMASITE": "Abomasnowita",
     "ABSOLITE": "Absolita",
     "AERODACTYLITE": "Aerodactylita",
@@ -532,70 +540,70 @@
     "SWAMPERTITE": "Swampertita",
     "TYRANITARITE": "Tyranitarita",
     "VENUSAURITE": "Venusaurita",
-    "BLUE_ORB": "Prisma Azul",
-    "RED_ORB": "Prisma Rojo",
-    "SHARP_METEORITE": "Meteorito Afilado",
-    "HARD_METEORITE": "Meteorito Duro",
-    "SMOOTH_METEORITE": "Meteorito Suave",
-    "ADAMANT_CRYSTAL": "Gran Diamansfera",
-    "LUSTROUS_GLOBE": "Gran Lustresfera",
-    "GRISEOUS_CORE": "Gran Griseosfera",
-    "REVEAL_GLASS": "Espejo Veraz",
+    "BLUE_ORB": "Prisma azul",
+    "RED_ORB": "Prisma rojo",
+    "SHARP_METEORITE": "Meteorito afilado",
+    "HARD_METEORITE": "Meteorito duro",
+    "SMOOTH_METEORITE": "Meteorito suave",
+    "ADAMANT_CRYSTAL": "Gran diamansfera",
+    "LUSTROUS_GLOBE": "Gran lustresfera",
+    "GRISEOUS_CORE": "Gran griseosfera",
+    "REVEAL_GLASS": "Espejo veraz",
     "GRACIDEA": "Gracídea",
-    "MAX_MUSHROOMS": "MaxiSetas",
-    "DARK_STONE": "Piedra Oscura",
-    "LIGHT_STONE": "Piedra Luminosa",
-    "PRISON_BOTTLE": "Vasija Castigo",
+    "MAX_MUSHROOMS": "Maxisetas",
+    "DARK_STONE": "Orbe oscuro",
+    "LIGHT_STONE": "Orbe claro",
+    "PRISON_BOTTLE": "Vasija castigo",
     "N_LUNARIZER": "Necroluna",
     "N_SOLARIZER": "Necrosol",
-    "RUSTED_SWORD": "Espada Oxidada",
-    "RUSTED_SHIELD": "Escudo Oxidado",
-    "ICY_REINS_OF_UNITY": "Riendas Unión Heladas",
-    "SHADOW_REINS_OF_UNITY": "Riendas Unión Oscuras",
-    "WELLSPRING_MASK": "Máscara Fuente",
-    "HEARTHFLAME_MASK": "Máscara Horno",
-    "CORNERSTONE_MASK": "Máscara Cimiento",
+    "RUSTED_SWORD": "Espada oxidada",
+    "RUSTED_SHIELD": "Escudo oxidado",
+    "ICY_REINS_OF_UNITY": "Riendas unión heladas",
+    "SHADOW_REINS_OF_UNITY": "Riendas unión oscuras",
+    "WELLSPRING_MASK": "Máscara fuente",
+    "HEARTHFLAME_MASK": "Máscara horno",
+    "CORNERSTONE_MASK": "Máscara cimiento",
     "SHOCK_DRIVE": "FulgoROM",
     "BURN_DRIVE": "PiroROM",
     "CHILL_DRIVE": "CrioROM",
     "DOUSE_DRIVE": "HidroROM",
     "ULTRANECROZIUM_Z": "Ultranecrostal Z",
-    "FIST_PLATE": "Tabla Fuerte",
-    "SKY_PLATE": "Tabla Cielo",
-    "TOXIC_PLATE": "Tabla Tóxica",
-    "EARTH_PLATE": "Tabla Terrax",
-    "STONE_PLATE": "Tabla Pétrea",
-    "INSECT_PLATE": "Tabla Bicho",
-    "SPOOKY_PLATE": "Tabla Terror",
-    "IRON_PLATE": "Tabla Acero",
-    "FLAME_PLATE": "Tabla Llama",
-    "SPLASH_PLATE": "Tabla Linfa",
-    "MEADOW_PLATE": "Tabla Pradal",
-    "ZAP_PLATE": "Tabla Trueno",
-    "MIND_PLATE": "Tabla Mental",
-    "ICICLE_PLATE": "Tabla Helada",
-    "DRACO_PLATE": "Tabla Draco",
-    "DREAD_PLATE": "Tabla Oscura",
-    "PIXIE_PLATE": "Tabla Duende",
-    "BLANK_PLATE": "Tabla Neutra",
-    "LEGEND_PLATE": "Tabla Legendaria",
-    "FIGHTING_MEMORY": "Disco Lucha",
-    "FLYING_MEMORY": "Disco Volador",
-    "POISON_MEMORY": "Disco Veneno",
-    "GROUND_MEMORY": "Disco Tierra",
-    "ROCK_MEMORY": "Disco Roca",
-    "BUG_MEMORY": "Disco Bicho",
-    "GHOST_MEMORY": "Disco Fantasma",
-    "STEEL_MEMORY": "Disco Acero",
-    "FIRE_MEMORY": "Disco Fuego",
-    "WATER_MEMORY": "Disco Agua",
-    "GRASS_MEMORY": "Disco Planta",
-    "ELECTRIC_MEMORY": "Disco Eléctrico",
-    "PSYCHIC_MEMORY": "Disco Psíquico",
-    "ICE_MEMORY": "Disco Hielo",
-    "DRAGON_MEMORY": "Disco Dragón",
-    "DARK_MEMORY": "Disco Siniestro",
-    "FAIRY_MEMORY": "Disco Hada",
-    "BLANK_MEMORY": "Disco Blanco"
+    "FIST_PLATE": "Tabla fuerte",
+    "SKY_PLATE": "Tabla cielo",
+    "TOXIC_PLATE": "Tabla tóxica",
+    "EARTH_PLATE": "Tabla terrax",
+    "STONE_PLATE": "Tabla pétrea",
+    "INSECT_PLATE": "Tabla bicho",
+    "SPOOKY_PLATE": "Tabla terror",
+    "IRON_PLATE": "Tabla acero",
+    "FLAME_PLATE": "Tabla llama",
+    "SPLASH_PLATE": "Tabla linfa",
+    "MEADOW_PLATE": "Tabla pradal",
+    "ZAP_PLATE": "Tabla trueno",
+    "MIND_PLATE": "Tabla mental",
+    "ICICLE_PLATE": "Tabla helada",
+    "DRACO_PLATE": "Tabla draco",
+    "DREAD_PLATE": "Tabla oscura",
+    "PIXIE_PLATE": "Tabla duende",
+    "BLANK_PLATE": "Tabla neutra",
+    "LEGEND_PLATE": "Tabla legendaria",
+    "FIGHTING_MEMORY": "Disco lucha",
+    "FLYING_MEMORY": "Disco volador",
+    "POISON_MEMORY": "Disco veneno",
+    "GROUND_MEMORY": "Disco tierra",
+    "ROCK_MEMORY": "Disco roca",
+    "BUG_MEMORY": "Disco bicho",
+    "GHOST_MEMORY": "Disco fantasma",
+    "STEEL_MEMORY": "Disco acero",
+    "FIRE_MEMORY": "Disco fuego",
+    "WATER_MEMORY": "Disco agua",
+    "GRASS_MEMORY": "Disco planta",
+    "ELECTRIC_MEMORY": "Disco eléctrico",
+    "PSYCHIC_MEMORY": "Disco psíquico",
+    "ICE_MEMORY": "Disco hielo",
+    "DRAGON_MEMORY": "Disco dragón",
+    "DARK_MEMORY": "Disco siniestro",
+    "FAIRY_MEMORY": "Disco hada",
+    "BLANK_MEMORY": "Disco en blanco"
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/es/move.json b/src/locales/es/move.json
index f8ec3be9ca1..f4c28dd02e7 100644
--- a/src/locales/es/move.json
+++ b/src/locales/es/move.json
@@ -3807,4 +3807,4 @@
     "name": "Cadena Virulenta",
     "effect": "Apresa al objetivo con una cadena hecha de ponzoña que le inocula toxinas para minarle las fuerzas. Puede envenenar gravemente."
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/es/pokemon-form.json b/src/locales/es/pokemon-form.json
index 91c49e30ca7..c46521d78da 100644
--- a/src/locales/es/pokemon-form.json
+++ b/src/locales/es/pokemon-form.json
@@ -56,7 +56,8 @@
   "deerlingSummer": "Verano",
   "deerlingAutumn": "Otoño",
   "deerlingWinter": "Invierno",
-  "meloettaAria": "Aria",
+  "meloettaAria": "Lírica",
+  "meloettaPirouette": "Danza",
   "froakieBattleBond": "Fuerte Afecto",
   "scatterbugMeadow": "Floral",
   "scatterbugIcySnow": "Polar",
diff --git a/src/locales/es/pokemon-info.json b/src/locales/es/pokemon-info.json
index 385970171f3..241f5e7c5d0 100644
--- a/src/locales/es/pokemon-info.json
+++ b/src/locales/es/pokemon-info.json
@@ -3,17 +3,18 @@
     "HP": "PS",
     "HPshortened": "PS",
     "ATK": "Ataque",
-    "ATKshortened": "Ata",
+    "ATKshortened": "Atq.",
     "DEF": "Defensa",
-    "DEFshortened": "Def",
-    "SPATK": "At. Esp.",
-    "SPATKshortened": "AtEsp",
+    "DEFshortened": "Def.",
+    "SPATK": "Atq. Esp.",
+    "SPATKshortened": "AtqEs.",
     "SPDEF": "Def. Esp.",
-    "SPDEFshortened": "DefEsp",
+    "SPDEFshortened": "DefEs.",
     "SPD": "Velocidad",
     "SPDshortened": "Veloc.",
-    "ACC": "Accuracy",
-    "EVA": "Evasiveness"
+    "ACC": "Precisión",
+    "EVA": "Evasión",
+    "HPStat": "PS"
   },
   "Type": {
     "UNKNOWN": "Desconocido",
@@ -37,4 +38,4 @@
     "FAIRY": "Hada",
     "STELLAR": "Astral"
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/es/run-history.json b/src/locales/es/run-history.json
index d5c52e10fd9..99b30586621 100644
--- a/src/locales/es/run-history.json
+++ b/src/locales/es/run-history.json
@@ -1,15 +1,15 @@
 {
   "victory":  "¡Victoria!",
-  "defeatedWildM": "Derrotado por ",
-  "defeatedTrainerM": "Derrotado por ",
-  "defeatedTrainerDoubleM": "Derrotado por un dúo",
-  "defeatedRivalM": "Derrotado por el rival",
-  "defeatedM": "Derrotado",
-  "defeatedWildF": "Derrotada por ",
-  "defeatedTrainerF": "Derrotada por ",
-  "defeatedTrainerDoubleF": "Derrotada por un dúo",
-  "defeatedRivalF": "Derrotada por el rival",
-  "defeatedF": "Derrotada",
+  "defeatedWild": "Derrotado por ",
+  "defeatedTrainer": "Derrotado por ",
+  "defeatedTrainerDouble": "Derrotado por un dúo",
+  "defeatedRival": "Derrotado por el rival",
+  "defeated": "Derrotado",
+  "defeatedWild_female": "Derrotada por ",
+  "defeatedTrainer_female": "Derrotada por ",
+  "defeatedTrainerDouble_female": "Derrotada por un dúo",
+  "defeatedRival_female": "Derrotada por el rival",
+  "defeated_female": "Derrotada",
   "luck": "Suerte",
   "score": "Puntuación",
   "mode": "Modo",
@@ -30,8 +30,8 @@
   "money": "Dinero",
   "runLength": "Duración de partida",
   "viewHeldItems": "Objetos equipados",
-  "hallofFameTextM": "¡Bienvenido al Hall de la Fama!",
-  "hallofFameTextF": "¡Bienvenida al Hall de la Fama!",
+  "hallofFameText": "¡Bienvenido al Hall de la Fama!",
+  "hallofFameText_female": "¡Bienvenida al Hall de la Fama!",
   "viewHallOfFame": "¡Ver Hall de la Fama!",
   "viewEndingSplash": "¡Ver la imagen final!"
 }
\ No newline at end of file
diff --git a/src/locales/es/settings.json b/src/locales/es/settings.json
index 2351abf04ae..9c16fbb0fd6 100644
--- a/src/locales/es/settings.json
+++ b/src/locales/es/settings.json
@@ -2,6 +2,106 @@
   "boy": "Chico",
   "girl": "Chica",
   "general": "General",
+  "display": "Pantalla",
   "audio": "Audio",
-  "shopOverlayOpacity": "Opacidad de la fase de compra"
+  "gamepad": "Mando",
+  "keyboard": "Teclado",
+  "gameSpeed": "Veloc. del juego",
+  "hpBarSpeed": "Veloc. barra PS",
+  "expGainsSpeed": "Veloc. de EXP",
+  "expPartyDisplay": "Mostrar EXP del Equipo",
+  "skipSeenDialogues": "Saltar diálogos leídos",
+  "battleStyle": "Estilo de lucha",
+  "enableRetries": "Activar reintento",
+  "hideIvs": "Ocultar escáner de IVs",
+  "tutorials": "Tutoriales",
+  "touchControls": "Control táctil",
+  "vibrations": "Vibración",
+  "normal": "Normal",
+  "fast": "+1",
+  "faster": "+2",
+  "skip": "Saltar",
+  "levelUpNotifications": "Aumentos de nivel",
+  "on": "Sí",
+  "off": "No",
+  "switch": "Cambiar",
+  "set": "Mantener",
+  "auto": "Auto.",
+  "disabled": "Desact.",
+  "language": "Idioma",
+  "change": "Cambiar",
+  "uiTheme": "Color UI",
+  "default": "Predet.",
+  "legacy": "Clásico",
+  "windowType": "Ventana",
+  "moneyFormat": "Formato dinero",
+  "damageNumbers": "Cifras de daño",
+  "simple": "Simple",
+  "fancy": "Elegante",
+  "abbreviated": "Abreviado",
+  "moveAnimations": "Animación de movs.",
+  "showStatsOnLevelUp": "Estadísticas al aum. nivel",
+  "candyUpgradeNotification": "Aviso de caramelos",
+  "passivesOnly": "Solo pasivas",
+  "candyUpgradeDisplay": "Muestra de caramelos",
+  "icon": "Icono",
+  "animation": "Animación",
+  "moveInfo": "Info. de movimientos",
+  "showMovesetFlyout": "Descripción de movimientos",
+  "showArenaFlyout": "Descripción de escenarios",
+  "showTimeOfDayWidget": "Mostrar hora del día",
+  "timeOfDayAnimation": "Animación hora del día",
+  "bounce": "Rebote",
+  "timeOfDay_back": "Vuelta",
+  "spriteSet": "Set de sprites",
+  "consistent": "Consistente",
+  "mixedAnimated": "Mixto",
+  "fusionPaletteSwaps": "Colores de fusión",
+  "playerGender": "Género del jugador",
+  "typeHints": "Pistas de tipos",
+  "masterVolume": "Volumen total",
+  "bgmVolume": "Volumen música",
+  "fieldVolume": "Volumen escenario",
+  "seVolume": "Volumen efectos",
+  "uiVolume": "Volumen sistema",
+  "musicPreference": "Preferencia musical",
+  "mixed": "Mixta",
+  "gamepadPleasePlug": "Conecta un mando o pulsa un botón",
+  "delete": "Eliminar",
+  "keyboardPleasePress": "Pulsa una tecla de tu teclado",
+  "reset": "Restablecer",
+  "requireReload": "Requiere reinicio",
+  "action": "Acción",
+  "back": "Atrás",
+  "pressToBind": "Pulsa para vincular",
+  "pressButton": "Pulsa un botón...",
+  "buttonUp": "Arriba",
+  "buttonDown": "Abajo",
+  "buttonLeft": "Izquierda",
+  "buttonRight": "Derecha",
+  "buttonAction": "Acción",
+  "buttonMenu": "Menú",
+  "buttonSubmit": "Confirmar",
+  "buttonCancel": "Cancelar",
+  "buttonStats": "Estadísticas",
+  "buttonCycleForm": "Cambiar forma",
+  "buttonCycleShiny": "Cambiar shiny",
+  "buttonCycleGender": "Cambiar género",
+  "buttonCycleAbility": "Cambiar habilidad",
+  "buttonCycleNature": "Cambiar naturaleza",
+  "buttonCycleVariant": "Cambiar variante",
+  "buttonSpeedUp": "Acelerar",
+  "buttonSlowDown": "Ralentizar",
+  "alt": " (Alt.)",
+  "mute": "Silenciar",
+  "controller": "Mando",
+  "gamepadSupport": "Soporte de mando",
+  "showBgmBar": "Mostrar título de canción",
+  "moveTouchControls": "Controles táctiles",
+  "shopOverlayOpacity": "Opacidad de la fase de compra",
+  "shopCursorTarget": "Cursor de la tienda",
+  "items": "Objetos",
+  "reroll": "Actualizar",
+  "shop": "Tienda",
+  "checkTeam": "Ver equipo"
 }
diff --git a/src/locales/es/trainer-classes.json b/src/locales/es/trainer-classes.json
index ac36d0c2b83..0677193e4f8 100644
--- a/src/locales/es/trainer-classes.json
+++ b/src/locales/es/trainer-classes.json
@@ -95,5 +95,8 @@
   "worker": "Operario",
   "worker_female": "Operaria",
   "workers": "Operarios",
-  "youngster": "Joven"
-}
\ No newline at end of file
+  "youngster": "Joven",
+  "aether_grunt": "Empleado de la Fundación Æther",
+  "aether_grunt_female": "Empleada de la Fundación Æther",
+  "aether_grunts": "Empleados de la Fundación Æther"
+}
diff --git a/src/locales/es/trainer-names.json b/src/locales/es/trainer-names.json
index 515a62d252a..c6758366db7 100644
--- a/src/locales/es/trainer-names.json
+++ b/src/locales/es/trainer-names.json
@@ -138,11 +138,15 @@
   "rood": "Rood",
   "xerosic": "Xerosic",
   "bryony": "Bryony",
+  "faba": "Fabio",
+
   "maxie": "Maxie",
   "archie": "Archie",
   "cyrus": "Cyrus",
   "ghetsis": "Ghetsis",
   "lysandre": "Lysandre",
+  "lusamine": "Samina",
+
   "blue_red_double": "Azul y Rojo",
   "red_blue_double": "Rojo y Azul",
   "tate_liza_double": "Vito y Leti",
@@ -153,4 +157,4 @@
   "iris_alder_double": "Iris y Mirto",
   "marnie_piers_double": "Roxy y Nerio",
   "piers_marnie_double": "Nerio y Roxy"
-}
\ No newline at end of file
+}
diff --git a/src/locales/es/trainer-titles.json b/src/locales/es/trainer-titles.json
index d352e404500..5bee9fc8c51 100644
--- a/src/locales/es/trainer-titles.json
+++ b/src/locales/es/trainer-titles.json
@@ -16,6 +16,8 @@
   "galactic_boss": "Team Galactic Boss",
   "plasma_boss": "Team Plasma Boss",
   "flare_boss": "Team Flare Boss",
+  "aether_boss": "Presidente Æther",
+
   "rocket_admin": "Team Rocket Admin",
   "rocket_admin_female": "Team Rocket Admin",
   "magma_admin": "Team Magma Admin",
@@ -27,5 +29,6 @@
   "plasma_sage": "Team Plasma Sage",
   "plasma_admin": "Team Plasma Admin",
   "flare_admin": "Team Flare Admin",
-  "flare_admin_female": "Team Flare Admin"
-}
\ No newline at end of file
+  "flare_admin_female": "Team Flare Admin",
+  "aether_admin": "Director de la Fundación Æther"
+}
diff --git a/src/locales/fr/ability-trigger.json b/src/locales/fr/ability-trigger.json
index 0f91f6e2209..d10fc18a146 100644
--- a/src/locales/fr/ability-trigger.json
+++ b/src/locales/fr/ability-trigger.json
@@ -12,7 +12,7 @@
   "typeImmunityHeal": "{{abilityName}} de {{pokemonNameWithAffix}}\nrestaure un peu ses PV !",
   "nonSuperEffectiveImmunity": "{{pokemonNameWithAffix}} évite\nles dégâts avec {{abilityName}} !",
   "disguiseAvoidedDamage": "Le déguisement de {{pokemonNameWithAffix}}\ntombe !",
-  "moveImmunity": "Ça n'affecte pas {{pokemonNameWithAffix}}…",
+  "moveImmunity": "Ça n’affecte pas {{pokemonNameWithAffix}}…",
   "reverseDrain": "{{pokemonNameWithAffix}} aspire\nle suintement !",
   "postDefendTypeChange": "{{abilityName}} de {{pokemonNameWithAffix}}\nle transforme en type {{typeName}} !",
   "postDefendContactDamage": "{{pokemonNameWithAffix}} est blessé\npar son talent {{abilityName}} !",
@@ -23,7 +23,7 @@
   "postAttackStealHeldItem": "{{pokemonNameWithAffix}} vole\nl’objet {{stolenItemType}} de {{defenderName}} !",
   "postDefendStealHeldItem": "{{pokemonNameWithAffix}} vole\nl’objet {{stolenItemType}} de {{attackerName}} !",
   "copyFaintedAllyAbility": "{{pokemonNameWithAffix}} reçoit\nle talent {{abilityName}} !",
-  "intimidateImmunity": "{{abilityName}} de {{pokemonNameWithAffix}}\nl’empêche d'être intimidé !",
+  "intimidateImmunity": "{{abilityName}} de {{pokemonNameWithAffix}}\nl’empêche d’être intimidé !",
   "postSummonAllyHeal": "{{pokemonNameWithAffix}} boit le thé\npréparé par {{pokemonName}} !",
   "postSummonClearAllyStats": "Les stats de {{pokemonNameWithAffix}}\nsont revenues à la normale !",
   "postSummonTransform": "{{pokemonNameWithAffix}} prend\nl’apparence de {{targetName}} !",
@@ -59,4 +59,4 @@
   "postSummonTabletsOfRuin": "Le Bois du Fléau de {{pokemonNameWithAffix}}\naffaiblit l’{{statName}} des Pokémon alentour !",
   "postSummonBeadsOfRuin": "Les Perles du Fléau de {{pokemonNameWithAffix}}\naffaiblissent la {{statName}} des Pokémon alentour !",
   "preventBerryUse": "{{pokemonNameWithAffix}} est tendu\net ne peut plus manger de Baies !"
-}
\ No newline at end of file
+}
diff --git a/src/locales/fr/ability.json b/src/locales/fr/ability.json
index 0993fcde3a9..7db44c45fa7 100644
--- a/src/locales/fr/ability.json
+++ b/src/locales/fr/ability.json
@@ -469,11 +469,11 @@
   },
   "honeyGather": {
     "name": "Cherche Miel",
-    "description": "The Pokémon gathers Honey after a battle. The Honey is then sold for money."
+    "description": "Le Pokémon trouve du Miel après un combat et est directement revendu contre de l’argent."
   },
   "frisk": {
     "name": "Fouille",
-    "description": "Lorsqu'il entre en combat, le Pokémon peut vérifier la capacité d'un Pokémon adverse."
+    "description": "Lorsqu’il entre en combat, le Pokémon peut vérifier la capacité d’un Pokémon adverse."
   },
   "reckless": {
     "name": "Téméraire",
@@ -1239,4 +1239,4 @@
     "name": "Emprise Toxique",
     "description": "Lorsque Pêchaminus empoisonne un Pokémon grâce à l’une de ses capacités, ce dernier devient également confus."
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/fr/achv-female.json b/src/locales/fr/achv-female.json
deleted file mode 100644
index 0f82f612a6c..00000000000
--- a/src/locales/fr/achv-female.json
+++ /dev/null
@@ -1,264 +0,0 @@
-{
-  "10K_MONEY": {
-    "name": "Épargnante"
-  },
-  "1M_MONEY": {
-    "name": "Banquière"
-  },
-  "10M_MONEY": {
-    "name": "Évadée fiscale"
-  },
-  "1000_DMG": {
-    "name": "Boxeuse"
-  },
-  "2500_DMG": {
-    "name": "Distributrice de pains"
-  },
-  "10000_DMG": {
-    "name": "One Punch Woman"
-  },
-  "250_HEAL": {
-    "name": "Infirmière"
-  },
-  "10_RIBBONS": {
-    "name": "Maitresse de la Ligue"
-  },
-  "25_RIBBONS": {
-    "name": "Super Maitresse de la Ligue"
-  },
-  "50_RIBBONS": {
-    "name": "Hyper Maitresse de la Ligue"
-  },
-  "75_RIBBONS": {
-    "name": "Rogue Maitresse de la Ligue"
-  },
-  "100_RIBBONS": {
-    "name": "Master Maitresse de la Ligue"
-  },
-  "SHINY_PARTY": {
-    "name": "Shasseuse",
-    "description": "Avoir une équipe exclusivement composée de Pokémon chromatiques"
-  },
-  "CLASSIC_VICTORY": {
-    "name": "Invaincue",
-    "description": "Terminer le jeu en mode classique"
-  },
-  "Achievements": {
-    "name": "Succès"
-  },
-  "Locked": {
-    "name": "Verrouillé"
-  },
-  "MoneyAchv": {
-    "description": "Récolter un total de {{moneyAmount}} ₽."
-  },
-  "100K_MONEY": {
-    "name": "Je possède des thunes"
-  },
-  "DamageAchv": {
-    "description": "Infliger {{damageAmount}} de dégâts en un coup."
-  },
-  "250_DMG": {
-    "name": "Caïd"
-  },
-  "HealAchv": {
-    "description": "Soigner {{healAmount}} {{HP}} en une fois avec une capacité, un talent ou un objet tenu."
-  },
-  "1000_HEAL": {
-    "name": "Médecin"
-  },
-  "2500_HEAL": {
-    "name": "Clerc"
-  },
-  "10000_HEAL": {
-    "name": "Centre Pokémon"
-  },
-  "LevelAchv": {
-    "description": "Monter un Pokémon au N.{{level}}."
-  },
-  "LV_100": {
-    "name": "Et c’est pas fini !"
-  },
-  "LV_250": {
-    "name": "Élite"
-  },
-  "LV_1000": {
-    "name": "Vers l’infini et au-delà"
-  },
-  "RibbonAchv": {
-    "description": "Accumuler un total de {{ribbonAmount}} Rubans."
-  },
-  "TRANSFER_MAX_BATTLE_STAT": {
-    "name": "Travail d’équipe",
-    "description": "Utiliser Relais avec au moins une statistique montée à fond."
-  },
-  "MAX_FRIENDSHIP": {
-    "name": "Copinage",
-    "description": "Atteindre le niveau de bonheur maximal avec un Pokémon."
-  },
-  "MEGA_EVOLVE": {
-    "name": "Mégamorph",
-    "description": "Méga-évoluer un Pokémon."
-  },
-  "GIGANTAMAX": {
-    "name": "Kaijū",
-    "description": "Gigamaxer un Pokémon."
-  },
-  "TERASTALLIZE": {
-    "name": "J’aime les STAB",
-    "description": "Téracristalliser un Pokémon."
-  },
-  "STELLAR_TERASTALLIZE": {
-    "name": "Le type enfoui",
-    "description": "Téracristalliser un Pokémon en type Stellaire."
-  },
-  "SPLICE": {
-    "name": "Infinite Fusion",
-    "description": "Fusionner deux Pokémon avec le Pointeau ADN."
-  },
-  "MINI_BLACK_HOLE": {
-    "name": "Item-stellar",
-    "description": "Obtenir un Mini Trou Noir."
-  },
-  "CATCH_MYTHICAL": {
-    "name": "Fabuleux",
-    "description": "Capturer un Pokémon fabuleux."
-  },
-  "CATCH_SUB_LEGENDARY": {
-    "name": "(Semi-)Légendaire",
-    "description": "Capturer un Pokémon semi-légendaire."
-  },
-  "CATCH_LEGENDARY": {
-    "name": "Légendaire",
-    "description": "Capturer un Pokémon légendaire."
-  },
-  "SEE_SHINY": {
-    "name": "Chromatique",
-    "description": "Trouver un Pokémon sauvage chromatique."
-  },
-  "HATCH_MYTHICAL": {
-    "name": "Œuf fabuleux",
-    "description": "Obtenir un Pokémon fabuleux dans un Œuf."
-  },
-  "HATCH_SUB_LEGENDARY": {
-    "name": "Œuf semi-légendaire",
-    "description": "Obtenir un Pokémon semi-légendaire dans un Œuf."
-  },
-  "HATCH_LEGENDARY": {
-    "name": "Œuf légendaire",
-    "description": "Obtenir un Pokémon légendaire dans un Œuf."
-  },
-  "HATCH_SHINY": {
-    "name": "Œuf chromatique",
-    "description": "Obtenir un Pokémon chromatique dans un Œuf."
-  },
-  "HIDDEN_ABILITY": {
-    "name": "Potentiel enfoui",
-    "description": "Capturer un Pokémon possédant un talent caché."
-  },
-  "PERFECT_IVS": {
-    "name": "Certificat d’authenticité",
-    "description": "Avoir des IV parfaits sur un Pokémon."
-  },
-  "UNEVOLVED_CLASSIC_VICTORY": {
-    "name": "Le stagiaire de 3e",
-    "description": "Terminer le mode Classique avec au moins un Pokémon non-évolué dans l’équipe."
-  },
-  "MONO_GEN_ONE": {
-    "name": "Le rival originel",
-    "description": "Terminer un challenge avec uniquement des Pokémon\nde 1re génération."
-  },
-  "MONO_GEN_TWO": {
-    "name": "Entre tradition et modernité",
-    "description": "Terminer un challenge avec uniquement des Pokémon\nde 2e génération."
-  },
-  "MONO_GEN_THREE": {
-    "name": "Too much water ?",
-    "description": "Terminer un challenge avec uniquement des Pokémon\nde 3e génération."
-  },
-  "MONO_GEN_FOUR": {
-    "name": "Réellement la plus difficile ?",
-    "description": "Terminer un challenge avec uniquement des Pokémon\nde 4e génération."
-  },
-  "MONO_GEN_FIVE": {
-    "name": "Recast complet",
-    "description": "Terminer un challenge avec uniquement des Pokémon\nde 5e génération."
-  },
-  "MONO_GEN_SIX": {
-    "name": "Aristocrate",
-    "description": "Terminer un challenge avec uniquement des Pokémon\nde 6e génération."
-  },
-  "MONO_GEN_SEVEN": {
-    "name": "Seulement techniquement",
-    "description": "Terminer un challenge avec uniquement des Pokémon\nde 7e génération."
-  },
-  "MONO_GEN_EIGHT": {
-    "name": "L’heure de gloire",
-    "description": "Terminer un challenge avec uniquement des Pokémon\nde 8e génération."
-  },
-  "MONO_GEN_NINE": {
-    "name": "Ça va, c’était EZ",
-    "description": "Terminer un challenge avec uniquement des Pokémon\nde 9e génération."
-  },
-  "MonoType": {
-    "description": "Terminer un challenge en monotype {{type}}."
-  },
-  "MONO_NORMAL": {
-    "name": "Extraordinairement banal"
-  },
-  "MONO_FIGHTING": {
-    "name": "Je connais le kung-fu"
-  },
-  "MONO_FLYING": {
-    "name": "Angry Birds"
-  },
-  "MONO_POISON": {
-    "name": "Touche moi je t’empoisonne !"
-  },
-  "MONO_GROUND": {
-    "name": "Prévisions : Séisme"
-  },
-  "MONO_ROCK": {
-    "name": "Comme un roc"
-  },
-  "MONO_BUG": {
-    "name": "Une chenille !"
-  },
-  "MONO_GHOST": {
-    "name": "SOS Fantômes"
-  },
-  "MONO_STEEL": {
-    "name": "De type Acier !"
-  },
-  "MONO_FIRE": {
-    "name": "Allumer le feu"
-  },
-  "MONO_WATER": {
-    "name": "Vacances en Bretagne"
-  },
-  "MONO_GRASS": {
-    "name": "Ne pas toucher !"
-  },
-  "MONO_ELECTRIC": {
-    "name": "À la masse"
-  },
-  "MONO_PSYCHIC": {
-    "name": "Grocervo"
-  },
-  "MONO_ICE": {
-    "name": "Froid comme la glace"
-  },
-  "MONO_DRAGON": {
-    "name": "Légendes du club, ou presque"
-  },
-  "MONO_DARK": {
-    "name": "Ça va lui passer"
-  },
-  "MONO_FAIRY": {
-    "name": "Hey ! Listen !"
-  },
-  "FRESH_START": {
-    "name": "Du premier coup !",
-    "description": "Terminer un challenge « Nouveau départ »."
-  }
-}
\ No newline at end of file
diff --git a/src/locales/fr/achv-male.json b/src/locales/fr/achv.json
similarity index 84%
rename from src/locales/fr/achv-male.json
rename to src/locales/fr/achv.json
index c51da04ecc8..60655ae22cf 100644
--- a/src/locales/fr/achv-male.json
+++ b/src/locales/fr/achv.json
@@ -9,16 +9,19 @@
     "description": "Récolter un total de {{moneyAmount}} ₽."
   },
   "10K_MONEY": {
-    "name": "Épargnant"
+    "name": "Épargnant",
+    "name_female": "Épargnante"
   },
   "100K_MONEY": {
     "name": "Je possède des thunes"
   },
   "1M_MONEY": {
-    "name": "Banquier"
+    "name": "Banquier",
+    "name_female": "Banquière"
   },
   "10M_MONEY": {
-    "name": "Évadé fiscal"
+    "name": "Évadé fiscal",
+    "name_female": "Évadée fiscale"
   },
   "DamageAchv": {
     "description": "Infliger {{damageAmount}} de dégâts en un coup."
@@ -27,19 +30,23 @@
     "name": "Caïd"
   },
   "1000_DMG": {
-    "name": "Boxeur"
+    "name": "Boxeur",
+    "name_female": "Boxeuse"
   },
   "2500_DMG": {
-    "name": "Distributeur de pains"
+    "name": "Distributeur de pains",
+    "name_female": "Distributrice de pains"
   },
   "10000_DMG": {
-    "name": "One Punch Man"
+    "name": "One Punch Man",
+    "name_female": "One Punch Woman"
   },
   "HealAchv": {
-    "description": "Soigner {{healAmount}} {{HP}} en une fois avec une capacité, un talent ou un objet tenu."
+    "description": "Soigner {{healAmount}} {{HP}} en une fois avec une capacité,\nun talent ou un objet tenu."
   },
   "250_HEAL": {
-    "name": "Infirmier"
+    "name": "Infirmier",
+    "name_female": "Infirmière"
   },
   "1000_HEAL": {
     "name": "Médecin"
@@ -66,19 +73,24 @@
     "description": "Accumuler un total de {{ribbonAmount}} Rubans."
   },
   "10_RIBBONS": {
-    "name": "Maitre de la Ligue"
+    "name": "Maitre de la Ligue",
+    "name_female": "Maitresse de la Ligue"
   },
   "25_RIBBONS": {
-    "name": "Super Maitre de la Ligue"
+    "name": "Super Maitre de la Ligue",
+    "name_female": "Super Maitresse de la Ligue"
   },
   "50_RIBBONS": {
-    "name": "Hyper Maitre de la Ligue"
+    "name": "Hyper Maitre de la Ligue",
+    "name_female": "Hyper Maitresse de la Ligue"
   },
   "75_RIBBONS": {
-    "name": "Rogue Maitre de la Ligue"
+    "name": "Rogue Maitre de la Ligue",
+    "name_female": "Rogue Maitresse de la Ligue"
   },
   "100_RIBBONS": {
-    "name": "Master Maitre de la Ligue"
+    "name": "Master Maitre de la Ligue",
+    "name_female": "Master Maitresse de la Ligue"
   },
   "TRANSFER_MAX_BATTLE_STAT": {
     "name": "Travail d’équipe",
@@ -130,6 +142,7 @@
   },
   "SHINY_PARTY": {
     "name": "Shasseur",
+    "name_female": "Shasseuse",
     "description": "Avoir une équipe exclusivement composée de Pokémon chromatiques."
   },
   "HATCH_MYTHICAL": {
@@ -158,6 +171,7 @@
   },
   "CLASSIC_VICTORY": {
     "name": "Invaincu",
+    "name_female": "Invaincue",
     "description": "Terminer le jeu en mode Classique."
   },
   "UNEVOLVED_CLASSIC_VICTORY": {
@@ -260,5 +274,9 @@
   "FRESH_START": {
     "name": "Du premier coup !",
     "description": "Terminer un challenge « Nouveau départ »."
+  },
+  "INVERSE_BATTLE": {
+    "name": "La teuté à verlan",
+    "description": "Terminer un challenge en Combat Inversé.\nMineter un lenjcha en Ba-con Versin."
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/fr/battle-info.json b/src/locales/fr/battle-info.json
index 1fd968a8bd4..1408fd4d602 100644
--- a/src/locales/fr/battle-info.json
+++ b/src/locales/fr/battle-info.json
@@ -1,3 +1,3 @@
 {
-  "generation": "Génération {{generation}}"
-}
\ No newline at end of file
+  "generation": "{{generation}}"
+}
diff --git a/src/locales/fr/battle.json b/src/locales/fr/battle.json
index bc8c02c07d8..1c108c89ded 100644
--- a/src/locales/fr/battle.json
+++ b/src/locales/fr/battle.json
@@ -38,7 +38,7 @@
   "learnMoveNotLearned": "{{pokemonName}} n’a pas appris\n{{moveName}}.",
   "learnMoveForgetQuestion": "Quelle capacité doit être oubliée ?",
   "learnMoveForgetSuccess": "{{pokemonName}} oublie comment\nutiliser {{moveName}}.",
-  "countdownPoof": "@d{32}1, @d{15}2, @d{15}et@d{15}… @d{15}… @d{15}… @d{15}@s{pb_bounce_1}Tadaaa !",
+  "countdownPoof": "@d{32}1, @d{15}2, @d{15}et@d{15}… @d{15}… @d{15}… @d{15}@s{se/pb_bounce_1}Tadaaa !",
   "learnMoveAnd": "Et…",
   "levelCapUp": "La limite de niveau\na été augmentée à {{levelCap}} !",
   "moveNotImplemented": "{{moveName}} n’est pas encore implémenté et ne peut pas être sélectionné.",
diff --git a/src/locales/fr/bgm-name.json b/src/locales/fr/bgm-name.json
index e32855990f7..ecf0075e79d 100644
--- a/src/locales/fr/bgm-name.json
+++ b/src/locales/fr/bgm-name.json
@@ -1,5 +1,5 @@
 {
-  "music": "Musique : ",
+  "music": "♪ : ",
   "missing_entries": "{{name}}",
   "battle_kanto_champion": "N2B2 - Vs. Maitre de Kanto",
   "battle_johto_champion": "N2B2 - Vs. Maitre de Johto",
@@ -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)",
@@ -78,46 +80,56 @@
   "battle_galactic_grunt": "DÉPS Vs. Team Galaxie",
   "battle_plasma_grunt": "NB - Vs. Team Plasma",
   "battle_flare_grunt": "XY - Vs. Team Flare",
+  "battle_aether_grunt": "SL - Vs. Fondation Æther",
+  "battle_skull_grunt": "SL - Vs. Team Skull",
+  "battle_macro_grunt": "ÉB - Vs. Macro Cosmos",
+  "battle_galactic_admin": "DÉPS - Vs. Admin Team Galaxie",
+  "battle_skull_admin": "SL - Vs. Admin Team Skull",
+  "battle_oleana": "ÉB - Vs. Liv",
   "battle_rocket_boss": "USUL - Vs. Giovanni",
   "battle_aqua_magma_boss": "ROSA - Vs. Arthur/Max",
   "battle_galactic_boss": "DÉPS - Vs. Hélio",
   "battle_plasma_boss": "N2B2 - Vs. Ghetis",
   "battle_flare_boss": "XY - Vs. Lysandre",
-  "abyss": "PDM EdS - Cratère Obscur",
-  "badlands": "PDM EdS - Vallée Stérile",
-  "beach": "PDM EdS - Falaise Trempée",
-  "cave": "PDM EdS - Pic Céleste (grotte)",
-  "construction_site": "PDM EdS - Carrière Rocher",
-  "desert": "PDM EdS - Désert du Nord",
-  "dojo": "PDM EdS - Dojo Ossatueur",
-  "end": "PDM EdS - Tour Céleste",
-  "factory": "PDM EdS - Ruines Cachées",
-  "fairy_cave": "PDM EdS - Caverne Étoile",
-  "forest": "PDM EdS - Forêt Crépuscule",
-  "grass": "PDM EdS - Bois aux Pommes",
-  "graveyard": "PDM EdS - Forêt Trompeuse",
-  "ice_cave": "PDM EdS - Montagne Glacier",
-  "island": "PDM EdS - Côte Escarpée",
+  "battle_aether_boss":  "SL - Vs. Elsa-Mina",
+  "battle_skull_boss": "SL - Vs. Guzma",
+  "battle_macro_boss": "ÉB - Vs. Shehroz",
+
+  "abyss": "PDM EdC - Cratère Obscur",
+  "badlands": "PDM EdC - Vallée Stérile",
+  "beach": "PDM EdC - Falaise Trempée",
+  "cave": "PDM EdC - Pic Céleste (grotte)",
+  "construction_site": "PDM EdC - Carrière Rocher",
+  "desert": "PDM EdC - Désert du Nord",
+  "dojo": "PDM EdC - Dojo Ossatueur",
+  "end": "PDM EdC - Tour Céleste",
+  "factory": "PDM EdC - Ruines Cachées",
+  "fairy_cave": "PDM EdC - Caverne Étoile",
+  "forest": "PDM EdC - Forêt Crépuscule",
+  "grass": "PDM EdC - Bois aux Pommes",
+  "graveyard": "PDM EdC - Forêt Trompeuse",
+  "ice_cave": "PDM EdC - Montagne Glacier",
+  "island": "PDM EdC - Côte Escarpée",
   "jungle": "Lmz - Jungle",
   "laboratory": "Firel - Laboratory",
-  "lake": "PDM EdS - Caverne Cristal",
-  "meadow": "PDM EdS - Pic Céleste (forêt)",
+  "lake": "PDM EdC - Caverne Cristal",
+  "meadow": "PDM EdC - Pic Céleste (forêt)",
   "metropolis": "Firel - Metropolis",
-  "mountain": "PDM EdS - Mt Corne",
-  "plains": "PDM EdS - Pic Céleste (prairie)",
-  "power_plant": "PDM EdS - Plaines Élek",
-  "ruins": "PDM EdS - Ruine Scellée",
+  "mountain": "PDM EdC - Mont Corne",
+  "plains": "PDM EdC - Pic Céleste (prairie)",
+  "power_plant": "PDM EdC - Plaines Élek",
+  "ruins": "PDM EdC - Ruine Scellée",
   "sea": "Andr06 - Marine Mystique",
   "seabed": "Firel - Seabed",
   "slum": "Andr06 - Sneaky Snom",
-  "snowy_forest": "PDM EdS - Pic Céleste (plaine enneigée)",
+  "snowy_forest": "PDM EdC - Pic Céleste (plaine enneigée)",
   "space": "Firel - Aether",
-  "swamp": "PDM EdS - Mer Fermée",
-  "tall_grass": "PDM EdS - Forêt Brumeuse",
-  "temple": "PDM EdS - Grotte Égide",
-  "town": "PDM EdS - Donjon aléatoire - Thème 3",
-  "volcano": "PDM EdS - Grotte Étuve",
-  "wasteland": "PDM EdS - Terres Illusoires",
+  "swamp": "PDM EdC - Mer Fermée",
+  "tall_grass": "PDM EdC - Forêt Brumeuse",
+  "temple": "PDM EdC - Grotte Égide",
+  "town": "PDM EdC - Donjon aléatoire - Thème 3",
+  "volcano": "PDM EdC - Grotte Étuve",
+  "wasteland": "PDM EdC - Terres Illusoires",
   "encounter_ace_trainer": "NB - Regards croisés (Topdresseur·euse)",
   "encounter_backpacker": "NB - Regards croisés (Randonneur·euse)",
   "encounter_clerk": "NB - Regards croisés (Employé·e)",
@@ -133,6 +145,6 @@
   "encounter_twins": "NB - Regards croisés (Jumelles)",
   "encounter_youngster": "NB - Regards croisés (Gamin)",
   "heal": "NB - Soin de Pokémon",
-  "menu": "PDM EdS - Bienvenue dans le monde de Pokémon !",
-  "title": "PDM EdS - Menu Principal"
-}
\ No newline at end of file
+  "menu": "PDM EdC - Bienvenue dans le monde de Pokémon !",
+  "title": "PDM EdC - Menu Principal"
+}
diff --git a/src/locales/fr/challenges.json b/src/locales/fr/challenges.json
index 50a8e34f298..a83ec2e0be4 100644
--- a/src/locales/fr/challenges.json
+++ b/src/locales/fr/challenges.json
@@ -25,5 +25,12 @@
     "desc": "Vous ne pouvez choisir que les starters de base du jeu, comme si vous le recommenciez.",
     "value.0": "Non",
     "value.1": "Oui"
+  },
+  "inverseBattle": {
+    "name": "Combat Inversé",
+    "shortName": "Inversé",
+    "desc": "Les affinités de la table des types sont inversées et plus aucun type n’a d’immunité.\nDésactive les succès des autres challenges.",
+    "value.0": "Non",
+    "value.1": "Oui"
   }
 }
\ No newline at end of file
diff --git a/src/locales/fr/config.ts b/src/locales/fr/config.ts
index a9ca99781fc..f79374cd3b9 100644
--- a/src/locales/fr/config.ts
+++ b/src/locales/fr/config.ts
@@ -4,8 +4,7 @@ import ability from "./ability.json";
 import abilityTriggers from "./ability-trigger.json";
 import arenaFlyout from "./arena-flyout.json";
 import arenaTag from "./arena-tag.json";
-import achvMale from "./achv-male.json";
-import achvFemale from "./achv-female.json";
+import achv from "./achv.json";
 import battle from "./battle.json";
 import battleScene from "./battle-scene.json";
 import battleInfo from "./battle-info.json";
@@ -16,14 +15,10 @@ import bgmName from "./bgm-name.json";
 import biome from "./biome.json";
 import challenges from "./challenges.json";
 import commandUiHandler from "./command-ui-handler.json";
-import dialogueMale from "./dialogue-male.json";
-import dialogueFemale from "./dialogue-female.json";
-import dialogueEndbossMale from "./dialogue-final-boss-male.json";
-import dialogueEndbossFemale from "./dialogue-final-boss-female.json";
-import dialogueMiscMale from "./dialogue-misc-male.json";
-import dialogueMiscFemale from "./dialogue-misc-female.json";
-import dialogueDoubleBattleMale from "./dialogue-double-battle-male.json";
-import dialogueDoubleBattleFemale from "./dialogue-double-battle-female.json";
+import dialogue from "./dialogue.json";
+import battleSpecDialogue from "./dialogue-final-boss.json";
+import miscDialogue from "./dialogue-misc.json";
+import doubleBattleDialogue from "./dialogue-double-battle.json";
 import egg from "./egg.json";
 import fightUiHandler from "./fight-ui-handler.json";
 import filterBar from "./filter-bar.json";
@@ -57,7 +52,7 @@ import weather from "./weather.json";
 import terrain from "./terrain.json";
 import modifierSelectUiHandler from "./modifier-select-ui-handler.json";
 import moveTriggers from "./move-trigger.json";
-import runHistory from "./run-history-ui-handler.json";
+import runHistory from "./run-history.json";
 
 export const frConfig = {
   ability,
@@ -76,16 +71,11 @@ export const frConfig = {
   challenges,
   commandUiHandler,
   common,
-  PGMachv: achvMale,
-  PGFachv: achvFemale,
-  PGMdialogue: dialogueMale,
-  PGFdialogue: dialogueFemale,
-  PGMbattleSpecDialogue: dialogueEndbossMale,
-  PGFbattleSpecDialogue: dialogueEndbossFemale,
-  PGMmiscDialogue: dialogueMiscMale,
-  PGFmiscDialogue: dialogueMiscFemale,
-  PGMdoubleBattleDialogue: dialogueDoubleBattleMale,
-  PGFdoubleBattleDialogue: dialogueDoubleBattleFemale,
+  achv,
+  dialogue,
+  battleSpecDialogue,
+  miscDialogue,
+  doubleBattleDialogue,
   egg,
   fightUiHandler,
   filterBar,
diff --git a/src/locales/fr/dialogue-double-battle-male.json b/src/locales/fr/dialogue-double-battle-male.json
deleted file mode 100644
index a31e855cf4b..00000000000
--- a/src/locales/fr/dialogue-double-battle-male.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "blue_red_double": {
-    "encounter": {
-      "1": "Blue : Hé Red, montrons-leur de quel bois on se chauffe !\n$Red : …\n$Blue : Voilà la puissance du Bourg Palette !"
-    },
-    "victory": {
-      "1": "Blue : C’était un magnifique combat !\n$Red : …"
-    }
-  },
-  "red_blue_double": {
-    "encounter": {
-      "1": "Red : … !\n$Blue : Il est pas très loquace.\n$Blue : Mais ne te laisse pas avoir, ça reste un Maitre Pokémon !"
-    },
-    "victory": {
-      "1": "Red : … !\n$Blue : La prochaine fois, on va te battre !"
-    }
-  },
-  "tate_liza_double": {
-    "encounter": {
-      "1": "Lévy : Héhéhé… Tu en fais une drôle de tête.\n$Tatia : Tu ne t’attendais pas à rencontrer deux Champions, n’est-ce pas ?\n$Lévy : Nous sommes des jumeaux !\n$Tatia : Nous n’avons pas besoin de parler entre nous !\n$Lévy : Tu crois pouvoir briser…\n$Tatia : … Notre duo parfait ?"
-    },
-    "victory": {
-      "1": "Lévy : Quoi ? Notre combinaison était parfaite !\n$Tatia : Nous avons encore besoin d’entrainement…"
-    }
-  },
-  "liza_tate_double": {
-    "encounter": {
-      "1": "Tatia : Hihih… Si tu voyais ta tête !\n$Lévy : Oui, nous sommes deux Champions en un !\n$Tatia : Voici mon frère, Lévy…\n$Lévy : … Et ma sœur, Tatia !\n$Tatia : Tu ne penses pas que notre combinaison est parfaite ?"
-    },
-    "victory": {
-      "1": "Tatia : Quoi ? Notre combinaison…\n$Lévy : … a échoué !"
-    }
-  },
-  "wallace_steven_double": {
-    "encounter": {
-      "1": "Pierre R. : Marc, montrons-lui la puissance des Maitres !\n$Marc : Tu vas gouter au pouvoir de Hoenn !\n$Pierre R. : C’est parti !"
-    },
-    "victory": {
-      "1": "Pierre R. : C’était un beau combat !\n$Marc : Ce sera notre tour la prochaine fois !"
-    }
-  },
-  "steven_wallace_double": {
-    "encounter": {
-      "1": "Pierre R. : Excuse-moi, aurais-tu des Pokémon rares ?\n$Marc : Pierre… Nous sommes là pour nous battre, pas pour frimer avec nos Pokémon.\n$Pierre R. : Oh… Je vois… Commençons alors !"
-    },
-    "victory": {
-      "1": "Pierre R. : Bien, maintenant que ce combat est clos, montrons-nous nos Pokémon !\n$Marc : Pierre…"
-    }
-  },
-  "alder_iris_double": {
-    "encounter": {
-      "1": "Goyah : Nous sommes l’élite des Dresseurs d’Unys !\n$Iris : Rien de mieux que des combats contre des prodiges !"
-    },
-    "victory": {
-      "1": "Goyah : INCROYABLE ! T’es trop doué !\n$Iris : On gagnera la prochaine fois !"
-    }
-  },
-  "iris_alder_double": {
-    "encounter": {
-      "1": "Iris : Bienvenue, Dresseur ! Je suis LA Maitresse d’Unys !\n$Goyah : Iris, concentre-toi s’il te plait…"
-    },
-    "victory": {
-      "1": "Iris : On a tout donné et pourtant…\n$Goyah : Cette défaite ne pourra que nous être bénéfique !"
-    }
-  },
-  "piers_marnie_double": {
-    "encounter": {
-      "1": "Rosemary : Frérot, montrons-lui la puissance de Smashings !\n$Peterson : Nous sommes les ténèbres !"
-    },
-    "victory": {
-      "1": "Rosemary : T’as amené la lumière dans les ténèbres !\n$Peterson : P’têtre un peu trop…"
-    }
-  },
-  "marnie_piers_double": {
-    "encounter": {
-      "1": "Peterson : Chauds pour un concert ?\n$Rosemary : Frérot… Il est pas là pour chanter, mais se battre…"
-    },
-    "victory": {
-      "1": "Peterson : Ça c’est du rock !\n$Rosemary : Frérot…"
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/locales/fr/dialogue-double-battle-female.json b/src/locales/fr/dialogue-double-battle.json
similarity index 91%
rename from src/locales/fr/dialogue-double-battle-female.json
rename to src/locales/fr/dialogue-double-battle.json
index 078149783a9..d35e9d87ced 100644
--- a/src/locales/fr/dialogue-double-battle-female.json
+++ b/src/locales/fr/dialogue-double-battle.json
@@ -1,7 +1,7 @@
 {
   "blue_red_double": {
     "encounter": {
-      "1": "Blue : Hé Red, montrons-leur de quel bois on se chauffe !\n$Red : …\n$Blue : Voilà la puissance du Bourg Palette !"
+      "1": "Blue : Hé Red, montrons-lui de quel bois on se chauffe !\n$Red : …\n$Blue : Voilà la puissance du Bourg Palette !"
     },
     "victory": {
       "1": "Blue : C’était un magnifique combat !\n$Red : …"
@@ -73,10 +73,11 @@
   },
   "marnie_piers_double": {
     "encounter": {
-      "1": "Peterson : Chauds pour un concert ?\n$Rosemary : Frérot… Elle est pas là pour chanter, mais se battre…"
+      "1": "Peterson : Chauds pour un concert ?\n$Rosemary : Frérot… Il est pas là pour chanter, mais se battre…",
+      "1_female": "Peterson : Chauds pour un concert ?\n$Rosemary : Frérot… Elle est pas là pour chanter, mais se battre…"
     },
     "victory": {
       "1": "Peterson : Ça c’est du rock !\n$Rosemary : Frérot…"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/fr/dialogue-female.json b/src/locales/fr/dialogue-female.json
deleted file mode 100644
index 1aaadbb6449..00000000000
--- a/src/locales/fr/dialogue-female.json
+++ /dev/null
@@ -1,458 +0,0 @@
-{
-  "youngster": {
-    "encounter": {
-      "1": "Hé ! Combat ?",
-      "2": "Toi aussi tu débutes ?",
-      "3": "Hé, j’me souviens pas de ta tête. Combat !",
-      "4": "J’ai perdu, alors j’essaye de capturer d’autres Pokémon.\nHé, t’as l’air faible toi ! Allez, combat !",
-      "5": "On s’connait ? J’ai comme un doute. Dans tous les cas, sympa de te rencontrer !",
-      "6": "Allez, c’est parti !",
-      "7": "Attention, me voilà !\nTu vas voir comment j’suis fort !",
-      "8": "Coucou… Tu veux voir mes bô Pokémon ?",
-      "9": "Trève de mondanités. Ramène-toi quand tu le sens !",
-      "10": "Baisse pas ta garde si tu veux pas pleurer d’avoir perdu face à un gamin.",
-      "11": "J’ai tout donné pour élever mes Pokémon. Attention à toi si tu leur fait du mal !",
-      "12": "Incroyable que t’y sois parvenue ! Mais la suite va pas être une partie de plaisir.",
-      "13": "Les combats sont éternels ! Bienvenue dans un monde sans fin !"
-    },
-    "victory": {
-      "1": "Hé, mais t’es trop forte !",
-      "2": "En vrai j’avais aucune chance hein ?",
-      "3": "J’te retrouverai un jour, et là j’te battrai !",
-      "4": "Arg… J’ai plus aucun Pokémon.",
-      "5": "Non… IMPOSSIBLE ! Pourquoi j’ai encore perdu…",
-      "6": "Non ! J’ai perdu !",
-      "7": "Waah ! T’es trop incroyable ! J’suis bouche bée !",
-      "8": "Pourquoi… Comment… Pourtant on est les plus forts, mes Pokémon et moi…",
-      "9": "J’perdrai pas la prochaine fois ! Remettons ça un jour !",
-      "10": "Weeeesh ! Tu vois que j’suis qu’un gamin ? C’est pas juste de me bully comme ça !",
-      "11": "Tes Pokémon sont trop incroyables !\n… P’tit échange ?",
-      "12": "Je me suis fait un peu aider plus tôt, mais de quel taf je parlais ?",
-      "13": "Ahaha ! Et voilà, ça y est !\nT’es déjà comme chez toi dans ce monde !"
-    }
-  },
-  "lass": {
-    "encounter": {
-      "1": "Affrontons-nous, d’accord ?",
-      "2": "T’as l’air d’une nouvelle Dresseuse. Battons nous !",
-      "3": "Je te connais pas. Ça te dis de te battre ?",
-      "4": "Prenons du bon temps avec ce combat Pokémon !",
-      "5": "Je vais t’apprendre à te battre avec tes Pokémon !",
-      "6": "Un combat doit être pris au sérieux. T’es prête à te battre ?",
-      "7": "Tu seras pas jeune éternellement. T’as qu’une chance pendant un combat. Bientôt, tu seras plus qu’un souvenir.",
-      "8": "Tu ferais mieux d’y aller doucement avec moi. Mais je vais me battre sérieusement !",
-      "9": "Je m’ennuie à l’école. Y’a rien à y faire. *Baille*\nJe me bats juste pour passer le temps."
-    },
-    "victory": {
-      "1": "Wah, c’était impressionnant ! J’ai encore beaucoup à apprendre.",
-      "2": "Je pensais pas que je perdrais comme ça…",
-      "3": "J’espère que j’aurai ma revanche un jour.",
-      "4": "C’était super amusant ! Mais ce combat m’a épuisée…",
-      "5": "Tu m’as appris une belle leçon ! T’es vraiment incroyable !",
-      "6": "Vraiment ? J’ai perdu… ? C’est des choses qui arrivent, ça me déprime mais t’es vraiment très cool.",
-      "7": "J’ai pas besoin de ce genre de souvenirs.\n*Suppression de mémoire en cours…*",
-      "8": "Hé ! Je t’avais dit d’y aller doucement avec moi ! Mais t’es vraiment si cool quand tu te bats sérieusement…",
-      "9": "J’en ai marre des combats Pokémon…\nJe vais chercher d’autres trucs à faire…"
-    }
-  },
-  "breeder": {
-    "encounter": {
-      "1": "Qu’ils soient obéissants ou égoïstes… Les Pokémon ont des caractéristiques uniques.",
-      "2": "Même si mes choix et ma personnalité ne sont pas fous, je pense quand même bien avoir élevé mes Pokémon.",
-      "3": "Hum, t’es pas trop laxiste avec tes Pokémon ?\nTrop les chouchouter n’est pas bon."
-    },
-    "victory": {
-      "1": "Il est primordial de nourir et développer toutes les caractéristiques de chaque Pokémon.",
-      "2": "Contrairement à moi, ces Pokémon ont un bon fond.",
-      "3": "Trop d’éloges peut ruiner les Pokémon et les gens."
-    },
-    "defeat": {
-      "1": "Tu ne devrais pas t’énerver sur tes Pokémon, même après une défaite.",
-      "2": "Alors ? Pas mal mes Pokémon, hein ? Je suis fait pour ça.",
-      "3": "Peut importe à quel point t’aimes tes Pokémon, il faut toujours de la discipline s’ils se comportent mal."
-    }
-  },
-  "breeder_female": {
-    "encounter": {
-      "1": "Les Pokémon ne trahissent jamais. Ils te rendront toujours l’amour que tu leur donne.",
-      "2": "Puis-je te donner une astuce pour mieux élever tes Pokémon ?",
-      "3": "J’ai élevé mes Pokémon en utilisant une méthode très spéciale."
-    },
-    "victory": {
-      "1": "Arg… C’était pas supposé se passer comme ça. Leur ai-je administré la mauvaise préparation ?",
-      "2": "Comment ça a pu arriver…\nAvec quoi nourris-tu tes Pokémon ?",
-      "3": "Si je perds, c’est juste pour te dire que je tuais le temps. Mon ego n’est absolument pas touché…"
-    },
-    "defeat": {
-      "1": "C’est la preuve que mes Pokémon reconnaissent tout mon amour.",
-      "2": "Le seul secret derrière des Pokémon bien entrainés, c’est surtout d’en capturer des bons.",
-      "3": "La force des Pokémon dépend de ta capacité à savoir les élever correctement."
-    }
-  },
-  "fisherman": {
-    "encounter": {
-      "1": "Aaah non ! J’avais une touche !\nTu comptes faire quoi pour arranger ça ?",
-      "2": "Bouge de là ! Tu fais peur aux Pokémon !",
-      "3": "Voyons si t’arrives à ferrer une victoire !"
-    },
-    "victory": {
-      "1": "Vas-y là, oublie.",
-      "2": "La prochaine fois, je vais me repêcher !",
-      "3": "Je présume que j’ai sous-estimé les courants…"
-    }
-  },
-  "fisherman_female": {
-    "encounter": {
-      "1": "Oh la belle prise !",
-      "2": "Ma ligne est en place, prête à ferrer le succès !",
-      "3": "Prête à faire des vagues !"
-    },
-    "victory": {
-      "1": "Je suppose que je vais avoir besoin d’un plus gros hameçon.",
-      "2": "La ligne s’est brisée, j’ai pas pu la ferrer…",
-      "3": "Attends que j’aiguise mes hameçons pour la revanche !"
-    }
-  },
-  "swimmer": {
-    "encounter": {
-      "1": "C’est l’heure de plonger dans le vif !",
-      "2": "C’est le moment de surfer sur les vagues de la victoire !",
-      "3": "Je vais t’éclabousser de mon talent !"
-    },
-    "victory": {
-      "1": "Tu m’as complètement séché",
-      "2": "Il semblerait que ce soit celles de la défaite…",
-      "3": "Retour sur la terre ferme je suppose"
-    }
-  },
-  "backpacker": {
-    "encounter": {
-      "1": "Fais ton sac, on y va !",
-      "2": "Voyons si t’arrives à garder le rythme !",
-      "3": "Accélère le pas, camarade !",
-      "4": "J’ai passé 20 ans à la recherche de moi-même…\nMais où suis-je ?"
-    },
-    "victory": {
-      "1": "J’ai trébuché !",
-      "2": "Ah, je crois que je me suis paumé.",
-      "3": "Ah, une impasse !",
-      "4": "Hé ! Attends une seconde…\nTu saurais pas qui je suis ?"
-    }
-  },
-  "ace_trainer": {
-    "encounter": {
-      "1": "T’as l’air plutôt confiante.",
-      "2": "Tes Pokémon… Montre-les-moi…",
-      "3": "Les gens pensent que je suis fort par que je suis un Topdresseur.",
-      "4": "T’es au courant de ce que ça signifie d’être un Topdresseur ?"
-    },
-    "victory": {
-      "1": "Très bien… T’as de bons Pokémon…",
-      "2": "Quoi ?! Mais c'est moi le génie des combats !",
-      "3": "Évidemment que t’es le personnage principal !",
-      "4": "OK ! OK ! Tu pourrais être une Topdresseuse !"
-    },
-    "defeat": {
-      "1": "Je me dévoue corps et âme aux combats Pokémon !",
-      "2": "Comme prévu… Vraiment aucune surprise…",
-      "3": "Et moi qui pensais qu’en grandissant, j’allais rester frêle et fragile, à me briser à la moindre étreinte.",
-      "4": "Évidemment que je suis fort et encore moins un perdant. C’est important de gagner avec grâce."
-    }
-  },
-  "parasol_lady": {
-    "encounter": {
-      "1": "Honorons ce terrain de combat avec élégance et équilibre !"
-    },
-    "victory": {
-      "2": "Mon élégance demeure inébranlable !"
-    }
-  },
-  "rocket_grunt": {
-    "encounter": {
-      "1": "Nous sommes de retour !"
-    },
-    "victory": {
-      "1": "Une fois de plus la Team Rocket s’envole vers d’autres cieux !"
-    }
-  },
-  "magma_grunt": {
-    "encounter": {
-      "1": "N’espère pas recevoir de la pitié si tu te mets sur le chemin de la Team Magma !"
-    },
-    "victory": {
-      "1": "Je…?\nJ’ai perdu ?!"
-    }
-  },
-  "aqua_grunt": {
-    "encounter": {
-      "1": "Aucune pitié si tu te mets sur le chemin de la Team Aqua, même pour une gamine !"
-    },
-    "victory": {
-      "1": "Comment ça ?"
-    }
-  },
-  "galactic_grunt": {
-    "encounter": {
-      "1": "Ne te mets pas en travers de la Team Galaxie !"
-    },
-    "victory": {
-      "1": "Désactivation…"
-    }
-  },
-  "plasma_grunt": {
-    "encounter": {
-      "1": "Pas de quatiers à ceux qui ne suivent pas notre idéal !"
-    },
-    "victory": {
-      "1": "Plasmaaaaaaaaa !"
-    }
-  },
-  "flare_grunt": {
-    "encounter": {
-      "1": "Le style et le bon gout, il n’y a que ça qui compte !"
-    },
-    "victory": {
-      "1": "Mon futur me semble guère radieux."
-    }
-  },
-  "rocket_boss_giovanni_1": {
-    "encounter": {
-      "1": "Bien. Je dois admettre que je suis impressionné de te voir ici !"
-    },
-    "victory": {
-      "1": "QUOI ? IMPOSSIBLE !"
-    },
-    "defeat": {
-      "1": "Retiens bien. Ton incapacité à évaluer ta propre force est\nla démonstration claire que tu n'es encore qu’une gamine."
-    }
-  },
-  "rocket_boss_giovanni_2": {
-    "encounter": {
-      "1": "Mes anciens collaborateurs m’attendent.\nComptes-tu m’en empêcher ?"
-    },
-    "victory": {
-      "1": "Comment c’est possible… ? Le grand dessein de la Team Rocket n’est plus qu’une illusion…"
-    },
-    "defeat": {
-      "1": "La Team Rocket renaitra, et je dominerai le monde !"
-    }
-  },
-  "magma_boss_maxie_1": {
-    "encounter": {
-      "1": "Je vais t’enterrer de mes propres mains.\nJ’espère que t’apprécieras cet honneur !"
-    },
-    "victory": {
-      "1": "Gnn… ! Tu… T’as du répondant…\nCe sentiment d’être à la traine, de si peu…"
-    },
-    "defeat": {
-      "1": "La Team Magma vaincra !"
-    }
-  },
-  "magma_boss_maxie_2": {
-    "encounter": {
-      "1": "T’es le dernier rempart entravant mes objectifs.\nPrépare-toi à mon ultime riposte ! Hahahaha !"
-    },
-    "victory": {
-      "1": "Ce… Ce n’est pas… Gnn…"
-    },
-    "defeat": {
-      "1": "L’heure est venue…\nJe vais transformer cette planète en paradis pour l’humanité."
-    }
-  },
-  "aqua_boss_archie_1": {
-    "encounter": {
-      "1": "Je suis le Leader de la Team Aqua.\nJ’ai bien peur que pour toi, ce soit fin de parcours."
-    },
-    "victory": {
-      "1": "Retrouvons-nous.\nJe me souviendrai de ton visage."
-    },
-    "defeat": {
-      "1": "Magnifique !\nPlus rien ne peut nous retenir !"
-    }
-  },
-  "aqua_boss_archie_2": {
-    "encounter": {
-      "1": "J’ai attendu ce moment depuis si longtemps.\nVoici la vraie puissance de la Team Aqua !"
-    },
-    "victory": {
-      "1": "Comme si j’y avait cru…"
-    },
-    "defeat": {
-      "1": "Je rendrai à ce monde sa pureté originelle !"
-    }
-  },
-  "galactic_boss_cyrus_1": {
-    "encounter": {
-      "1": "Tu t’es sentie obligée de venir ici dans un acte vide de sens. Je vais te le faire regretter."
-    },
-    "victory": {
-      "1": "Intéressant. Et plutôt curieux."
-    },
-    "defeat": {
-      "1": "Je le créerai, mon nouveau monde…"
-    }
-  },
-  "galactic_boss_cyrus_2": {
-    "encounter": {
-      "1": "Nous y revoilà. Il semblerait que nos destinées soient entremêlées. Il est l’heure d’y mettre un terme."
-    },
-    "victory": {
-      "1": "Comment. Comment ?\nCOMMENT ?!"
-    },
-    "defeat": {
-      "1": "Adieu."
-    }
-  },
-  "plasma_boss_ghetsis_1": {
-    "encounter": {
-      "1": "Je n’accepterai pas qu’on me barre la route !\nPeu importe qui fait quoi !"
-    },
-    "victory": {
-      "1": "Comment ? Je suis le leader de la Team Plasma !\nJe suis parfait !"
-    },
-    "defeat": {
-      "1": "Je suis le parfait monarque d’un monde parfait !\nHahaha !"
-    }
-  },
-  "plasma_boss_ghetsis_2": {
-    "encounter": {
-      "1": "Viens ! Je veux voir ton visage à l’instant même où l’espoir quittera ton corps !"
-    },
-    "victory": {
-      "1": "Mes calculs… Non ! Mes plans étaient parfaits !\nCe monde devrait être mien !"
-    },
-    "defeat": {
-      "1": "Kyurem ! Fusiorption !!!"
-    }
-  },
-  "flare_boss_lysandre_1": {
-    "encounter": {
-      "1": "Comptes-tu m’arrêter ? Prouve-le."
-    },
-    "victory": {
-      "1": "T’es venu m’arrêter. Mais je te demande d’attendre."
-    },
-    "defeat": {
-      "1": "Les Pokémon… Ne devraient plus exister."
-    }
-  },
-  "flare_boss_lysandre_2": {
-    "encounter": {
-      "1": "Ton futur ou le mien…\nVoyons lequel mérite plus d’aboutir."
-    },
-    "victory": {
-      "1": "Ohhhh… !"
-    },
-    "defeat": {
-      "1": "Les ignorants sans aucune vision n’auront donc de cesse de souiller ce monde."
-    }
-  },
-  "rival": {
-    "encounter": {
-      "1": "@c{smile}Ah, je te cherchais ! Je savais que t’étais pressée de partir, mais je m’attendais quand même à un au revoir…\n$@c{smile_eclosed}T’as finalement décidé de réaliser ton rêve ?\nJ’ai peine à y croire.\n$@c{serious_smile_fists}Vu que t’es là, ça te dis un petit combat ?\nJe voudrais quand même m’assurer que t’es prête.\n$@c{serious_mopen_fists}Surtout ne te retiens pas et donne-moi tout ce que t’as !"
-    },
-    "victory": {
-      "1": "@c{shock}Wah… Tu m’as vraiment lavé.\nT’es vraiment une débutante ?\n$@c{smile}T’as peut-être eu de la chance, mais…\nPeut-être que t’arriveras jusqu’au bout du chemin.\n$D’ailleurs, le prof m’a demandé de te filer ces objets.\nIls ont l’air sympas.\n$@c{serious_smile_fists}Bonne chance à toi !"
-    }
-  },
-  "rival_female": {
-    "encounter": {
-      "1": "@c{smile_wave}Ah, je te cherchais ! Je t’ai cherchée partout !\n@c{angry_mopen}On oublie de dire au revoir à sa meilleure amie ?\n$@c{smile_ehalf}T’as décidé de réaliser ton rêve, hein ?\nCe jour est donc vraiment arrivé…\n$@c{smile}Je veux bien te pardonner de m’avoir oubliée,\nà une conditon. @c{smile_wave_wink}Que tu m’affronte !\n$@c{angry_mopen}Donne tout ! Ce serait dommage que ton aventure finisse avant d’avoir commencé, hein ?"
-    },
-    "victory": {
-      "1": "@c{shock}Tu viens de commencer et t’es déjà si forte ?!@d{96}\n@c{angry}T’as triché non ? Avoue !\n$@c{smile_wave_wink}J’déconne !@d{64} @c{smile_eclosed}J’ai perdu dans les règles…\nJ’ai le sentiment que tu vas très bien t’en sortir.\n$@c{smile}D’ailleurs, le prof veut que je te donne ces quelques objets. Ils te seront utiles, pour sûr !\n$@c{smile_wave}Fais de ton mieux, comme toujours !\nJe crois fort en toi !"
-    }
-  },
-  "rival_2": {
-    "encounter": {
-      "1": "@c{smile}Hé, toi aussi t’es là ?\n@c{smile_eclosed}Toujours invaincue, hein… ?\n$@c{serious_mopen_fists}Je sais que j’ai l’air de t’avoir suivie ici, mais c’est pas complètement vrai.\n$@c{serious_smile_fists}Pour être honnête, ça me démangeait d’avoir une revanche depuis que tu m’as battu.\n$Je me suis beaucoup entrainé, alors sois sure que je vais pas retenir mes coups cette fois.\n$@c{serious_mopen_fists}Et comme la dernière fois, ne te retiens pas !\nC’est parti !"
-    },
-    "victory": {
-      "1": "@c{neutral_eclosed}Oh. Je crois que j’ai trop pris la confiance.\n$@c{smile}Pas grave, c’est OK. Je me doutais que ça arriverait.\n@c{serious_mopen_fists}Je vais juste devoir encore plus m’entrainer !\n\n$@c{smile}Ah, et pas que t’aies réellement besoin d’aide, mais j’ai ça en trop sur moi qui pourrait t’intéresser.\n\n$@c{serious_smile_fists}Mais n’espère plus en avoir d’autres !\nJe peux pas passer mon temps à aider mon adversaire.\n$@c{smile}Bref, prends soin de toi et profite bien de l’évènement !"
-    }
-  },
-  "rival_2_female": {
-    "encounter": {
-      "1": "@c{smile_wave}Hé, sympa de te croiser ici. T’as toujours l’air invaincue. @c{angry_mopen}Eh… Pas mal !\n$@c{angry_mopen}Je sais à quoi tu penses et non, je t’espionne pas.\n@c{smile_eclosed}C’est juste que j’étais aussi dans le coin.\n$@c{smile_ehalf}Heureuse pour toi, mais je veux juste te rappeler que c’est pas grave de perdre parfois.\n$@c{smile}On apprend de nos erreurs, souvent plus que si on ne connaissait que le succès.\n$@c{angry_mopen}Dans tous les cas je me suis bien entrainée pour cette revanche, t’as intérêt à tout donner !"
-    },
-    "victory": {
-      "1": "@c{neutral}Je… J’étais pas encore supposée perdre…\n$@c{smile}Bon. Ça veut juste dire que je vais devoir encore plus m’entrainer !\n$@c{smile_wave}J’ai aussi ça en rab pour toi !\n@c{smile_wave_wink}Inutile de me remercier ~.\n$@c{angry_mopen}C’était le dernier, terminé les cadeaux après celui-là !\n$@c{smile_wave}Allez, tiens le coup et profite bien de l’évènement !"
-    },
-    "defeat": {
-      "1": "Je suppose que c’est parfois normal de perdre…"
-    }
-  },
-  "rival_3": {
-    "encounter": {
-      "1": "@c{smile}Hé, mais qui voilà ! Ça fait un bail.\n@c{neutral}T’es… toujours invaincue ? Incroyable.\n$@c{neutral_eclosed}Tout est devenu un peu… étrange.\nC’est plus pareil sans toi au village.\n$@c{serious}Je sais que c’est égoïste, mais j’ai besoin d’expier ça.\n@c{neutral_eclosed}Je crois que tout ça te dépasse.\n$@c{serious}Ne jamais perdre, c’est juste irréaliste.\nGrandir, c’est parfois aussi savoir perdre.\n$@c{neutral_eclosed}T’as un beau parcours, mais il y a encore tellement à venir et ça va pas s’arranger. @c{neutral}T’es prête pour ça ?\n$@c{serious_mopen_fists}Si tu l’es, alors prouve-le."
-    },
-    "victory": {
-      "1": "@c{angry_mhalf}C’est lunaire… J’ai presque fait que m’entrainer…\nAlors pourquoi il y a encore un tel écart entre nous ?"
-    }
-  },
-  "rival_3_female": {
-    "encounter": {
-      "1": "@c{smile_wave}Ça fait une éternité ! Toujours debout hein ?\n@c{angry}Tu commences à me pousser à bout là. @c{smile_wave_wink}T’inquiètes j’déconne !\n$@c{smile_ehalf}Mais en vrai, ta maison te manque pas ? Ou… Moi ?\nJ… Je veux dire… Tu me manques vraiment beaucoup.\n$@c{smile_eclosed}Je te soutiendrai toujours dans tes ambitions, mais la vérité est que tu finiras par perdre un jour ou l’autre.\n$@c{smile}Quand ça arrivera, je serai là pour toi, comme toujours.\n@c{angry_mopen}Maintenant, montre-moi à quel point t’es devenue forte !"
-    },
-    "victory": {
-      "1": "@c{shock}Après tout ça… Ça te suffit toujours pas… ?\nTu reviendras jamais à ce rythme…"
-    },
-    "defeat": {
-      "1": "T’as fait de ton mieux.\nAllez, rentrons à la maison."
-    }
-  },
-  "rival_4": {
-    "encounter": {
-      "1": "@c{neutral}Hé.\n$Je vais pas y aller par quatre chemins avec toi.\n@c{neutral_eclosed}Je suis là pour gagner. Simple, basique.\n$@c{serious_mhalf_fists}J’ai appris à maximiser tout mon potentiel en m’entrainant d’arrachepied.\n$@c{smile}C’est fou tout le temps que tu peux te dégager si tu dors pas en sacrifiant ta vie sociale.\n$@c{serious_mopen_fists}Plus rien n’a d’importance désormais, pas tant que j’aurai pas gagné.\n$@c{neutral_eclosed}J’ai atteint un stade où je ne peux plus perdre.\n@c{smile_eclosed}Je présume que ta philosophie était pas si fausse finalement.\n$@c{angry_mhalf}La défaite, c’est pour les faibles, et je ne suis plus un faible.\n$@c{serious_mopen_fists}Tiens-toi prête."
-    },
-    "victory": {
-      "1": "@c{neutral}Que…@d{64} Qui es-tu ?"
-    }
-  },
-  "rival_4_female": {
-    "encounter": {
-      "1": "@c{neutral}C’est moi ! Tu m’as pas encore oubliée… n’est-ce pas ?\n$@c{smile}Tu devrais être fière d’être arrivée aussi loin. GG !\nMais c’est certainement pas la fin de ton aventure.\n$@c{smile_eclosed}T’as éveillé en moi quelque chose que j’ignorais.\nTout mon temps passe dans l’entrainement.\n$@c{smile_ehalf}Je dors et je mange à peine, je m’entraine juste tous les jours, et deviens de plus en plus forte.\n$@c{neutral}En vrai, Je… J’ai de la peine à me reconnaitre.\n$Mais maintenant, je suis au top de mes capacités.\nJe doute que tu sois de nouveau capable de me battre.\n$Et tu sais quoi ? Tout ça, c’est de ta faute.\n@c{smile_ehalf}Et j’ignore si je dois te remercier ou te haïr.\n$@c{angry_mopen}Tiens-toi prête."
-    },
-    "victory": {
-      "1": "@c{neutral}Que…@d{64} Qui es-tu ?"
-    },
-    "defeat": {
-      "1": "$@c{smile}Tu devrais être fière d’être arrivé jusque là."
-    }
-  },
-  "rival_5": {
-    "encounter": {
-      "1": "@c{neutral}…"
-    },
-    "victory": {
-      "1": "@c{neutral}…"
-    }
-  },
-  "rival_5_female": {
-    "encounter": {
-      "1": "@c{neutral}…"
-    },
-    "victory": {
-      "1": "@c{neutral}…"
-    },
-    "defeat": {
-      "1": "$@c{smile_ehalf}…"
-    }
-  },
-  "rival_6": {
-    "encounter": {
-      "1": "@c{smile_eclosed}Nous y revoilà.\n$@c{neutral}J’ai eu du temps pour réfléchir à tout ça.\nIl y a une raison à pourquoi tout semble étrange.\n$@c{neutral_eclosed}Ton rêve, ma volonté de te battre…\nFont partie de quelque chose de plus grand.\n$@c{serious}C’est même pas à propos de moi, ni de toi… Mais du monde, @c{serious_mhalf_fists}et te repousser dans tes limites est ma mission.\n$@c{neutral_eclosed}J’ignore si je serai capable de l’accomplir, mais je ferai tout ce qui est en mon pouvoir.\n$@c{neutral}Cet endroit est terrifiant… Et pourtant il m’a l’air familier, comme si j’y avais déjà mis les pieds.\n$@c{serious_mhalf_fists}Tu ressens la même chose, pas vrai ?\n$@c{serious}… et c’est comme si quelque chose ici me parlait.\n$Comme si c’était tout ce que ce monde avait toujours connu.\n$Ces précieux moments ensemble semblent si proches ne sont rien de plus qu’un lointain souvenir.\n$@c{neutral_eclosed}D’ailleurs, qui peut dire aujourd’hui qu’ils ont pu être réels ?\n$@c{serious_mopen_fists}Il faut que tu persévères. Si tu t’arrêtes, ça n'aura jamais de fin et t’es la seule à en être capable.\n$@c{serious_smile_fists}Difficile de comprendre le sens de tout ça, je sais juste que c’est la réalité.\n$@c{serious_mopen_fists}Si tu ne parviens à pas me battre ici et maintenant, tu n’as aucune chance."
-    },
-    "victory": {
-      "1": "@c{smile_eclosed}J’ai fait ce que j’avais à faire.\n$Promets-moi juste une chose.\n@c{smile}Après avoir réparé ce monde… Rentre à la maison."
-    }
-  },
-  "rival_6_female": {
-    "encounter": {
-      "1": "@c{smile_ehalf}C’est donc encore entre toi et moi.\n$@c{smile_eclosed}Tu sais, j’ai beau retouner ça dans tous les sens…\n$@c{smile_ehalf}Quelque chose peut expliquer tout ça, pourquoi tout semble si étrange…\n$@c{smile}T’as tes rêves, j’ai mes ambitions…\n$J’ai juste le sentiment qu’il y a un grand dessein derrière tout ça, derrière ce qu’on fait toi et moi.\n$@c{smile_eclosed}Je crois que mon but est de… repousser tes limites.\n$@c{smile_ehalf}Je suis pas certaine de bien être douée à cet exercice, mais je fais de mon mieux.\n$Cet endroit épouvantable cache quelque chose d’étrange… Tout semble si limpide…\n$Comme… si c’était tout ce que ce monde avait toujours connu.\n$@c{smile_eclosed}J’ai le sentiment que nos précieux moments ensemble sont devenus si flous.\n$@c{smile_ehalf}Ont-ils au moins été réels ? Tout semble si loin maintenant…\n$@c{angry_mopen}Il faut que tu persévères. Si tu t’arrêtes, ça n’aura jamais de fin et t’es le seul à en être capable.\n$@c{smile_ehalf}Je… j’ignore le sens de tout ça… Mais je sais que c’est la réalité.\n$@c{neutral}Si tu ne parviens pas à me battre ici et maintenant, tu n’as aucune chance."
-    },
-    "victory": {
-      "1": "@c{smile_ehalf}Je… Je crois que j’ai rempli ma mission…\n$@c{smile_eclosed}Promets-moi… Après avoir réparé ce monde… Reviens à la maison saine et sauve.\n$@c{smile_ehalf}… Merci."
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/locales/fr/dialogue-final-boss-female.json b/src/locales/fr/dialogue-final-boss-female.json
deleted file mode 100644
index be4ad6d83fe..00000000000
--- a/src/locales/fr/dialogue-final-boss-female.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "encounter": "Une fois de plus, te revoilà.\nSais-tu que ce n’est point là ta première venue ?\n$Tu as été appelée ici parce que t’y es déjà venue.\nUn nombre inimaginable de fois.\n$Mais allons-y, faisons le décompte.\nTu en es très précisément à ton {{cycleCount}}e cycle.\n$Chaque cycle réinitialise ton souvenir du précédent.\nMais étrangement, des bribes subsistent en toi.\n$Jusqu’à maintenant, tu as toujours échoué. Mais je ressens quelque chose de différent cette fois-ci.\n\n$Tu es la seule présence ici, bien que j’ai le sentiment d’en ressentir… une autre.\n$Vas-tu enfin me livrer un affrontement digne de ce nom ?\nCe challenge dont je rêve depuis un millénaire ?\n$Commençons.",
-  "firstStageWin": "Je vois. Cette présence était bien réelle.\nJe n’ai donc plus besoin de retenir mes coups.\n$Ne me déçoit pas.",
-  "secondStageWin": "… Magnifique."
-}
\ No newline at end of file
diff --git a/src/locales/fr/dialogue-final-boss-male.json b/src/locales/fr/dialogue-final-boss.json
similarity index 55%
rename from src/locales/fr/dialogue-final-boss-male.json
rename to src/locales/fr/dialogue-final-boss.json
index 7c51d1cc3a3..c5a5e3b7d89 100644
--- a/src/locales/fr/dialogue-final-boss-male.json
+++ b/src/locales/fr/dialogue-final-boss.json
@@ -1,5 +1,6 @@
 {
   "encounter": "Une fois de plus, te revoilà.\nSais-tu que ce n’est point là ta première venue ?\n$Tu as été appelé ici parce que t’y es déjà venu.\nUn nombre inimaginable de fois.\n$Mais allons-y, faisons le décompte.\nTu en es très précisément à ton {{cycleCount}}e cycle.\n$Chaque cycle réinitialise ton souvenir du précédent.\nMais étrangement, des bribes subsistent en toi.\n$Jusqu’à maintenant, tu as toujours échoué. Mais je ressens quelque chose de différent cette fois-ci.\n\n$Tu es la seule présence ici, bien que j’ai le sentiment d’en ressentir… une autre.\n$Vas-tu enfin me livrer un affrontement digne de ce nom ?\nCe challenge dont je rêve depuis un millénaire ?\n$Commençons.",
+  "encounter_female":  "Une fois de plus, te revoilà.\nSais-tu que ce n’est point là ta première venue ?\n$Tu as été appelée ici parce que t’y es déjà venue.\nUn nombre inimaginable de fois.\n$Mais allons-y, faisons le décompte.\nTu en es très précisément à ton {{cycleCount}}e cycle.\n$Chaque cycle réinitialise ton souvenir du précédent.\nMais étrangement, des bribes subsistent en toi.\n$Jusqu’à maintenant, tu as toujours échoué. Mais je ressens quelque chose de différent cette fois-ci.\n\n$Tu es la seule présence ici, bien que j’ai le sentiment d’en ressentir… une autre.\n$Vas-tu enfin me livrer un affrontement digne de ce nom ?\nCe challenge dont je rêve depuis un millénaire ?\n$Commençons.",
   "firstStageWin": "Je vois. Cette présence était bien réelle.\nJe n’ai donc plus besoin de retenir mes coups.\n$Ne me déçoit pas.",
   "secondStageWin": "… Magnifique."
 }
\ No newline at end of file
diff --git a/src/locales/fr/dialogue-misc-male.json b/src/locales/fr/dialogue-misc-male.json
deleted file mode 100644
index d932d283d37..00000000000
--- a/src/locales/fr/dialogue-misc-male.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "ending": "@c{smile}Oh ? T’as gagné ?@d{96} @c{smile_eclosed}J’aurais dû le savoir.\nMais de voilà de retour.\n$@c{smile}C’est terminé.@d{64} T’as brisé ce cycle infernal.\n$@c{serious_smile_fists}T’as aussi accompli ton rêve non ?\nTu n’as pas connu la moindre défaite.\n$@c{neutral}Je suis le seul à me souvenir de ce que t’as fait.@d{96}\nJe pense que ça ira, non ?\n$@c{serious_smile_fists}Ta légende vivra à jamais dans nos cœurs.\n$@c{smile_eclosed}Bref, j’en ai un peu marre de ce endroit, pas toi ? Rentrons à la maison.\n$@c{serious_smile_fists}On se fera un p’tit combat une fois rentrés ?\nSi t’es d’accord.",
-  "ending_female": "@c{shock}T’es revenu ?@d{32} Ça veut dire…@d{96} que t’as gagné ?!\n@c{smile_ehalf}J’aurais dû le savoir.\n$@c{smile_eclosed}Bien sûr… J’ai toujours eu ce sentiment.\n@c{smile}C’est fini maitenant hein ? T’as brisé ce cycle.\n$@c{smile_ehalf}T’as aussi accompli ton rêve non ?\nTu n’as pas connu la moindre défaite.\n$Je serai la seule à me souvenir de ce que t’as fait.\n@c{angry_mopen}Je tâcherai de ne pas oublier !\n$@c{smile_wave_wink}J’déconne !@d{64} @c{smile}Jamais j’oublierai.@d{32}\nTa légende vivra à jamais dans nos cœurs.\n$@c{smile_wave}Bon,@d{64} il se fait tard…@d{96} je crois ?\nDifficile à dire ici.\n$Rentrons, @c{smile_wave_wink}et demain on se fera un p’tit combat, comme au bon vieux temps ?"
-}
\ No newline at end of file
diff --git a/src/locales/fr/dialogue-misc-female.json b/src/locales/fr/dialogue-misc.json
similarity index 100%
rename from src/locales/fr/dialogue-misc-female.json
rename to src/locales/fr/dialogue-misc.json
diff --git a/src/locales/fr/dialogue-male.json b/src/locales/fr/dialogue.json
similarity index 71%
rename from src/locales/fr/dialogue-male.json
rename to src/locales/fr/dialogue.json
index d0642641d0f..c9bb3c417c7 100644
--- a/src/locales/fr/dialogue-male.json
+++ b/src/locales/fr/dialogue.json
@@ -13,10 +13,12 @@
       "10": "Baisse pas ta garde si tu veux pas pleurer d’avoir perdu face à un gamin.",
       "11": "J’ai tout donné pour élever mes Pokémon. Attention à toi si tu leur fait du mal !",
       "12": "Incroyable que t’y sois parvenu ! Mais la suite va pas être une partie de plaisir.",
+      "12_female": "Incroyable que t’y sois parvenue ! Mais la suite va pas être une partie de plaisir.",
       "13": "Les combats sont éternels ! Bienvenue dans un monde sans fin !"
     },
     "victory": {
       "1": "Hé, mais t’es trop fort !",
+      "1_female": "Hé, mais t’es trop forte !",
       "2": "En vrai j’avais aucune chance hein ?",
       "3": "J’te retrouverai un jour, et là j’te battrai !",
       "4": "Arg… J’ai plus aucun Pokémon.",
@@ -35,10 +37,12 @@
     "encounter": {
       "1": "Affrontons-nous, d’accord ?",
       "2": "T’as l’air d’un nouveau Dresseur. Battons nous !",
+      "2_female": "T’as l’air d’une nouvelle Dresseuse. Battons nous !",
       "3": "Je te connais pas. Ça te dis de te battre ?",
       "4": "Prenons du bon temps avec ce combat Pokémon !",
       "5": "Je vais t’apprendre à te battre avec tes Pokémon !",
-      "6": "Un combat doit être pris au sérieux. T’es prêt à te battre ?",
+      "6": "Un combat doit toujours être pris au sérieux.\nT’es prêt à te battre ?",
+      "6_female": "Un combat doit toujours être pris au sérieux.\nT’es prête à te battre ?",
       "7": "Tu seras pas jeune éternellement. T’as qu’une chance pendant un combat. Bientôt, tu seras plus qu’un souvenir.",
       "8": "Tu ferais mieux d’y aller doucement avec moi. Mais je vais me battre sérieusement !",
       "9": "Je m’ennuie à l’école. Y’a rien à y faire. *Baille*\nJe me bats juste pour passer le temps."
@@ -46,10 +50,12 @@
     "victory": {
       "1": "Wah, c’était impressionnant ! J’ai encore beaucoup à apprendre.",
       "2": "Je ne pensais pas que je perdrais comme ça…",
+      "2_female": "Je pensais pas que je perdrais comme ça…",
       "3": "J’espère que j’aurai ma revanche un jour.",
       "4": "C’était super amusant ! Mais ce combat m’a épuisée…",
       "5": "Tu m’as appris une belle leçon ! T’es vraiment incroyable !",
       "6": "Vraiment ? J’ai perdu… ? C’est des choses qui arrivent, ça me déprime mais tu es vraiment très cool.",
+      "6_female": "Vraiment ? J’ai perdu… ? C’est des choses qui arrivent, ça me déprime mais t’es vraiment très cool.",
       "7": "J’ai pas besoin de ce genre de souvenirs.\n*Suppression de mémoire en cours…*",
       "8": "Hé ! Je t’avais dit d’y aller doucement avec moi ! Mais t’es vraiment si cool quand tu te bats sérieusement…",
       "9": "J’en ai marre des combats Pokémon…\nJe vais chercher d’autres trucs à faire…"
@@ -69,7 +75,7 @@
     "defeat": {
       "1": "Tu ne devrais pas t’énerver sur tes Pokémon, même après une défaite.",
       "2": "Alors ? Pas mal mes Pokémon, hein ? Je suis fait pour ça.",
-      "3": "Peut importe à quel point t’aimes tes Pokémon, il faut toujours de la discipline s’ils se comportent mal."
+      "3": "Peu importe à quel point t’aimes tes Pokémon, il faut toujours de la discipline s’ils se comportent mal."
     }
   },
   "breeder_female": {
@@ -93,7 +99,7 @@
     "encounter": {
       "1": "Aaah non ! J’avais une touche !\nTu comptes faire quoi pour arranger ça ?",
       "2": "Bouge de là ! Tu fais peur aux Pokémon !",
-      "3": "Voyons si t'arrives à ferrer une victoire !"
+      "3": "Voyons si t’arrives à ferrer une victoire !"
     },
     "victory": {
       "1": "Vas-y là, oublie.",
@@ -142,15 +148,17 @@
   "ace_trainer": {
     "encounter": {
       "1": "T’as l’air plutôt confiant.",
+      "1_female": "T’as l’air plutôt confiante.",
       "2": "Tes Pokémon… Montre-les-moi…",
       "3": "Les gens pensent que je suis fort par que je suis un Topdresseur.",
       "4": "T’es au courant de ce que ça signifie d’être un Topdresseur ?"
     },
     "victory": {
       "1": "Très bien… T’as de bons Pokémon…",
-      "2": "Quoi ?! Mais c'est moi le génie des combats !",
+      "2": "Quoi ?! Mais c’est moi le génie des combats !",
       "3": "Évidemment que t’es le personnage principal !",
-      "4": "OK ! OK ! Tu pourrais être un Topdresseur !"
+      "4": "OK ! OK ! Tu pourrais être un Topdresseur !",
+      "4_female": "OK ! OK ! Tu pourrais être une Topdresseuse !"
     },
     "defeat": {
       "1": "Je me dévoue corps et âme aux combats Pokémon !",
@@ -164,87 +172,107 @@
       "1": "Honorons ce terrain de combat avec élégance et équilibre !"
     },
     "victory": {
-      "2": "Mon élégance demeure inébranlable !"
+      "1": "Mon élégance demeure inébranlable !"
     }
   },
   "rocket_grunt": {
     "encounter": {
       "1": "Nous sommes de retour !",
-      "2": "We're pulling a big job here! Get lost, kid!",
-      "3": "Hand over your Pokémon, or face the wrath of Team Rocket!",
-      "4": "You're about to experience the true terror of Team Rocket!",
-      "5": "Hey, kid! Me am a Team Rocket member kind of guy!"
+      "2": "Ça bosse dur, ici ! Alors du balai !",
+      "3": "File-nous tes Pokémon ou tu vas gouter à la colère de la Team Rocket !",
+      "4": "Sois témoin de ce qu’est une vraie terreur de la Team Rocket!",
+      "5": "Hé gamin ! Moi être guy member of la Team Rocket !",
+      "5_female": "Hé gamine ! Moi être guy member of la Team Rocket !"
     },
     "victory": {
       "1": "Une fois de plus la Team Rocket s’envole vers d’autres cieux !",
-      "2": "Oh no! I dropped the Lift Key!",
-      "3": "I blew it!",
-      "4": "My associates won't stand for this!",
-      "5": "You say what? Team Rocket bye-bye a go-go? Broken it is says you?"
+      "2": "Mince! J’ai laissé tomber\nla Clé Ascenseur !",
+      "3": "J’ai tout foiré !",
+      "4": "Mes compagnons vont me venger !",
+      "5": "Toi dire quoi ? Forget que tu m’as vu !\nYou n’as rien seen !"
     }
   },
   "magma_grunt": {
     "encounter": {
       "1": "N’espère pas recevoir de la pitié si tu te mets sur le chemin de la Team Magma !",
-      "2": "You'd better not interfere with our plans! We're making the world a better place!",
-      "3": "You're in the way! Team Magma has no time for kids like you!",
-      "4": "I hope you brought marshmallows because things are about to heat up!",
-      "5": "We're going to use the power of a volcano! It's gonna be... explosive! Get it? Heh heh!"
+      "2": "Ne te mêle pas de nos affaires ! On va rendre ce monde meilleur !",
+      "3": "Hors de mon chemin ! La Team Magma n’a pas de temps pour les gamins !",
+      "4": "J’espère que t’as quelques marshmallows, car ça va chauffer !",
+      "5": "On va utiliser le puissance d’un volcan ! Ça va être… explosif ! Tu l’as… ? Héhé !"
     },
     "victory": {
       "1": "Je…?\nJ’ai perdu ?!",
-      "2": "I can't believe I lost! I even skipped lunch for this",
-      "3": "No way! You're just a kid!",
-      "4": "Urrrgh... I should've ducked into our hideout right away...",
-      "5": "You beat me... Do you think the boss will dock my pay for this?"
+      "2": "Je peux pas croire que j’ai pas pris mon déjeuner juste pour ça…",
+      "3": "Impossible ! T’es qu’un gosse !",
+      "3_female": "Impossible ! T’es qu’une gosse !",
+      "4": "Aahhh…\nJ’aurais dû directement rentrer à la planque…",
+      "5": "Tu m’as démoli… Tu crois que le boss va suspendre mon salaire ?"
     }
   },
   "aqua_grunt": {
     "encounter": {
       "1": "Aucune pitié si tu te mets sur le chemin de la Team Aqua, même pour un gamin !",
-      "2": "Grrr... You've got some nerve meddling with Team Aqua!",
-      "3": "You're about to get soaked! And not just from my water Pokémon!",
-      "4": "We, Team Aqua, exist for the good of all!",
-      "5": "Prepare to be washed away by the tides of my... uh, Pokémon! Yeah, my Pokémon!"
+      "2": "Grrr…\nTu as eu le culot de t’opposer à la Team Aqua !",
+      "3": "Je vais te liquéfier !\nEt ce sera pas qu’à cause des mes Pokémon Eau !",
+      "4": "Nous, la Team Aqua, existons pour le bien commun !",
+      "5": "Prépare-toi à te faire emporter par le courant de…\nEuh… Mes Pokémon ! Oui, mes Pokémon !"
     },
     "victory": {
       "1": "Comment ça ?",
-      "2": "Arrgh, I didn't count on being meddled with by some meddling kid!",
-      "3": "I lost?! Guess I'll have to swim back to the hideout now...",
-      "4": "Oh, man, what a disaster... The boss is going to be furious...",
-      "5": "You beat me... Do you think the boss will make me walk the plank for this?"
+      "2": "Ah, j’avais pas prévu d’être gêné par un mouflet qui se mêle de tout !",
+      "3": "J’ai perdu ?! Super, j’ai plus qu’à nager jusqu’à la planque maintenant…",
+      "4": "Oh non quelle angoisse…\nLe boss va me démonter…",
+      "5": "Je suis battu… Tu penses que le boss va me faire subir le supplice de la planche ?…"
     }
   },
   "galactic_grunt": {
     "encounter": {
       "1": "Ne te mets pas en travers de la Team Galaxie !",
-      "2": "Witness the power of our technology and the future we envision!",
-      "3": "In the name of Team Galactic, I'll eliminate anyone who stands in our way!",
-      "4": "Get ready to lose!",
-      "5": "Hope you're ready for a cosmic beatdown!"
+      "2": "Sois témoin de la puissance de notre technologie et du futur qui se profile !",
+      "3": "Au nom de la Team Galaxie, j’éliminerai quiconque se mettera sur notre route !",
+      "4": "Prépare ta défaite !",
+      "5": "J’espère que t’es prêt à te prendre une raclée de l’espace !",
+      "5_female": "J’espère que t’es prête à te prendre une raclée de l’espace !"
     },
     "victory": {
       "1": "Désactivation…",
-      "2": "This setback means nothing in the grand scheme.",
-      "3": "Our plans are bigger than this defeat.",
-      "4": "How?!",
-      "5": "Note to self: practice Pokémon battling, ASAP."
+      "2": "Cet échec n’est qu’une poussière face à nos ambitions débordantes.",
+      "3": "Notre projet est bien plus important que cette défaite.",
+      "4": "Comment ?!",
+      "5": "Note à moi-même :\nM’entrainer aux combats Pokémon. Ça urge…"
     }
   },
   "plasma_grunt": {
     "encounter": {
       "1": "Pas de quatiers à ceux qui ne suivent pas notre idéal !",
-      "2": "If I win against you, release your Pokémon!",
-      "3": "If you get in the way of Team Plasma, I'll take care of you!",
-      "4": "Team Plasma will liberate Pokémon from selfish humans like you!",
-      "5": "Our hairstyles are out of this world... but our battling skills? You'll find out soon enough."
+      "2": "Si je gagne, tu relâches tous tes Pokémon !",
+      "3": "Si tu te mets en travers de la Team Plasma, je m’occuperai de toi personnellement !",
+      "4": "La Team Plasma va libérer les Pokémon de tous les humains égoïstes dans ton genre !",
+      "5": "Nos coupes sont lunaires… Mais en combat ?\nTu vas vite le découvrir."
     },
     "victory": {
       "1": "Plasmaaaaaaaaa !",
-      "2": "How could I lose...",
-      "3": "...What a weak Pokémon, I'll just have to go steal some better ones!",
-      "4": "Great plans are always interrupted.",
-      "5": "This is bad... Badbadbadbadbadbadbad! Bad for Team Plasma! Or Plasbad, for short!"
+      "2": "Comment ai-je pu perdre…",
+      "3": "… Ce Pokémon est nul, j’vais aller en voler de meilleurs !",
+      "4": "Les plans ambitieux connaissent toujours leurs lots d’interruptions.",
+      "5": "C’est mauvais… MAUVAIS MAUVAIS MAUVAIS MAUVAIS !\nVa falloir battre en retraite, c’est la méga cata !"
+    }
+  },
+  "flare_grunt": {
+    "encounter": {
+      "1": "Tes Pokémon ne sont pas dignes de l’élégance de la Team Flare.",
+      "2": "T’as des lunettes de soleil j’espère ?\nCar prépare-toi à être ébloui !",
+      "2_female": "T’as des lunettes de soleil j’espère ?\nCar prépare-toi à être éblouie !",
+      "3": "La Team Flare va purifier ce monde de toute imperfection !",
+      "4": "Prépare-toi à découvrir l’indiscutable sens du style de la Team Flare !",
+      "5": "La mode, c’est important !"
+    },
+    "victory": {
+      "1": "Mon futur n’a pas l’air si radieux.",
+      "2": "Les combats semblent être plus complexes que je le pensais.\nRetour aux planches à dessin.",
+      "3": "Ehhhh ?! J’ai perdu ?!",
+      "4": "Même dans la défaite, l’élégance de la Team Flare continue de rayonner sur ce monde.",
+      "5": "J’appelle pas ça perdre, j’appelle ça échouer avec panache !"
     }
   },
   "rocket_boss_giovanni_1": {
@@ -255,7 +283,8 @@
       "1": "QUOI ? IMPOSSIBLE !"
     },
     "defeat": {
-      "1": "Retiens bien. Ton incapacité à évaluer ta propre force est\nla démonstration claire que tu n’es encore qu’un gamin."
+      "1": "Retiens bien. Ton incapacité à évaluer ta propre force est\nla démonstration claire que tu n’es encore qu’un gamin.",
+      "1_female": "Retiens bien. Ton incapacité à évaluer ta propre force est\nla démonstration claire que tu n’es encore qu’une gamine."
     }
   },
   "rocket_boss_giovanni_2": {
@@ -315,7 +344,8 @@
   },
   "galactic_boss_cyrus_1": {
     "encounter": {
-      "1": "Tu t’es senti obligé de venir ici dans un acte vide de sens. Je vais te le faire regretter."
+      "1": "Tu t’es senti obligé de venir ici dans un acte vide de sens. Je vais te le faire regretter.",
+      "1_female": "Tu t’es sentie obligée de venir ici dans un acte vide de sens. Je vais te le faire regretter."
     },
     "victory": {
       "1": "Intéressant. Et plutôt curieux."
@@ -379,6 +409,78 @@
       "1": "Les ignorants sans aucune vision n’auront donc de cesse de souiller ce monde."
     }
   },
+  "brock": {
+    "encounter": {
+      "1": "Mon expertise des types Roche va te mettre au sol ! En garde !",
+      "2": "Tu veux toujours te battre avec moi ? Même en sachant que tu vas perdre ?",
+      "3": "Laisse-moi de montrer la véritable force de mes Pokémon Roche !"
+    },
+    "victory": {
+      "1": "J’étais trop sûr de moi, c’est pour ça que j’ai perdu.",
+      "2": "Ce monde est vaste ! Je suis honoré d’avoir pu t’affronter.",
+      "3": "Peut-être bien que je n’aurais pas dû abandonner ma vocation d’Éleveur…"
+    },
+    "defeat": {
+      "1": "La défense est la meilleure des attaques !\nTelle est ma méthode !",
+      "2": "Viens étudier des roches avec moi la prochaine fois si tu veux apprendre à mieux les aborder !",
+      "3": "Tout ce temps à voyager autour du monde paie enfin !"
+    }
+  },
+  "misty": {
+    "encounter": {
+      "1": "Ma tactique ? Attaquer avec des Pokémon Eau !",
+      "2": "Je vais te prouver le tsunami que sont mes Pokémon aquatiques !",
+      "3": "Mon rêve, c’était de voyager et de défier des Dresseurs super forts. Seras-tu à la hauteur ?"
+    },
+    "victory": {
+      "1": "OK. T’es pas naze… Je le reconnais…",
+      "2": "Pfff… T’as juste eu de la chance hein ?!",
+      "3": "Ouah ! T’es super balèze !"
+    },
+    "defeat": {
+      "1": "Qu’en dis-tu? C’est ça, la puissance des Pokémon Eau !",
+      "2": "J’espère que t’as pris note des élégantes techniques de nage de mes Pokémon !",
+      "3": "Tes Pokémon ne jouent visiblement pas dans le même bassin…"
+    }
+  },
+  "lt_surge": {
+    "encounter": {
+      "1": "T’as pas froid aux yeux, soldat ! Les combats Pokémon, c’est la guerre !",
+      "2": "Tu as du guts pour venir me fight ici ! Je vais te shock !",
+      "3": "Compte tes dents, tu vas morfler !\nMes Pokémon Électrik vont t’atomiser !"
+    },
+    "victory": {
+      "1": "Whoo ! T’iras loin toi.",
+      "2": "Oh noes ! Mes tricks électriques sont à plat…\nYou are very fortiche!",
+      "3": "Tu es very costaud ! Je vais training very dur mes Pokémon, moi too, et on sera Number One !"
+    },
+    "defeat": {
+      "1": "Oh yeah !\nMes Pokémon Électrik sont les best du monde !",
+      "2": "Oh yeah, baby ! I am trop fort !",
+      "3": "Une combat Pokémon, c’est comme une guerre et t’as eu droit à une bataille de premier ordre !"
+    }
+  },
+  "erika": {
+    "encounter": {
+      "1": "Il fait beau, aujourd’hui, n’est-ce pas… ?\nQuoi un combat… ? Très bien…",
+      "2": "L’arrangement floral est ma spécialité, et mes Pokémon sont de type Plante. Quoi ? Tu veux te battre ?",
+      "3": "Il fait beau… Le soleil brille… Les plantes bourgeonnent… Je m’ennuie…",
+      "4": "Voir un tel jardin rempli de fleurs est si apaisant…"
+    },
+    "victory": {
+      "1": "Bien joué, c’est mértié.",
+      "2": "Dommage, on s’amusait si bien…",
+      "3": "Oh non, le combat est terminé…",
+      "4": "Aaah, ça fait du bien !\nMerci, j’en avais besoin."
+    },
+    "defeat": {
+      "1": "J’ai failli m’endormir…",
+      "2": "Oh non… Mes Pokémon Plante ont l’air de t’avoir bien endormi…",
+      "2_female": "Oh non… Mes Pokémon Plante ont l’air de t’avoir bien endormie…",
+      "3": "Ce combat était si apaisant…",
+      "4": "Oh non… C’est tout ?"
+    }
+  },
   "alder": {
     "encounter": {
       "1": "Prépare-toi pour un combat contre le meilleur Dresseur d’Unys !"
@@ -411,7 +513,7 @@
   },
   "rival_female": {
     "encounter": {
-      "1": "@c{smile_wave}Ah, je te cherchais ! Je t’ai cherché partout !\n@c{angry_mopen}On oublie de dire au revoir à sa meilleure amie ?\n$@c{smile_ehalf}T’as décidé de réaliser ton rêve, hein ?\nCe jour est donc vraiment arrivé…\n$@c{smile}Je veux bien te pardonner de m’avoir oubliée,\nà une conditon. @c{smile_wave_wink}Que tu m’affronte !\n$@c{angry_mopen}Donne tout ! Ce serait dommage que ton aventure finisse avant d’avoir commencé, hein ?"
+      "1": "@c{smile_wave}Ah, te voilà ! Je t’ai cherché partout !\n@c{angry_mopen}On oublie de dire au revoir à sa meilleure amie ?\n$@c{smile_ehalf}T’as décidé de réaliser ton rêve, hein ?\nCe jour est donc vraiment arrivé…\n$@c{smile}Je veux bien te pardonner de m’avoir oubliée,\nà une conditon. @c{smile_wave_wink}Que tu m’affronte !\n$@c{angry_mopen}Donne tout ! Ce serait dommage que ton aventure finisse avant d’avoir commencé, hein ?"
     },
     "victory": {
       "1": "@c{shock}Tu viens de commencer et t’es déjà si fort ?!@d{96}\n@c{angry}T’as triché non ? Avoue !\n$@c{smile_wave_wink}J’déconne !@d{64} @c{smile_eclosed}J’ai perdu dans les règles…\nJ’ai le sentiment que tu vas très bien t’en sortir.\n$@c{smile}D’ailleurs, le prof veut que je te donne ces quelques objets. Ils te seront utiles, pour sûr !\n$@c{smile_wave}Fais de ton mieux, comme toujours !\nJe crois fort en toi !"
@@ -509,4 +611,4 @@
       "1": "@c{smile_ehalf}Je… Je crois que j’ai rempli ma mission…\n$@c{smile_eclosed}Promets-moi… Après avoir réparé ce monde… Reviens à la maison sain et sauf.\n$@c{smile_ehalf}… Merci."
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/fr/egg.json b/src/locales/fr/egg.json
index 0cd6f0b3750..64f22aa330d 100644
--- a/src/locales/fr/egg.json
+++ b/src/locales/fr/egg.json
@@ -4,23 +4,23 @@
   "ultraTier": "Épique",
   "masterTier": "Légendaire",
   "defaultTier": "Commun",
-  "hatchWavesMessageSoon": "Il fait du bruit. Il va éclore !",
+  "hatchWavesMessageSoon": "Il fait du bruit. Il va éclore !",
   "hatchWavesMessageClose": "Il bouge de temps en temps. Il devrait bientôt éclore.",
   "hatchWavesMessageNotClose": "Qu’est-ce qui va en sortir ? Ça va mettre du temps.",
-  "hatchWavesMessageLongTime": "Cet Œuf va sûrement mettre du temps à éclore.",
+  "hatchWavesMessageLongTime": "Cet Œuf va surement mettre du temps à éclore.",
   "gachaTypeLegendary": "Taux de Légendaires élevé",
   "gachaTypeMove": "Taux de Capacité Œuf Rare élevé",
   "gachaTypeShiny": "Taux de Chromatiques élevé",
   "selectMachine": "Sélectionnez une machine.",
-  "notEnoughVouchers": "Vous n’avez pas assez de coupons !",
-  "tooManyEggs": "Vous avez trop d’Œufs !",
+  "notEnoughVouchers": "Vous n’avez pas assez de coupons !",
+  "tooManyEggs": "Vous avez trop d’Œufs !",
   "pull": "Tirage",
   "pulls": "Tirages",
   "sameSpeciesEgg": "{{species}} sortira de cet Œuf !",
-  "hatchFromTheEgg": "{{pokemonName}} sort de l’Œuf !",
+  "hatchFromTheEgg": "{{pokemonName}} sort de l’Œuf !",
   "eggMoveUnlock": "Capacité Œuf débloquée :\n{{moveName}}",
   "rareEggMoveUnlock": "Capacité Œuf Rare débloquée :\n{{moveName}}",
-  "moveUPGacha": "Bonus Capacité\nŒuf Rare !",
-  "shinyUPGacha": "Bonus\nChromatique !",
-  "legendaryUPGacha": "Bonus !"
-}
\ No newline at end of file
+  "moveUPGacha": "Bonus Capacité\nŒuf Rare !",
+  "shinyUPGacha": "Bonus\nChromatique !",
+  "legendaryUPGacha": "Bonus !"
+}
diff --git a/src/locales/fr/menu-ui-handler.json b/src/locales/fr/menu-ui-handler.json
index 089e52d55a4..807b34f1315 100644
--- a/src/locales/fr/menu-ui-handler.json
+++ b/src/locales/fr/menu-ui-handler.json
@@ -3,7 +3,6 @@
   "ACHIEVEMENTS": "Succès",
   "STATS": "Statistiques",
   "RUN_HISTORY": "Historique",
-  "VOUCHERS": "Coupons",
   "EGG_LIST": "Liste des Œufs",
   "EGG_GACHA": "Gacha-Œufs",
   "MANAGE_DATA": "Mes données",
diff --git a/src/locales/fr/menu.json b/src/locales/fr/menu.json
index d6823b43009..83626a1f33f 100644
--- a/src/locales/fr/menu.json
+++ b/src/locales/fr/menu.json
@@ -42,14 +42,14 @@
   "wave": "Vague",
   "loading": "Chargement…",
   "loadingAsset": "Chargement de la ressource : {{assetName}}",
-  "playersOnline": "Joueurs Connectés",
+  "playersOnline": "Joueurs connectés",
   "yes": "Oui",
   "no": "Non",
   "disclaimer": "AVERTISSEMENT",
   "disclaimerDescription": "Ce jeu n’est pas un produit fini et peut contenir des problèmes de jouabilité, dont de possibles pertes de sauvegardes,\ndes modifications sans avertissement et pourrait ou non encore être mis à jour ou terminé.",
   "choosePokemon": "Sélectionnez un Pokémon.",
-  "renamePokemon": "Renommer Pokémon",
+  "renamePokemon": "Renommer le Pokémon",
   "rename": "Renommer",
   "nickname": "Surnom",
   "errorServerDown": "Oupsi ! Un problème de connexion au serveur est survenu.\n\nVous pouvez garder cette fenêtre ouverte,\nle jeu se reconnectera automatiquement."
-}
\ No newline at end of file
+}
diff --git a/src/locales/fr/modifier-type.json b/src/locales/fr/modifier-type.json
index c041adbf6d5..6d5cfb098ef 100644
--- a/src/locales/fr/modifier-type.json
+++ b/src/locales/fr/modifier-type.json
@@ -11,7 +11,7 @@
     "PokemonHeldItemModifierType": {
       "extra": {
         "inoperable": "{{pokemonName}} ne peut pas\nporter cet objet !",
-        "tooMany": "{{pokemonName}} possède trop\nd’exemplaires de cet objet !"
+        "tooMany": "{{pokemonName}} porte trop\nd’exemplaires de cet objet !"
       }
     },
     "PokemonHpRestoreModifierType": {
@@ -108,7 +108,7 @@
       "description": "Permet à certains Pokémon de changer de forme."
     },
     "FusePokemonModifierType": {
-      "description": "Fusionne deux Pokémon (transfère le talent, sépare les stats de base et les types, partage le movepool)."
+      "description": "Fusionne deux Pokémon (transfère le talent, sépare les stats de base et les types, partage les capacités)."
     },
     "TerastallizeModifierType": {
       "name": "Téra-Éclat {{teraType}}",
@@ -194,7 +194,7 @@
     "RELIC_GOLD": { "name": "Vieux Ducat" },
 
     "AMULET_COIN": { "name": "Pièce Rune", "description": "Augmente de 20% les gains d’argent." },
-    "GOLDEN_PUNCH": { "name": "Poing Doré", "description": "50% des dégâts infligés sont convertis en argent." },
+    "GOLDEN_PUNCH": { "name": "Poing Doré", "description": "La moitié des dégâts infligés sont convertis en argent." },
     "COIN_CASE": { "name": "Boite Jetons", "description": "Tous les 10 combats, recevez 10% de votre argent en intérêts." },
 
     "LOCK_CAPSULE": { "name": "Poké Écrin", "description": "Permet de conserver la rareté des objets si vous relancez les objets proposés." },
@@ -205,13 +205,13 @@
     "MULTI_LENS": { "name": "Lentille Multi" },
 
     "HEALING_CHARM": { "name": "Charme Soin", "description": "Augmente de 10% l’efficacité des capacités et objets de soin de PV (hors Rappels)." },
-    "CANDY_JAR": { "name": "Bonbonnière", "description": "Augmente de 1 le nombre de niveaux gagnés à l’utilisation d’un Super Bonbon." },
+    "CANDY_JAR": { "name": "Bonbonnière", "description": "Augmente de 1 le nombre de niveaux gagnés à l’utilisation d’un Super Bonbon ou d’un Hyper Bonbon." },
 
     "BERRY_POUCH": { "name": "Sac à Baies", "description": "Ajoute 30% de chances qu’une Baie utilisée ne soit pas consommée." },
 
     "FOCUS_BAND": { "name": "Bandeau", "description": "Ajoute 10% de chances de survivre avec 1 PV si les dégâts reçus pouvaient mettre K.O. ." },
 
-    "QUICK_CLAW": { "name": "Vive Griffe", "description": "Ajoute 10% de chances d’agir en premier, indépendamment de la vitesse (après la priorité)." },
+    "QUICK_CLAW": { "name": "Vive Griffe", "description": "Ajoute 10% de chances d’agir en premier, indépendamment de la Vitesse (après la priorité)." },
 
     "KINGS_ROCK": { "name": "Roche Royale", "description": "Ajoute 10% de chances qu’une capacité offensive apeure l’adversaire." },
 
@@ -261,14 +261,14 @@
   },
 
   "TempBattleStatBoosterStatName": {
-    "ATK": "Attaque",
-    "DEF": "Défense",
-    "SPATK": "Atq. Spé.",
-    "SPDEF": "Déf. Spé.",
-    "SPD": "Vitesse",
-    "ACC": "Précision",
-    "CRIT": "Taux de critique",
-    "EVA": "Esquive",
+    "ATK": "l’Attaque",
+    "DEF": "la Défense",
+    "SPATK": "l’Atq. Spé.",
+    "SPDEF": "la Déf. Spé.",
+    "SPD": "la Vitesse",
+    "ACC": "la précision",
+    "CRIT": "le taux de critique",
+    "EVA": "l’esquive",
     "DEFAULT": "???"
   },
 
@@ -452,4 +452,4 @@
     "FAIRY_MEMORY": "ROM Fée",
     "BLANK_MEMORY": "ROM Vierge"
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/fr/modifier.json b/src/locales/fr/modifier.json
index afc15b2cb88..8a15c9e5ddf 100644
--- a/src/locales/fr/modifier.json
+++ b/src/locales/fr/modifier.json
@@ -3,10 +3,10 @@
   "turnHealApply": "Les PV de {{pokemonNameWithAffix}}\nsont un peu restaurés par les {{typeName}} !",
   "hitHealApply": "Les PV de {{pokemonNameWithAffix}}\nsont un peu restaurés par le {{typeName}} !",
   "pokemonInstantReviveApply": "{{pokemonNameWithAffix}} a repris connaissance\navec sa {{typeName}} et est prêt à se battre de nouveau !",
-  "pokemonResetNegativeStatStageApply": "{{pokemonNameWithAffix}}'s lowered stats were restored\nby its {{typeName}}!",
+  "pokemonResetNegativeStatStageApply": "Les stats baissées de {{pokemonNameWithAffix}}\nsont restaurées par l’{{typeName}} !",
   "moneyInterestApply": "La {{typeName}} vous rapporte\n{{moneyAmount}} ₽ d’intérêts !",
   "turnHeldItemTransferApply": "{{itemName}} de {{pokemonNameWithAffix}} est absorbé·e\npar le {{typeName}} de {{pokemonName}} !",
   "contactHeldItemTransferApply": "{{itemName}} de {{pokemonNameWithAffix}} est volé·e\npar l’{{typeName}} de {{pokemonName}} !",
   "enemyTurnHealApply": "{{pokemonNameWithAffix}}\nrestaure un peu ses PV !",
   "bypassSpeedChanceApply": "{{itemName}} de {{pokemonName}}\nlui permet d’agir plus vite que d’habitude !"
-}
\ No newline at end of file
+}
diff --git a/src/locales/fr/move.json b/src/locales/fr/move.json
index 8ad216a2501..a48e17b3fd9 100644
--- a/src/locales/fr/move.json
+++ b/src/locales/fr/move.json
@@ -25,7 +25,7 @@
   },
   "firePunch": {
     "name": "Poing Feu",
-    "effect": "Un coup de poing enflammé vient frapper la cible, ce qui peut la brûler (10% de chances)."
+    "effect": "Un coup de poing enflammé vient frapper la cible, ce qui peut la bruler (10% de chances)."
   },
   "icePunch": {
     "name": "Poing Glace",
@@ -205,11 +205,11 @@
   },
   "ember": {
     "name": "Flammèche",
-    "effect": "La cible est attaquée par une faible flamme qui peut aussi la brûler."
+    "effect": "La cible est attaquée par une faible flamme qui peut aussi la bruler."
   },
   "flamethrower": {
     "name": "Lance-Flammes",
-    "effect": "La cible reçoit un torrent de flammes qui peut aussi la brûler (10% de chances)."
+    "effect": "La cible reçoit un torrent de flammes qui peut aussi la bruler (10% de chances)."
   },
   "mist": {
     "name": "Brume",
@@ -356,7 +356,7 @@
     "effect": "Le lanceur provoque un tremblement de terre touchant tous les Pokémon autour de lui."
   },
   "fissure": {
-    "name": "Abîme",
+    "name": "Abime",
     "effect": "Le lanceur fait tomber la cible dans une crevasse. Si cette attaque réussit, elle met K.O. sur le coup."
   },
   "dig": {
@@ -489,7 +489,7 @@
   },
   "smog": {
     "name": "Purédpois",
-    "effect": "Le lanceur attaque à l'aide d'une éruption de gaz répugnants qui peuvent aussi empoisonner la cible."
+    "effect": "Le lanceur attaque à l’aide d’une éruption de gaz répugnants qui peuvent aussi empoisonner la cible."
   },
   "sludge": {
     "name": "Détritus",
@@ -501,7 +501,7 @@
   },
   "fireBlast": {
     "name": "Déflagration",
-    "effect": "Un déluge de flammes ardentes submerge la cible, ce qui peut aussi la brûler (10% de chances)."
+    "effect": "Un déluge de flammes ardentes submerge la cible, ce qui peut aussi la bruler (10% de chances)."
   },
   "waterfall": {
     "name": "Cascade",
@@ -581,7 +581,7 @@
   },
   "dizzyPunch": {
     "name": "Uppercut",
-    "effect": "Un enchaînement de coups de poing cadencés frappe l’ennemi. Peut aussi le rendre confus."
+    "effect": "Un enchainement de coups de poing cadencés frappe l’ennemi. Peut aussi le rendre confus."
   },
   "spore": {
     "name": "Spore",
@@ -632,7 +632,7 @@
     "effect": "Le lanceur mord l’ennemi à l’aide de ses incisives aiguisées. Peut aussi l’apeurer (10% de chances)."
   },
   "sharpen": {
-    "name": "Affûtage",
+    "name": "Affutage",
     "effect": "Le lanceur réduit son nombre de polygones pour accentuer ses angles et augmenter son Attaque."
   },
   "conversion": {
@@ -641,7 +641,7 @@
   },
   "triAttack": {
     "name": "Triplattaque",
-    "effect": "Le lanceur envoie trois boules d’énergie simultanément qui peuvent aussi paralyser, brûler ou geler la cible (6.67% de chances)."
+    "effect": "Le lanceur envoie trois boules d’énergie simultanément qui peuvent aussi paralyser, bruler ou geler la cible (6.67% de chances)."
   },
   "superFang": {
     "name": "Croc Fatal",
@@ -661,7 +661,7 @@
   },
   "sketch": {
     "name": "Gribouille",
-    "effect": "Le lanceur apprend la dernière capacité utilisée par la cible. Gribouille disparaît après utilisation."
+    "effect": "Le lanceur apprend la dernière capacité utilisée par la cible. Gribouille disparait après utilisation."
   },
   "tripleKick": {
     "name": "Triple Pied",
@@ -685,7 +685,7 @@
   },
   "flameWheel": {
     "name": "Roue de Feu",
-    "effect": "Le lanceur s’entoure de feu et charge la cible, ce qui peut aussi la brûler (10% de chances)."
+    "effect": "Le lanceur s’entoure de feu et charge la cible, ce qui peut aussi la bruler (10% de chances)."
   },
   "snore": {
     "name": "Ronflement",
@@ -881,7 +881,7 @@
   },
   "sacredFire": {
     "name": "Feu Sacré",
-    "effect": "Le lanceur génère un feu mystique d’une intensité redoutable pour attaquer l’ennemi. Peut aussi le brûler (50% de chances)."
+    "effect": "Le lanceur génère un feu mystique d’une intensité redoutable pour attaquer l’ennemi. Peut aussi le bruler (50% de chances)."
   },
   "magnitude": {
     "name": "Ampleur",
@@ -1025,7 +1025,7 @@
   },
   "heatWave": {
     "name": "Canicule",
-    "effect": "Le lanceur provoque une vague de chaleur qui peut aussi brûler la cible (10% de chances)."
+    "effect": "Le lanceur provoque une vague de chaleur qui peut aussi bruler la cible (10% de chances)."
   },
   "hail": {
     "name": "Grêle",
@@ -1041,7 +1041,7 @@
   },
   "willOWisp": {
     "name": "Feu Follet",
-    "effect": "Le lanceur projette des flammes maléfiques à la cible pour lui infliger une brûlure."
+    "effect": "Le lanceur projette des flammes maléfiques à la cible pour lui infliger une brulure."
   },
   "memento": {
     "name": "Souvenir",
@@ -1049,7 +1049,7 @@
   },
   "facade": {
     "name": "Façade",
-    "effect": "Une capacité dont la puissance double lorsque le lanceur est empoisonné, paralysé ou brûlé."
+    "effect": "Une capacité dont la puissance double lorsque le lanceur est empoisonné, paralysé ou brulé."
   },
   "focusPunch": {
     "name": "Mitra-Poing",
@@ -1145,7 +1145,7 @@
   },
   "refresh": {
     "name": "Régénération",
-    "effect": "Le lanceur se repose pour guérir d’un empoisonnement, d’une brûlure ou d’une paralysie."
+    "effect": "Le lanceur se repose pour guérir d’un empoisonnement, d’une brulure ou d’une paralysie."
   },
   "grudge": {
     "name": "Rancune",
@@ -1192,8 +1192,8 @@
     "effect": "Danse qui rend confus tous les Pokémon autour du lanceur."
   },
   "blazeKick": {
-    "name": "Pied Brûleur",
-    "effect": "Le lanceur envoie un coup de pied au taux de critiques élevé. Peut aussi brûler la cible (10% de chances)."
+    "name": "Pied Bruleur",
+    "effect": "Le lanceur envoie un coup de pied au taux de critiques élevé. Peut aussi bruler la cible (10% de chances)."
   },
   "mudSport": {
     "name": "Lance-Boue",
@@ -1573,7 +1573,7 @@
   },
   "flareBlitz": {
     "name": "Boutefeu",
-    "effect": "Le lanceur s’embrase avant de charger la cible, ce qui peut la brûler (10% de chances). Le choc blesse aussi gravement le lanceur."
+    "effect": "Le lanceur s’embrase avant de charger la cible, ce qui peut la bruler (10% de chances). Le choc blesse aussi gravement le lanceur."
   },
   "forcePalm": {
     "name": "Forte-Paume",
@@ -1693,7 +1693,7 @@
   },
   "fireFang": {
     "name": "Crocs Feu",
-    "effect": "Le lanceur utilise une morsure enflammée qui peut aussi brûler (10% de chances) ou apeurer (10% de chances) la cible."
+    "effect": "Le lanceur utilise une morsure enflammée qui peut aussi bruler (10% de chances) ou apeurer (10% de chances) la cible."
   },
   "shadowSneak": {
     "name": "Ombre Portée",
@@ -1741,7 +1741,7 @@
   },
   "lavaPlume": {
     "name": "Ébullilave",
-    "effect": "Des flammes s’abattent sur tous les Pokémon autour du lanceur, ce qui peut aussi les brûler (10% de chances)."
+    "effect": "Des flammes s’abattent sur tous les Pokémon autour du lanceur, ce qui peut aussi les bruler (10% de chances)."
   },
   "leafStorm": {
     "name": "Tempête Verte",
@@ -1796,7 +1796,7 @@
     "effect": "Le lanceur libère une myriade de rayons de lumière. Le type varie selon la plaque que tient le lanceur."
   },
   "bugBite": {
-    "name": "Piqûre",
+    "name": "Piqure",
     "effect": "Le lanceur pique la cible. Si celle-ci tient une Baie, le lanceur la dévore et obtient son effet."
   },
   "chargeBeam": {
@@ -1865,7 +1865,7 @@
   },
   "shadowForce": {
     "name": "Revenant",
-    "effect": "Le lanceur disparaît au premier tour et frappe la cible au deuxième. Cette capacité fonctionne même si la cible se protège."
+    "effect": "Le lanceur disparait au premier tour et frappe la cible au deuxième. Cette capacité fonctionne même si la cible se protège."
   },
   "honeClaws": {
     "name": "Aiguisage",
@@ -2009,7 +2009,7 @@
   },
   "scald": {
     "name": "Ébullition",
-    "effect": "Le lanceur projette un jet d’eau bouillante sur la cible, ce qui peut aussi la brûler (30% de chances)."
+    "effect": "Le lanceur projette un jet d’eau bouillante sur la cible, ce qui peut aussi la bruler (30% de chances)."
   },
   "shellSmash": {
     "name": "Exuviation",
@@ -2037,7 +2037,7 @@
   },
   "incinerate": {
     "name": "Calcination",
-    "effect": "Des flammes calcinent la cible. Si elle tient un objet, une Baie par exemple, celui-ci est brûlé et devient inutilisable."
+    "effect": "Des flammes calcinent la cible. Si elle tient un objet, une Baie par exemple, celui-ci est brulé et devient inutilisable."
   },
   "quash": {
     "name": "À la Queue",
@@ -2065,19 +2065,19 @@
   },
   "inferno": {
     "name": "Feu d’Enfer",
-    "effect": "La cible est entourée d’un torrent de flammes ardentes qui la brûlent."
+    "effect": "La cible est entourée d’un torrent de flammes ardentes qui la brulent."
   },
   "waterPledge": {
     "name": "Aire d’Eau",
-    "effect": "Une masse d’eau s’abat sur la cible. Si cette capacité est utilisée en même temps qu’Aire de Feu, la puissance augmente et un arc-en-ciel apparaît."
+    "effect": "Une masse d’eau s’abat sur la cible. Si cette capacité est utilisée en même temps qu’Aire de Feu, la puissance augmente et un arc-en-ciel apparait."
   },
   "firePledge": {
     "name": "Aire de Feu",
-    "effect": "Une masse de feu s’abat sur la cible. Si cette capacité est utilisée en même temps qu’Aire d’Herbe, la puissance augmente et une mer de feu apparaît."
+    "effect": "Une masse de feu s’abat sur la cible. Si cette capacité est utilisée en même temps qu’Aire d’Herbe, la puissance augmente et une mer de feu apparait."
   },
   "grassPledge": {
     "name": "Aire d’Herbe",
-    "effect": "Une masse végétale s’abat sur la cible. Si cette capacité est utilisée en même temps qu’Aire d’Eau, la puissance augmente et un marécage apparaît."
+    "effect": "Une masse végétale s’abat sur la cible. Si cette capacité est utilisée en même temps qu’Aire d’Eau, la puissance augmente et un marécage apparait."
   },
   "voltSwitch": {
     "name": "Change Éclair",
@@ -2177,7 +2177,7 @@
   },
   "searingShot": {
     "name": "Incendie",
-    "effect": "Des boules de feu s’abattent sur tous les Pokémon autour du lanceur. Peut aussi les brûler (30% de chances)."
+    "effect": "Des boules de feu s’abattent sur tous les Pokémon autour du lanceur. Peut aussi les bruler (30% de chances)."
   },
   "technoBlast": {
     "name": "Techno-Buster",
@@ -2201,7 +2201,7 @@
   },
   "blueFlare": {
     "name": "Flamme Bleue",
-    "effect": "De magnifiques et redoutables flammes bleues fondent sur l’ennemi. Peut aussi le brûler (20% de chances)."
+    "effect": "De magnifiques et redoutables flammes bleues fondent sur l’ennemi. Peut aussi le bruler (20% de chances)."
   },
   "fieryDance": {
     "name": "Danse du Feu",
@@ -2213,7 +2213,7 @@
   },
   "iceBurn": {
     "name": "Feu Glacé",
-    "effect": "Au second tour, le lanceur projette un souffle de vent glacial dévastateur sur l’ennemi. Peut aussi le brûler (30% de chances)."
+    "effect": "Au second tour, le lanceur projette un souffle de vent glacial dévastateur sur l’ennemi. Peut aussi le bruler (30% de chances)."
   },
   "snarl": {
     "name": "Aboiement",
@@ -2261,7 +2261,7 @@
   },
   "phantomForce": {
     "name": "Hantise",
-    "effect": "Le lanceur disparaît au premier tour et frappe au second. Cette attaque passe outre les protections."
+    "effect": "Le lanceur disparait au premier tour et frappe au second. Cette attaque passe outre les protections."
   },
   "trickOrTreat": {
     "name": "Halloween",
@@ -2333,7 +2333,7 @@
   },
   "fairyWind": {
     "name": "Vent Féérique",
-    "effect": "Le lanceur déchaîne un vent magique qui cingle la cible."
+    "effect": "Le lanceur déchaine un vent magique qui cingle la cible."
   },
   "moonblast": {
     "name": "Pouvoir Lunaire",
@@ -2345,7 +2345,7 @@
   },
   "fairyLock": {
     "name": "Verrou Enchanté",
-    "effect": "Des chaînes entourent la zone de combat, empêchant tous les Pokémon de quitter le terrain au tour suivant."
+    "effect": "Des chaines entourent la zone de combat, empêchant tous les Pokémon de quitter le terrain au tour suivant."
   },
   "kingsShield": {
     "name": "Bouclier Royal",
@@ -2365,7 +2365,7 @@
   },
   "steamEruption": {
     "name": "Jet de Vapeur",
-    "effect": "Le lanceur projette de la vapeur extrêmement chaude sur la cible, ce qui peut aussi la brûler (30% de chances)."
+    "effect": "Le lanceur projette de la vapeur extrêmement chaude sur la cible, ce qui peut aussi la bruler (30% de chances)."
   },
   "hyperspaceHole": {
     "name": "TrouDimensionnel",
@@ -2377,7 +2377,7 @@
   },
   "mysticalFire": {
     "name": "Feu Ensorcelé",
-    "effect": "Le lanceur attaque en soufflant des flammes brûlantes par la bouche et diminue l’Attaque Spéciale de la cible."
+    "effect": "Le lanceur attaque en soufflant des flammes brulantes par la bouche et diminue l’Attaque Spéciale de la cible."
   },
   "spikyShield": {
     "name": "Pico-Défense",
@@ -2517,7 +2517,7 @@
   },
   "tectonicRagePhysical": {
     "name": "Éruption Géo-Sismique",
-    "effect": "Le Pokémon utilise la Force Z pour entraîner l’adversaire dans les profondeurs de la terre. La puissance varie selon celle de la capacité originale."
+    "effect": "Le Pokémon utilise la Force Z pour entrainer l’adversaire dans les profondeurs de la terre. La puissance varie selon celle de la capacité originale."
   },
   "tectonicRageSpecial": {
     "name": "Éruption Géo-Sismique",
@@ -2653,7 +2653,7 @@
   },
   "sparklingAria": {
     "name": "Aria de l’Écume",
-    "effect": "Le lanceur émet plusieurs bulles en chantant. Soigne les brûlures des Pokémon touchés par ces bulles."
+    "effect": "Le lanceur émet plusieurs bulles en chantant. Soigne les brulures des Pokémon touchés par ces bulles."
   },
   "iceHammer": {
     "name": "Marteau de Glace",
@@ -2757,7 +2757,7 @@
   },
   "beakBlast": {
     "name": "Bec-Canon",
-    "effect": "Le lanceur fait chauffer son bec avant d’attaquer. S’il subit une attaque directe pendant la montée en température, l’attaquant sera brûlé."
+    "effect": "Le lanceur fait chauffer son bec avant d’attaquer. S’il subit une attaque directe pendant la montée en température, l’attaquant sera brulé."
   },
   "clangingScales": {
     "name": "Vibrécaille",
@@ -2789,7 +2789,7 @@
   },
   "guardianOfAlola": {
     "name": "Colère du Gardien d’Alola",
-    "effect": "Le Pokémon Tutélaire utilise la Force Z et déchaîne toute la puissance d’Alola sur sa cible. Inflige des dégâts en fonction des PV restants de celle-ci."
+    "effect": "Le Pokémon Tutélaire utilise la Force Z et déchaine toute la puissance d’Alola sur sa cible. Inflige des dégâts en fonction des PV restants de celle-ci."
   },
   "soulStealing7StarStrike": {
     "name": "Fauche-Âme des Sept Étoiles",
@@ -2865,7 +2865,7 @@
   },
   "naturesMadness": {
     "name": "Ire de la Nature",
-    "effect": "Le lanceur déchaîne toute la colère de la nature pour baisser les PV de la cible de moitié."
+    "effect": "Le lanceur déchaine toute la colère de la nature pour baisser les PV de la cible de moitié."
   },
   "multiAttack": {
     "name": "Coup Varia-Type",
@@ -2873,7 +2873,7 @@
   },
   "tenMillionVoltThunderbolt": {
     "name": "Giga-Tonnerre",
-    "effect": "Le Pikachu à casquette utilise la Force Z pour augmenter sa puissance électrique avant de la déchaîner sur la cible. Taux de critique élevé."
+    "effect": "Le Pikachu à casquette utilise la Force Z pour augmenter sa puissance électrique avant de la déchainer sur la cible. Taux de critique élevé."
   },
   "mindBlown": {
     "name": "Caboche-Kaboum",
@@ -2893,11 +2893,11 @@
   },
   "searingSunrazeSmash": {
     "name": "Hélio-Choc Dévastateur",
-    "effect": "Baigné dans la Force Z, Solgaleo attaque en déchaînant toute sa puissance. Ignore le talent de la cible."
+    "effect": "Baigné dans la Force Z, Solgaleo attaque en déchainant toute sa puissance. Ignore le talent de la cible."
   },
   "menacingMoonrazeMaelstrom": {
     "name": "Rayons Séléno-Explosifs",
-    "effect": "Baigné dans la Force Z, Lunala attaque en déchaînant toute sa puissance. Ignore le talent de la cible."
+    "effect": "Baigné dans la Force Z, Lunala attaque en déchainant toute sa puissance. Ignore le talent de la cible."
   },
   "letsSnuggleForever": {
     "name": "Patati-Patattrape",
@@ -2913,7 +2913,7 @@
   },
   "zippyZap": {
     "name": "Pika-Sprint",
-    "effect": "Une attaque électrique rapide comme l’éclair qui augmente l’esquive. Frappe en priorité."
+    "effect": "Une attaque électrique rapide comme l’éclair qui inflige un coup critique à coup sûr. Frappe en priorité."  
   },
   "splishySplash": {
     "name": "Pika-Splash",
@@ -2937,7 +2937,7 @@
   },
   "sizzlySlide": {
     "name": "Évo-Flambo",
-    "effect": "Évoli s’embrase et percure violemment l’adversaire. Brûle aussi l’ennemi."
+    "effect": "Évoli s’embrase et percure violemment l’adversaire. Brule aussi l’ennemi."
   },
   "glitzyGlow": {
     "name": "Évo-Psycho",
@@ -2961,7 +2961,7 @@
   },
   "veeveeVolley": {
     "name": "Évo-Chardasso",
-    "effect": "Le lanceur lance une attaque dès lors qu’un signe apparaît sur le terrain. Les dégâts infligés sont proportionnels à l’affection de votre Pokémon"
+    "effect": "Le lanceur lance une attaque dès lors qu’un signe apparait sur le terrain. Les dégâts infligés sont proportionnels à l’affection de votre Pokémon"
   },
   "doubleIronBash": {
     "name": "Écrous d’Poing",
@@ -3005,7 +3005,7 @@
   },
   "teatime": {
     "name": "Thérémonie",
-    "effect": "Le lanceur invite tous les Pokémon sur le terrain à prendre le goûter autour d’une tasse de thé. Ceux qui tiennent une Baie la mangent."
+    "effect": "Le lanceur invite tous les Pokémon sur le terrain à prendre le gouter autour d’une tasse de thé. Ceux qui tiennent une Baie la mangent."
   },
   "octolock": {
     "name": "Octoprise",
@@ -3105,7 +3105,7 @@
   },
   "decorate": {
     "name": "Nappage",
-    "effect": "Augmente fortement l’Attaque et l’Attaque Spéciale du lanceur."
+    "effect": "Augmente fortement l’Attaque et l’Attaque Spéciale de la cible."
   },
   "drumBeating": {
     "name": "Tambour Battant",
@@ -3116,8 +3116,8 @@
     "effect": "Bloque l’ennemi pendant 4 à 5 tours."
   },
   "pyroBall": {
-    "name": "Ballon Brûlant",
-    "effect": "Le lanceur attaque avec un ballon fait à partir d’un caillou enflammé. Peut aussi brûler la cible (10% de chances)."
+    "name": "Ballon Brulant",
+    "effect": "Le lanceur attaque avec un ballon fait à partir d’un caillou enflammé. Peut aussi bruler la cible (10% de chances)."
   },
   "behemothBlade": {
     "name": "Gladius Maximus",
@@ -3189,7 +3189,7 @@
   },
   "steelRoller": {
     "name": "Métalliroue",
-    "effect": "Une attaque qui inflige des dégâts et fait disparaître le champ actif, mais qui échoue s’il n’y en a pas à ce moment."
+    "effect": "Une attaque qui inflige des dégâts et fait disparaitre le champ actif, mais qui échoue s’il n’y en a pas à ce moment."
   },
   "scaleShot": {
     "name": "Rafale Écailles",
@@ -3225,7 +3225,7 @@
   },
   "burningJealousy": {
     "name": "Feu Envieux",
-    "effect": "Le lanceur attaque sa cible avec toute sa jalousie. Cette capacité brûle tout Pokémon dont les stats ont augmenté pendant ce tour."
+    "effect": "Le lanceur attaque sa cible avec toute sa jalousie. Cette capacité brule tout Pokémon dont les stats ont augmenté pendant ce tour."
   },
   "lashOut": {
     "name": "Cent Rancunes",
@@ -3257,7 +3257,7 @@
   },
   "scorchingSands": {
     "name": "Sable Ardent",
-    "effect": "Le lanceur projette du sable chauffé à blanc sur la cible, ce qui peut aussi la brûler (30% de chances)."
+    "effect": "Le lanceur projette du sable chauffé à blanc sur la cible, ce qui peut aussi la bruler (30% de chances)."
   },
   "jungleHealing": {
     "name": "Selve Salvatrice",
@@ -3265,11 +3265,11 @@
   },
   "wickedBlow": {
     "name": "Poing Obscur",
-    "effect": "Le lanceur assène un coup puissant à la cible. Cette technique qui inflige toujours un coup critique est réservée à ceux qui maîtrisent la puissance des Ténèbres."
+    "effect": "Le lanceur assène un coup puissant à la cible. Cette technique qui inflige toujours un coup critique est réservée à ceux qui maitrisent la puissance des Ténèbres."
   },
   "surgingStrikes": {
     "name": "Torrent de Coups",
-    "effect": "Le lanceur assène trois coups fluides à la cible. Cette technique qui inflige toujours un coup critique est réservée à ceux qui maîtrisent la puissance de l’Eau."
+    "effect": "Le lanceur assène trois coups fluides à la cible. Cette technique qui inflige toujours un coup critique est réservée à ceux qui maitrisent la puissance de l’Eau."
   },
   "thunderCage": {
     "name": "Voltageôle",
@@ -3285,7 +3285,7 @@
   },
   "fieryWrath": {
     "name": "Fureur Ardente",
-    "effect": "Le lanceur canalise sa colère et la transforme en émanation brûlante, avec laquelle il attaque la cible, ce qui peut aussi apeurer celle-ci (20% de chances)."
+    "effect": "Le lanceur canalise sa colère et la transforme en émanation brulante, avec laquelle il attaque la cible, ce qui peut aussi apeurer celle-ci (20% de chances)."
   },
   "thunderousKick": {
     "name": "Coup Fulgurant",
@@ -3329,7 +3329,7 @@
   },
   "ragingFury": {
     "name": "Grand Courroux",
-    "effect": "Le lanceur se déchaîne et attaque en projetant de violentes flammes pendant deux ou trois tours. Il devient ensuite confus."
+    "effect": "Le lanceur se déchaine et attaque en projetant de violentes flammes pendant deux ou trois tours. Il devient ensuite confus."
   },
   "waveCrash": {
     "name": "Aquatacle",
@@ -3373,7 +3373,7 @@
   },
   "infernalParade": {
     "name": "Cortège Funèbre",
-    "effect": "Une multitude de boules de feu frappent la cible, ce qui peut aussi la brûler (30% de chances et 50% en Style Puissant). La puissance est doublée si celle-ci souffre d’une altération de statut."
+    "effect": "Une multitude de boules de feu frappent la cible, ce qui peut aussi la bruler (30% de chances et 50% en Style Puissant). La puissance est doublée si celle-ci souffre d’une altération de statut."
   },
   "ceaselessEdge": {
     "name": "Vagues à Lames",
@@ -3389,7 +3389,7 @@
   },
   "sandsearStorm": {
     "name": "Typhon Pyrosable",
-    "effect": "Le lanceur déclenche un violent typhon mêlé à du sable ardent qui s’abat sur la cible, ce qui peut la brûler (30% de chances et 50% en Style Puissant)."
+    "effect": "Le lanceur déclenche un violent typhon mêlé à du sable ardent qui s’abat sur la cible, ce qui peut la bruler (30% de chances et 50% en Style Puissant)."
   },
   "lunarBlessing": {
     "name": "Prière Lunaire",
@@ -3529,7 +3529,7 @@
   },
   "gMaxRapidFlow": {
     "name": "Multicoup G-Max",
-    "effect": "Une attaque de type Eau que seul un Shifours Gigamax peut utiliser. Cet enchaînement de coups permet d’ignorer la capacité Gardomax."
+    "effect": "Une attaque de type Eau que seul un Shifours Gigamax peut utiliser. Cet enchainement de coups permet d’ignorer la capacité Gardomax."
   },
   "teraBlast": {
     "name": "Téra Explosion",
@@ -3712,8 +3712,8 @@
     "effect": "Le lanceur projette de l’eau pressurisée qui entaille la cible comme une lame. Taux de critiques élevé."
   },
   "blazingTorque": {
-    "name": "Crash Brûlant",
-    "effect": "Crash Brûlant inflige des dégâts et possède 30 % de chances de brûler l’adversaire."
+    "name": "Crash Brulant",
+    "effect": "Crash Brulant inflige des dégâts et possède 30 % de chances de bruler l’adversaire."
   },
   "wickedTorque": {
     "name": "Crash Obscur",
@@ -3737,7 +3737,7 @@
   },
   "matchaGotcha": {
     "name": "Mortier Matcha",
-    "effect": "Le lanceur remue son thé et en bombarde la cible. La moitié des dégâts infligés sont convertis en PV pour le lanceur. Cette capacité peut aussi brûler la cible."
+    "effect": "Le lanceur remue son thé et en bombarde la cible. La moitié des dégâts infligés sont convertis en PV pour le lanceur. Cette capacité peut aussi bruler la cible."
   },
   "syrupBomb": {
     "name": "Bombe au Sirop",
@@ -3760,8 +3760,8 @@
     "effect": "Le lanceur attaque en tirant un rayon lumineux. Il arrive parfois que toutes les têtes agissent ensemble, ce qui double la puissance de la capacité."
   },
   "burningBulwark": {
-    "name": "Rempart Brûlant",
-    "effect": "Le lanceur se protège contre les attaques grâce à son pelage incandescent, et si un assaillant utilise une attaque directe contre lui, il le brûle."
+    "name": "Rempart Brulant",
+    "effect": "Le lanceur se protège contre les attaques grâce à son pelage incandescent, et si un assaillant utilise une attaque directe contre lui, il le brule."
   },
   "thunderclap": {
     "name": "Vif Éclair",
@@ -3784,7 +3784,7 @@
     "effect": "Le lanceur galvanise ses alliés avec un encouragement draconique qui augmente leur taux de critiques. L’effet est plus puissant si les alliés ont le type Dragon."
   },
   "alluringVoice": {
-    "name": "Voix Envoûtante",
+    "name": "Voix Envoutante",
     "effect": "Le lanceur attaque la cible avec sa voix angélique. Cette capacité rend la cible confuse si ses stats ont augmenté pendant ce tour."
   },
   "temperFlare": {
@@ -3804,7 +3804,7 @@
     "effect": "Le lanceur réagit instinctivement au moindre mouvement et donne un coup de paume qui apeure la cible. Échoue si cette dernière n’a pas utilisé une attaque prioritaire."
   },
   "malignantChain": {
-    "name": "Chaîne Malsaine",
-    "effect": "Le lanceur ligote la cible avec une chaîne faite de poison et lui injecte un venin corrosif, ce qui peut aussi gravement l’empoisonner."
+    "name": "Chaine Malsaine",
+    "effect": "Le lanceur ligote la cible avec une chaine faite de poison et lui injecte un venin corrosif, ce qui peut aussi gravement l’empoisonner."
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/fr/pokemon-form.json b/src/locales/fr/pokemon-form.json
index 3a2557fb747..44f2bcecf2c 100644
--- a/src/locales/fr/pokemon-form.json
+++ b/src/locales/fr/pokemon-form.json
@@ -64,6 +64,7 @@
   "landorusIncarnate": "Avatar",
   "keldeoOrdinary": "Normal",
   "meloettaAria": "Chant",
+  "meloettaPirouette": "Danse",
   "froakieBattleBond": "Synergie",
   "scatterbugMeadow": "Floraison",
   "scatterbugIcySnow": "Blizzard",
diff --git a/src/locales/fr/run-history-ui-handler.json b/src/locales/fr/run-history.json
similarity index 58%
rename from src/locales/fr/run-history-ui-handler.json
rename to src/locales/fr/run-history.json
index 7ee0a879e3e..1def265acf1 100644
--- a/src/locales/fr/run-history-ui-handler.json
+++ b/src/locales/fr/run-history.json
@@ -1,15 +1,15 @@
 {
   "victory": "Victoire !",
-  "defeatedWildM": "Battu par ",
-  "defeatedTrainerM": "Battu par ",
-  "defeatedTrainerDoubleM": "Battu par Duo",
-  "defeatedRivalM": "Battu par Rivale",
-  "defeatedM": "Vaincu",
-  "defeatedWildF": "Battue par ",
-  "defeatedTrainerF": "Battue par ",
-  "defeatedTrainerDoubleF": "Battue par Duo",
-  "defeatedRivalF": "Battue par Rival",
-  "defeatedF": "Vaincue",
+  "defeatedWild": "Battu par ",
+  "defeatedTrainer": "Battu par ",
+  "defeatedTrainerDouble": "Battu par Duo",
+  "defeatedRival": "Battu par Rivale",
+  "defeated": "Vaincu",
+  "defeatedWild_female": "Battue par ",
+  "defeatedTrainer_female": "Battue par ",
+  "defeatedTrainerDouble_female": "Battue par Duo",
+  "defeatedRival_female": "Battue par Rival",
+  "defeated_female": "Vaincue",
   "luck": "Chance ",
   "score": "Score",
   "mode": "Mode ",
@@ -30,8 +30,8 @@
   "money": "Argent",
   "runLength": "Durée session ",
   "viewHeldItems": "Objets tenus",
-  "hallofFameTextM": "Bienvenue au Panthéon !",
-  "hallofFameTextF": "Bienvenue au Panthéon !",
+  "hallofFameText": "Bienvenue au Panthéon !",
+  "hallofFameText_female": "Bienvenue au Panthéon !",
   "viewHallOfFame": "Voir le Panthéon",
   "viewEndingSplash": "Voir l’illustration\nde fin"
 }
\ No newline at end of file
diff --git a/src/locales/fr/settings.json b/src/locales/fr/settings.json
index deee95a124a..181a593cc99 100644
--- a/src/locales/fr/settings.json
+++ b/src/locales/fr/settings.json
@@ -61,7 +61,9 @@
   "typeHints": "Indications de type",
   "masterVolume": "Vol. principal",
   "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/fr/trainer-classes.json b/src/locales/fr/trainer-classes.json
index 34768d0a31f..cebdadf09e9 100644
--- a/src/locales/fr/trainer-classes.json
+++ b/src/locales/fr/trainer-classes.json
@@ -11,7 +11,7 @@
   "baker": "Boulangère",
   "battle_girl": "Combattante",
   "beauty": "Canon",
-  "beginners": "Beginners",
+  "beginners": "Débutants",
   "biker": "Motard",
   "black_belt": "Karatéka",
   "breeder": "Éleveur",
@@ -29,7 +29,7 @@
   "depot_agent": "Cheminot",
   "doctor": "Docteur",
   "doctor_female": "Docteure",
-  "firebreather": "Firebreather",
+  "firebreather": "Crache-Feu",
   "fisherman": "Pêcheur",
   "fisherman_female": "Pêcheuse",
   "gentleman": "Gentleman",
@@ -68,7 +68,7 @@
   "pokémon_rangers": "Pokémon Rangers",
   "ranger": "Ranger",
   "restaurant_staff": "Serveurs",
-  "rich": "Rich",
+  "rich": "Gentleman",
   "rich_female": "Mondaine",
   "rich_boy": "Gentleman",
   "rich_couple": "Couple de Bourgeois",
@@ -117,5 +117,13 @@
   "plasma_grunts": "Sbires de la Team Plasma",
   "flare_grunt": "Sbire de la Team Flare",
   "flare_grunt_female": "Sbire de la Team Flare",
-  "flare_grunts": "Sbires de la Team Flare"
-}
\ No newline at end of file
+  "flare_grunts": "Sbires de la Team Flare",
+  "aether_grunt": "Employé de la Fondation Æther",
+  "aether_grunt_female": "Employée de la Fondation Æther",
+  "aether_grunts": "Employés de la Fondation Æther",
+  "skull_grunt": "Sbire de la Team Skull",
+  "skull_grunt_female": "Sbire de la Team Skull",
+  "macro_grunt": "Employé de Macro Cosmos",
+  "macro_grunt_female": "Employée de Macro Cosmos",
+  "macro_grunts": "Employés de Macro Cosmos"
+}
diff --git a/src/locales/fr/trainer-names.json b/src/locales/fr/trainer-names.json
index 4444a530df8..5864976cc34 100644
--- a/src/locales/fr/trainer-names.json
+++ b/src/locales/fr/trainer-names.json
@@ -138,11 +138,19 @@
   "rood": "Carmine",
   "xerosic": "Xanthin",
   "bryony": "Brasénie",
+  "faba": "Saubohne",
+  "plumeria": "Apocyne",
+  "oleana": "Liv",
+
   "maxie": "Max",
   "archie": "Arthur",
   "cyrus": "Hélio",
   "ghetsis": "Ghetis",
   "lysandre": "Lysandre",
+  "lusamine": "Elsa-Mina",
+  "guzma": "Guzma",
+  "rose": "Shehroz",
+
   "blue_red_double": "Blue & Red",
   "red_blue_double": "Red & Blue",
   "tate_liza_double": "Lévy & Tatia",
diff --git a/src/locales/fr/trainer-titles.json b/src/locales/fr/trainer-titles.json
index f53c5be7445..6d966bbd9ec 100644
--- a/src/locales/fr/trainer-titles.json
+++ b/src/locales/fr/trainer-titles.json
@@ -16,6 +16,10 @@
   "galactic_boss": "Leader de la Team Galaxie",
   "plasma_boss": "Leader de la Team Plasma",
   "flare_boss": "Leader de la Team Flare",
+  "aether_boss": "Présidente d’Æther",
+  "skull_boss": "Boss de la Team Skull",
+  "macro_boss": "Président de Macro Cosmos",
+
   "rocket_admin": "Admin Team Rocket",
   "rocket_admin_female": "Admin Team Rocket",
   "magma_admin": "Admin Team Magma",
@@ -27,5 +31,8 @@
   "plasma_sage": "Sage Plasma",
   "plasma_admin": "Admin Team Plasma",
   "flare_admin": "Manager de la Team Flare",
-  "flare_admin_female": "Manageuse de la Team Flare"
-}
\ No newline at end of file
+  "flare_admin_female": "Manageuse de la Team Flare",
+  "aether_admin": "Directeur d’Æther",
+  "skull_admin": "Admin Team Skull",
+  "macro_admin": "Macro Cosmos"
+}
diff --git a/src/locales/it/achv-male.json b/src/locales/it/achv-male.json
deleted file mode 100644
index 98e41005c46..00000000000
--- a/src/locales/it/achv-male.json
+++ /dev/null
@@ -1,264 +0,0 @@
-{
-  "Achievements": {
-    "name": "Obiettivi"
-  },
-  "Locked": {
-    "name": "Bloccato"
-  },
-  "MoneyAchv": {
-    "description": "Accumula {{moneyAmount}} PokéDollari"
-  },
-  "10K_MONEY": {
-    "name": "Benestante"
-  },
-  "100K_MONEY": {
-    "name": "Ricco"
-  },
-  "1M_MONEY": {
-    "name": "Milionario"
-  },
-  "10M_MONEY": {
-    "name": "La numero uno"
-  },
-  "DamageAchv": {
-    "description": "Infliggi {{damageAmount}} danni in un colpo"
-  },
-  "250_DMG": {
-    "name": "Grandi danni!"
-  },
-  "1000_DMG": {
-    "name": "Incredibili danni"
-  },
-  "2500_DMG": {
-    "name": "Danni a palate!"
-  },
-  "10000_DMG": {
-    "name": "One Punch Man"
-  },
-  "HealAchv": {
-    "description": "Cura {{healAmount}} {{HP}} tramite mossa, abilità, o oggetto"
-  },
-  "250_HEAL": {
-    "name": "Paramedico"
-  },
-  "1000_HEAL": {
-    "name": "Dottore"
-  },
-  "2500_HEAL": {
-    "name": "Chierico"
-  },
-  "10000_HEAL": {
-    "name": "Mastro Curatore"
-  },
-  "LevelAchv": {
-    "description": "Porta un pokémon a Lv{{level}}"
-  },
-  "LV_100": {
-    "name": "E Non Finisce Qui!"
-  },
-  "LV_250": {
-    "name": "Elite"
-  },
-  "LV_1000": {
-    "name": "Verso l'Infinito ed Oltre!"
-  },
-  "RibbonAchv": {
-    "description": "Accumula un Totale di {{ribbonAmount}} Nastri"
-  },
-  "10_RIBBONS": {
-    "name": "Campione Lega Pokémon"
-  },
-  "25_RIBBONS": {
-    "name": "Campione Lega Estesa"
-  },
-  "50_RIBBONS": {
-    "name": "Campione Lega Ultra"
-  },
-  "75_RIBBONS": {
-    "name": "Campione Lega Rogue"
-  },
-  "100_RIBBONS": {
-    "name": "Campione Lega Assoluta"
-  },
-  "TRANSFER_MAX_BATTLE_STAT": {
-    "name": "Lavoro di Squadra",
-    "description": "Trasferisci almeno sei bonus statistiche tramite staffetta"
-  },
-  "MAX_FRIENDSHIP": {
-    "name": "Amiconi",
-    "description": "Raggiungi amicizia massima con un Pokémon"
-  },
-  "MEGA_EVOLVE": {
-    "name": "Megamorfosi",
-    "description": "Megaevolvi un Pokémon"
-  },
-  "GIGANTAMAX": {
-    "name": "Grosso e Cattivo",
-    "description": "Ottieni una gigamax"
-  },
-  "TERASTALLIZE": {
-    "name": "STAB Per Tutti",
-    "description": "Teracristallizza un Pokémon"
-  },
-  "STELLAR_TERASTALLIZE": {
-    "name": "Tipo Segreto",
-    "description": "Teracristallizza un Pokémon stellare"
-  },
-  "SPLICE": {
-    "name": "Fusione Infinita",
-    "description": "Fondi due Pokémon insieme tramite cuneo DNA"
-  },
-  "MINI_BLACK_HOLE": {
-    "name": "Universo di Oggetti",
-    "description": "Ottieni un Mini Buco Nero"
-  },
-  "CATCH_MYTHICAL": {
-    "name": "Mitico",
-    "description": "Cattura un Pokémon mitico"
-  },
-  "CATCH_SUB_LEGENDARY": {
-    "name": "(Semi)Leggendario",
-    "description": "Cattura un Pokémon semileggendario"
-  },
-  "CATCH_LEGENDARY": {
-    "name": "Leggendario",
-    "description": "Cattura un Pokémon leggendario"
-  },
-  "SEE_SHINY": {
-    "name": "Cromatico",
-    "description": "Trova un Pokémon shiny in natura"
-  },
-  "SHINY_PARTY": {
-    "name": "Dedizione Totale",
-    "description": "Riempi la squadra di Pokémon shiny"
-  },
-  "HATCH_MYTHICAL": {
-    "name": "Uovo Mitico",
-    "description": "Schiudi l'uovo di un Pokémon mitico"
-  },
-  "HATCH_SUB_LEGENDARY": {
-    "name": "Uovo (Semi)Leggendario",
-    "description": "Schiudi l'uovo di un Pokémon semileggendario"
-  },
-  "HATCH_LEGENDARY": {
-    "name": "Uovo Leggendario",
-    "description": "Schiudi l'uovo di un Pokémon leggendario"
-  },
-  "HATCH_SHINY": {
-    "name": "Uovo Cromatico",
-    "description": "Schiudi l'uovo di un Pokémon shiny"
-  },
-  "HIDDEN_ABILITY": {
-    "name": "Potenziale Nascosto",
-    "description": "Cattura un Pokémon con abilità nascosta"
-  },
-  "PERFECT_IVS": {
-    "name": "Certificato di Autenticità",
-    "description": "Ottieni un Pokémon con IV perfetti"
-  },
-  "CLASSIC_VICTORY": {
-    "name": "Imbattuto",
-    "description": "Vinci in modalità classica"
-  },
-  "UNEVOLVED_CLASSIC_VICTORY": {
-    "name": "Alternanza scuola-lavoro",
-    "description": "Completa la modalità classica con almeno un membro della squadra non evoluto completamente."
-  },
-  "MONO_GEN_ONE": {
-    "name": "Rivale Originale",
-    "description": "Completa la modalità sfida di prima generazione."
-  },
-  "MONO_GEN_TWO": {
-    "name": "Generazione 1.5",
-    "description": "Completa la modalità sfida di seconda generazione."
-  },
-  "MONO_GEN_THREE": {
-    "name": "Troppa Acqua?",
-    "description": "Completa la modalità sfida di terza generazione."
-  },
-  "MONO_GEN_FOUR": {
-    "name": "È Davvero La Più Forte?",
-    "description": "Completa la modalità sfida di quarta generazione."
-  },
-  "MONO_GEN_FIVE": {
-    "name": "Tutti Originali",
-    "description": "Completa la modalità sfida di quinta generazione."
-  },
-  "MONO_GEN_SIX": {
-    "name": "Vita e Morte",
-    "description": "Completa la modalità sfida di sesta generazione."
-  },
-  "MONO_GEN_SEVEN": {
-    "name": "Troppo amichevoli?",
-    "description": "Completa la modalità sfida di settima generazione."
-  },
-  "MONO_GEN_EIGHT": {
-    "name": "It's champion time!",
-    "description": "Completa la modalità sfida di ottava generazione."
-  },
-  "MONO_GEN_NINE": {
-    "name": "Paradossalmente sbalorditivi",
-    "description": "Completa la modalità sfida di nona generazione."
-  },
-  "MonoType": {
-    "description": "Completa la modalità sfida monotipo {{type}}"
-  },
-  "MONO_NORMAL": {
-    "name": "Un tipo semplice"
-  },
-  "MONO_FIGHTING": {
-    "name": "Conosco il Kung-fu"
-  },
-  "MONO_FLYING": {
-    "name": "È un uccello? È un aereo?"
-  },
-  "MONO_POISON": {
-    "name": "I migliori di Kanto"
-  },
-  "MONO_GROUND": {
-    "name": "Con i piedi per terra"
-  },
-  "MONO_ROCK": {
-    "name": "Forte come una roccia!"
-  },
-  "MONO_BUG": {
-    "name": "Metodo Guzma"
-  },
-  "MONO_GHOST": {
-    "name": "Sono fantasmi, caro Watson"
-  },
-  "MONO_STEEL": {
-    "name": "Pugno di ferro"
-  },
-  "MONO_FIRE": {
-    "name": "Giocare col fuoco"
-  },
-  "MONO_WATER": {
-    "name": "Piove sul bagnato"
-  },
-  "MONO_GRASS": {
-    "name": "L'erba del vicino è sempre più verde"
-  },
-  "MONO_ELECTRIC": {
-    "name": "Elettrizzante"
-  },
-  "MONO_PSYCHIC": {
-    "name": "Mentalista"
-  },
-  "MONO_ICE": {
-    "name": "Rompere il ghiaccio"
-  },
-  "MONO_DRAGON": {
-    "name": "Sangue di drago"
-  },
-  "MONO_DARK": {
-    "name": "Solo una fase"
-  },
-  "MONO_FAIRY": {
-    "name": "Follettini e follettine"
-  },
-  "FRESH_START": {
-    "name": "Buona la prima!",
-    "description": "Completa la modalità sfida 'Un nuovo inizio'."
-  }
-}
\ No newline at end of file
diff --git a/src/locales/it/achv-female.json b/src/locales/it/achv.json
similarity index 100%
rename from src/locales/it/achv-female.json
rename to src/locales/it/achv.json
diff --git a/src/locales/it/battle.json b/src/locales/it/battle.json
index 3fd255353d3..f0339f761c7 100644
--- a/src/locales/it/battle.json
+++ b/src/locales/it/battle.json
@@ -38,7 +38,7 @@
   "learnMoveNotLearned": "{{pokemonName}} non ha imparato\n{{moveName}}.",
   "learnMoveForgetQuestion": "Quale mossa deve dimenticare?",
   "learnMoveForgetSuccess": "{{pokemonName}} ha dimenticato la mossa\n{{moveName}}.",
-  "countdownPoof": "@d{32}1, @d{15}2, @d{15}e@d{15}… @d{15}… @d{15}… @d{15}@s{pb_bounce_1}ta-daaaa!",
+  "countdownPoof": "@d{32}1, @d{15}2, @d{15}e@d{15}… @d{15}… @d{15}… @d{15}@s{se/pb_bounce_1}ta-daaaa!",
   "learnMoveAnd": "E…",
   "levelCapUp": "Il livello massimo\nè aumentato a {{levelCap}}!",
   "moveNotImplemented": "{{moveName}} non è ancora implementata e non può essere selezionata.",
diff --git a/src/locales/it/config.ts b/src/locales/it/config.ts
index 19d2f92f04e..a8cd1e4e0bd 100644
--- a/src/locales/it/config.ts
+++ b/src/locales/it/config.ts
@@ -4,8 +4,7 @@ import ability from "./ability.json";
 import abilityTriggers from "./ability-trigger.json";
 import arenaFlyout from "./arena-flyout.json";
 import arenaTag from "./arena-tag.json";
-import achvMale from "./achv-male.json";
-import achvFemale from "./achv-female.json";
+import achv from "./achv.json";
 import battle from "./battle.json";
 import battleScene from "./battle-scene.json";
 import battleInfo from "./battle-info.json";
@@ -16,14 +15,10 @@ import bgmName from "./bgm-name.json";
 import biome from "./biome.json";
 import challenges from "./challenges.json";
 import commandUiHandler from "./command-ui-handler.json";
-import dialogueMale from "./dialogue-male.json";
-import dialogueFemale from "./dialogue-female.json";
-import dialogueEndbossMale from "./dialogue-final-boss-male.json";
-import dialogueEndbossFemale from "./dialogue-final-boss-female.json";
-import dialogueMiscMale from "./dialogue-misc-male.json";
-import dialogueMiscFemale from "./dialogue-misc-female.json";
-import dialogueDoubleBattleMale from "./dialogue-double-battle-male.json";
-import dialogueDoubleBattleFemale from "./dialogue-double-battle-female.json";
+import dialogue from "./dialogue.json";
+import battleSpecDialogue from "./dialogue-final-boss.json";
+import miscDialogue from "./dialogue-misc.json";
+import doubleBattleDialogue from "./dialogue-double-battle.json";
 import egg from "./egg.json";
 import fightUiHandler from "./fight-ui-handler.json";
 import filterBar from "./filter-bar.json";
@@ -57,7 +52,7 @@ import weather from "./weather.json";
 import terrain from "./terrain.json";
 import modifierSelectUiHandler from "./modifier-select-ui-handler.json";
 import moveTriggers from "./move-trigger.json";
-import runHistory from "./run-history-ui-handler.json";
+import runHistory from "./run-history.json";
 
 export const itConfig = {
   ability,
@@ -76,16 +71,11 @@ export const itConfig = {
   challenges,
   commandUiHandler,
   common,
-  PGMachv: achvMale,
-  PGFachv: achvFemale,
-  PGMdialogue: dialogueMale,
-  PGFdialogue: dialogueFemale,
-  PGMbattleSpecDialogue: dialogueEndbossMale,
-  PGFbattleSpecDialogue: dialogueEndbossFemale,
-  PGMmiscDialogue: dialogueMiscMale,
-  PGFmiscDialogue: dialogueMiscFemale,
-  PGMdoubleBattleDialogue: dialogueDoubleBattleMale,
-  PGFdoubleBattleDialogue: dialogueDoubleBattleFemale,
+  achv,
+  dialogue,
+  battleSpecDialogue,
+  miscDialogue,
+  doubleBattleDialogue,
   egg,
   fightUiHandler,
   filterBar,
diff --git a/src/locales/it/dialogue-double-battle-female.json b/src/locales/it/dialogue-double-battle-female.json
deleted file mode 100644
index 9e26dfeeb6e..00000000000
--- a/src/locales/it/dialogue-double-battle-female.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/src/locales/it/dialogue-double-battle-male.json b/src/locales/it/dialogue-double-battle-male.json
deleted file mode 100644
index 9e26dfeeb6e..00000000000
--- a/src/locales/it/dialogue-double-battle-male.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/src/locales/ca_ES/dialogue-misc-male.json b/src/locales/it/dialogue-double-battle.json
similarity index 100%
rename from src/locales/ca_ES/dialogue-misc-male.json
rename to src/locales/it/dialogue-double-battle.json
diff --git a/src/locales/it/dialogue-female.json b/src/locales/it/dialogue-female.json
deleted file mode 100644
index 9e26dfeeb6e..00000000000
--- a/src/locales/it/dialogue-female.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/src/locales/it/dialogue-final-boss-female.json b/src/locales/it/dialogue-final-boss-female.json
deleted file mode 100644
index 9e26dfeeb6e..00000000000
--- a/src/locales/it/dialogue-final-boss-female.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/src/locales/it/dialogue-final-boss-male.json b/src/locales/it/dialogue-final-boss-male.json
deleted file mode 100644
index 9e26dfeeb6e..00000000000
--- a/src/locales/it/dialogue-final-boss-male.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/src/locales/ca_ES/run-history-ui-handler.json b/src/locales/it/dialogue-final-boss.json
similarity index 100%
rename from src/locales/ca_ES/run-history-ui-handler.json
rename to src/locales/it/dialogue-final-boss.json
diff --git a/src/locales/it/dialogue-male.json b/src/locales/it/dialogue-male.json
deleted file mode 100644
index 9e26dfeeb6e..00000000000
--- a/src/locales/it/dialogue-male.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/src/locales/it/dialogue-misc-female.json b/src/locales/it/dialogue-misc-female.json
deleted file mode 100644
index 9e26dfeeb6e..00000000000
--- a/src/locales/it/dialogue-misc-female.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/src/locales/it/dialogue-misc-male.json b/src/locales/it/dialogue-misc-male.json
deleted file mode 100644
index 9e26dfeeb6e..00000000000
--- a/src/locales/it/dialogue-misc-male.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/src/locales/es/dialogue-double-battle-female.json b/src/locales/it/dialogue-misc.json
similarity index 100%
rename from src/locales/es/dialogue-double-battle-female.json
rename to src/locales/it/dialogue-misc.json
diff --git a/src/locales/es/dialogue-double-battle-male.json b/src/locales/it/dialogue.json
similarity index 100%
rename from src/locales/es/dialogue-double-battle-male.json
rename to src/locales/it/dialogue.json
diff --git a/src/locales/it/menu-ui-handler.json b/src/locales/it/menu-ui-handler.json
index 091942082ad..7776825f1fe 100644
--- a/src/locales/it/menu-ui-handler.json
+++ b/src/locales/it/menu-ui-handler.json
@@ -3,7 +3,6 @@
   "ACHIEVEMENTS": "Obiettivi",
   "STATS": "Statistiche",
   "RUN_HISTORY": "Run precedenti",
-  "VOUCHERS": "Biglietti",
   "EGG_LIST": "Lista uova",
   "EGG_GACHA": "Macchine uova",
   "MANAGE_DATA": "Gestisci dati",
diff --git a/src/locales/it/move.json b/src/locales/it/move.json
index 4c3a831197d..f5bb1954278 100644
--- a/src/locales/it/move.json
+++ b/src/locales/it/move.json
@@ -2913,7 +2913,7 @@
   },
   "zippyZap": {
     "name": "Sprintaboom",
-    "effect": "Un attacco elettrico ad altissima velocità. Questa mossa ha priorità alta e aumenta l'elusione dell'utilizzatore."
+    "effect": "Un attacco elettrico ad altissima velocità. Questa mossa ha priorità alta e infligge sicuramente un brutto colpo."
   },
   "splishySplash": {
     "name": "Surfasplash",
@@ -3807,4 +3807,4 @@
     "name": "Intossicatena",
     "effect": "Il Pokémon logora il bersaglio avvolgendolo con le sue catene fatte di veleno e iniettandogli delle tossine che possono anche iperavvelenarlo."
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/it/party-ui-handler.json b/src/locales/it/party-ui-handler.json
index 9e26dfeeb6e..f5582e5b630 100644
--- a/src/locales/it/party-ui-handler.json
+++ b/src/locales/it/party-ui-handler.json
@@ -1 +1,42 @@
-{}
\ No newline at end of file
+{
+    "SEND_OUT": "Manda in campo",
+    "SUMMARY": "Sommario",
+    "CANCEL": "Annulla",
+    "RELEASE": "Rilascia",
+    "APPLY": "Applica",
+    "TEACH": "Insegna",
+    "SPLICE": "Unisci",
+    "UNSPLICE": "Dividi",
+    "ACTIVATE": "Attiva",
+    "DEACTIVATE": "Disattiva",
+    "TRANSFER": "Trasferisci",
+    "ALL": "Tutto",
+    "PASS_BATON": "Staffetta",
+    "UNPAUSE_EVOLUTION": "Consenti evoluzione",
+    "REVIVE": "Revitalizza",
+    "RENAME": "Rinomina",
+    "choosePokemon": "Scegli un Pokémon.",
+    "doWhatWithThisPokemon": "Hai selezionato questo Pokémon.",
+    "noEnergy": "{{pokemonName}} non ha più energie\nper lottare!",
+    "hasEnergy": "{{pokemonName}} ha ancora energie\nper lottare!",
+    "cantBeUsed": "{{pokemonName}} non può essere usato\nin questa sfida!",
+    "tooManyItems": "{{pokemonName}} possiede già\nquest'oggetto in abbondanza!",
+    "anyEffect": "Non avrebbe alcun effetto.",
+    "unpausedEvolutions": "{{pokemonName}} può di nuovo evolversi.",
+    "unspliceConfirmation": "Vuoi davvero dividere {{fusionName}}\nda {{pokemonName}}? {{fusionName}} andrà perduto.",
+    "wasReverted": "{{fusionName}} è tornato ad essere {{pokemonName}}.",
+    "releaseConfirmation": "Vuoi davvero liberare {{pokemonName}}?",
+    "releaseInBattle": "Non puoi liberare un Pokémon che sta combattendo!",
+    "selectAMove": "Scegli una mossa.",
+    "changeQuantity": "Scegli un oggetto da trasferire.\nUsa < e > per cambiarne la quantità.",
+    "selectAnotherPokemonToSplice": "Scegli un altro Pokémon da unire.",
+    "cancel": "Annulla",
+    "goodbye": "Addio, {{pokemonName}}!",
+    "byebye": "Ciao ciao, {{pokemonName}}!",
+    "farewell": "Arrivederci, {{pokemonName}}!",
+    "soLong": "È stato bello, {{pokemonName}}!",
+    "thisIsWhereWePart": "Le nostre strade si dividono, {{pokemonName}}!",
+    "illMissYou": "Mi mancherai, {{pokemonName}}!",
+    "illNeverForgetYou": "Non ti dimenticherò, {{pokemonName}}!",
+    "untilWeMeetAgain": "Alla prossima, {{pokemonName}}!"
+  }
\ No newline at end of file
diff --git a/src/locales/it/pokemon-form-battle.json b/src/locales/it/pokemon-form-battle.json
index 911f4fcf7c9..3c9b36f8150 100644
--- a/src/locales/it/pokemon-form-battle.json
+++ b/src/locales/it/pokemon-form-battle.json
@@ -10,5 +10,5 @@
   "eternamaxChange": "{{preName}} si Dynamaxxa infinitamente\nin {{pokemonName}}!",
   "revertChange": "{{pokemonName}} è tornato\nalla sua forma originaria!",
   "formChange": "{{preName}} ha cambiato forma!",
-  "disguiseChange": "Its disguise served it as a decoy!"
+  "disguiseChange": "Il costume ha assorbito l’attacco!"
 }
\ No newline at end of file
diff --git a/src/locales/it/pokemon-form.json b/src/locales/it/pokemon-form.json
index d51c038b83a..505173e4c8a 100644
--- a/src/locales/it/pokemon-form.json
+++ b/src/locales/it/pokemon-form.json
@@ -64,6 +64,7 @@
   "landorusIncarnate": "Incarnazione",
   "keldeoOrdinary": "Normale",
   "meloettaAria": "Canto",
+  "meloettaPirouette": "Danza",
   "froakieBattleBond": "Morfosintonia",
   "scatterbugMeadow": "Giardinfiore",
   "scatterbugIcySnow": "Nevi perenni",
diff --git a/src/locales/it/pokemon-info.json b/src/locales/it/pokemon-info.json
index 015cbd77ad0..4b655dbe1ce 100644
--- a/src/locales/it/pokemon-info.json
+++ b/src/locales/it/pokemon-info.json
@@ -13,7 +13,8 @@
     "SPD": "Velocità",
     "SPDshortened": "Vel",
     "ACC": "Precisione",
-    "EVA": "Elusione"
+    "EVA": "Elusione",
+    "HPStat": "PS"
   },
   "Type": {
     "UNKNOWN": "Sconosciuto",
@@ -37,4 +38,4 @@
     "FAIRY": "Folletto",
     "STELLAR": "Astrale"
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/it/run-history-ui-handler.json b/src/locales/it/run-history.json
similarity index 57%
rename from src/locales/it/run-history-ui-handler.json
rename to src/locales/it/run-history.json
index b49b7ddc168..87f5a746303 100644
--- a/src/locales/it/run-history-ui-handler.json
+++ b/src/locales/it/run-history.json
@@ -1,15 +1,15 @@
 {
   "victory": "Vittoria!",
-  "defeatedWildM": "Sconfitto da ",
-  "defeatedTrainerM": "Sconfitto da ",
-  "defeatedTrainerDoubleM": "Sconfitto dalla coppia ",
-  "defeatedRivalM": "Sconfitto dalla rivale",
-  "defeatedM": "Sconfitto",
-  "defeatedWildF": "Sconfitta da ",
-  "defeatedTrainerF": "Sconfitta da ",
-  "defeatedTrainerDoubleF": "Sconfitta dalla coppia ",
-  "defeatedRivalF": "Sconfitta dal rivale",
-  "defeatedF": "Sconfitta",
+  "defeatedWild": "Sconfitto da ",
+  "defeatedTrainer": "Sconfitto da ",
+  "defeatedTrainerDouble": "Sconfitto dalla coppia ",
+  "defeatedRival": "Sconfitto dalla rivale",
+  "defeated": "Sconfitto",
+  "defeatedWild_female": "Sconfitta da ",
+  "defeatedTrainer_female": "Sconfitta da ",
+  "defeatedTrainerDouble_female": "Sconfitta dalla coppia ",
+  "defeatedRival_female": "Sconfitta dal rivale",
+  "defeated_female": "Sconfitta",
   "luck": "Fortuna",
   "score": "Punteggio",
   "mode": "Modalità",
@@ -30,8 +30,8 @@
   "money": "Patrimonio",
   "runLength": "Durata Run",
   "viewHeldItems": "Oggetti equip.",
-  "hallofFameTextM": "Benvenuto alla Sala d'Onore!",
-  "hallofFameTextF": "Benvenuto alla Sala d'Onore!",
+  "hallofFameText": "Benvenuto alla Sala d'Onore!",
+  "hallofFameText_female": "Benvenuto alla Sala d'Onore!",
   "viewHallOfFame": "Vai alla Sala d'Onore!",
   "viewEndingSplash": "Vai all'arte finale!"
 }
\ No newline at end of file
diff --git a/src/locales/it/settings.json b/src/locales/it/settings.json
index 1a0f05d368c..381503f21bd 100644
--- a/src/locales/it/settings.json
+++ b/src/locales/it/settings.json
@@ -2,6 +2,7 @@
   "boy": "Ragazzo",
   "girl": "Ragazza",
   "general": "Generale",
+  "uiVolume": "Volume UI ",
   "gamepadSupport": "Supporto Gamepad",
   "showBgmBar": "Mostra Nomi Musica",
   "moveTouchControls": "Move Touch Controls",
diff --git a/src/locales/it/starter-select-ui-handler.json b/src/locales/it/starter-select-ui-handler.json
index 2bdc267d5f6..04137993d33 100644
--- a/src/locales/it/starter-select-ui-handler.json
+++ b/src/locales/it/starter-select-ui-handler.json
@@ -1,6 +1,6 @@
 {
   "confirmStartTeam": "Vuoi iniziare con questi Pokémon?",
-  "confirmExit": "Do you want to exit?",
+  "confirmExit": "Vuoi tornare alla schermata principale?",
   "invalidParty": "Questo squadra iniziale non è valida!",
   "gen1": "1ª",
   "gen2": "2ª",
@@ -21,13 +21,13 @@
   "toggleIVs": "Vedi/Nascondi IV",
   "manageMoves": "Gestisci mosse",
   "manageNature": "Gestisci natura",
-  "addToFavorites": "Add to Favorites",
-  "removeFromFavorites": "Remove from Favorites",
+  "addToFavorites": "Aggiungi ai preferiti",
+  "removeFromFavorites": "Rimuovi dai preferiti",
   "useCandies": "Usa caramelle",
   "selectNature": "Seleziona natura.",
   "selectMoveSwapOut": "Seleziona una mossa da scambiare.",
   "selectMoveSwapWith": "Seleziona una mossa da scambiare con",
-  "sameSpeciesEgg": "Buy an Egg",
+  "sameSpeciesEgg": "Compra un uovo",
   "unlockPassive": "Sblocca passiva",
   "reduceCost": "Riduci costo",
   "cycleShiny": ": Shiny",
@@ -36,7 +36,7 @@
   "cycleAbility": ": Abilità",
   "cycleNature": ": Natura",
   "cycleVariant": ": Variante",
-  "goFilter": ": Go to filters",
+  "goFilter": ": Vai ai filtri",
   "enablePassive": "Attiva passiva",
   "disablePassive": "Disattiva passiva",
   "locked": "Bloccato",
diff --git a/src/locales/it/terrain.json b/src/locales/it/terrain.json
index 9e26dfeeb6e..d0a584d74ab 100644
--- a/src/locales/it/terrain.json
+++ b/src/locales/it/terrain.json
@@ -1 +1,16 @@
-{}
\ No newline at end of file
+{
+  "misty": "Nebbioso",
+  "mistyStartMessage": "Ai piedi dei Pokémon si addensa la nebbia.",
+  "mistyClearMessage": "La nebbia si dissolve.",
+  "mistyBlockMessage": "Il Campo Nebbioso protegge {{pokemonNameWithAffix}}!",
+  "electric": "Elettrico",
+  "electricStartMessage": "Ai piedi dei Pokémon si accumula dell’elettricità.",
+  "electricClearMessage": "L’elettricità svanisce.",
+  "grassy": "Erboso",
+  "grassyStartMessage": "Ai piedi dei Pokémon cresce rigogliosa l’erba.",
+  "grassyClearMessage": "L’erba sparisce.",
+  "psychic": "Psichico",
+  "psychicStartMessage": "Nel campo si avverte una strana sensazione...",
+  "psychicClearMessage": "La strana sensazione nel campo è svanita!",
+  "defaultBlockMessage": "Il Campo {{terrainName}} protegge {{pokemonNameWithAffix}}!"
+}
diff --git a/src/locales/it/trainer-classes.json b/src/locales/it/trainer-classes.json
index 854975859ce..205a7c59d42 100644
--- a/src/locales/it/trainer-classes.json
+++ b/src/locales/it/trainer-classes.json
@@ -117,5 +117,14 @@
   "plasma_grunts": "Seguaci Plasma",
   "flare_grunt": "Recluta Team Flare",
   "flare_grunt_female": "Recluta Team Flare",
-  "flare_grunts": "Reclute Team Flare"
-}
\ No newline at end of file
+  "flare_grunts": "Reclute Team Flare",
+  "aether_grunt": "Dipendente (Fondazione Æther)",
+  "aether_grunt_female": "Dipendente (Fondazione Æther)",
+  "aether_grunts": "Dipendenti (Fondazione Æther)",
+  "skull_grunt": "Recluta Team Skull",
+  "skull_grunt_female": "Recluta Team Skull",
+  "skull_grunts": "Reclute Team Skull",
+  "macro_grunt": "Impiegato Macro Cosmos",
+  "macro_grunt_female": "Impiegata Macro Cosmos",
+  "macro_grunts": "Impiegati Macro Cosmos"
+}
diff --git a/src/locales/it/trainer-names.json b/src/locales/it/trainer-names.json
index e5ad03321a8..6d1373c0bb3 100644
--- a/src/locales/it/trainer-names.json
+++ b/src/locales/it/trainer-names.json
@@ -124,25 +124,29 @@
   "rival": "Finn",
   "rival_female": "Ivy",
   "archer": "Archer",
-  "ariana": "Ariana",
-  "proton": "Proton",
-  "petrel": "Petrel",
-  "tabitha": "Tabitha",
-  "courtney": "Courtney",
-  "shelly": "Shelly",
-  "matt": "Matt",
-  "mars": "Mars",
-  "jupiter": "Jupiter",
-  "saturn": "Saturn",
-  "zinzolin": "Zinzolin",
-  "rood": "Rood",
-  "xerosic": "Xerosic",
-  "bryony": "Bryony",
-  "maxie": "Maxie",
-  "archie": "Archie",
+  "ariana": "Atena",
+  "proton": "Milas",
+  "petrel": "Maxus",
+  "tabitha": "Ottavio",
+  "courtney": "Rossella",
+  "shelly": "Ada",
+  "matt": "Alan",
+  "mars": "Martes",
+  "jupiter": "Giovia",
+  "saturn": "Saturno",
+  "zinzolin": "Violante",
+  "rood": "Ross",
+  "xerosic": "Xante",
+  "bryony": "Bromelia",
+  "faba": "Vicio",
+
+  "maxie": "Max",
+  "archie": "Ivan",
   "cyrus": "Cyrus",
-  "ghetsis": "Ghetsis",
-  "lysandre": "Lysandre",
+  "ghetsis": "Ghecis",
+  "lysandre": "Elisio",
+  "lusamine": "Samina",
+  "guzma": "Guzman",
   "blue_red_double": "Blu & Rosso",
   "red_blue_double": "Rosso & Blu",
   "tate_liza_double": "Tell & Pat",
@@ -153,4 +157,4 @@
   "iris_alder_double": "Iris & Nardo",
   "marnie_piers_double": "Mary & Ginepro",
   "piers_marnie_double": "Ginepro & Mary"
-}
\ No newline at end of file
+}
diff --git a/src/locales/it/trainer-titles.json b/src/locales/it/trainer-titles.json
index c7f0dd8b323..eff152795cd 100644
--- a/src/locales/it/trainer-titles.json
+++ b/src/locales/it/trainer-titles.json
@@ -10,22 +10,30 @@
   "rival": "Rivale",
   "professor": "Professore",
   "frontier_brain": "Asso lotta",
-  "rocket_boss": "Team Rocket Boss",
-  "magma_boss": "Team Magma Boss",
-  "aqua_boss": "Team Aqua Boss",
-  "galactic_boss": "Team Galactic Boss",
-  "plasma_boss": "Team Plasma Boss",
-  "flare_boss": "Team Flare Boss",
-  "rocket_admin": "Team Rocket Admin",
-  "rocket_admin_female": "Team Rocket Admin",
-  "magma_admin": "Team Magma Admin",
-  "magma_admin_female": "Team Magma Admin",
-  "aqua_admin": "Team Aqua Admin",
-  "aqua_admin_female": "Team Aqua Admin",
-  "galactic_commander": "Team Galactic Commander",
-  "galactic_commander_female": "Team Galactic Commander",
-  "plasma_sage": "Team Plasma Sage",
-  "plasma_admin": "Team Plasma Admin",
-  "flare_admin": "Team Flare Admin",
-  "flare_admin_female": "Team Flare Admin"
-}
\ No newline at end of file
+  "rocket_boss": "Capo Rocket",
+  "magma_boss": "Capo Magma",
+  "aqua_boss": "Capo Idro",
+  "galactic_boss": "Capo Galassia",
+  "plasma_boss": "Capo Plasma",
+  "flare_boss": "Capo Flare",
+  "aether_boss": "Direttrice Æther",
+  "skull_boss": "Capo Team Skull",
+  "macro_boss": "Presidente Macro Cosmos",
+
+  "rocket_admin": "Tenente Team Rocket",
+  "rocket_admin_female": "Tenente Team Rocket",
+  "magma_admin": "Magmatenente",
+  "magma_admin_female": "Magmatenente",
+  "aqua_admin": "Idrotenente",
+  "aqua_admin_female": "Idrotenente",
+  "galactic_commander": "Comandante Galassia",
+  "galactic_commander_female": "Comandante Galassia",
+  "plasma_sage": "Saggio Team Plasma",
+  "plasma_admin": "Tenente Team Plasma",
+  "flare_admin": "Ufficiale Team Flare",
+  "flare_admin_female": "Ufficiale Team Flare",
+  "aether_admin": "Capo Filiale Æther",
+  "skull_admin": "Ufficiale Team Skull",
+  "macro_admin": "Vicepresidente Macro Cosmos"
+}
+
diff --git a/src/locales/ja/achv-male.json b/src/locales/ja/achv-male.json
deleted file mode 100644
index 0dc5dc8185a..00000000000
--- a/src/locales/ja/achv-male.json
+++ /dev/null
@@ -1,264 +0,0 @@
-{
-  "Achievements": {
-    "name": "実績"
-  },
-  "Locked": {
-    "name": "なし"
-  },
-  "MoneyAchv": {
-    "description": "一回の　ランで　₽{{moneyAmount}}を　稼ぐ"
-  },
-  "10K_MONEY": {
-    "name": "お金を持つ人"
-  },
-  "100K_MONEY": {
-    "name": "富豪"
-  },
-  "1M_MONEY": {
-    "name": "百万長者"
-  },
-  "10M_MONEY": {
-    "name": "超富裕層"
-  },
-  "DamageAchv": {
-    "description": "一撃で　{{damageAmount}}ダメージを　与える"
-  },
-  "250_DMG": {
-    "name": "力持ち"
-  },
-  "1000_DMG": {
-    "name": "強者"
-  },
-  "2500_DMG": {
-    "name": "カカロット"
-  },
-  "10000_DMG": {
-    "name": "ワンパンマン"
-  },
-  "HealAchv": {
-    "description": "一つの　技や　特性や　持っているアイテムで　{{healAmount}}{{HP}}を　一気に　回復する"
-  },
-  "250_HEAL": {
-    "name": "回復発見者"
-  },
-  "1000_HEAL": {
-    "name": "大いなる治療者"
-  },
-  "2500_HEAL": {
-    "name": "回復達人"
-  },
-  "10000_HEAL": {
-    "name": "ジョーイさん"
-  },
-  "LevelAchv": {
-    "description": "一つの　ポケモンを　Lv{{level}}まで　レベルアップする"
-  },
-  "LV_100": {
-    "name": "まだまだだよ"
-  },
-  "LV_250": {
-    "name": "天王"
-  },
-  "LV_1000": {
-    "name": "向こうの向こうを超え"
-  },
-  "RibbonAchv": {
-    "description": "{{ribbonAmount}}巻の　リボンを　積もる"
-  },
-  "10_RIBBONS": {
-    "name": "ポケモンリーグチャンピオン"
-  },
-  "25_RIBBONS": {
-    "name": "スーパーリーグチャンピオン"
-  },
-  "50_RIBBONS": {
-    "name": "ハイパーリーグチャンピオン"
-  },
-  "75_RIBBONS": {
-    "name": "ローグリーグチャンピオン"
-  },
-  "100_RIBBONS": {
-    "name": "マスターリーグチャンピオン"
-  },
-  "TRANSFER_MAX_BATTLE_STAT": {
-    "name": "同力",
-    "description": "少なくとも　一つの　能力を　最大まで　あげて　他の　手持ちポケモンに　バトンタッチする"
-  },
-  "MAX_FRIENDSHIP": {
-    "name": "マブ達",
-    "description": "一つの　手持ちポケモンの　仲良し度を　最大に　上げる"
-  },
-  "MEGA_EVOLVE": {
-    "name": "ザ・アブソリュート",
-    "description": "一つの　手持ちポケモンを　メガシンカさせる"
-  },
-  "GIGANTAMAX": {
-    "name": "太―くて　堪らない",
-    "description": "一つの　手持ちポケモンを　キョダイマックスさせる"
-  },
-  "TERASTALLIZE": {
-    "name": "一致好き",
-    "description": "一つの　手持ちポケモンを　テラスタルさせる"
-  },
-  "STELLAR_TERASTALLIZE": {
-    "name": "隠れたタイプ",
-    "description": "一つの　手持ちポケモンを　ステラ・テラスタルさせる"
-  },
-  "SPLICE": {
-    "name": "インフィニット・フュジョン",
-    "description": "いでんしのくさびで　二つの　ポケモンを　吸収合体させる"
-  },
-  "MINI_BLACK_HOLE": {
-    "name": "アイテムホーリック",
-    "description": "ミニブラックホールを　手に入れる"
-  },
-  "CATCH_MYTHICAL": {
-    "name": "幻",
-    "description": "幻の　ポケモンを　捕まえる"
-  },
-  "CATCH_SUB_LEGENDARY": {
-    "name": "準・伝説",
-    "description": "準伝説の　ポケモンを　捕まえる"
-  },
-  "CATCH_LEGENDARY": {
-    "name": "ザ・伝説",
-    "description": "伝説の　ポケモンを　捕まえる"
-  },
-  "SEE_SHINY": {
-    "name": "色とりどりに光る",
-    "description": "野生の　色違いポケモンを　みつける"
-  },
-  "SHINY_PARTY": {
-    "name": "きらきら努力家",
-    "description": "手持ちポケモンは　全員　色違いポケモンに　する"
-  },
-  "HATCH_MYTHICAL": {
-    "name": "幻のタマゴ",
-    "description": "幻の　ポケモンを　タマゴから　生まれる"
-  },
-  "HATCH_SUB_LEGENDARY": {
-    "name": "準伝説のタマゴ",
-    "description": "準伝説の　ポケモンを　タマゴから　生まれる"
-  },
-  "HATCH_LEGENDARY": {
-    "name": "伝説のタマゴ",
-    "description": "伝説の　ポケモンを　タマゴから　生まれる"
-  },
-  "HATCH_SHINY": {
-    "name": "色違いタマゴ",
-    "description": "色違いポケモンを　タマゴから　生まれる"
-  },
-  "HIDDEN_ABILITY": {
-    "name": "底力",
-    "description": "隠れ特性がある　ポケモンを　捕まえる"
-  },
-  "PERFECT_IVS": {
-    "name": "個体値の賞状",
-    "description": "一つの　ポケモンの　個体値を　すべて　最大に　する"
-  },
-  "CLASSIC_VICTORY": {
-    "name": "無双",
-    "description": "クラシックモードを　クリアする"
-  },
-  "UNEVOLVED_CLASSIC_VICTORY": {
-    "name": "Bring Your Child To Work Day",
-    "description": "Beat the game in Classic Mode with at least one unevolved party member."
-  },
-  "MONO_GEN_ONE": {
-    "name": "原始",
-    "description": "１世代の　単一世代チャレンジを　クリアする"
-  },
-  "MONO_GEN_TWO": {
-    "name": "懐かしいカンジョウ",
-    "description": "2世代の　単一世代チャレンジを　クリアする"
-  },
-  "MONO_GEN_THREE": {
-    "name": "水浸し",
-    "description": "3世代の　単一世代チャレンジを　クリアする"
-  },
-  "MONO_GEN_FOUR": {
-    "name": "神々の地",
-    "description": "4世代の　単一世代チャレンジを　クリアする"
-  },
-  "MONO_GEN_FIVE": {
-    "name": "ニューヨーカー",
-    "description": "5世代の　単一世代チャレンジを　クリアする"
-  },
-  "MONO_GEN_SIX": {
-    "name": "サヴァ・サヴァ",
-    "description": "6世代の　単一世代チャレンジを　クリアする"
-  },
-  "MONO_GEN_SEVEN": {
-    "name": "アローラ・オエ",
-    "description": "7世代の　単一世代チャレンジを　クリアする"
-  },
-  "MONO_GEN_EIGHT": {
-    "name": "チャンピオン タイムを 楽しめ！",
-    "description": "8世代の　単一世代チャレンジを　クリアする"
-  },
-  "MONO_GEN_NINE": {
-    "name": "ネモに甘えたでしょう",
-    "description": "9世代の　単一世代チャレンジを　クリアする"
-  },
-  "MonoType": {
-    "description": "{{type}}タイプの　単一タイプチャレンジを　クリアする"
-  },
-  "MONO_NORMAL": {
-    "name": "凡人"
-  },
-  "MONO_FIGHTING": {
-    "name": "八千以上だ!!"
-  },
-  "MONO_FLYING": {
-    "name": "翼をください"
-  },
-  "MONO_POISON": {
-    "name": "カントーの名物"
-  },
-  "MONO_GROUND": {
-    "name": "自信でユラユラ"
-  },
-  "MONO_ROCK": {
-    "name": "タケシの挑戦状"
-  },
-  "MONO_BUG": {
-    "name": "チョウチョウせん者"
-  },
-  "MONO_GHOST": {
-    "name": "貞子ちゃん"
-  },
-  "MONO_STEEL": {
-    "name": "ハガネーター"
-  },
-  "MONO_FIRE": {
-    "name": "NIGHT　OF　FIRE"
-  },
-  "MONO_WATER": {
-    "name": "土砂降リスト"
-  },
-  "MONO_GRASS": {
-    "name": "ｗｗｗ"
-  },
-  "MONO_ELECTRIC": {
-    "name": "パチピカペコ"
-  },
-  "MONO_PSYCHIC": {
-    "name": "陽キャ"
-  },
-  "MONO_ICE": {
-    "name": "ありのまま"
-  },
-  "MONO_DRAGON": {
-    "name": "龍が如く"
-  },
-  "MONO_DARK": {
-    "name": "陰キャ"
-  },
-  "MONO_FAIRY": {
-    "name": "あらハート満タンになった"
-  },
-  "FRESH_START": {
-    "name": "一発で！",
-    "description": "出直しチャレンジを　クリアする"
-  }
-}
\ No newline at end of file
diff --git a/src/locales/ja/achv-female.json b/src/locales/ja/achv.json
similarity index 100%
rename from src/locales/ja/achv-female.json
rename to src/locales/ja/achv.json
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/battle.json b/src/locales/ja/battle.json
index f75365a648e..f3f1d134d16 100644
--- a/src/locales/ja/battle.json
+++ b/src/locales/ja/battle.json
@@ -38,7 +38,7 @@
   "learnMoveNotLearned": "{{pokemonName}}は　{{moveName}}を\n覚えずに　終わった！",
   "learnMoveForgetQuestion": "どの　技を\n忘れさせたい？",
   "learnMoveForgetSuccess": "{{pokemonName}}は　{{moveName}}の\n使い方を　きれいに　忘れた！",
-  "countdownPoof": "@d{32}1 @d{15}2の @d{15}… @d{15}… @d{15}… @d{15}@s{pb_bounce_1}ポカン！",
+  "countdownPoof": "@d{32}1 @d{15}2の @d{15}… @d{15}… @d{15}… @d{15}@s{se/pb_bounce_1}ポカン！",
   "learnMoveAnd": "そして…",
   "levelCapUp": "レベルキャップの\n{{levelCap}}に　上がった！",
   "moveNotImplemented": "{{moveName}}は　まだ　実装されておらず　選択できません。",
diff --git a/src/locales/ja/challenges.json b/src/locales/ja/challenges.json
index 29f6ca835fe..54225ebf766 100644
--- a/src/locales/ja/challenges.json
+++ b/src/locales/ja/challenges.json
@@ -22,6 +22,7 @@
   },
   "freshStart": {
     "name": "出直し",
+    "shortName": "出直し",
     "desc": "ポケローグを　始めた　ばかりの　ような　ままで　ゲーム開始の　最初のパートナーしか　使えません",
     "value.0": "オフ",
     "value.1": "オン"
diff --git a/src/locales/ja/config.ts b/src/locales/ja/config.ts
index fade2cd258f..f8afd6eb167 100644
--- a/src/locales/ja/config.ts
+++ b/src/locales/ja/config.ts
@@ -4,8 +4,7 @@ import ability from "./ability.json";
 import abilityTriggers from "./ability-trigger.json";
 import arenaFlyout from "./arena-flyout.json";
 import arenaTag from "./arena-tag.json";
-import achvMale from "./achv-male.json";
-import achvFemale from "./achv-female.json";
+import achv from "./achv.json";
 import battle from "./battle.json";
 import battleScene from "./battle-scene.json";
 import battleInfo from "./battle-info.json";
@@ -16,14 +15,10 @@ import bgmName from "./bgm-name.json";
 import biome from "./biome.json";
 import challenges from "./challenges.json";
 import commandUiHandler from "./command-ui-handler.json";
-import dialogueMale from "./dialogue-male.json";
-import dialogueFemale from "./dialogue-female.json";
-import dialogueEndbossMale from "./dialogue-final-boss-male.json";
-import dialogueEndbossFemale from "./dialogue-final-boss-female.json";
-import dialogueMiscMale from "./dialogue-misc-male.json";
-import dialogueMiscFemale from "./dialogue-misc-female.json";
-import dialogueDoubleBattleMale from "./dialogue-double-battle-male.json";
-import dialogueDoubleBattleFemale from "./dialogue-double-battle-female.json";
+import dialogue from "./dialogue.json";
+import battleSpecDialogue from "./dialogue-final-boss.json";
+import miscDialogue from "./dialogue-misc.json";
+import doubleBattleDialogue from "./dialogue-double-battle.json";
 import egg from "./egg.json";
 import fightUiHandler from "./fight-ui-handler.json";
 import filterBar from "./filter-bar.json";
@@ -57,7 +52,7 @@ import weather from "./weather.json";
 import terrain from "./terrain.json";
 import modifierSelectUiHandler from "./modifier-select-ui-handler.json";
 import moveTriggers from "./move-trigger.json";
-import runHistory from "./run-history-ui-handler.json";
+import runHistory from "./run-history.json";
 
 export const jaConfig = {
   ability,
@@ -76,16 +71,11 @@ export const jaConfig = {
   challenges,
   commandUiHandler,
   common,
-  PGMachv: achvMale,
-  PGFachv: achvFemale,
-  PGMdialogue: dialogueMale,
-  PGFdialogue: dialogueFemale,
-  PGMbattleSpecDialogue: dialogueEndbossMale,
-  PGFbattleSpecDialogue: dialogueEndbossFemale,
-  PGMmiscDialogue: dialogueMiscMale,
-  PGFmiscDialogue: dialogueMiscFemale,
-  PGMdoubleBattleDialogue: dialogueDoubleBattleMale,
-  PGFdoubleBattleDialogue: dialogueDoubleBattleFemale,
+  achv,
+  dialogue,
+  battleSpecDialogue,
+  miscDialogue,
+  doubleBattleDialogue,
   egg,
   fightUiHandler,
   filterBar,
diff --git a/src/locales/ja/dialogue-double-battle-female.json b/src/locales/ja/dialogue-double-battle-female.json
deleted file mode 100644
index 9e26dfeeb6e..00000000000
--- a/src/locales/ja/dialogue-double-battle-female.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/src/locales/ja/dialogue-double-battle-male.json b/src/locales/ja/dialogue-double-battle-male.json
deleted file mode 100644
index 9e26dfeeb6e..00000000000
--- a/src/locales/ja/dialogue-double-battle-male.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/src/locales/es/dialogue-female.json b/src/locales/ja/dialogue-double-battle.json
similarity index 100%
rename from src/locales/es/dialogue-female.json
rename to src/locales/ja/dialogue-double-battle.json
diff --git a/src/locales/ja/dialogue-female.json b/src/locales/ja/dialogue-female.json
deleted file mode 100644
index 9e26dfeeb6e..00000000000
--- a/src/locales/ja/dialogue-female.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/src/locales/ja/dialogue-final-boss-female.json b/src/locales/ja/dialogue-final-boss-female.json
deleted file mode 100644
index 9e26dfeeb6e..00000000000
--- a/src/locales/ja/dialogue-final-boss-female.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/src/locales/ja/dialogue-final-boss-male.json b/src/locales/ja/dialogue-final-boss-male.json
deleted file mode 100644
index 9e26dfeeb6e..00000000000
--- a/src/locales/ja/dialogue-final-boss-male.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/src/locales/es/dialogue-final-boss-female.json b/src/locales/ja/dialogue-final-boss.json
similarity index 100%
rename from src/locales/es/dialogue-final-boss-female.json
rename to src/locales/ja/dialogue-final-boss.json
diff --git a/src/locales/ja/dialogue-male.json b/src/locales/ja/dialogue-male.json
deleted file mode 100644
index 9e26dfeeb6e..00000000000
--- a/src/locales/ja/dialogue-male.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/src/locales/ja/dialogue-misc-female.json b/src/locales/ja/dialogue-misc-female.json
deleted file mode 100644
index 9e26dfeeb6e..00000000000
--- a/src/locales/ja/dialogue-misc-female.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/src/locales/ja/dialogue-misc-male.json b/src/locales/ja/dialogue-misc-male.json
deleted file mode 100644
index 9e26dfeeb6e..00000000000
--- a/src/locales/ja/dialogue-misc-male.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/src/locales/es/dialogue-final-boss-male.json b/src/locales/ja/dialogue-misc.json
similarity index 100%
rename from src/locales/es/dialogue-final-boss-male.json
rename to src/locales/ja/dialogue-misc.json
diff --git a/src/locales/es/dialogue-male.json b/src/locales/ja/dialogue.json
similarity index 100%
rename from src/locales/es/dialogue-male.json
rename to src/locales/ja/dialogue.json
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 fbab18bb9eb..beb014b84a9 100644
--- a/src/locales/ja/menu-ui-handler.json
+++ b/src/locales/ja/menu-ui-handler.json
@@ -1,20 +1,26 @@
 {
-  "GAME_SETTINGS": "せってい",
-  "ACHIEVEMENTS": "じっせき",
-  "STATS": "とうけい",
-  "RUN_HISTORY":"ラン履歴",
-  "VOUCHERS": "クーポン",
+  "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/ja/run-history-ui-handler.json b/src/locales/ja/run-history.json
similarity index 74%
rename from src/locales/ja/run-history-ui-handler.json
rename to src/locales/ja/run-history.json
index 523cdbf8bb5..222f7de728d 100644
--- a/src/locales/ja/run-history-ui-handler.json
+++ b/src/locales/ja/run-history.json
@@ -5,11 +5,11 @@
   "defeatedTrainerDouble": "倒された相手：",
   "defeatedRival": "倒された相手：",
   "defeated": "敗北",
-  "defeatedWildF": "倒された相手：",
-  "defeatedTrainerF": "倒された相手：",
-  "defeatedTrainerDoubleF": "倒された相手：",
-  "defeatedRivalF": "倒された相手：",
-  "defeatedF": "敗北",
+  "defeatedWild_female": "倒された相手：",
+  "defeatedTrainer_female": "倒された相手：",
+  "defeatedTrainerDouble_female": "倒された相手：",
+  "defeatedRival_female": "倒された相手：",
+  "defeated_female": "敗北",
   "luck": "運",
   "score": "スコア",
   "mode": "モード",
@@ -30,8 +30,8 @@
   "money": "お金",
   "runLength": "ラン最高ウェーブ",
   "viewHeldItems": "手持ちアイテム",
-  "hallofFameTextM": "殿堂へようこそ！",
-  "hallofFameTextF": "殿堂へようこそ！",
+  "hallofFameText": "殿堂へようこそ！",
+  "hallofFameText_female": "殿堂へようこそ！",
   "viewHallOfFame": "殿堂登録を見る！",
   "viewEndingSplash": "クリア後のアートを見る！"
 }
\ No newline at end of file
diff --git a/src/locales/ko/achv-female.json b/src/locales/ko/achv-female.json
deleted file mode 100644
index 73753dd9b5a..00000000000
--- a/src/locales/ko/achv-female.json
+++ /dev/null
@@ -1,264 +0,0 @@
-{
-  "Achievements": {
-    "name": "업적"
-  },
-  "Locked": {
-    "name": "미완료"
-  },
-  "MoneyAchv": {
-    "description": "누적 소지금 ₽{{moneyAmount}} 달성"
-  },
-  "10K_MONEY": {
-    "name": "돈 좀 있나?"
-  },
-  "100K_MONEY": {
-    "name": "부자"
-  },
-  "1M_MONEY": {
-    "name": "백만장자"
-  },
-  "10M_MONEY": {
-    "name": "상위 1프로"
-  },
-  "DamageAchv": {
-    "description": "한 번의 공격만으로 {{damageAmount}} 데미지"
-  },
-  "250_DMG": {
-    "name": "강타자"
-  },
-  "1000_DMG": {
-    "name": "최강타자"
-  },
-  "2500_DMG": {
-    "name": "때릴 줄 아시는군요!"
-  },
-  "10000_DMG": {
-    "name": "원펀맨"
-  },
-  "HealAchv": {
-    "description": "기술이나 특성, 지닌 도구로 한 번에 {{healAmount}} {{HP}} 회복"
-  },
-  "250_HEAL": {
-    "name": "견습 힐러"
-  },
-  "1000_HEAL": {
-    "name": "상급 힐러"
-  },
-  "2500_HEAL": {
-    "name": "클레릭"
-  },
-  "10000_HEAL": {
-    "name": "회복 마스터"
-  },
-  "LevelAchv": {
-    "description": "포켓몬 Lv{{level}} 달성"
-  },
-  "LV_100": {
-    "name": "잠깐, 여기가 끝이 아니라구!"
-  },
-  "LV_250": {
-    "name": "엘리트"
-  },
-  "LV_1000": {
-    "name": "더 먼 곳을 향해"
-  },
-  "RibbonAchv": {
-    "description": "총 {{ribbonAmount}}개의 리본 획득"
-  },
-  "10_RIBBONS": {
-    "name": "포켓몬 리그 챔피언"
-  },
-  "25_RIBBONS": {
-    "name": "슈퍼 리그 챔피언"
-  },
-  "50_RIBBONS": {
-    "name": "하이퍼 리그 챔피언"
-  },
-  "75_RIBBONS": {
-    "name": "로그 리그 챔피언"
-  },
-  "100_RIBBONS": {
-    "name": "마스터 리그 챔피언"
-  },
-  "TRANSFER_MAX_BATTLE_STAT": {
-    "name": "팀워크",
-    "description": "한 개 이상의 능력치가 최대 랭크일 때 배턴터치 사용"
-  },
-  "MAX_FRIENDSHIP": {
-    "name": "친밀 맥스",
-    "description": "최대 친밀도 달성"
-  },
-  "MEGA_EVOLVE": {
-    "name": "메가변환",
-    "description": "포켓몬을 메가진화"
-  },
-  "GIGANTAMAX": {
-    "name": "엄청난 것",
-    "description": "포켓몬을 다이맥스"
-  },
-  "TERASTALLIZE": {
-    "name": "반짝반짝",
-    "description": "포켓몬을 테라스탈"
-  },
-  "STELLAR_TERASTALLIZE": {
-    "name": "숨겨진 타입",
-    "description": "포켓몬을 스텔라 테라스탈"
-  },
-  "SPLICE": {
-    "name": "끝없는 융합",
-    "description": "유전자쐐기로 두 포켓몬을 융합"
-  },
-  "MINI_BLACK_HOLE": {
-    "name": "도구가 가득한 구멍",
-    "description": "미니 블랙홀 획득"
-  },
-  "CATCH_MYTHICAL": {
-    "name": "환상",
-    "description": "환상의 포켓몬 포획"
-  },
-  "CATCH_SUB_LEGENDARY": {
-    "name": "(준)전설",
-    "description": "준전설 포켓몬 포획"
-  },
-  "CATCH_LEGENDARY": {
-    "name": "전설",
-    "description": "전설의 포켓몬 포획"
-  },
-  "SEE_SHINY": {
-    "name": "다른 색",
-    "description": "야생의 색이 다른 포켓몬 발견"
-  },
-  "SHINY_PARTY": {
-    "name": "찐사랑",
-    "description": "색이 다른 포켓몬만으로 파티 구성"
-  },
-  "HATCH_MYTHICAL": {
-    "name": "환상의 알",
-    "description": "알에서 환상의 포켓몬이 부화"
-  },
-  "HATCH_SUB_LEGENDARY": {
-    "name": "준전설 알",
-    "description": "알에서 준전설 포켓몬이 부화"
-  },
-  "HATCH_LEGENDARY": {
-    "name": "전설의 알",
-    "description": "알에서 전설의 포켓몬이 부화"
-  },
-  "HATCH_SHINY": {
-    "name": "빛나는 알",
-    "description": "알에서 색이 다른 포켓몬이 부화"
-  },
-  "HIDDEN_ABILITY": {
-    "name": "숨은 잠재력",
-    "description": "숨겨진 특성을 지닌 포켓몬을 포획"
-  },
-  "PERFECT_IVS": {
-    "name": "진짜배기 증명서",
-    "description": "최고의 개체값을 지닌 포켓몬 획득"
-  },
-  "CLASSIC_VICTORY": {
-    "name": "무패",
-    "description": "클래식 모드 클리어"
-  },
-  "UNEVOLVED_CLASSIC_VICTORY": {
-    "name": "우리집 꿈나무",
-    "description": "최종 진화형이 아닌 포켓몬을 데리고 클래식 모드 클리어."
-  },
-  "MONO_GEN_ONE": {
-    "name": "근본 라이벌",
-    "description": "1세대 챌린지 모드 클리어."
-  },
-  "MONO_GEN_TWO": {
-    "name": "이거 1.5세대죠?",
-    "description": "2세대 챌린지 모드 클리어."
-  },
-  "MONO_GEN_THREE": {
-    "name": "Too much water?",
-    "description": "3세대 챌린지 모드 클리어."
-  },
-  "MONO_GEN_FOUR": {
-    "name": "난천이 진짜 최강인가요?",
-    "description": "4세대 챌린지 모드 클리어."
-  },
-  "MONO_GEN_FIVE": {
-    "name": "100% 오리지널!",
-    "description": "5세대 챌린지 모드 클리어."
-  },
-  "MONO_GEN_SIX": {
-    "name": "크루아상 안에 뭐 들었나요?",
-    "description": "6세대 챌린지 모드 클리어."
-  },
-  "MONO_GEN_SEVEN": {
-    "name": "기술적으로는…",
-    "description": "7세대 챌린지 모드 클리어."
-  },
-  "MONO_GEN_EIGHT": {
-    "name": "챔피언 타임!",
-    "description": "8세대 챌린지 모드 클리어."
-  },
-  "MONO_GEN_NINE": {
-    "name": "걔, 봐 준 거야",
-    "description": "9세대 챌린지 모드 클리어."
-  },
-  "MonoType": {
-    "description": "{{type}} 타입 챌린지 모드 클리어."
-  },
-  "MONO_NORMAL": {
-    "name": "심플한 것이 가장 강한 것"
-  },
-  "MONO_FIGHTING": {
-    "name": "태권도 할 줄 알아요"
-  },
-  "MONO_FLYING": {
-    "name": "추락하는 것은 날개가 있다"
-  },
-  "MONO_POISON": {
-    "name": "관동 지방 최애 타입"
-  },
-  "MONO_GROUND": {
-    "name": "전기 안 통해요"
-  },
-  "MONO_ROCK": {
-    "name": "웅골참"
-  },
-  "MONO_BUG": {
-    "name": "독침붕처럼 쏴라"
-  },
-  "MONO_GHOST": {
-    "name": "누굴 부를 거야?"
-  },
-  "MONO_STEEL": {
-    "name": "강철 심장"
-  },
-  "MONO_FIRE": {
-    "name": "불타오르네"
-  },
-  "MONO_WATER": {
-    "name": "물 들어올 때 노 젓기"
-  },
-  "MONO_GRASS": {
-    "name": "초록은 동색"
-  },
-  "MONO_ELECTRIC": {
-    "name": "찌릿찌릿"
-  },
-  "MONO_PSYCHIC": {
-    "name": "1세대 최강"
-  },
-  "MONO_ICE": {
-    "name": "얼음땡"
-  },
-  "MONO_DRAGON": {
-    "name": "용용 죽겠지"
-  },
-  "MONO_DARK": {
-    "name": "어둠의 다크"
-  },
-  "MONO_FAIRY": {
-    "name": "설마 자시안으로?"
-  },
-  "FRESH_START": {
-    "name": "첫트!",
-    "description": "새 출발 챌린지 모드 클리어."
-  }
-}
\ No newline at end of file
diff --git a/src/locales/ko/achv-male.json b/src/locales/ko/achv.json
similarity index 97%
rename from src/locales/ko/achv-male.json
rename to src/locales/ko/achv.json
index 73753dd9b5a..8546dff949c 100644
--- a/src/locales/ko/achv-male.json
+++ b/src/locales/ko/achv.json
@@ -260,5 +260,9 @@
   "FRESH_START": {
     "name": "첫트!",
     "description": "새 출발 챌린지 모드 클리어."
+  },
+  "INVERSE_BATTLE": {
+    "name": "상성 전문가(였던 것)",
+    "description": "거꾸로 배틀 챌린지 모드 클리어."
   }
 }
\ No newline at end of file
diff --git a/src/locales/ko/battle.json b/src/locales/ko/battle.json
index 954ff84b4c9..001720e4e5c 100644
--- a/src/locales/ko/battle.json
+++ b/src/locales/ko/battle.json
@@ -38,7 +38,7 @@
   "learnMoveNotLearned": "{{pokemonName}}[[는]] {{moveName}}[[를]]\n결국 배우지 않았다!",
   "learnMoveForgetQuestion": "어느 기술을 잊게 하고싶은가?",
   "learnMoveForgetSuccess": "{{pokemonName}}[[는]] {{moveName}}[[를]] 깨끗이 잊었다!",
-  "countdownPoof": "@d{32}1, @d{15}2, @d{15}… @d{15}… @d{30}@s{pb_bounce_1}짠!",
+  "countdownPoof": "@d{32}1, @d{15}2, @d{15}… @d{15}… @d{30}@s{se/pb_bounce_1}짠!",
   "learnMoveAnd": "그리고…",
   "levelCapUp": "레벨의 최대치가\n{{levelCap}}까지 상승했다!",
   "moveNotImplemented": "{{moveName}}[[는]] 아직 구현되지 않아 사용할 수 없다…",
diff --git a/src/locales/ko/bgm-name.json b/src/locales/ko/bgm-name.json
index 5c35987b878..5295e2d8708 100644
--- a/src/locales/ko/bgm-name.json
+++ b/src/locales/ko/bgm-name.json
@@ -45,6 +45,7 @@
   "battle_legendary_lake_trio": "ORAS 호수의 수호신 배틀",
   "battle_legendary_sinnoh": "ORAS 신오 전설 조우 배틀",
   "battle_legendary_dia_pal": "ORAS 디아루가 & 펄기아 배틀",
+  "battle_legendary_origin_forme": "LA 오리진 디아루가 & 펄기아 배틀",
   "battle_legendary_giratina": "ORAS 기라티나 배틀",
   "battle_legendary_arceus": "HGSS 아르세우스 배틀",
   "battle_legendary_unova": "BW 하나 전설 조우 배틀",
@@ -59,6 +60,7 @@
   "battle_legendary_zac_zam": "SWSH 자시안 & 자마젠타 배틀",
   "battle_legendary_glas_spec": "SWSH 블리자포스 & 레이스포스 배틀",
   "battle_legendary_calyrex": "SWSH 버드렉스 배틀",
+  "battle_legendary_riders": "SWSH 백마 & 흑마 버드렉스 배틀",
   "battle_legendary_birds_galar": "SWSH 가라르 전설의 새 배틀",
   "battle_legendary_ruinous": "SV 재앙의 보물 배틀",
   "battle_legendary_kor_mir": "SV 에리어 제로 배틀",
@@ -78,11 +80,20 @@
   "battle_galactic_grunt": "BDSP 갤럭시단 배틀",
   "battle_plasma_grunt": "BW 플라스마단 배틀",
   "battle_flare_grunt": "XY 플레어단 배틀",
+  "battle_aether_grunt": "SM 에테르재단 배틀",
+  "battle_skull_grunt": "SM 스컬단 배틀",
+  "battle_macro_grunt": "SWSH 트레이너 배틀",
+  "battle_galactic_admin": "BDSP 갤럭시단 간부 배틀",
+  "battle_skull_admin": "SM 스컬단 간부 배틀",
+  "battle_oleana": "SWSH 올리브 배틀",
   "battle_rocket_boss": "USUM 비주기 배틀",
   "battle_aqua_magma_boss": "ORAS 아강 & 마적 배틀",
   "battle_galactic_boss": "BDSP 태홍 배틀",
   "battle_plasma_boss": "B2W2 게치스 배틀",
   "battle_flare_boss": "XY 플라드리 배틀",
+  "battle_aether_boss": "SM 루자미네 배틀",
+  "battle_skull_boss": "SM 구즈마 배틀",
+  "battle_macro_boss": "SWSH 로즈 배틀",
   "abyss": "불가사의 던전 하늘의 탐험대 어둠의 화구",
   "badlands": "불가사의 던전 하늘의 탐험대 불모의 계곡",
   "beach": "불가사의 던전 하늘의 탐험대 축축한 암반",
@@ -135,4 +146,4 @@
   "heal": "BW 포켓몬 센터",
   "menu": "불가사의 던전 하늘의 탐험대 포켓몬 세계에 온 것을 환영한다!",
   "title": "불가사의 던전 하늘의 탐험대 메뉴 테마"
-}
\ No newline at end of file
+}
diff --git a/src/locales/ko/challenges.json b/src/locales/ko/challenges.json
index 433b0990e87..7efdfef3570 100644
--- a/src/locales/ko/challenges.json
+++ b/src/locales/ko/challenges.json
@@ -25,5 +25,12 @@
     "desc": "포켓로그를 처음 시작했던 때처럼 강화가 전혀 되지 않은 오리지널 스타팅 포켓몬만 고를 수 있습니다.",
     "value.0": "해제",
     "value.1": "설정"
+  },
+  "inverseBattle": {
+    "name": "거꾸로 배틀",
+    "shortName": "거꾸로",
+    "desc": "타입 상성이 반대로 바뀌고 면역 타입은 약점 타입이 됩니다.\n설정 시 다른 챌린지 업적은 달성할 수 없습니다.",
+    "value.0": "해제",
+    "value.1": "설정"
   }
 }
\ No newline at end of file
diff --git a/src/locales/ko/config.ts b/src/locales/ko/config.ts
index e570742bb73..978cdc83002 100644
--- a/src/locales/ko/config.ts
+++ b/src/locales/ko/config.ts
@@ -4,8 +4,7 @@ import ability from "./ability.json";
 import abilityTriggers from "./ability-trigger.json";
 import arenaFlyout from "./arena-flyout.json";
 import arenaTag from "./arena-tag.json";
-import achvMale from "./achv-male.json";
-import achvFemale from "./achv-female.json";
+import achv from "./achv.json";
 import battle from "./battle.json";
 import battleScene from "./battle-scene.json";
 import battleInfo from "./battle-info.json";
@@ -16,14 +15,10 @@ import bgmName from "./bgm-name.json";
 import biome from "./biome.json";
 import challenges from "./challenges.json";
 import commandUiHandler from "./command-ui-handler.json";
-import dialogueMale from "./dialogue-male.json";
-import dialogueFemale from "./dialogue-female.json";
-import dialogueEndbossMale from "./dialogue-final-boss-male.json";
-import dialogueEndbossFemale from "./dialogue-final-boss-female.json";
-import dialogueMiscMale from "./dialogue-misc-male.json";
-import dialogueMiscFemale from "./dialogue-misc-female.json";
-import dialogueDoubleBattleMale from "./dialogue-double-battle-male.json";
-import dialogueDoubleBattleFemale from "./dialogue-double-battle-female.json";
+import dialogue from "./dialogue.json";
+import battleSpecDialogue from "./dialogue-final-boss.json";
+import miscDialogue from "./dialogue-misc.json";
+import doubleBattleDialogue from "./dialogue-double-battle.json";
 import egg from "./egg.json";
 import fightUiHandler from "./fight-ui-handler.json";
 import filterBar from "./filter-bar.json";
@@ -57,7 +52,7 @@ import weather from "./weather.json";
 import terrain from "./terrain.json";
 import modifierSelectUiHandler from "./modifier-select-ui-handler.json";
 import moveTriggers from "./move-trigger.json";
-import runHistory from "./run-history-ui-handler.json";
+import runHistory from "./run-history.json";
 
 export const koConfig = {
   ability,
@@ -76,16 +71,11 @@ export const koConfig = {
   challenges,
   commandUiHandler,
   common,
-  PGMachv: achvMale,
-  PGFachv: achvFemale,
-  PGMdialogue: dialogueMale,
-  PGFdialogue: dialogueFemale,
-  PGMbattleSpecDialogue: dialogueEndbossMale,
-  PGFbattleSpecDialogue: dialogueEndbossFemale,
-  PGMmiscDialogue: dialogueMiscMale,
-  PGFmiscDialogue: dialogueMiscFemale,
-  PGMdoubleBattleDialogue: dialogueDoubleBattleMale,
-  PGFdoubleBattleDialogue: dialogueDoubleBattleFemale,
+  achv,
+  dialogue,
+  battleSpecDialogue,
+  miscDialogue,
+  doubleBattleDialogue,
   egg,
   fightUiHandler,
   filterBar,
diff --git a/src/locales/ko/dialogue-double-battle-male.json b/src/locales/ko/dialogue-double-battle-male.json
deleted file mode 100644
index 134b8ade71e..00000000000
--- a/src/locales/ko/dialogue-double-battle-male.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "blue_red_double": {
-    "encounter": {
-      "1": "그린: 어이 레드! 우리가 누군지 보여주자고!\n$레드: ...\n$그린: 태초마을의 힘을 보여주지!"
-    },
-    "victory": {
-      "1": "그린: 훌륭한 승부였어!\n$레드: ..."
-    }
-  },
-  "red_blue_double": {
-    "encounter": {
-      "1": "레드: ...!\n$그린: 이 녀석은 여전히 말이 없구나.\n$그린: 그렇지만 방심해선 안 돼! 그래도 챔피언이라고!"
-    },
-    "victory": {
-      "1": "레드: ...!\n$그린: 다음에는 우리가 이길 테다!"
-    }
-  },
-  "tate_liza_double": {
-    "encounter": {
-      "1": "풍: 에헤헤... 체육관 관장이\n$란: 두 명이나 있어서 놀랐지?\n$풍: 우리는 쌍둥이!\n$란: 굳이 말을 하지 않아도 서로가 무슨 생각을 하고 있는지\n$풍: 자동으로 머릿속에 떠오르니까\n$란: 호흡을 척척 맞출 수가 있지!"
-    },
-    "victory": {
-      "1": "풍: 우, 우리들의\n$란: 팀워크가...!"
-    }
-  },
-  "liza_tate_double": {
-    "encounter": {
-      "1": "란: 우후후... 체육관 관장이\n$풍: 두 명이나 있어서 놀랐어?\n$란: 우리는 쌍둥이!\n$풍: 완벽한 우리의 콤비네이션을\n$란: 과연 네가 깨뜨릴 수 있을까?"
-    },
-    "victory": {
-      "1": "란: 우리들이 생각한 만큼\n$풍: 우리가 강하지 않았던 걸까?"
-    }
-  },
-  "wallace_steven_double": {
-    "encounter": {
-      "1": "성호: 윤진! 우리 챔피언의 힘을 보여주자!\n$윤진: 호연의 힘을 보여주마!\n$성호: 간다!"
-    },
-    "victory": {
-      "1": "성호: 훌륭한 승부였어!\n$윤진: 다음엔 우리가 이길 거다!"
-    }
-  },
-  "steven_wallace_double": {
-    "encounter": {
-      "1": "성호: 너 혹시 희귀한 포켓몬 가지고 있니?\n$윤진: 성호야... 우리는 포켓몬을 자랑하러 온 게 아니라 승부하러 온 거야.\n$성호: 오... 그렇지... 그럼 간다!"
-    },
-    "victory": {
-      "1": "성호: 이제 승부는 끝났으니 포켓몬을 자랑해 볼까!\n$윤진: 성호야..."
-    }
-  },
-  "alder_iris_double": {
-    "encounter": {
-      "1": "노간주: 우리는 하나 지방 최강의 트레이너들이란다!\n$아이리스: 이렇게 강한 트레이너와 싸울 수 있어서 정말 기뻐~!!"
-    },
-    "victory": {
-      "1": "노간주: 장하구나! 실로 견줄 자가 천하에 없도다!\n$아이리스: 다음 번엔 우리가 꼭 이길 거야~!"
-    }
-  },
-  "iris_alder_double": {
-    "encounter": {
-      "1": "아이리스: 어서 와, 도전자! 내가 바로 하나 지방 챔피언이야~!\n$노간주: 아이리스야, 너무 흥분한 것 아니냐?"
-    },
-    "victory": {
-      "1": "아이리스: 후와아아아아... 최선을 다했는데도... 우리가 져버렸네!\n$노간주: 하지만 우리의 패배를 발판 삼아 나아가리라!"
-    }
-  },
-  "piers_marnie_double": {
-    "encounter": {
-      "1": "마리: 오빠, 스파이크마을의 힘을 보여주자!\n$두송: 우리가 어둠을 불러올 것이다!"
-    },
-    "victory": {
-      "1": "마리: 네가 우리의 어둠에 빛을 불러왔구나!\n$두송: 여긴 너무 밝네..."
-    }
-  },
-  "marnie_piers_double": {
-    "encounter": {
-      "1": "두송: 콘서트 즐길 준비 됐어?\n$마리: 오빠... 얘들은 노래가 아니라 승부를 하러 왔어..."
-    },
-    "victory": {
-      "1": "두송: 훌륭한 콘서트였다!\n$마리: 오빠..."
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/locales/ko/dialogue-double-battle-female.json b/src/locales/ko/dialogue-double-battle.json
similarity index 100%
rename from src/locales/ko/dialogue-double-battle-female.json
rename to src/locales/ko/dialogue-double-battle.json
diff --git a/src/locales/ko/dialogue-final-boss-male.json b/src/locales/ko/dialogue-final-boss-male.json
deleted file mode 100644
index d9b8dfc4526..00000000000
--- a/src/locales/ko/dialogue-final-boss-male.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "encounter": "드디어 때가 다시 도래했다.\n당도한 연유를 아는가?\n$이미 도달한 적이 있기에 이 자리에 있다.\n셀 수도 없이 많이.\n$아니, 사실 셀 수는 있지.\n정확히 너의 {{cycleCount}}번째다.\n$매 번 태초의 정신으로 되돌아갔을 뿐.\n하지만 어떻게든, 흔적은 남는다.\n$실패만을 반복했을 뿐이지만,\n지금은 네 안에 무언가가 있구나.\n\n$홀로 선 것처럼 보이나, 무언가 이질적인…\n$마침내 그간의 갈망을 해소해주는가?\n수천 년 간 기다려온 도전을?\n$시작하지.",
-  "firstStageWin": "그렇군. 정말로 있었어.\n이제 주저할 필요는 없다.\n$실망시키지 않도록.",
-  "secondStageWin": "…고무적이군."
-}
\ No newline at end of file
diff --git a/src/locales/ko/dialogue-final-boss-female.json b/src/locales/ko/dialogue-final-boss.json
similarity index 100%
rename from src/locales/ko/dialogue-final-boss-female.json
rename to src/locales/ko/dialogue-final-boss.json
diff --git a/src/locales/ko/dialogue-male.json b/src/locales/ko/dialogue-male.json
deleted file mode 100644
index 693b0704512..00000000000
--- a/src/locales/ko/dialogue-male.json
+++ /dev/null
@@ -1,2545 +0,0 @@
-{
-  "youngster": {
-    "encounter": {
-      "1": "거기 너! 나와 배틀 어때?",
-      "2": "넌 새내기 트레이너구나. 맞지?",
-      "3": "거기 너! 처음보는 얼굴인데? 나랑 배틀하자!",
-      "4": "방금 배틀에서 져서 새로운 포켓몬을 찾는 중이야.\n잠깐! 넌 약해보이는데? 어서 나와 배틀하자!",
-      "5": "우리 만난 적이 있었던가? 잘 기억은 안나지만 어쨌든 만나서 반가워!",
-      "6": "좋아! 시작하자!",
-      "7": "좋아! 내가 왔다! 내 힘을 보여주지!",
-      "8": "하하하… 내 포켓몬이 얼마나 멋진지 보여주겠어!",
-      "9": "인사할 시간도 없어. 준비가 되었다면 이리 와!",
-      "10": "긴장을 늦추지마. 그렇지 않으면 어린이에게 맞아 울지도 몰라.",
-      "11": "난 내 포켓몬들을 소중히 키웠어. 내 포켓몬에게 상처를 입히게 놔두지 않겠어!",
-      "12": "여기까지 잘 왔구나! 하지만 지금부턴 쉽지 않을거야.",
-      "13": "배틀은 끝나지 않아! 끝없는 배틀의 세계에 온 것을 환영해!"
-    },
-    "victory": {
-      "1": "우와! 넌 강하구나!",
-      "2": "하? 난 기회가 없었어.",
-      "3": "내가 조금 더 큰 다음엔 널 찾아서 때리겠어!",
-      "4": "으.. 더이상 가지고 있는 포켓몬이 없어.",
-      "5": "말도 안돼… 안돼! 내가 또 지다니…",
-      "6": "안돼! 내가 지다니!",
-      "7": "우와! 정말 깜짝 놀랐어! 넌 정말 강하구나!",
-      "8": "이럴수가… 내 포켓몬과 난 최강인데… 어떻게…",
-      "9": "다음엔 지지 않을거야! 다음에 다시 배틀하자!",
-      "10": "쳇! 내가 어린애인게 보이지 않아?! 그렇게 최선을 다하는건 불공평해!",
-      "11": "네 포켓몬은 정말 굉장하구나! 나와 교환하자!",
-      "12": "내가 잠깐 정신이 나갔었나 봐. 내가 무슨 말을 하고 있었지?",
-      "13": "아하! 거기구나! 좋아! 넌 이미 이 세계에 머무를 곳이 있구나!"
-    }
-  },
-  "lass": {
-    "encounter": {
-      "1": "나랑 배틀하자, 어때?",
-      "2": "넌 신입 트레이너구나. 나랑 배틀하자!",
-      "3": "너 거기 있었구나? 나랑 배틀할래?",
-      "4": "재밌는 포켓몬 배틀하자!",
-      "5": "내가 포켓몬을 어떻게 다뤄야하는지 보여줄게!",
-      "6": "진정한 배틀은 진지한 자세부터 시작이야! 준비됐어?",
-      "7": "젊음이 한순간이듯 배틀에서 네 기회도 단 한번만 주어질거야. 곧 넌 추억속으로 사라질거야.",
-      "8": "나에겐 살살해도 돼, 알았지? 그래도 난 진지하게 싸울거야!",
-      "9": "학교는 지겨워. 나는 할 일이 없어. 하암~ 난 그저 시간을 때우기 위해 싸울뿐이야."
-    },
-    "victory": {
-      "1": "인상적이었어! 난 아직 배울게 많구나.",
-      "2": "내가 이렇게까지 크게 질 줄은 몰랐어…",
-      "3": "언젠가 우리가 다시 배틀할 수 있을 날을 기다릴게.",
-      "4": "놀라울 정도로 엄청 재미있었어! 넌 날 완전히 지치게 만들어버렸네…",
-      "5": "넌 나에게 진짜 교훈을 주었어! 넌 정말 대단해!",
-      "6": "세상에, 내가 지다니. 이거 정말 우울하지만… 넌 정말 멋있었어.",
-      "7": "난 이런 기억따윈 필요없어. 잊어버리겠어…",
-      "8": "거기 너! 살살하라고 했지! 그래도 넌 진지할때 정말 멋지구나!",
-      "9": "사실 배틀하는 것이 지루하던 참이야… 뭔가 새로운 것이 없을까?"
-    }
-  },
-  "breeder": {
-    "encounter": {
-      "1": "순종적인 포켓몬, 이기적인 포켓몬… 포켓몬들은 각기 다른 성격을 가지고 있지.",
-      "2": "내 태도가 그렇게 좋진 않아도, 내 포켓몬들은 잘 키웠어.",
-      "3": "음, 넌 포켓몬들을 훈육하니? 너무 심하게 하는 것은 좋지 않다고."
-    },
-    "victory": {
-      "1": "각 포켓몬의 성격을 이해하고 육성하는 건 중요해.",
-      "2": "사악한 나와는 달리 좋은 포켓몬들도 있지.",
-      "3": "과도한 칭찬은 사람과 포켓몬 모두에게 독이 될 수 있어."
-    },
-    "defeat": {
-      "1": "배틀에서 지더라도 포켓몬에게 화를 내면 안돼.",
-      "2": "어때? 꽤 괜찮은 포켓몬이지? 난 무언가 기르는 게 꽤 잘 맞더라고.",
-      "3": "네가 포켓몬을 얼마나 사랑하는지와 관계없이, 그들이 잘못을 저지르면 바로잡아야 해."
-    }
-  },
-  "breeder_female": {
-    "encounter": {
-      "1": "포켓몬은 절대 널 배신하지 않아. 네가 주는 사랑을 고스란히 되돌려 준다구.",
-      "2": "좋은 포켓몬을 키우는 팁을 알려줄까?",
-      "3": "난 아주 특별한 방법으로 아주 특별한 포켓몬들을 키웠지!"
-    },
-    "victory": {
-      "1": "이런… 이렇게 될 리가 없는데. 내가 블렌딩을 잘못 썼나?",
-      "2": "내 포켓몬에게 이런 일이… 넌 네 포켓몬에게 뭘 먹이는 거야?",
-      "3": "내가 지는 건 그저 내가 시간을 때우고 있었다는 걸 알려주는 거지. 내 자존심엔 전혀 상처가 되지 않는다구."
-    },
-    "defeat": {
-      "1": "이건 내 포켓몬들이 내 사랑을 받아들였다는 걸 입증하지.",
-      "2": "좋은 포켓몬을 키우는 진짜 비결은 좋은 포켓몬을 잡는 거야.",
-      "3": "포켓몬의 강함과 약함은 네가 어떻게 키우느냐에 따라 결정되지."
-    }
-  },
-  "fisherman": {
-    "encounter": {
-      "1": "앗! 너 때문에 한 마리 놓쳤잖아! 어떻게 할 거야?",
-      "2": "저리 가! 네가 포켓몬들을 놀래키고 있잖아!",
-      "3": "네가 승리를 낚을 수 있을지 한번 보자고!"
-    },
-    "victory": {
-      "1": "그냥 잊어버려.",
-      "2": "다음 번엔 내가 승리의 나팔을 울리고 있을거다!",
-      "3": "이번엔 내가 물살을 과소평가했나보군."
-    }
-  },
-  "fisherman_female": {
-    "encounter": {
-      "1": "월척이다!",
-      "2": "낚시대는 던져졌고, 이젠 성공을 끌어올리는 일만 남았다!",
-      "3": "파도를 일으킬 준비는 끝났어!"
-    },
-    "victory": {
-      "1": "더 튼튼한 바늘을 가지고 돌아올테다.",
-      "2": "다음번엔 꼭 성공을 낚을 거야!",
-      "3": "다시 돌아올 날을 기다리며 바늘을 다듬고 있을게!"
-    }
-  },
-  "swimmer": {
-    "encounter": {
-      "1": "뛰어들 시간이다!",
-      "2": "승리의 파도 속으로!",
-      "3": "첨벙댈 준비는 끝났어!"
-    },
-    "victory": {
-      "1": "패배에 젖어버렸어…",
-      "2": "패배의 파도였군.",
-      "3": "해변으로 돌아갈 시간이군."
-    }
-  },
-  "backpacker": {
-    "encounter": {
-      "1": "게임 시작이야! 짐 단단히 싸놓으라구!",
-      "2": "네가 속도를 유지할 수 있을지 보자!",
-      "3": "각오 단단히 하라고!",
-      "4": "20년 동안 나 자신을 찾기 위해 헤매왔어… 근데 내가 어디 있지?"
-    },
-    "victory": {
-      "1": "이번엔 걸려 넘어져 버렸네!",
-      "2": "내가 속도를 잃어버렸잖아!",
-      "3": "막다른 길이야!",
-      "4": "잠깐! 그래 거기, 혹시 내가 누군지 아나?"
-    }
-  },
-  "ace_trainer": {
-    "encounter": {
-      "1": "너는 꽤 자신만만해 보이는구나.",
-      "2": "너의 포켓몬들… 나에게 보여줘…",
-      "3": "내가 엘리트 트레이너라서, 사람들은 내가 강하다고 생각해.",
-      "4": "엘리트 트레이너가 되려면 무엇이 필요한지 알고 있니?"
-    },
-    "victory": {
-      "1": "그러네… 넌 좋은 포켓몬을 가졌구나…",
-      "2": "뭐? 말도 안 돼, 난 배틀 천재라구!",
-      "3": "그래도 역시, 네가 주인공이구나!",
-      "4": "좋아! 좋아! 너도 엘리트 트레이너가 될 수 있겠어!"
-    },
-    "defeat": {
-      "1": "난 내 몸과 마음을 포켓몬 배틀에 바치고 있어!",
-      "2": "모두 예상된 일이었어… 이건 놀랄 일이 아니야…",
-      "3": "난 내가 강하게 압박하면 무너질 연약한 사람이라고 생각했어.",
-      "4": "난 강하고, 지지 않아. 그저 멋지게 이길 수 없었기 때문이야."
-    }
-  },
-  "parasol_lady": {
-    "encounter": {
-      "1": "우아함과 침착함으로 승부하겠습니다!"
-    },
-    "victory": {
-      "1": "그래도 제 우아함은 무너지지 않아요!"
-    }
-  },
-  "twins": {
-    "encounter": {
-      "1": "각오해, 우리가 한 팀이 되면 두 배로 강해진다구!",
-      "2": "마음은 두 개지만 우리는 하나 – 네가 쌍둥이의 파워를 따라잡을 수 있는지 보겠어!",
-      "3": "두 배로 각오하는 게 좋을 거야. 우리가 곧 화나게 할 거거든!"
-    },
-    "victory": {
-      "1": "비록 우리는 졌지만, 우리의 관계는 깨지지 않아!",
-      "2": "그래도 우리의 영혼은 오랫동안 흐려지지 않을 거야.",
-      "3": "더 강력한 듀오로 강해져서 돌아오겠어!"
-    },
-    "defeat": {
-      "1": "우리 쌍둥이의 파워는 최고야!",
-      "2": "마음은 두 개지만 승리는 하나!",
-      "3": "미소도 두 배, 승리의 댄스도 두 배!"
-    }
-  },
-  "cyclist": {
-    "encounter": {
-      "1": "내가 만든 먼지나 마실 준비하시지!",
-      "2": "준비하라구! 난 널 먼지 속에 놓고 올 거니까!",
-      "3": "전력을 다해야 할 거야, 네가 날 따라올 수 있는지 지켜보겠어!"
-    },
-    "victory": {
-      "1": "바퀴가 움직이지 않더라도, 나의 페달은 그렇지 않아.",
-      "2": "이런, 따라잡혔어!",
-      "3": "승리로 가는 길에는 아직 만나지 못한 우여곡절이 많이 있구나."
-    }
-  },
-  "black_belt": {
-    "encounter": {
-      "1": "네 용기가 대단하구나! 난 최고의 발차기 실력을 갖추고 있다구!",
-      "2": "오, 알겠어. 산산조각이 나고 싶구나? 아니면 샌드백이 되고 싶은 거야?"
-    },
-    "victory": {
-      "1": "이런, 포켓몬이 배틀을 하는 동안 내 발차기는 전혀 도움이 되지 않았어.",
-      "2": "음… 어차피 내가 질거라면, 완전 엉망진창이 되길 바랬는데…"
-    }
-  },
-  "battle_girl": {
-    "encounter": {
-      "1": "감동을 주려고 노력할 필요는 없어. 네가 질 수도 있으니까."
-    },
-    "victory": {
-      "1": "작별인사는 어렵지만, 우리에겐 시간이 얼마 안 남았네…"
-    }
-  },
-  "hiker": {
-    "encounter": {
-      "1": "중년으로 접어들면서 등산해왔던 산처럼 진중해졌습니다!",
-      "2": "살아있는 산같은… 큰 체격을 부모님이 물려주셨죠…"
-    },
-    "victory": {
-      "1": "적어도 BMI에 대해서는 질 수 없습니다!",
-      "2": "부족해… 절대로 충분하지 않아. 저의 콜레스테롤이 부족합니다…"
-    }
-  },
-  "ranger": {
-    "encounter": {
-      "1": "자연에 둘러싸여 있으면, 다른 건 중요하지 않게 느껴져.",
-      "2": "인생에서 자연을 빼고 살면, 가끔 갑자기 마음이 불안해지지."
-    },
-    "victory": {
-      "1": "광활한 자연 앞에서는 내가 이기든 지든 상관없어…",
-      "2": "도시 생활의 답답한 느낌에 비하면 이런 것은 아주 사소한 일지."
-    },
-    "defeat": {
-      "1": "내가 이겼네. 그러나 승리는 광대한 자연에 비하면 아무것도 아니야…",
-      "2": "내 마음속 불안함과 비교하면, 당신 기분은 그렇게 나쁘지 않을텐데…"
-    }
-  },
-  "scientist": {
-    "encounter": {
-      "1": "제 연구는 이 세상을 평화와 기쁨으로 이끌 겁니다."
-    },
-    "victory": {
-      "1": "전 천재니까… 당신 같은 사람에게 질 수 없는데…"
-    }
-  },
-  "school_kid": {
-    "encounter": {
-      "1": "…헤헷. 계산과 분석에는 자신 있어.",
-      "2": "언젠가 체육관 관장이 되고 싶어서, 최대한 많은 경험을 쌓고 있어."
-    },
-    "victory": {
-      "1": "으아아… 이번에는 아마 계산과 분석이 빗나간 것 같아…",
-      "2": "내가 보기엔, 어렵고 힘든 경험도 나름의 의미가 있는 것 같아."
-    }
-  },
-  "artist": {
-    "encounter": {
-      "1": "예전엔 인기가 많았지만, 지금은 모두 사라졌다네."
-    },
-    "victory": {
-      "1": "시대가 변하면, 가치관도 변하지. 난 그걸 너무 늦게 깨달았어."
-    }
-  },
-  "guitarist": {
-    "encounter": {
-      "1": "패배의 리듬을 느낄 준비는 됐겠지? 내가 승리할 거니까!"
-    },
-    "victory": {
-      "1": "지금은 조용하지만, 회복의 멜로디를 연주할 거야."
-    }
-  },
-  "worker": {
-    "encounter": {
-      "1": "사람들이 저를 오해하는 게 신경 쓰여요. 전 생각보다 훨씬 깨끗하답니다."
-    },
-    "victory": {
-      "1": "피부가 타는 게 싫어서, 일하는 동안엔 그늘에 머물고 싶어요."
-    }
-  },
-  "worker_female": {
-    "encounter": {
-      "1": "사람들이 나를 오해하는 게 신경 쓰여.\n$나는 생각보다 훨씬 깨끗한데."
-    },
-    "victory": {
-      "1": "피부가 타는 게 싫어서, 일하는 동안엔 그늘에 머물고 싶어."
-    },
-    "defeat": {
-      "1": "생각처럼 몸이 잘 안따라주네."
-    }
-  },
-  "worker_double": {
-    "encounter": {
-      "1": "너를 무너뜨릴 수 있다는 것을 보여줄게. 우리는 실전 경험이 있거든!"
-    },
-    "victory": {
-      "1": "이상하네… 어떻게 이럴 수 있지… 힘으로 압도할 수 없다니."
-    }
-  },
-  "hex_maniac": {
-    "encounter": {
-      "1": "평소에는 클래식 음악만 들었는데, 지면 뉴에이지도 좀 들어볼까!",
-      "2": "눈물을 흘릴 때마다 더 강해지는 것 같아."
-    },
-    "victory": {
-      "1": "지금이 물병자리 시대의 시작일까?",
-      "2": "이제 나는 더 강해지겠지. 모든 원한과 함께 성장하겠어."
-    },
-    "defeat": {
-      "1": "뉴에이지란 단순히 20세기 클래식 작곡가들을 말하는 거, 맞지?",
-      "2": "슬픔이나 좌절에 얽매이지 마. 넌 그 원한을 원동력으로 사용할 수 있어."
-    }
-  },
-  "psychic": {
-    "encounter": {
-      "1": "안녕! 집중해!"
-    },
-    "victory": {
-      "1": "에에에에엣!"
-    }
-  },
-  "officer": {
-    "encounter": {
-      "1": "마음의 준비를 하시죠, 정의가 곧 실행될 거니까요!",
-      "2": "법을 지키고 정의를 위해 봉사할 준비가 되었습니다!"
-    },
-    "victory": {
-      "1": "정의의 무게가 그 어느 때보다 무겁게 느껴집니다…",
-      "2": "패배의 그림자가 관할 경찰서에 남았습니다."
-    }
-  },
-  "beauty": {
-    "encounter": {
-      "1": "나의 마지막 배틀… 이 승부를 그렇게 봐주셨으면 좋겠어요…"
-    },
-    "victory": {
-      "1": "즐거웠어요… 언젠가 또 다른 마지막 승부를 하죠…"
-    }
-  },
-  "baker": {
-    "encounter": {
-      "1": "패배의 맛을 볼 준비는 됐겠지!"
-    },
-    "victory": {
-      "1": "실력이든 빵이든, 굽고 나면 단단해지는 법이라네."
-    }
-  },
-  "biker": {
-    "encounter": {
-      "1": "힘차게 먼지 속으로 출발할 시간입니다!"
-    },
-    "victory": {
-      "1": "다음 경주를 위해 준비해야겠습니다."
-    }
-  },
-  "firebreather": {
-    "encounter": {
-      "1": "내 불꽃이 너를 삼킬 테니까!",
-      "2": "내 영혼은 불타고 있다. 얼마나 뜨겁게 타는지 보여주지!",
-      "3": "이리 올라와서 보도록!"
-    },
-    "victory": {
-      "1": "하얗게 불태웠다………",
-      "2": "큭! 제법 뜨겁군!",
-      "3": "으윽! 코끝에 화상을 입었다!"
-    }
-  },
-  "sailor": {
-    "encounter": {
-      "1": "친구여, 진다면 널빤지 행이야!",
-      "2": "덤벼! 내 선원으로서 자존심이 위태롭군!",
-      "3": "여어 거기! 뱃멀미 하나?"
-    },
-    "victory": {
-      "1": "크윽! 꼬맹이한테 지다니!",
-      "2": "네 영혼이 나를 침몰시켰어!",
-      "3": "내가 뱃멀미가 나는 것 같군…"
-    }
-  },
-  "archer": {
-    "encounter": {
-      "1": "더 나아가기 전에 우리 로켓단과 맞설 만한지 한 번 봅시다!",
-      "2": "당신의 실력이 예사롭지 않다는 소식을 들었습니다. 정말인지 한 번 보지요.",
-      "3": "…저는 로켓단의 간부 아폴로. 우리 조직의 적에게는 봐 주지 않습니다!"
-    },
-    "victory": {
-      "1": "…이런 실수를 하다니!",
-      "2": "역시 지금의 저는 무리였군요…",
-      "3": "비, 비주기님, 용서해주십시오…제가 일개 트레이너한테 당하다니…"
-    }
-  },
-  "ariana": {
-    "encounter": {
-      "1": "거기까지다~!! 너 같은 놈을 언제까지고 설치게 두었다가는 \n$로켓단의 프라이드는 상처 입고 상처 입어서 상처투성이가 돼 버린다고-!",
-      "2": "내가 하는 일이 옳은지 그른지는 상관 없어…\n$그저 비주기님을 믿고 따르는 것 뿐이니까-!",
-      "3": "네 여정은 여기서 끝이야. 내가 널 이길 테니까-!"
-    },
-    "victory": {
-      "1": "어머, 강하군. 안타깝네.\n$네가 로켓단에 있었다면 간부가 될 수 있었을 텐데.",
-      "2": "사…산산조각났네…",
-      "3": "으이이이익! 온 힘을 다해서 싸웠는데…이래도 이길 수 없다니!"
-    }
-  },
-  "proton": {
-    "encounter": {
-      "1": "뭐죠? 우리 일에 끼어든다면 자비를 바라지 마십시오!",
-      "2": "뭐죠? 나는 로켓단에서 제일 냉혹하다고 불리는 남자…\n$우리 일을 방해하도록 그냥 놔두지 않겠습니다!",
-      "3": "나는 로켓단의 간부 랜스. 당신의 참견도 여기까지입니다!"
-    },
-    "victory": {
-      "1": "요새가 무너져내렸네요…",
-      "2": "나한테 이긴 건 결국 로켓단의 분노를 강하게 했을 뿐이예요…",
-      "3": "나는 졌지만, 결코 이 일을 잊지 않을 겁니다!"
-    }
-  },
-  "petrel": {
-    "encounter": {
-      "1": "후후훗, 잘 왔구나. 오잉? 내가 누군지 알아? 비주기야.\n$비주기님이라고, 우-하하! …엥? 전혀 안 닮았다고?\n$비주기님으로는 안 보인다고? 제길- 열심히 연습했는데!",
-      "2": "나는 로켓단의 간부 람다. 우리 계획을 방해하는 건 용납할 수 없다!",
-      "3": "이 로켓단 간부 람다가 네놈 불청객을 처리해 주지!"
-    },
-    "victory": {
-      "1": "조…좋아. 비주기님이 어디 계신지 알려주지.",
-      "2": "크으으… 이 내가 당해낼 수 없다니… 비주기님, 용서해주십시오…",
-      "3": "안돼, 이런다고 나한테 어쩔 수는 없어. 다른 사람들에게 알려야겠어…"
-    }
-  },
-  "tabitha": {
-    "encounter": {
-      "1": "우효효효! 그래 당신 여기까지 왔구나! 그치만 늦었어요!",
-      "2": "우효효… 벌써 여기까지 왔네요? 우리가 당신을 과소평가했어요. 하지만 이제 시작입니다! \n$이 호걸님은 이제까지 본 조무래기들과는 차원이 다르답니다! 우물쭈물 시간을 끌지 않아요.\n$확실하게 보내주마! 우효효효효효효!!",
-      "3": "여기서 어른의 무서움을 제대로 알려주지! 받아랏-!"
-    },
-    "victory": {
-      "1": "우효효! 이 호걸은 이겼을지 몰라도 마적님한테는 안 될 겁니다!\n$차라리 여기서 졌다면 무자비한 채찍질은 피했을텐데 말이죠!",
-      "2": "우효~! 이야 이건 예상 밖의 전개인데!?",
-      "3": "우효! 어떻게?! 이 호걸님이 이런 일개 트레이너에게…"
-    }
-  },
-  "courtney": {
-    "encounter": {
-      "1": "…그 …네가 가진 …우리…마그마단이 원하는 것",
-      "2": "…………그럼 …………삭제하겠습니다",
-      "3": "……애널라이즈 ……하고 싶어 ……아하하하♪"
-    },
-    "victory": {
-      "1": "……바꿔줘 ……세계를",
-      "2": "………예상대로 ………예상외 ………너 …………타깃 록 ………했으니까\n$……엑스페리먼트 ……할 테니까 ………너를………계속………아핫…♪",
-      "3": "……또 ……예상외 ………… ……역시 ……너…재미있어…! ………아하하…♪"
-    }
-  },
-  "shelly": {
-    "encounter": {
-      "1": "엥? 우리 아쿠아단의 일에 끼어들겠다고?\n$…좋아! 기본적인 예의도 모르는 애송이한테는 제대로 그 버릇을 고쳐줘야지…\n$겁먹고 도망쳐도 용서 따위 없을 줄 알아! 우하하하!",
-      "2": "아앙? 뭐야? 이 건방진 꼬맹이는…",
-      "3": "침착해. 조급해 하지 말라고… 금방 박살내 줄 테니까."
-    },
-    "victory": {
-      "1": "아아아아앙!? 예상치 못하게 방해받았잖아! 어쩔 수 없네.\n$여기선 물러나야겠네. 그렇지만 네가 아쿠아단을 만나는 게 이게 마지막은 아닐 거야.\n$우리는 다른 계획도 있거든! 잊지 마!",
-      "2": "크윽…!? 너무 봐줬나…!",
-      "3": "…으윽 …싸우면서 더욱 실력이 좋아졌다고…!?\n$장래가 무서워지는 애송이네… …나와 내 포켓몬들은 더 이상 싸울 힘이 남아 있지 않아.\n$…가 …가서 아강님한테 아주 혼쭐이나 나 버려."
-    }
-  },
-  "matt": {
-    "encounter": {
-      "1": "후하하하하하! 뭐라 떠들고 있는 거야! 너 생긴 게 마크탕이랑 똑같네!",
-      "2": "음음! 네 녀석은! 재미있는 녀석!",
-      "3": "뭐야?! 우릴 따라온 거냐!"
-    },
-    "victory": {
-      "1": "…그래서 말이지, 리더님이 시간이 나실 때까진 내가 상대해 주마!",
-      "2": "확 확 느껴지는데! 네놈들의 강함이 말이야!\n$제대로 붙었다고 하기엔 조금 모자라지만 이제 타임오버 같네…",
-      "3": "재밌는데!! 역시 재미있어! 넌! 또 붙게 될 때를 기대하고 있겠어!"
-    }
-  },
-  "mars": {
-    "encounter": {
-      "1": "난 갤럭시단 간부인 마스! 강하고 아름답지!",
-      "2": "갤럭시단의 미래에 대한 비전은 흔들림 없지. 방해한다면 무자비하게 짓밟아 주마!",
-      "3": "두렵지 않아? 넌 그래야만 할 걸!"
-    },
-    "victory": {
-      "1": "갤럭시단의 간부로서… 이런 일은 있을 수 없어!!",
-      "2": "넌 능력 있구나. 그건 인정하지.",
-      "3": "아-이런 이런! 졌잖아!"
-    }
-  },
-  "jupiter": {
-    "encounter": {
-      "1": "무슨 볼일이라도? 좋아! 갤럭시단 간부인 나 주피터가 상대해주지.",
-      "2": "발버둥쳐 봐야 소용 없어. 갤럭시단이 승리할 거니까!",
-      "3": "너 떨고 있네… 무서운 거지?"
-    },
-    "victory": {
-      "1": "일개 트레이너에게 지다니 방심이란 무섭구나.",
-      "2": "다음에는 내가 울려 주고 말겠어!",
-      "3": "흥! 강하네. 하지만 보스는 당할 수 없어"
-    }
-  },
-  "saturn": {
-    "encounter": {
-      "1": "나는 갤럭시단의 간부 새턴. 모든 것은 모두를 위해 그리고 갤럭시단을 위해!",
-      "2": "갤럭시단을 방해한다면 일말의 가능성도 모두 제거한다!",
-      "3": "여기까지 왔으니 갤럭시단 나름의 접대를 해 주지."
-    },
-    "victory": {
-      "1": "이럴 수가… 너한테 졌다고?!",
-      "2": "…역시 강해! 갤럭시단에 맞설 만하군.",
-      "3": "강하다! 하지만 불쌍하군."
-    }
-  },
-  "zinzolin": {
-    "encounter": {
-      "1": "너는 플라스마단에게 있어 불안요소가 될 것이다. 여기서 제거하겠다!",
-      "2": "이런 이런… 내가 이런 곳에서 싸워야만 하다니!",
-      "3": "여기까지 오다니 대단한 트레이너군. 그러나 여기가 끝이다."
-    },
-    "victory": {
-      "1": "게치스님… 제가 실패했습니다…",
-      "2": "그건 그렇고 힘들구먼. 나는 떨고 있다. 괴롭지만 살아 있다. 그것이야말로 살아 있다는 실감!",
-      "3": "흐음. 의외로 똑똑한 트레이너군. 하지만 생각만큼은 아니야."
-    }
-  },
-  "rood": {
-    "encounter": {
-      "1": "너는 플라스마단에 위협이 되는구나. 너라는 트레이너가 어떤 인물인지 승부로 알아봐야겠다.",
-      "2": "오호! 싸늘하구먼… 이런 곳에서 싸울 줄이야!",
-      "3": "너는 여기까지 온 것으로 보니 뛰어난 트레이너구나. 그렇다만 이젠 끝이다."
-    },
-    "victory": {
-      "1": "게치스님… 임무를 실패했습니다…",
-      "2": "나는 떨고 있다. 나는 괴롭지만 이겨냈다.",
-      "3": "음… 너는 재능이 있는 트레이너구나. 하지만 충분하지는 않다."
-    }
-  },
-  "xerosic": {
-    "encounter": {
-      "1": "오오- 네 소문은 많이 들었다. 자, 이리 와 보거라!",
-      "2": "너 강하구나. 에너지를 얼마나 갖고 있지?",
-      "3": "기다리고 있었어! 너를 조사하겠다. 자 시작한다!"
-    },
-    "victory": {
-      "1": "강하구나, 너는. 응, 정말 강해, 너는.",
-      "2": "뭣이라! 넌 굉장하군! 너의 포켓몬도 대단하군!",
-      "3": "굉장하구나 너! 아주 굉장해! 나는 너를 인정하겠다!"
-    }
-  },
-  "bryony": {
-    "encounter": {
-      "1": "나는 바라. 당신과 싸울 수 있어 기쁘군요. 한 번 보여주시죠.",
-      "2": "인상적이군요… 보기보다 강해요. 에너지가 어디까지 뻗어나가는지 봅시다.",
-      "3": "도착할 줄 알았습니다. 시작할까요?"
-    },
-    "victory": {
-      "1": "어라? 이길 확률은 어디까지나 확률. 절대적이진 않네.",
-      "2": "확률을 무시하는 트레이너, 네 파워의 원천은 뭐지?",
-      "3": "놀랍군! 칭찬할 만 해."
-    }
-  },
-  "rocket_grunt": {
-    "encounter": {
-      "1": "트러블에 대비하도록!",
-      "2": "우리는 위업을 이루는 중이라고! 저리 비켜, 꼬마 녀석!",
-      "3": "포켓몬을 넘기지 않겠다면, 로켓단이 징벌하겠다!",
-      "4": "로켓단의 진정한 공포를 보여주마!",
-      "5": "헤이, 키드! 미는 로켓단의 멤버라구요!"
-    },
-    "victory": {
-      "1": "로켓단은 다시 떠오를 거니까!",
-      "2": "이런! 엘리베이터 키를 떨어뜨렸어!",
-      "3": "실패했군!",
-      "4": "내 동료들이 가만히 있지 않을 거다!",
-      "5": "유 쎄이 왓? 로켓단이 바이바이? 유한테 브레이킹?"
-    }
-  },
-  "magma_grunt": {
-    "encounter": {
-      "1": " 마그마단을 방해한다면, 자비는 없닷!",
-      "2": "계획을 방해하지 않는 게 좋을 거다! 우리는 세상을 더 나은 곳으로 만들고 있거든!",
-      "3": "방해꾼 녀석! 마그단은 너 같은 꼬마들을 상대할 시간이 없어!",
-      "4": "마시멜로를 갖고 있었으면 좋겠네. 왜냐하면… 곧 뜨거워질 테니까!",
-      "5": "화산의 힘을 사용할 거야! 그건 정말로… 폭발적일 테니까! 알아들었지? 헤헷!"
-    },
-    "victory": {
-      "1": "하? 내가 졌어?!",
-      "2": "내가 지다니! 이것 때문에 점심도 거르고 왔는데.",
-      "3": "말도 안돼! 넌 아직 어린애잖아!",
-      "4": "으윽… 당장 은신처로 숨을 걸 그랬나…",
-      "5": "네가 이겼어… 이것 때문에 보스가, 내 월급 깎으려나?"
-    }
-  },
-  "aqua_grunt": {
-    "encounter": {
-      "1": "아쿠아단을 넘본 사람에게는 자비는 없다, 꼬마도 마찬가지야!",
-      "2": "쯧… 아쿠아단에 참견하다니 오지랖이 넓군!",
-      "3": "흠뻑 물을 뒤집어쓰게 될 거다! 내 물 포켓몬의 공격 뿐만이 아니야!",
-      "4": "우리, 아쿠아단은, 모두를 위해 존재한다!",
-      "5": "내가 떠밀… 아니, 파도에 떠내려갈 준비나 하라고! 내 포켓몬이 그렇게 만들 테니까 "
-    },
-    "victory": {
-      "1": "말도 안 돼!",
-      "2": "크윽, 참견쟁이 꼬마에게 당하다니!",
-      "3": "내가 졌다고?! 헤엄쳐서 은신처로 돌아가야겠군…",
-      "4": "이런, 완전 망했군… 보스가 화를 내실텐데…",
-      "5": "네가 이겼어… 이것 때문에 보스가, 나를 판자 위로 보내는 거 아냐?"
-    }
-  },
-  "galactic_grunt": {
-    "encounter": {
-      "1": "갤럭시단을 방해하지 마!",
-      "2": "기술의 힘과 우리가 꿈꾸는 미래를 목격하라!",
-      "3": "갤럭시단으로서, 우리를 방해하는 자는 누구든 제거하겠다!",
-      "4": "질 준비나 하라고!",
-      "5": "우주에서 싸울 준비는 됐겠지!"
-    },
-    "victory": {
-      "1": "사격 중지…… ",
-      "2": "이런 좌절이라도, 우리의 큰 계획 앞엔 아무 의미도 못 돼.",
-      "3": "우리의 계획은 이번 패배보다 크거든.",
-      "4": "어떻게 한 거지?!",
-      "5": "메모해야겠군. 최대한 포켓몬 배틀을 ASAP으로 연습할 것."
-    }
-  },
-  "plasma_grunt": {
-    "encounter": {
-      "1": "다른 생각을 가진사람들은 용납하지 않겠다!",
-      "2": "내가 이기면, 네 포켓몬들을 놓아주도록 해!",
-      "3": "플라즈마단을 방해한다면, 내가 처리해주지!",
-      "4": "플라즈마단은 너 같은 이기적인 인간에게서 포켓몬을 해방할 것이다!",
-      "5": "우리 스타일링은 정말 대단하지… 배틀 실력은 어떻냐고? 곧 알게 될거야."
-    },
-    "victory": {
-      "1": "플라-스마-!",
-      "2": "내가 지다니…",
-      "3": "…포켓몬이 너무 약해, 더 좋은 포켓몬을 훔치러 가야겠군!",
-      "4": "훌륭한 계획은 항상 방해를 받는다니깐.",
-      "5": "이건 나빠… 나빠나빠나빠나빠나빠! 플라스마단에 나빠! 줄여서, 플라나빠!"
-    }
-  },
-  "flare_grunt": {
-    "encounter": {
-      "1": "네 포켓몬, 플레어단의 우아함에 상대가 되지 않는다고.",
-      "2": "선글라스를 가져왔길 바랄게. 곧 밝게 빛날 테니까!",
-      "3": "플레어단이 세상의 불완전함을 정화할 거야!",
-      "4": "플레어단의 광채를 마주칠 준비는 됐겠지!",
-      "5": "패션이 우리한텐 가장 중요하다고!"
-    },
-    "victory": {
-      "1": "미래가 밝아 보이질 않네.",
-      "2": "생각했던 것보다 전투에는 많은 요소가 있는 것 같군. 다시 계획을 짜야겠어.",
-      "3": "아앗?! 내가 졌어?!",
-      "4": "패배 속에서도, 플레어단의 우아함은 빛나고 있다고.",
-      "5": "네가 이긴 것 같네. 그렇지만 졌어도, 난 우아하게 퇴장할 거니까!"
-    }
-  },
-  "rocket_boss_giovanni_1": {
-    "encounter": {
-      "1": "그래서! 여기까지 오다니, 감탄이 절로 나오는군!"
-    },
-    "victory": {
-      "1": "하! 이럴 순 없어!"
-    },
-    "defeat": {
-      "1": "자신의 힘을 측정하지 못하는 걸 보아하니, 아직 별볼일 없는 꼬맹이로군. 내 말을 명심하도록. "
-    }
-  },
-  "rocket_boss_giovanni_2": {
-    "encounter": {
-      "1": "옛 친구들이 나를 필요로 하고 있다…… 그런데도 방해하겠다는 건가?"
-    },
-    "victory": {
-      "1": "어떻게 이런 일이…?\n로켓단의 소중한 꿈이 환상에 불과해졌군…… "
-    },
-    "defeat": {
-      "1": "로켓단은 다시 태어난다, 그리고 세상을 지배할 것이다!"
-    }
-  },
-  "magma_boss_maxie_1": {
-    "encounter": {
-      "1": "내 손으로 널 파묻어주지. 영광으로 알도록!"
-    },
-    "victory": {
-      "1": "윽! 꽤… 제법이군…\n내가 뒤쳐졌지만, 겨우 한 끝이다…"
-    },
-    "defeat": {
-      "1": "마그마단이 앞선다!"
-    }
-  },
-  "magma_boss_maxie_2": {
-    "encounter": {
-      "1": "나와 내 목표 사이에 남은 마지막 장애물이로군.\n최후의 공격에 대비하도록! 후하하하!"
-    },
-    "victory": {
-      "1": "이런… 이럴 수는… 없어… "
-    },
-    "defeat": {
-      "1": "이제부터… 인류의 이상을 위해 대지를 더 늘려가겠다."
-    }
-  },
-  "aqua_boss_archie_1": {
-    "encounter": {
-      "1": "내가 아쿠아단의 리더다, 유감스럽게도 넌 이게 끝이겠군."
-    },
-    "victory": {
-      "1": "다시 어딘가에서 만나도록하지. 그 얼굴 기억해둘테니까."
-    },
-    "defeat": {
-      "1": "좋군! 이제 아쿠아단을 막아설 것은 없다!"
-    }
-  },
-  "aqua_boss_archie_2": {
-    "encounter": {
-      "1": "이 날이 오는 것을 너무 오래 기다렸군.\n이것이 우리의 진정한 힘이다!"
-    },
-    "victory": {
-      "1": "내가 생각했던 것들이…… "
-    },
-    "defeat": {
-      "1": "이 세상을 원래의 순수한 상태로 되돌리겠다, 그 모든 것을!!"
-    }
-  },
-  "galactic_boss_cyrus_1": {
-    "encounter": {
-      "1": "넌 공허한 감정에 이끌려 이곳에 오게된 것이다.\n마음에 귀를 기울인 것을 후회하게 해주지!"
-    },
-    "victory": {
-      "1": "흥미롭군. 게다가 꽤 궁금해졌어."
-    },
-    "defeat": {
-      "1": "새로운 세상을 만들 것이다…"
-    }
-  },
-  "galactic_boss_cyrus_2": {
-    "encounter": {
-      "1": "이런 우리가 다시 만나게 됐군. 우리의 운명이 얽히게 된 것 같군.\n 하지만 지금 여기서, 나는 마침내 그 끈을 끊을 것이다!"
-    },
-    "victory": {
-      "1": "어떻게? 어째서? 어떻게?!"
-    },
-    "defeat": {
-      "1": "작별이로군."
-    }
-  },
-  "plasma_boss_ghetsis_1": {
-    "encounter": {
-      "1": "누구도 저를 막을 수 없습니다! 무슨 짓을 하더라도!"
-    },
-    "victory": {
-      "1": "…어떻게 된 거지? 이 몸은 플라스마단을 만들어낸 완벽한 남자라고! "
-    },
-    "defeat": {
-      "1": "세계를 바꿀 완전한 지배자가 아니었단 말인가!? …흐하하!"
-    }
-  },
-  "plasma_boss_ghetsis_2": {
-    "encounter": {
-      "1": "오시죠! 당신이 모든 희망을 잃는 순간의 얼굴을 보겠습니다!"
-    },
-    "victory": {
-      "1": "내 계산이… 틀려! 내 치밀한 계획이 틀리다니! 세상은 내 것이어야 하는데!"
-    },
-    "defeat": {
-      "1": "큐레무! 합체해라!"
-    }
-  },
-  "flare_boss_lysandre_1": {
-    "encounter": {
-      "1": "나를 막겠다고? 배틀로 증명하도록."
-    },
-    "victory": {
-      "1": "네가 나를 여기서 막았군. 하지만 잠시 기다리도록. "
-    },
-    "defeat": {
-      "1": "포켓몬은… 더 이상 존재하지 않는다."
-    }
-  },
-  "flare_boss_lysandre_2": {
-    "encounter": {
-      "1": "너의 미래와 나의 미래… 어느 쪽이 옳은지 서로의 포켓몬에게 묻도록 하지."
-    },
-    "victory": {
-      "1": "크윽!"
-    },
-    "defeat": {
-      "1": "우매한 자들이 이 아름다운 세상을 계속 더럽히고 있군."
-    }
-  },
-  "brock": {
-    "encounter": {
-      "1": "내 전문인 바위 타입 포켓몬으로 널 쓰러뜨려줄게! 덤벼!",
-      "2": "바위같은 의지로 널 압도하겠어!",
-      "3": "내 포켓몬의 진정한 힘을 보여줄게!"
-    },
-    "victory": {
-      "1": "네 포켓몬의 힘이 바위같은 내 방어를 이겼어!",
-      "2": "세상은 넓구나! 너랑 겨뤄볼 수 있어서 즐거웠어.",
-      "3": "아마도 난 포켓몬 브리더의 꿈을 이루러 가야할지도…"
-    },
-    "defeat": {
-      "1": "최선의 공격은 적절한 방어지!\n그게 내 방식이야!",
-      "2": "다음에 나한테 더 배우러와. 바위타입과 어떻게 싸워야하는지 알려주지!",
-      "3": "아, 여러 지역을 돌아다니며 여행한 보람이 있군!"
-    }
-  },
-  "misty": {
-    "encounter": {
-      "1": "내 방침은 물타입 포켓몬으로 공격하고 공격하고 또 공격하는 거!",
-      "2": "아하핫, 너한테 내 물타입 포켓몬들의 힘을 보여줄게!",
-      "3": "내 꿈은 여행을 다니며 강한 트레이너들과 배틀하는 거였어…\n네가 그 충분한 도전자가 될 수 있는지 볼까?"
-    },
-    "victory": {
-      "1": "너 정말로 강하구나… 그 실력 인정하도록 할게…",
-      "2": "으으… 너 그냥 운이 좋았던거야, 그치?!",
-      "3": "우와, 너 대단해! 날 이기다니 믿을 수 없어!"
-    },
-    "defeat": {
-      "1": "최강인 최이슬! 너한테 좀 심했나?",
-      "2": "내 포켓몬들의 우아한 수영 테크닉을 봤길 바랄게!",
-      "3": "내 프라이드와 즐거움엔 네 포켓몬들은 상대가 안 돼. "
-    }
-  },
-  "lt_surge": {
-    "encounter": {
-      "1": "마이 전기 포켓몬은 전쟁에서 미를 구했어요! 하우를 유에게 보여줄게요!",
-      "2": "헤이! 쇼크로 유를 항복시키겠어요!",
-      "3": "배틀에서 마이 에너미에게 했던 것처럼 유에게도 펀치를 날리겠어요!"
-    },
-    "victory": {
-      "1": "와우, 키드! 유어 팀은 진짜 대단하군요!",
-      "2": "으흐흑, 유는 스트롱하네요! 마이 전기 트릭도 유에겐 로스트입니다.",
-      "3": "앱솔루트하고 쇼킹한 패배였어요!"
-    },
-    "defeat": {
-      "1": "오우 예! 전기 타입 포켓몬이라면, 미가 월드에서 넘버 원이에요!",
-      "2": "하하하! 키드, 이것이 찌릿찌릿 일렉트릭 배틀입니다!",
-      "3": "포켓몬 배틀은 전쟁, 앤드 나는 유에게 직접 전투를 보여줬습니다!"
-    }
-  },
-  "erika": {
-    "encounter": {
-      "1": "아, 오늘은 날씨가 좋네요…\n음, 배틀일까요? 그럼 더 좋죠.",
-      "2": "제 포켓몬들의 배틀 실력은 제 꽃꽂이 실력만큼 대단하답니다.",
-      "3": "아, 제 포켓몬의 달콤한 향기가 저를 다시 잠들게 하지 않았으면 좋겠는데……",
-      "4": "정원에서 꽃을 보면 마음이 편안해져요.”."
-    },
-    "victory": {
-      "1": "앗! 제 패배를 인정합니다.",
-      "2": "방금 경기 정말 달콤했어요.",
-      "3": "아, 제가 진 것 같네요…",
-      "4": "앗, 맙소사."
-    },
-    "defeat": {
-      "1": "저 조금 걱정했어요. 너무 졸려서…",
-      "2": "어머, 제 풀 포켓몬이 당신을 압도한 것 같네요.",
-      "3": "이 배틀 정말로 편안한 경험이었네요.",
-      "4": "어머… 이게 끝인가요?"
-    }
-  },
-  "janine": {
-    "encounter": {
-      "1": "난 독을 사용하는 인술을 갈고 닦고 있어.\n오늘 수련에서는 너랑 대련할거야!",
-      "2": "아버지는 내가 잘해낼 수 있다고 신뢰하셔.\n 그게 맞는다는 걸 증명할게!",
-      "3": "내 인술은 아버지한테 뒤처지지 않아! 따라올 수 있겠어? "
-    },
-    "victory": {
-      "1": "역시 아직도, 난 더 수련이 필요해… 납득했어.",
-      "2": "네 배틀 기술이 내 인술보다 한 수위야.",
-      "3": "더 스스로 갈고 닦아서, 내 인술을 향상 시키겠어."
-    },
-    "defeat": {
-      "1": "후후후… 독이 네 기력을 모두 가져가버렸네.",
-      "2": "하핫, 너 내 인술에 맞설 기회를 잡지 못했구나!",
-      "3": "나를 향한 아버지의 신뢰, 틀리지 않았다는 걸 증명해냈어."
-    }
-  },
-  "sabrina": {
-    "encounter": {
-      "1": "내 초능력을 통해서, 너의 도착은 예상하고 있었어!",
-      "2": "싸우는 건 좋아하지 않지만 네가 원한다면… 나의 힘을 보여줄게!",
-      "3": "네게서 큰 염원이 느껴져. 그것이 근거 없는 것이 아닌지 지켜보겠어."
-    },
-    "victory": {
-      "1": "너의 힘은… 내가 예견했던 것보다 훨씬 뛰어나…",
-      "2": "나는 너의 힘을 정확하게 예측하지 못했어.",
-      "3": "나 엄청난 초능력을 가지고도, 너처럼 강한 사람을 느끼지 못했네."
-    },
-    "defeat": {
-      "1": "이 승리는… 내가 환상에서 예견한 그대로네!",
-      "2": "아마도 그건, 내가 깊이 느꼈던 또 다른 염원이었을거야…",
-      "3": "무모하게 배틀에 임하기 전에 능력을 갈고닦도록.\n넌 미래가 어떻게 될지 예지할 수 없으니까…"
-    }
-  },
-  "blaine": {
-    "encounter": {
-      "1": "우오오~옷! 화상치료제는 잘 준비했는가!",
-      "2": "나의 포켓몬은 모든 것을 불꽃으로 태워버리는 강한 녀석들뿐이다!",
-      "3": "불꽃과 함께할 준비는 됐는가!"
-    },
-    "victory": {
-      "1": "아무것도 남지 않고 불타버렸다! 재조차 남지 않았어!",
-      "2": "내가 불을 너무 세게 피우지 않았나?",
-      "3": "불태웠다… 하지만 이건 불꽃을 향상시키려는 내 동기를 더욱 뜨겁게 만드는군!"
-    },
-    "defeat": {
-      "1": "나의 타오르는 불길은 진압할 수 없다!",
-      "2": "내 포켓몬은 이번 승리의 열기로 더욱 강해졌다!",
-      "3": "하! 내 열정이 네 것보다 더 밝게 타오르고 있군!"
-    }
-  },
-  "giovanni": {
-    "encounter": {
-      "1": "나, 로켓단의 리더가, 고통의 세계를 느끼게 해주마!",
-      "2": "옛 동료들과 다시 만나기 전, 이곳에서의 훈련은 매우 중요하겠군.",
-      "3": "너는 곧 경험하게 될 실패에 대한 준비가 되어 있지 않군!"
-    },
-    "victory": {
-      "1": "하! 내가 졌다고?! 더 이상 할말이 없군!",
-      "2": "흐음… 넌 내가 이루고자 하는 것을 결코 이해할 수 없을 거다.",
-      "3": "이 패배는 피할 수 없는 것을 단지 지연시킬 뿐.\n때가 되면 잿더미에서 로켓단을 일으켜 세울 것이다."
-    },
-    "defeat": {
-      "1": "자신의 힘을 스스로 잴수 없다는 것은 네가 아직 꼬맹이라는 것을 보여준다고 할 수 있지.",
-      "2": "다시는 나를 방해하지 말도록.",
-      "3": "나에게 도전하는 것이 얼마나 어리석은 짓인지 이해했으면 좋겠군."
-    }
-  },
-  "roxanne": {
-    "encounter": {
-      "1": "당신이 어떻게 싸우는지 보여주시겠어요?",
-      "2": "당신은 여러 트레이너와 싸우면서 많은 것을 배울 수 있을거예요.",
-      "3": "아, 전략짜는 거 들켰네요.\n배틀할까요?"
-    },
-    "victory": {
-      "1": "아, 제가 진 것 같네요.\n승복하겠습니다.",
-      "2": "전 아직도 포켓몬 배틀에 대해서 한참 더 배워야할 것 같네요.",
-      "3": "오늘 여기서 배운 것들을 마음에 담아둬야겠어요."
-    },
-    "defeat": {
-      "1": "전 방금 승부에서 많은 것을 배웠습니다.\n당신도 그랬길 바래요.",
-      "2": "다시 붙을 날이 기대되네요.\n당신이 여기서 배운 걸 활용할 수 있길 바랍니다.",
-      "3": "여태까지 공부해온 것 덕분에 이겼네요."
-    }
-  },
-  "brawly": {
-    "encounter": {
-      "1": "오, 도전자잖아!\n어디 한 번 볼까!",
-      "2": "넌 큰 파란을 일으킬 것 같군.\n승부다!",
-      "3": "폭풍을 일으킬 시간이야!\n가자!"
-    },
-    "victory": {
-      "1": "우와, 너 날 씻겨버렸네!",
-      "2": "내 파도를 타고, 나까지 밀어내다니!",
-      "3": "바위 동굴에서 길을 잃은 기분이야!"
-    },
-    "defeat": {
-      "1": "하핫, 난 큰 파도를 탔다고!\n언제 또 도전해주라.",
-      "2": "언젠가 또 같이 서핑하자고!",
-      "3": "파도가 밀려왔다가 밀려나듯, 언젠가 너도 다시 도전하러 와."
-    }
-  },
-  "wattson": {
-    "encounter": {
-      "1": "찌릿찌릿해질 때가 됐군!\n와하하하핫!",
-      "2": "스파크가 튀도록 해주마!\n와하하하하!",
-      "3": "와하하하하!\n마비 치료제를 가져왔길 바라네!"
-    },
-    "victory": {
-      "1": "이 몸 배터리가 다 됐군!\n와하하하하!",
-      "2": "자네 완전히 날 좌초시켰군!\n와하하하핫!",
-      "3": "스릴 넘치는 배틀, 고맙네!\n와하하하하하!"
-    },
-    "defeat": {
-      "1": "자네의 배터리 재충전하게. 그리고 나에게 도전하러 돌아오도록!\n와하하하핫!",
-      "2": "방금 배틀이 자네에게 짜릿짜릿했길 바란다네!\n와하하하하!",
-      "3": "자네 혹시 내가 이겨서 충격 받았나?\n와하하하핫!"
-    }
-  },
-  "flannery": {
-    "encounter": {
-      "1": "어서오세요! 잠깐, 아냐…\n너를 무너뜨려줄게!",
-      "2": "난 체육관 관장이 된지는 얼마 안됐지만, 널 태워버릴거야!",
-      "3": "할아버지에게 배운 기술을 한 수 보여줄게! 승부다!"
-    },
-    "victory": {
-      "1": "너 우리 할아버지를 생각나게 하네…\n내가 진 게 놀랍진 않아.",
-      "2": "나 너무 열심히 하는 건가?\n너무 열 올리면 안되니깐, 진정해야겠어.",
-      "3": "패배는 날 꺼뜨릴 수 없어.\n트레이닝으로 다시 불을 붙일 때야!"
-    },
-    "defeat": {
-      "1": "할아버지가 자랑스러워하시길…\n언젠가 다시 배틀하자.",
-      "2": "내…내가 이기다니!\n내 방식대로 한 게 통했어!",
-      "3": "조만간 다시 뜨겁게 불타오르는 배틀을 하자!"
-    }
-  },
-  "norman": {
-    "encounter": {
-      "1": "여기까지 오다니 놀랍군.\n한 번 겨뤄볼까.",
-      "2": "관장으로서 최선을 다해 널 이길 거란다.\n가자!",
-      "3": "최선을 다하는 게 좋을 거야.\n승부할 시간이다!"
-    },
-    "victory": {
-      "1": "내가 지다니…?\n규칙은 규칙이니, 흐음.",
-      "2": "담청시티에서 이사한 게 문제였나…?",
-      "3": "믿을 수 없구나.\n훌륭한 승부였어."
-    },
-    "defeat": {
-      "1": "우린 둘 다 최선을 다했지.\n다시 대결할 수 있었으면 좋겠구나.",
-      "2": "우리 집 꼬마에게 도전해보는 것도 좋겠군.\n아마 뭔가 배울 수 있을거다!",
-      "3": "방금 전 배틀 완벽했어.\n다음에도 행운이 함께하길."
-    }
-  },
-  "winona": {
-    "encounter": {
-      "1": "저는 먹이를 찾아서 하늘을 날아다녔어요…\n그리고 당신은 제 타겟입니다!",
-      "2": "배틀이 어떻게 되든, 전 제 비행 포켓몬과 우아하게 승리하겠어요. 승부합시다!",
-      "3": "당신이 높은 곳을 무서워하지 않기를.\n자, 날아올라요!"
-    },
-    "victory": {
-      "1": "저보다 우아하게 나서는 트레이너는 처음 봤습니다.\n훌륭하시네요.",
-      "2": "이런, 제 비행 포켓몬이 추락해버렸네요!\n훌륭한 배틀이었습니다.",
-      "3": "비록 전 떨어졌지만, 제 포켓몬은 다시 날아갈 겁니다!"
-    },
-    "defeat": {
-      "1": "제 비행 포켓몬과 영원히 우아하게 춤출게요.",
-      "2": "우리의 쇼가 즐거웠길 바라요.\n우아한 춤은 끝났습니다.",
-      "3": "우리의 엘레강스한 안무를 다시 보러오지 않을래요?"
-    }
-  },
-  "tate": {
-    "encounter": {
-      "1": "헤헤헤…\n내가 란과 같이 있지 않아서 놀랐지?",
-      "2": "네가 무슨 생각을 하는지 알아…\n승부하고 싶은거지!",
-      "3": "네 움직임을 모두 알고 있는데…\n어떻게 이기려고?"
-    },
-    "victory": {
-      "1": "어쩔 수 없지…\n란이 보고싶다아…",
-      "2": "너와 네 포켓몬과의 유대, 나보다 더 견고한걸.",
-      "3": "란이랑 함께였다면, 우리가 이겼어.\n둘이선 더 잘 할 수 있다구!"
-    },
-    "defeat": {
-      "1": "내 포켓몬과 나는 우수하다구!",
-      "2": "날 못 이긴다면, 넌 란한테도 절대로 못 이겨.",
-      "3": "란과 함께한 엄격한 훈련 덕이야.\n덕분에 포켓몬과 하나가 될 수 있었어."
-    }
-  },
-  "liza": {
-    "encounter": {
-      "1": "후후후…\n내가 풍과 같이 있지 않아서 놀랐지?",
-      "2": "네가 무얼 바라는지 알아…\n포켓몬 배틀, 맞지?",
-      "3": "포켓몬과 하나가 된 사람…\n어떻게 이기려고?"
-    },
-    "victory": {
-      "1": "어쩔 수 없지…\n풍이 보고싶다아…",
-      "2": "너와 네 포켓몬과의 유대, 나보다 더 견고한걸.",
-      "3": "풍이랑 함께였다면, 우리가 이겼어.\n둘이선 더 잘 할 수 있다구!"
-    },
-    "defeat": {
-      "1": "내 포켓몬과 내가 승리한거야.",
-      "2": "날 못 이긴다면, 넌 풍한테도 절대로 못 이겨.",
-      "3": "풍과 함께한 엄격한 훈련 덕이야.\n덕분에 포켓몬과 싱크로 될 수 있었어."
-    }
-  },
-  "juan": {
-    "encounter": {
-      "1": "지금은 겸양을 부릴 때가 아니군요.\n승부합시다!",
-      "2": "아하하하, 물 포켓몬과 함께 아트를 보여드리겠습니다!",
-      "3": "태풍이 다가오는군요!\n저를 테스트해주시겠습니까?",
-      "4": "자, 마음껏 봐주십시오.\n저와 포켓몬이 이루어내는 물의 일루전을!"
-    },
-    "victory": {
-      "1": "당신은 윤진 관장을 뛰어넘을 지니어스군요!",
-      "2": "당신이 훈련할 때 저는 엘레강스에 집중했습니다.\n당신이 이기는 건 당연하죠.",
-      "3": "아하하하하!\n잘했습니다, 이번엔 당신이 이겼네요.",
-      "4": "모든 것을 극복하는 브릴리언트 스킬, 당신에게 느껴지네요."
-    },
-    "defeat": {
-      "1": "저와 포켓몬이 이루어내는 물의 일루전이 승리했습니다.",
-      "2": "아하하핫, 저는 이겼고, 당신은 졌습니다.",
-      "3": "겉옷 빌려드릴까요? 아마도 배틀에 도움이 될겁니다!\n아하하하, 농담입니다!",
-      "4": "제가 승리자군요! 그리고, 당신은 졌네요."
-    }
-  },
-  "crasher_wake": {
-    "encounter": {
-      "1": "철썩! 철썩! 조심해라!\n맥시멈 가면이…지금…간다!",
-      "2": "철썩! 철썩! 파도의 맥시멈 가면!",
-      "3": "밀물같은 힘으로 쓸려나가도록 해보실까!!"
-    },
-    "victory": {
-      "1": "저절로 웃음이 나오게 되는군!\n크하하핫! 정말 훌륭했다!",
-      "2": "우왓! 끝나버렸나!\n뭐랄까…\n좀 더 싸우고 싶은 기분이야!",
-      "3": "이럴수가!?"
-    },
-    "defeat": {
-      "1": "으하하핫! 보람차군!",
-      "2": "내가 이겼지만, 아쉽군! 좀 더 배틀하고 싶은데!",
-      "3": "잘 가게나!"
-    }
-  },
-  "falkner": {
-    "encounter": {
-      "1": "넓은 하늘을 화려하게 나는 새 포켓몬의 진정한 강함을 알게 해주겠다!",
-      "2": "바람이여, 나에게 오라!",
-      "3": "아버지, 내 시합을 하늘에서도 봐줘!"
-    },
-    "victory": {
-      "1": "알았다… 미련없이 땅에 내려가지.",
-      "2": "패배는 패배니까. 넌 정말 강하군.",
-      "3": "…큭! 그래, 내가 졌다."
-    },
-    "defeat": {
-      "1": "아버지! 소중히 여기던 새 포켓몬으로 이겼어…",
-      "2": "언제나 새 포켓몬이 최강이다!",
-      "3": "아버지를 따라 잡은 기분이군!"
-    }
-  },
-  "nessa": {
-    "encounter": {
-      "1": "똑똑한 네가 어떤 계획을 세우고 있든지, 나와 내 파트너가 가라앉혀줄 테니까 문제 없어.",
-      "2": "잡담하려고 나온 게 아니야. 이기려고 나온 거지!",
-      "3": "이건 내 포켓몬이 주는 작은 선물이야… 네가 잘 받아줘야 해!"
-    },
-    "victory": {
-      "1": "너와 네 포켓몬 정말로 너무…",
-      "2": "어째서…? 어떻게 이럴 수 있지?!",
-      "3": "완전히 씻겨 나갔잖아!"
-    },
-    "defeat": {
-      "1": "성난 파도가 다시 부딪혀올거니까!",
-      "2": "승리의 파도를 탈 시간이야!",
-      "3": "에헤헤!"
-    }
-  },
-  "melony": {
-    "encounter": {
-      "1": "봐주지는 않을 거란다!",
-      "2": "그럼 이제, 시작해도 될 것 같네.",
-      "3": "영하의 세계로 안내해주마!"
-    },
-    "victory": {
-      "1": "너… 꽤 하는구나?",
-      "2": "만약 주변에서 마쿠와를 찾는다면, 그 때는 따끔한 맛을 보여주도록 하렴, 알았지?",
-      "3": "아이스 브레이킹을 너무 문자 그대로 받아들인 것 같은데…"
-    },
-    "defeat": {
-      "1": "이제 전투가 얼마나 치열할 수 있는 지 알겠니?",
-      "2": "아하하! 내가 또 이긴 것 같네!",
-      "3": "너 혹시 봐준거니?"
-    }
-  },
-  "marlon": {
-    "encounter": {
-      "1": "너 강해보이네! 받아라! 승부 시작이야!",
-      "2": "난 넓은 대양처럼 강인하다고. 너 분명히 휩쓸려 갈거야.",
-      "3": "오, 내가 너를 마주 보고 있군! 둘다 파도에서 떨어지겠어."
-    },
-    "victory": {
-      "1": "너… 좋은 포켓몬을 키우고 있구나! 꽤 하는군! 끝내주는 트레이너야!",
-      "2": "강해 보이는 게 아니고 진짜 강하구나! 에-, 나도 휩쓸려버렸어!",
-      "3": "넌 거친 파도처럼 강인하구나!"
-    },
-    "defeat": {
-      "1": "넌 강하지만, 바다를 흔들기에는 역부족이네, 그치!",
-      "2": "아하핫! 내가 또 이긴 것 같네!",
-      "3": "달콤하네, 승리 역시 달콤하고!"
-    }
-  },
-  "shauntal": {
-    "encounter": {
-      "1": "미안합니다. 도전자이시죠?\n고스트포켓몬 조련사인 사천왕 망초가 상대하겠습니다.",
-      "2": "겨루었던 트레이너와 포켓몬의 마음이 통하는 모습을 이야기로 만드는 것을 좋아해서요!\n그러니까 당신들에 대한 취재를 허락해 주세요?",
-      "3": "포켓몬과 함께 일하는 모든 사람들은 각자 이야기를 갖고 있죠.\n어떤 이야기를 들려드릴까요?"
-    },
-    "victory": {
-      "1": "…우와. 저 아연실색 망연자실이에요!",
-      "2": "미-미 미안합니다! 먼저 포켓몬에게 사과해야지…\n\n나 때문에 괴로운 기억을 만들게 돼서 정말 미안해!",
-      "3": "그치만, 전 여전히 사천왕인걸요!"
-    },
-    "defeat": {
-      "1": "에헤헤.",
-      "2": "다음 소설의 완벽한 소재를 얻었다!",
-      "3": "그리고 이렇게, 또 다른 이야기가 끝났습니다…"
-    }
-  },
-  "marshal": {
-    "encounter": {
-      "1": "노간주 스승님이, 잠재력을 보고 네게 관심을 갖고 계시더군.\n그 힘의 한계까지 데려가는 것이 이번 의도다! 그럼 간다!",
-      "2": "승리, 압도적인 승리, 내가 바라는 것이다! 강인한 도전자여, 간다!",
-      "3": "깨뜨리는 것은 약한 자신, 관철하는 것은 강한 신념!\n 그리고 바라는 것은 압도적인 승리!"
-    },
-    "victory": {
-      "1": "후우! 잘 싸웠다!",
-      "2": "역시 대단하구나! 싸워서 더욱더 높은 곳을 노려라…!",
-      "3": "너와 네 포켓몬이 보여준 그 힘, 감명 깊군…"
-    },
-    "defeat": {
-      "1": "흐음.",
-      "2": "좋은 승부였다.",
-      "3": "하압! 하압! 히야아아압!!!!"
-    }
-  },
-  "cheren": {
-    "encounter": {
-      "1": "넌 내 오랜 친구가 생각나게 하는군. 그 덕분에 이 배틀이 기대돼!",
-      "2": "왜 하고 있는지 생각하지 않으면, 포켓몬 배틀은 의미가 없어 . \n$좋게 말하면, 함께 포켓몬과 승부하는 것이 무의미해 지는 것이지.",
-      "3": "내 이름은 체렌! 체육관 관장이자 선생님을 하고 있지! 널 만나게 되서 기쁘군."
-    },
-    "victory": {
-      "1": "고마워! 내 안에 무엇이 부족했는지 알게 됐네.",
-      "2": "고마워! 내가 추구하는 이상에 조금 다가간 것 같아.",
-      "3": "으음… 이건 문제가 있군."
-    },
-    "defeat": {
-      "1": "체육관 관장으로서, 나는 넘어야할 벽이 되고자 하고 있거든.",
-      "2": "좋았어!",
-      "3": "포켓몬이 곁에 있었기 때문에 여기까지 올 수 있었어.\n생명체와 생명체라는 동등한 관계에서 포켓몬이 우리에게 도움을 주는 이유를 생각해 볼 필요는 있지."
-    }
-  },
-  "chili": {
-    "encounter": {
-      "1": "이얏호-! 형제중 가장 강한 나하고 놀자고!",
-      "2": "짜잔! 불꽃타입 불꽃의 남자 팟, 바로 너의 상대가 되어주지!",
-      "3": "나와 내 불타오르는 불꽃타입 포켓몬들이 뭘 할수 있는지 보여주지!"
-    },
-    "victory": {
-      "1": "졌지만… 모 두 불 태 웠 어!!",
-      "2": "와우! 불태워졌네!",
-      "3": "으악! 너가 나를 이겨버렸잖아!"
-    },
-    "defeat": {
-      "1": "난 지금 불타오르고 있어, 나와 싸우게 된다면 넌 다치게 될거야!",
-      "2": "불장난하면 밤에 이불에 지도를 그리는 법이지!",
-      "3": "그러니까, 상대가 나였잖아? 너에게는 처음부터 기회가 없었다고!"
-    }
-  },
-  "cilan": {
-    "encounter": {
-      "1": "개인적으로 받아들이지 마세요… 감정 상하지도 말고요… 저와 제 풀타입 포켓몬들이라면…\n$음… 무슨 일이 있더라도 배틀을 할 겁니다.",
-      "2": "네. 저로 괜찮다면 진심을 담아서 상대해 드리겠습니다.",
-      "3": "네… 그, 음, 저는 덴트입니다, 풀타입 포켓몬을 좋아합니다."
-    },
-    "victory": {
-      "1": "…에- 그게…  끝나버렸나요?",
-      "2": "…놀랐습니다. 당신 아주 강하군요. \n$팟이나 콘이라도 이길 수 없었을 것 같습니다…",
-      "3": "…어라, 타이밍이 좀 잘못된것 같네요?"
-    },
-    "defeat": {
-      "1": "어라? 제가 이긴 건가요?",
-      "2": "제 생각엔… \n$아무래도 제가 이겼어야만 했을 거라 생각합니다, 팟과 콘이랑 배틀하면서 우리는 모두 더 강해졌기 때문이죠.",
-      "3": "정말… 아주 짜릿한 경험이었습니다…"
-    }
-  },
-  "roark": {
-    "encounter": {
-      "1": "트레이너로서 너의 실력이 어느 정도인지 그리고 함께 싸울 포켓몬이 얼마나 강한지 확인해보겠어!",
-      "2": "자 간다! 내 자랑이자 기쁨인 바위타입 포켓몬들이야!",
-      "3": "바위타입 포켓몬이야말로 최고지!",
-      "4": "트레이너로서 너의 실력이 어느 정도인지 그리고 함께 싸울 포켓몬이 얼마나 강한지 확인해보겠어!"
-    },
-    "victory": {
-      "1": "이-이럴수가! 열심히 단련시킨 포켓몬들이!",
-      "2": "…져버린 건가. 다음엔 지하통로에서 화석캐기 승부를 하고 싶구나.",
-      "3": "네 실력이라면 승리는 당연한 결과겠지.",
-      "4": "뭐-뭐야?! 이럴 수가! 이것도 부족했단 말인가?",
-      "5": "내가 실수했군."
-    },
-    "defeat": {
-      "1": "봤지? 이게 바로 내가 자랑하는 바위 스타일 전투야!",
-      "2": "고마워! 이번 승부로 아버지를 이길 수 있겠다는 자신감이 생겼어!",
-      "3": "정말 단단한 바위를 뚫고 나온 기분인데!"
-    }
-  },
-  "morty": {
-    "encounter": {
-      "1": "조금만 더 노력하면, 내가 전설의 포켓몬을 만나는 미래가 보여.\n$내가 그 수준에 도달할 수 있게 도와줘!",
-      "2": "커다란 무지개색 포켓몬은 진정한 강함을 가진 트레이너 앞에 나타난다는 이야기가 있어. \n$난 그 이야기를 믿고, 줄곧 이 곳에서 몰래 수행하고 있어. 그 결과로, 다른 사람들은 볼 수 없는 것을 볼 수 있게 됐지. \n$내겐 그 포켓몬을 나타나게 할 사람의 그림자가 보이거든. \n$난 그게 나라고 믿어! 넌 내가 그 수준에 올라갈 수 있도록 도와줘야겠어!",
-      "3": "네가 믿든 믿지 않든, 불가사의한 힘은 존재해.",
-      "4": "넌 내 수련의 결실을 보게 될 거야.",
-      "5": "포켓몬과 너의 영혼을 하나로 만들어야 해. 가능하겠어?",
-      "6": "저기, 너 내 수행의 일부분이 되고 싶은거지?"
-    },
-    "victory": {
-      "1": "나는 아직 멀었구나…",
-      "2": "그래… 여행으로 먼 곳을 돌아다니면서, 나보다 훨씬 많은 것을 봐왔구나.\n$네가 조금 부럽네…",
-      "3": "이게 어떻게 가능한 거지…",
-      "4": "우리의 잠재력은 그렇게 다르진 않은 것 같아.\n$그치만 넌 그것과 다른 무언가를 많이 갖고 있는 것 같네… 흐음.",
-      "5": "수련이 더 필요하겠군.",
-      "6": "안타깝게 됐네."
-    },
-    "defeat": {
-      "1": "내가…다시 한 발짝 앞섰어.",
-      "2": "후후훗…",
-      "3": "뭐-뭐야?! 이럴 수가! 그것도 부족해?",
-      "4": "정말 단단한 바위를 뚫고 나온 기분인데!",
-      "5": "아하하하하!",
-      "6": "내가 이길 줄 알았어!"
-    }
-  },
-  "crispin": {
-    "encounter": {
-      "1": "이기고 싶으니까 이기고 말겠어!",
-      "2": "싸우고 싶으면 싸운다! 이거면 충분하지 않아!?"
-    },
-    "victory": {
-      "1": "이기고 싶었는데…졌잖아!",
-      "2": "이기지 못해서…지고 말았어!"
-    },
-    "defeat": {
-      "1": "잠시만. 나 지금 이긴거지? 이긴 거 맞지! 기분 좋은데!",
-      "2": "우와아! 이거 굉장한데!"
-    }
-  },
-  "amarys": {
-    "encounter": {
-      "1": "네리네는 그 사람을 구원하고 싶습니다. 그렇기에 패배는 용납되지 않습니다.\n$… 승부를 시작합니다."
-    },
-    "victory": {
-      "1": "네리네는… 안 된다는 건가요."
-    },
-    "defeat": {
-      "1": "네리네가 승리했습니다. 수고하셨습니다."
-    }
-  },
-  "lacey": {
-    "encounter": {
-      "1": "이번에는 사천왕으로서 승부하는 거니까 평소 사용하는 아이들로 상대해 드릴게요!"
-    },
-    "victory": {
-      "1": "멋진 포켓몬 배틀이었어요!"
-    },
-    "defeat": {
-      "1": "당신의 포켓몬의 노력에 박수를 보내주세요!"
-    }
-  },
-  "drayton": {
-    "encounter": {
-      "1": "의자는 좋은 거야. 너도 그렇게 생각해? 정말 고마운 물건이지. \n$왜 다들 앉지 않는 걸까. 서 있는 건 힘들잖아!"
-    },
-    "victory": {
-      "1": "전보다 더 강해질 줄이야!"
-    },
-    "defeat": {
-      "1": "헤헤헷! 내 승리야. 분한 건 알겠지만 카지처럼 나가떨어지지마, 응?"
-    }
-  },
-  "ramos": {
-    "encounter": {
-      "1": "그래, 올곧게 자란 초목을 모아서 만든 풀 정글짐은 어땠는가?\n$자네가 느낀 그것이 나의 체육관 관장으로서의 실력이네! 한번 확인해 보겠나?"
-    },
-    "victory": {
-      "1": "포켓몬은 자네를 믿고, 자네는 그들을 믿는다…가슴이 후련해지는 승부였구먼."
-    },
-    "defeat": {
-      "1": "호호호…연약해 보이는 풀잎은 콘크리트도 뚫을 수 있다네."
-    }
-  },
-  "viola": {
-    "encounter": {
-      "1": "패배의 분함도 승리의 순간도…\n$둘 다 최고의 피사체야! 정말 멋져 멋져! \n$자, 그럼 덤비렴!",
-      "2": "나 비올라는 셔트 찬스를 노리는 것처럼--승리를 노릴 거야!"
-    },
-    "victory": {
-      "1": "너와 네 포켓몬은 최고의 콤비구나! 정말 멋져 멋져!",
-      "2": "렌즈 너머의 세계와 포켓몬의 마음으로 보는 세계…\n$똑같이 보이는 풍경이지만 다양한 세계가 겹쳐져 있는 거야."
-    },
-    "defeat": {
-      "1": "내가 승리한 순간을 찍은 사진은 정말 멋져 멋져!",
-      "2": "좋아! 멋진 사진을 찍었어!"
-    }
-  },
-  "candice": {
-    "encounter": {
-      "1": "나, 무청에게 도전하고 싶은거야? 좋아! 강한 사람을 기다리고 있었으니까!\n$그치만 말해두는데, 집중하는 방법을 아는 나도 강력하거든.",
-      "2": "포켓몬도 멋도 연애도 정신 집중이 중요하다고!\n$무슨 뜻인지 보여줄테니까 각오해!"
-    },
-    "victory": {
-      "1": "있지, 나 조금 불타오르게 됐어! 널 조금 존경하게 될지도 몰라.",
-      "2": "우와! 제법인데! 내가 존경하게 만들다니!\n$네 집중력과 의지, 완전히 나를 압도하는 같아. "
-    },
-    "defeat": {
-      "1": "이기고자 하는 의지는 전해졌지만, 난 지지 않았어!",
-      "2": "봤지? 무청의 집중력! 내 포켓몬의 집중력도 대단하다구!"
-    }
-  },
-  "gardenia": {
-    "encounter": {
-      "1": "너에게선 승리의 기운이 느껴져. 어쨌든 재밌을 것 같아. 포켓몬 승부하자!"
-    },
-    "victory": {
-      "1": "대단해! 너 정말 강하구나!"
-    },
-    "defeat": {
-      "1": "그렇지! 나와 포켓몬은 완벽해!"
-    }
-  },
-  "aaron": {
-    "encounter": {
-      "1": "좋습니다! 그럼 상대해 드리죠!"
-    },
-    "victory": {
-      "1": "승부는 딥하고 컴플렉스한 일이네요…"
-    },
-    "defeat": {
-      "1": "사천왕을 상대로 하는 승리는 쉽게 오지 않는다구요."
-    }
-  },
-  "cress": {
-    "encounter": {
-      "1": "맞습니다! 당신은 저와 제 자랑스러운 물타입 포켓몬들과 상대하게 될것입니다."
-    },
-    "victory": {
-      "1": "곤란하네… 이 콘이 질 줄이야."
-    },
-    "defeat": {
-      "1": "제가 당신의 상대였기 때문에 이건 당연한 결과였습니다."
-    }
-  },
-  "allister": {
-    "encounter": {
-      "1": "……어니언이야.\n……가 간다…"
-    },
-    "victory": {
-      "1": "충격을 받아서… 가면을 떨어뜨릴 뻔 했지만…\n$네가 얼마나 강한지 확실히 봤어."
-    },
-    "defeat": {
-      "1": "이-이게 내 실력이니까!"
-    }
-  },
-  "clay": {
-    "encounter": {
-      "1": "실망스럽군! 나를 기다리게 하다니, 이 꼬마가. 아무튼 실력을 확인해 볼까!"
-    },
-    "victory": {
-      "1": "이런 이런… 진심으로 싸워서 진 거라 오히려 시원한 기분이군!"
-    },
-    "defeat": {
-      "1": "중요한 것은 패배에 어떻게 반응하는 거다. \n$그렇기 때문에 패배를 연료로 삼아 나아가는 사람들은 강인하지."
-    }
-  },
-  "kofu": {
-    "encounter": {
-      "1": "물포켓몬의 풀코스를! 배 터지게 먹여 주도록 하마!"
-    },
-    "victory": {
-      "1": "우옷! 우오오옷! 이렇게 팔팔한 트레이너가 다 있다니!"
-    },
-    "defeat": {
-      "1": "젊은 친구! 다음에 또 만나기를 기대하고 있으마!"
-    }
-  },
-  "tulip": {
-    "encounter": {
-      "1": "리파의 기술로 너의 포켓몬들을 지금보다 훨~씬 아름답게 만들어 줄게!"
-    },
-    "victory": {
-      "1": "너의 강함은 풀 수 없는 매직이구나."
-    },
-    "defeat": {
-      "1": "…리파의 업계에서는 어중간한 재능을 가진 사람은 대체로 금방 사라져 버려."
-    }
-  },
-  "sidney": {
-    "encounter": {
-      "1": "음, 좋은 표정이야. 꽤나 즐길 수 있겠는데.\n$좋아! 아주 좋아! 좋았어!\n$우리 함께, 포켓몬리그에서만 맛볼 수 있는 배틀을 즐겨보도록 하자!"
-    },
-    "victory": {
-      "1": "이런, 이런 져버렸군? 뭐, 꽤 즐겼으니 상관없지만."
-    },
-    "defeat": {
-      "1": "기분 나빠하지 마, 알겠지?"
-    }
-  },
-  "phoebe": {
-    "encounter": {
-      "1": "송화산에서 수행하면서, 고스트 타입 포켓몬과 마음이 통하게 됐어. \n$응, 나와 내 포켓몬의 유대감은 정말 강해! \n$이런 내 포켓몬들에게 과연 데미지를 줄 수 있을지 한번 시험해봐!"
-    },
-    "victory": {
-      "1": "아- 아, 내가 져버렸다."
-    },
-    "defeat": {
-      "1": "언젠가 다시 승부할 수 있기를 기대할게!"
-    }
-  },
-  "glacia": {
-    "encounter": {
-      "1": "이곳에 도전하러 오는 건 모두 어설픈 트레이너와 포켓몬뿐…. \n$당신은 어떤가요? 제 진짜 실력을 발휘해도 괜찮을 정도라면 정말 기쁠텐데 말이죠…!"
-    },
-    "victory": {
-      "1": "당신과… 당신 포켓몬들의 뜨거운 혼!\n$정말로 압도적인 뜨거움이네요. \n$내 얼음 기술로 피해를 주지 못한 것도 놀랍지 않을정도로요!"
-    },
-    "defeat": {
-      "1": "저런, 정말로 치열한 승부였네요."
-    }
-  },
-  "drake": {
-    "encounter": {
-      "1": "파트너로 포켓몬과 함께하는 승부에 무엇이 필요한지 넌 알고 있는가? \n$그걸 모른다면 넌 이 몸을 이길 수 없다!"
-    },
-    "victory": {
-      "1": "훌륭하다, 라고 할 만 하군!"
-    },
-    "defeat": {
-      "1": "난 승부에서 최선을 다했으니까!"
-    }
-  },
-  "wallace": {
-    "encounter": {
-      "1": "뭐랄까, 너의 분위기가 조금 변한 것 같은… \n$그런 느낌이 드는군. 자, 그럼 한번 확인해볼까? 너와 포켓몬의 힘을. \n$그리고 확실하게 보여주도록 하지. 나와 포켓몬에 의한 물의 일루전을!"
-    },
-    "victory": {
-      "1": "훌륭하군. 넌 정말 굉장한 포켓몬 트레이너다. \n$그런 너와 너의 포켓몬을 만나게 된 걸 기쁘게 생각해. 스스로 그 가치를 증명하다니!"
-    },
-    "defeat": {
-      "1": "거대한 일루전이로군!"
-    }
-  },
-  "lorelei": {
-    "encounter": {
-      "1": "얼음포켓몬을 내보내면 대적할 사람이 없지! 상대를 얼린다는 건 매우 강력한 공격이야.\n$네 포켓몬이 꽁꽁 얼면 그때부턴 내 손바닥 위거든! 아하하! 준비됐어?"
-    },
-    "victory": {
-      "1": "어떻게 감히!"
-    },
-    "defeat": {
-      "1": "얼어붙은 넌 아무것도 할 수 없어."
-    }
-  },
-  "will": {
-    "encounter": {
-      "1": "나는 전세계를 돌아다니며, 강한 에스퍼 포켓몬을 만들도록 수행해왔다.\n$계속 더 정진하겠다! 패배는 선택지에 없어!"
-    },
-    "victory": {
-      "1": "이… 내가… 믿을수 없어…"
-    },
-    "defeat": {
-      "1": "근소한 차이였다. 네게 부족한 것이 무엇인지 궁금하군."
-    }
-  },
-  "malva": {
-    "encounter": {
-      "1": "심장이 불에 타버릴 것만 같아요. \n$당신에 대한 증오로 불타고 있거든요, 얄미운 트레이너!"
-    },
-    "victory": {
-      "1": "도전자가… 사천왕 파키라에게서 멋지게 승리를 쟁취했습니다!"
-    },
-    "defeat": {
-      "1": "기쁘네요! 당신을 짓밟을 수 있어서 말이죠!"
-    }
-  },
-  "hala": {
-    "encounter": {
-      "1": "그럼…진심을 담아서 진지한 할라로 임하겠다!"
-    },
-    "victory": {
-      "1": "네가 순례하면서 갖추게 된 강함을 느낄 수 있었다."
-    },
-    "defeat": {
-      "1": "하하! 경쾌한 승부였구나!"
-    }
-  },
-  "molayne": {
-    "encounter": {
-      "1": "사촌인 마마네에게 캡틴 자리는 줬지만, 아직 실력에는 자신 있어요. \n$제 실력은 초신성처럼 빛나니까요!"
-    },
-    "victory": {
-      "1": "확실히 겨룰 흥미로운 트레이너를 찾았네요!"
-    },
-    "defeat": {
-      "1": "아하하. 흥미로운 배틀이었네요."
-    }
-  },
-  "rika": {
-    "encounter": {
-      "1": "실컷 귀여워해 줄 테니까… 한 번 열심히 해 보라고!"
-    },
-    "victory": {
-      "1": "너, 꽤 하는구나!"
-    },
-    "defeat": {
-      "1": "아하하! 제법인데! 역시 너는 재밌는 녀석이라니까!"
-    }
-  },
-  "bruno": {
-    "encounter": {
-      "1": "우월한 힘으로 너를 부숴주지! 우! 하~앗!"
-    },
-    "victory": {
-      "1": "하? 어떻게 내가 진 거지?"
-    },
-    "defeat": {
-      "1": "얼마든지 내게 도전 할 수 있지만, 결과는 절대 바뀌지 않을 거다!"
-    }
-  },
-  "bugsy": {
-    "encounter": {
-      "1": "내 이름은 호일! 벌레 포켓몬에 대해서라면 누구에게도 지지 않아!"
-    },
-    "victory": {
-      "1": "우와, 대단해! 넌 포켓몬 전문가구나!\n내 연구는 아직 안 끝났네. 응, 네가 이겼어."
-    },
-    "defeat": {
-      "1": "고마워! 방금 승부 덕분에, 내 연구도 진전을 이룬 것 같아!"
-    }
-  },
-  "koga": {
-    "encounter": {
-      "1": "후하하하! 포켓몬은 단순히 강한 것만이 아니다--곧 알려주지!"
-    },
-    "victory": {
-      "1": "하! 스스로 증명해냈군!"
-    },
-    "defeat": {
-      "1": "인술을 피하는 방법을 배워보겠나?"
-    }
-  },
-  "bertha": {
-    "encounter": {
-      "1": "그럼, 할머니가 네가 얼마나 해낼 수 있는지 보도록 할게?"
-    },
-    "victory": {
-      "1": "좋아! 꼬마야, 정말로, 인상적이었단다.\n$네 포켓몬은 너를 믿고 승리를 위해 최선을 다했구나.\n$비록 내가 졌지만, 좋아서 바보같이 웃음이 나오는구나!"
-    },
-    "defeat": {
-      "1": "호호호! 이 할머니가 이겼구나!"
-    }
-  },
-  "lenora": {
-    "encounter": {
-      "1": "자 그럼 도전자여, 애정을 담아 키운 포켓몬으로 어떤 방식으로 싸우는지 연구해 보겠다!"
-    },
-    "victory": {
-      "1": "너에 대한 내 가설이 맞았네. 재능만 있는 게 아니라… 대단한 녀석이구나! 너 반할것 같잖아!"
-    },
-    "defeat": {
-      "1": "아 하 하! 패배했다면, 그 이유를 분석하고, 다음 승부에서 그 지식을 활용하도록!"
-    }
-  },
-  "siebold": {
-    "encounter": {
-      "1": "살아가는 동안, 궁극적인 요리와 강력한 상대를 찾기 위해… 열과 성을 다할 것입니다!"
-    },
-    "victory": {
-      "1": "당신에 대한 기억을 제 가슴 속에 담아두겠습니다."
-    },
-    "defeat": {
-      "1": "우리의 포켓몬 배틀은 영혼의 양식과 같습니다. 그건 저를 계속 지탱할 거예요. \n$이것이 제가 전투에서 모든 것을 바친 당신에게, 경의를 표하는 방법입니다!"
-    }
-  },
-  "roxie": {
-    "encounter": {
-      "1": "간다! 너의 이성을 싹 날려줄 거야!!"
-    },
-    "victory": {
-      "1": "굉-장해! 네 이성, 이미 나보다 TOXIC해버렸잖아!"
-    },
-    "defeat": {
-      "1": "헤이, 잠깐-! 좀 더 진지해져! 넌 더 날아가야한다구!"
-    }
-  },
-  "olivia": {
-    "encounter": {
-      "1": "여기에 소개는 필요 없지. 자, 라이치님과 승부할 시간이다!"
-    },
-    "victory": {
-      "1": "정말 훌륭하군… 당신과 포켓몬 둘 다…"
-    },
-    "defeat": {
-      "1": "흐-음."
-    }
-  },
-  "poppy": {
-    "encounter": {
-      "1": "우와~! 뽀삐와 포켓몬 승부가 하고 싶으세요?"
-    },
-    "victory": {
-      "1": "훌쩍, 으에엥~"
-    },
-    "defeat": {
-      "1": "만세~! 만세~ 목수, 성공했어요! \n$에헴! 리벤지 매치는 언제든지 받아 줄게요!"
-    }
-  },
-  "agatha": {
-    "encounter": {
-      "1": "포켓몬은 싸우게 하려고 있는 것이야! 진정한 싸움이라는 것을 보여주겠다!"
-    },
-    "victory": {
-      "1": "이런! 넌 무언가 특별하구나, 꼬마야!"
-    },
-    "defeat": {
-      "1": "바하하하. 제대로 된 승부는 이렇게 하는거다!"
-    }
-  },
-  "flint": {
-    "encounter": {
-      "1": "뜨겁게 타오를 준비는 됐겠지, 이제 곧 대폭발이 다가올테니까!"
-    },
-    "victory": {
-      "1": "놀랍군! 네 기술이 너무 뜨거워서, 내가 미적지근해보이잖아!"
-    },
-    "defeat": {
-      "1": "하? 그게 다야? 좀 더 열정이 필요해보이는걸."
-    }
-  },
-  "grimsley": {
-    "encounter": {
-      "1": "이긴 자가 모든 것을 갖고 패배한 자에겐 아무것도 남지 않는다."
-    },
-    "victory": {
-      "1": "누군가가 이기면 상대한 누군가가 진다… 난 다음 승리를 목표로 하겠어!"
-    },
-    "defeat": {
-      "1": "누군가가 이기면, 그 사람과 싸운 사람은 지게 되는 것이지."
-    }
-  },
-  "caitlin": {
-    "encounter": {
-      "1": "피어난 꽃에서 나타난 것은 나. 거기 있는 당신…\n$강함과 상냥함을 함께 갖춘 포켓몬 트레이너인 것 같네. \n$이 카틀레야가 대전 상대로 원하는 건 최고의 강함… \n$너도 그 실력을 마음껏 펼쳐 봐!"
-    },
-    "victory": {
-      "1": "대전을 통해서 저도 포켓몬도 성장합니다. 감사드립니다."
-    },
-    "defeat": {
-      "1": "더욱 엘레강트하고 엑셀런트하게 승리를 쟁취하고 싶거든."
-    }
-  },
-  "diantha": {
-    "encounter": {
-      "1": "미래를 향한 희망으로 빛나는 당신과, 당신의 포켓몬을 상대로 승부하는 것…\n$솔직히, 매일매일 새로운 날을 위해 필요한 에너지가 채워지는 것 같아요! 정말로요!"
-    },
-    "victory": {
-      "1": "고귀한 영혼을 지닌 포켓몬과 트레이너의 모습에 격하게 마음이 흔들려서…"
-    },
-    "defeat": {
-      "1": "정말, 환상적이야! 어떻게 생각하시나요? 저의 포켓몬들, 꽤 멋있었죠?"
-    }
-  },
-  "wikstrom": {
-    "encounter": {
-      "1": "잘 왔네, 젊은 도전자여! 이 몸은 사천왕 중 한 명인 강철의 남자 간피다! \n$자 그럼 간다, 간다! 간닷!"
-    },
-    "victory": {
-      "1": "정말 영광이군! 자네의 포켓몬과 서로 신뢰하는 힘, 날 능가하는군!!"
-    },
-    "defeat": {
-      "1": "이게 무슨 마법이지? 내 마음의 떨림이 멈추질 않는군! \n$가치 있는 상대를 이기는 것은 영혼에 날개를 달아주는 것과 같지--그런 내가 비상하는 것일까!"
-    }
-  },
-  "acerola": {
-    "encounter": {
-      "1": "포켓몬 배틀은 언제나 재미있지! 자, 내가 상대해줄게!"
-    },
-    "victory": {
-      "1": "아세로라… 입이 딱 벌어졌어! 어떻게 해낸 거야?!"
-    },
-    "defeat": {
-      "1": "후아~! 놀라운 승리네!"
-    }
-  },
-  "larry_elite": {
-    "encounter": {
-      "1": "…안녕하십니까, 청목입니다.\n$귀찮게도 저는 사천왕도 겸임하고 있습니다."
-    },
-    "victory": {
-      "1": "날고 있는 새포켓몬도 떨어뜨릴 기세로군요."
-    },
-    "defeat": {
-      "1": "치프와 만나기로 한 시각이군요."
-    }
-  },
-  "lance": {
-    "encounter": {
-      "1": "널 기다리고 있었다. 그 실력을 시험해보겠어.",
-      "2": "여기까지 올 수 있을거라고 생각했다. 슬슬 시작해볼까."
-    },
-    "victory": {
-      "1": "날 따라잡았군. 훌륭해!",
-      "2": "다른 트레이너가 날 이길 거라곤 생각 못했는데… 놀랍군."
-    },
-    "defeat": {
-      "1": "근소하군. 다시 해볼까?",
-      "2": "네가 약해서가 아니다. 신경쓰지 말도록."
-    }
-  },
-  "karen": {
-    "encounter": {
-      "1": "난 카렌! 내 악 타입 포켓몬과의 승부를 원하니?",
-      "2": "난 네가 이전에 만났던 트레이너들과는 달라.",
-      "3": "강한 포켓몬, 약한 포켓몬, 그런 건 사람이 멋대로 정하는 것."
-    },
-    "victory": {
-      "1": "좋아하는 마음이 전해진다면 포켓몬도 답할거야. 그렇게 강해지는 거지",
-      "2": "난 내가 선택한 길을 걸어갈거야.",
-      "3": "챔피언이 너를 기다리고 있어."
-    },
-    "defeat": {
-      "1": "정말 강한 트레이너라면 좋아하는 포켓몬으로 이길 수 있도록 열심히 해야 해.",
-      "2": "뭐, 비교적 재밌었어.",
-      "3": "언제라도 다시 찾아와, 상대해줄게."
-    }
-  },
-  "milo": {
-    "encounter": {
-      "1": "그렇다는 건 당신이 포켓몬을 아주 깊게 이해하고 있다는 뜻이겠죠? \n$이거 만만치 않은 승부가 되겠네요!  \n$저도 다이맥스를 사용해야겠어요!"
-    },
-    "victory": {
-      "1": "풀의 힘이 모두 시들어버리다니… 당신은 굉장한 도전자시군요!"
-    },
-    "defeat": {
-      "1": "충격과 공포를 전해드리겠습니다."
-    }
-  },
-  "lucian": {
-    "encounter": {
-      "1": "잠깐, 기다려주세요. 제가 읽던 책이 거의 클라이맥스에 도달했거든요…\n$주인공이 성스러운 검을 얻었고 마지막 시련을 앞두고 있는데… 아, 신경 쓰지 마세요.\n$여기까지 왔으니, 그건 제쳐두고 당신과 싸워야겠습니다.\n$당신이 과연 주인공이 될 그릇인지 확인해 보도록 하죠!"
-    },
-    "victory": {
-      "1": "그렇군요… 결국 체크메이트인가요."
-    },
-    "defeat": {
-      "1": "제 평판을 지켜냈네요."
-    }
-  },
-  "drasna": {
-    "encounter": {
-      "1": "당신 강하시죠? 그것도 상당히 꽤 말이에요…\n$어머 기뻐라! 그런 상대와 놀면 포켓몬들도 쑥쑥 크겠어요!"
-    },
-    "victory": {
-      "1": "어머머 벌써 끝나버리다니… 미안해요, 괜찮으면 또 오세요!"
-    },
-    "defeat": {
-      "1": "어머, 웬일이야?"
-    }
-  },
-  "kahili": {
-    "encounter": {
-      "1": "자, 여기에서… 승리의 바람이 부는 쪽은 당신과 저 중에 어느 쪽일까요?"
-    },
-    "victory": {
-      "1": "사천왕으로서 분하지만 당신들의 강함은 진정한 강함이군요."
-    },
-    "defeat": {
-      "1": "이것이 에이스니까요!"
-    }
-  },
-  "hassel": {
-    "encounter": {
-      "1": "맹렬하게 몰아치는 승부의 숨결을 직접 가르쳐 드리겠습니다!!"
-    },
-    "victory": {
-      "1": "이번에는 당신이 승리를 쟁취했군요. \n$하지만, 시합의 흐름을 보니… 다음 승부는 또 어떻게 될지 모르겠네요."
-    },
-    "defeat": {
-      "1": "저에게 더 배우고 싶은 것이 있으시다면 또 승부하도록 하죠."
-    }
-  },
-  "blue": {
-    "encounter": {
-      "1": "여기까지 왔다니, 실력이 꽤 봐줄만 할 것 같은데."
-    },
-    "victory": {
-      "1": "그 녀석한테만 지는 줄 알았는데… 누구냐고? 하, 하…"
-    },
-    "defeat": {
-      "1": "봤지? 여기까지 온 내 실력."
-    }
-  },
-  "piers": {
-    "encounter": {
-      "1": "뜨거운 현장을 즐길 준비는 됐겠지! 스파이크 마을, it's time to rock!"
-    },
-    "victory": {
-      "1": "나도 내 멤버들도 최선을 다했어. 다음에 또 배틀하자고…"
-    },
-    "defeat": {
-      "1": "소리를 지르느라 목이 가버렸군… 그렇지만 박진감 넘치는 배틀이었다!"
-    }
-  },
-  "red": {
-    "encounter": {
-      "1": "…!"
-    },
-    "victory": {
-      "1": "…?"
-    },
-    "defeat": {
-      "1": "…!"
-    }
-  },
-  "jasmine": {
-    "encounter": {
-      "1": "와… 당신의 포켓몬은 인상적이네요. 재미있을 것 같아요."
-    },
-    "victory": {
-      "1": "당신은 정말 강하네요. 저도 더 열심히 노력해야겠어요."
-    },
-    "defeat": {
-      "1": "이길 줄은 몰랐어요."
-    }
-  },
-  "lance_champion": {
-    "encounter": {
-      "1": "여전히 난 챔피언이다. 더이상 주저할 게 없군."
-    },
-    "victory": {
-      "1": "새로운 챔피언의 등장이군."
-    },
-    "defeat": {
-      "1": "성공적으로 챔피언 자리를 지켜냈다."
-    }
-  },
-  "steven": {
-    "encounter": {
-      "1": "넌… 포켓몬과 함께 모험을 하면서 무엇을 봤지? \n$많은 트레이너와 만나면서 무엇을 느꼈지? \n$풍요로운 이 지역을 돌아다니면서, 네 안에서 눈뜨기 시작한 무언가… \n$그 모든 것을 나에게 쏟아부었으면 좋겠어. \n$나와 내 포켓몬들도 전력을 다해 상대해줄 테니까!"
-    },
-    "victory": {
-      "1": "챔피언인 내가 질 줄이야…"
-    },
-    "defeat": {
-      "1": "덕분에 즐거웠어! 고마워!"
-    }
-  },
-  "cynthia": {
-    "encounter": {
-      "1": "나, 난천은, 네 도전을 받아들일게! 온 힘을 다해 너와 시합하겠어!"
-    },
-    "victory": {
-      "1": "포켓몬 배틀보다 재밌는 것은 없지만, 언젠간 끝나기 마련이니…"
-    },
-    "defeat": {
-      "1": "비록 졌어도, 포켓몬에 대한 사랑은 잃지 않도록 해."
-    }
-  },
-  "iris": {
-    "encounter": {
-      "1": "나는 말이지, 강한 트레이너와의 진지한 승부를 즐겨!\n$왜냐면 그렇잖아! 이곳에 오는 건 마음 깊이 승리를 추구하는 트레이너. \n#함께 싸우는 건 수많은 승부를 헤쳐온 포켓몬.\n$그런 상대와 겨룰 수 있다면 나도! 내 포켓몬도!\n$더욱더 강해지고 서로 알 수 있으니까! 으응! 그럼 간다! \n$포켓몬리그 챔피언 아이리스! 당신을 이기겠습니다!!"
-    },
-    "victory": {
-      "1": "후와아아아… 힘을 모두 발휘했는데도 우리가 졌네."
-    },
-    "defeat": {
-      "1": "우와! 이겼다!"
-    }
-  },
-  "hau": {
-    "encounter": {
-      "1": "트레이너가 따뜻한 지역 출신인지 추운 지역 출신인지에 따라 배틀 스타일이 달라지는지 궁금해졌어.\n$그럼 테스트 해볼게~!"
-    },
-    "victory": {
-      "1": "멋진데~! 이제 너의 스타일을 조금 더 잘 알게된 것 같아!"
-    },
-    "defeat": {
-      "1": "이런, 그건 그냥 승부였는데~!"
-    }
-  },
-  "geeta": {
-    "encounter": {
-      "1": "그 도전장, 한 번 더 승낙하도록 하죠. \n$자… 훈련의 결실을 보여주세요."
-    },
-    "victory": {
-      "1": "당신이 이룰 업적에 대한 소식들, 기다리고 있겠습니다!"
-    },
-    "defeat": {
-      "1": "무슨 문제라도 있나요? 이게 전부라니, 그럴리 없잖아요?"
-    }
-  },
-  "nemona": {
-    "encounter": {
-      "1": "만세! 나 너무 기대돼! 이제 전력으로 승부하는거야~!"
-    },
-    "victory": {
-      "1": "우와, 조금 문제 있지만, 그래도 너무 재밌었어! 다음에는 지지 않을거야!"
-    },
-    "defeat": {
-      "1": "우와, 너무 멋진 승부였어! 정말로 강하네."
-    }
-  },
-  "leon": {
-    "encounter": {
-      "1": "레츠, 챔피언 타임!!!"
-    },
-    "victory": {
-      "1": "챔피언 타임은 끝났어… \n$하지만 정말 멋진 시간이었지! \n$최고의 시합을 만들어줘서 고맙다!"
-    },
-    "defeat": {
-      "1": "최고의 챔피언 타임이었어, 정말로!"
-    }
-  },
-  "whitney": {
-    "encounter": {
-      "1": "있지! 포켓몬들 말이야, 정말 너무 귀엽지?"
-    },
-    "victory": {
-      "1": "흑! 으아앙! 너무해!"
-    },
-    "defeat": {
-      "1": "이걸로 끝!"
-    }
-  },
-  "chuck": {
-    "encounter": {
-      "1": "하! 나에게 도전하겠다고? 용감한 거냐, 아니면 그냥 무모한 거냐?"
-    },
-    "victory": {
-      "1": "자네 강하군! 나를 제자로 삼아주겠나?"
-    },
-    "defeat": {
-      "1": "자. 내가 자네보다 얼마나 더 강력한지 깨달았겠지?"
-    }
-  },
-  "katy": {
-    "encounter": {
-      "1": "쓰러지고 싶지 않다면 방심하지 말고 열심히 해 봐~"
-    },
-    "victory": {
-      "1": "내 포켓몬들 모두 지쳐서 헤벌레~ 해졌어~"
-    },
-    "defeat": {
-      "1": "비비용~ 많~이 먹으렴~"
-    }
-  },
-  "pryce": {
-    "encounter": {
-      "1": "젊음만으로는 승리를 보장할 수 없다! 중요한 것은 경험이다."
-    },
-    "victory": {
-      "1": "특출하군! 완벽해. 지금 이 느낌을 잊지 말도록."
-    },
-    "defeat": {
-      "1": "내가 예상했던 그대로군."
-    }
-  },
-  "clair": {
-    "encounter": {
-      "1": "내가 누군지 알지? 그런데도 감히 내게 도전해?"
-    },
-    "victory": {
-      "1": "네 실력이 어디까지 올라갈 수 있는지 궁금하네. 아주 흥미진진하겠어."
-    },
-    "defeat": {
-      "1": "끝이다."
-    }
-  },
-  "maylene": {
-    "encounter": {
-      "1": "지금 당신에게 도전하러 왔어요.\n$전력을 다할 테니 각오하세요!"
-    },
-    "victory": {
-      "1": "나의 패배입니다…"
-    },
-    "defeat": {
-      "1": "멋진 승부였습니다."
-    }
-  },
-  "fantina": {
-    "encounter": {
-      "1": "당신도 도전해 보세요. 전 당신을 이기겠어요.\n$그것이 체육관 관장!"
-    },
-    "victory": {
-      "1": "당신 최고로 강해요. 나 진 것 알아요."
-    },
-    "defeat": {
-      "1": "너무, 너무 행복해요!"
-    }
-  },
-  "byron": {
-    "encounter": {
-      "1": "젊은 트레이너여! 자네는 내 아들 강석처럼 젊군.\n$젊은 트레이너가 많아질수록, 포켓몬의 미래도 밝지!\n$그러니, 젊은이들이 넘어야할 벽으로서 상대해주겠다!"
-    },
-    "victory": {
-      "1": "흠! 내 견고한 포켓몬이--져버렸군!"
-    },
-    "defeat": {
-      "1": "으하하핫! 내 견고한 포켓몬은 어땠나?!"
-    }
-  },
-  "olympia": {
-    "encounter": {
-      "1": "이 의식은 앞으로의 길을 정하는 것입니다. 포켓몬 승부를 시작해볼까요!"
-    },
-    "victory": {
-      "1": "당신이라면 별이라도 움직여서 가야 할 길을 만들어 낼 것 같습니다."
-    },
-    "defeat": {
-      "1": "우리의 길은 이제 분명해졌습니다."
-    }
-  },
-  "volkner": {
-    "encounter": {
-      "1": "여기까지 왔으니, 넌 꽤 강하겠군…\n$네가 내게 포켓몬 승부의 즐거움을 상기시켜 줄 트레이너이길 바란다!"
-    },
-    "victory": {
-      "1": "너 나를 이겼군…\n$네 열정과 포켓몬이 그런 너를 위해 싸워준 고귀한 방식…\n$심지어 스릴까지 넘쳤다. 아주 좋은 승부였어."
-    },
-    "defeat": {
-      "1": "전혀 충격적이지 않았다…\n$이런 건 원하지 않았어!"
-    }
-  },
-  "burgh": {
-    "encounter": {
-      "1": "으-음… 이번 배틀에서 이기면, 예전과는 다른 그림을 그릴 수 있을 것 같아. \n$맞아! 난 승리 뮤즈의 목소리를 선명하게 들을 수 있거든. 그럼 승부다!",
-      "2": "물론, 난 내 포켓몬을 자랑스럽게 생각하거든! \n$자 그럼… 바로 승부할까!"
-    },
-    "victory": {
-      "1": "벌써 끝이라고? 뮤즈가 나를 버리고 떠나버렸나?",
-      "2": "아우… 져버렸네! 너 굉장히 강하잖아!"
-    },
-    "defeat": {
-      "1": "우와… 왠지 뭔가 아름답네, 그치…",
-      "2": "가끔 사람들이 못난 승리라고 말하는 걸 듣곤 해. \n$그치만 난 최선을 다했다면, 어떤 승리든 아름답다고 생각하거든."
-    }
-  },
-  "elesa": {
-    "encounter": {
-      "1": "컴플리트…! 확신이 들때면, 내 몸을 통하는 전기가 짜릿짜릿하게 느껴져! \n$그 감각을 느끼고 싶으니까…, 다음은 사랑스러운 포켓몬들로 너를 어질어질하게 할게!"
-    },
-    "victory": {
-      "1": "어질어질하게 만들 셈이였는데, 너한테는 짜릿짜릿하게 당해버렸네."
-    },
-    "defeat": {
-      "1": "왠지 부족한 기분이야… 다음에는 최선을 다할 수 있지?"
-    }
-  },
-  "skyla": {
-    "encounter": {
-      "1": "드디어 대결의 시간이야! 누가 정상에 오를지 결정짓는 포켓몬 배틀, 그치? \n$난 정상에 있는 게 좋아! 높은 곳에서는 항상 멀리 볼 수 있으니까! \n$그럼, 다음은 나랑 더욱 즐거운 것을 할까?"
-    },
-    "victory": {
-      "1": "배틀에서 네 상대가 되는 거, 뭔가 새로운 모티브가 되네. 고마워!"
-    },
-    "defeat": {
-      "1": "이기든 지든, 항상 무언가를 얻게 돼, 그치?"
-    }
-  },
-  "brycen": {
-    "encounter": {
-      "1": "다른사람이나 포켓몬과 함께 있을 때도 힘이 생긴다. \n$그 도움을 받는 것이 너를 강하게 만들었겠지. 그 힘을 보이거라!"
-    },
-    "victory": {
-      "1": "너와 포켓몬과! 멋진 콤비네이션! 아름다운 우정!"
-    },
-    "defeat": {
-      "1": "극한에서 시험받고 단련하도록!"
-    }
-  },
-  "drayden": {
-    "encounter": {
-      "1": "지금 찾는 것은 밝은 미래를 보여줄 젋은 트레이너의 존재. \n$승부에서 모든 걸 보이도록. 네 기술, 내 경험, 그리고 포켓몬을 키워온 사랑도 함께!"
-    },
-    "victory": {
-      "1": "패배하여 끓어오르는 이 마음… 뭐라고 표현해야 좋을까."
-    },
-    "defeat": {
-      "1": "실망스럽군! 난 자네의 능력이 그보다 더 크다는 걸 알고있네!"
-    }
-  },
-  "grant": {
-    "encounter": {
-      "1": "제가 바라는 것은 단 하나뿐입니다. \n$서로가 서로를 뛰어넘어, 더 높은 벽에 도달하는 것입니다."
-    },
-    "victory": {
-      "1": "내 앞에 솟아 있는 높은 벽… 그건 바로 당신입니다."
-    },
-    "defeat": {
-      "1": "인생에서 중요한 교훈은 간단합니다.\n$포기하지 않는 것.\n$이것이 전부입니다."
-    }
-  },
-  "korrina": {
-    "encounter": {
-      "1": "코르니 납시오!"
-    },
-    "victory": {
-      "1": "네 존재가 너의 포켓몬을 점점 진화시키고 있어!"
-    },
-    "defeat": {
-      "1": "정말 멋진 배틀이었어!"
-    }
-  },
-  "clemont": {
-    "encounter": {
-      "1": "아앗! 잘 부탁드립니다!"
-    },
-    "victory": {
-      "1": "당신들의 승부를 향한 마음에 자극을 받았습니다!"
-    },
-    "defeat": {
-      "1": "저의 슈퍼트레이닝 발명품이 효과가 있는 것 같군요!"
-    }
-  },
-  "valerie": {
-    "encounter": {
-      "1": "어라,트레이너님… 슝슝 워프해서… 이렇게 만나서 반갑네. \n$그리고 내가 보기엔 당신은 노력했기에, 이 승부에 참가할 수 있게 된 것 같아. \n$찾기 힘든 요정 같은 페어리 타입, 우리 포켓몬들 사뿐하고 화사하지만 강하다구."
-    },
-    "victory": {
-      "1": "난 당신이 내일을 생각하며 웃을 수 있는 것들을 찾길 바라고 있을게…"
-    },
-    "defeat": {
-      "1": "앗 이런, 가엾어라…"
-    }
-  },
-  "wulfric": {
-    "encounter": {
-      "1": "그거 알아? 그거… 전투와 유대감을 통해 배운다거나 하는… 거 뭐더라, 음.\n$여튼 말이지, 난 그냥 재밌어서 하는 거야. \n$내 자랑은 별로 듣고 싶지 않으려나? 자, 포켓몬을 꺼내자!"
-    },
-    "victory": {
-      "1": "그거야, 바로 그거! 멋지다고. 단단한 얼음을 깨부쉈구나!"
-    },
-    "defeat": {
-      "1": "나와 싸우면 그런 일이 벌어진다니까!"
-    }
-  },
-  "kabu": {
-    "encounter": {
-      "1": "모든 트레이너와 포켓몬은 이기기 위해 훈련을 하고 있다. \n$하지만 싸우는 상대 역시 그만큼 노력하고 있지. \n$ 결국 승부는 실전에서, 얼마만큼 제 실력을 발휘할 수 있느냐에 달렸다."
-    },
-    "victory": {
-      "1": "오늘 너와 싸울 수 있어서 참 기뻤다!"
-    },
-    "defeat": {
-      "1": "내 성장을 체감하게 되는군!"
-    }
-  },
-  "bea": {
-    "encounter": {
-      "1": "당신은 과연, 어떤 공격에도 흔들리지 않는 마음을 가졌을까요? \n$제가 시험해보겠습니다, 준비는 되셨습니까?"
-    },
-    "victory": {
-      "1": "당신이 데리고 있는 포켓몬에게서 무예의 혼을 느꼈습니다."
-    },
-    "defeat": {
-      "1": "누구나 바랄 법한 최고의 경기였습니다."
-    }
-  },
-  "opal": {
-    "encounter": {
-      "1": "그럼 너의 파트너 포켓몬 다루는 실력을 내게 보여주거라!"
-    },
-    "victory": {
-      "1": "핑크는 부족하지만, 너희는 좋은 트레이너와 포켓몬이구나."
-    },
-    "defeat": {
-      "1": "내가 보기엔, 불합격이란다."
-    }
-  },
-  "bede": {
-    "encounter": {
-      "1": "의심할 여지 없이 증명하겠습니다. 당신이 한심한지, 그리고 내가 얼마나 강한지!"
-    },
-    "victory": {
-      "1": "잘 봤습니다… 뭐, 꽤 괜찮네요. 전 그렇게 열심히 하지도 않았으니까요."
-    },
-    "defeat": {
-      "1": "이런 결과, 나쁘지 않군요."
-    }
-  },
-  "gordie": {
-    "encounter": {
-      "1": "그럼, 빨리 끝내도록 하죠."
-    },
-    "victory": {
-      "1": "구멍이 있다면 들어가고 싶군요… 아니지, 여기선 빠지고 싶다고 해야하나?"
-    },
-    "defeat": {
-      "1": "이런 배틀이라면, 매번 승리가 따라올 것 같네요!"
-    }
-  },
-  "marnie": {
-    "encounter": {
-      "1": "사실은, 말했던 일들이 해결 되고 나면… 결국은 나 자신이 챔피언이 되고싶다는 걸 알았으니까!  \n$그러니까 너의 팀을 기분 좋게 잠들게 해주겠어!"
-    },
-    "victory": {
-      "1": "응, 그래서 내가 졌구나… 그치만 너와 네 포켓몬의 좋은 점을 많이 볼 수 있었어!"
-    },
-    "defeat": {
-      "1": "우리의 배틀 방식을 즐겼길 바라."
-    }
-  },
-  "raihan": {
-    "encounter": {
-      "1": "챔피언도 쓰러뜨리고, 토너먼트에서도 우승해서, 위대한 나 금랑님이 얼마나 강한지 세계에 증명 해보실까!"
-    },
-    "victory": {
-      "1": "역시 난 진 다음에도 멋있네! \n$조금 분하지만…. \n$기념으로 셀카라도 찍어둘까…!"
-    },
-    "defeat": {
-      "1": "자, 이 순간을 기억하기 위한 셀카를 찍자고."
-    }
-  },
-  "brassius": {
-    "encounter": {
-      "1": "준비는 됐겠지!? 그럼, 우리 둘의 예술적인 합작품을 한번 만들어 보도록 할까!"
-    },
-    "victory": {
-      "1": "아… 아방가르드!!"
-    },
-    "defeat": {
-      "1": "바로 신작을 만들러 가야 하니 이만 실례하겠다!"
-    }
-  },
-  "iono": {
-    "encounter": {
-      "1": "자~ 오늘의 각오는~ 모야모야~?\n$...\n$그럼, 이제 시작해 볼까! \n$도전자님의 실력은 과연 과연~!?"
-    },
-    "victory": {
-      "1": "너의 반짝임은 1000만볼트!"
-    },
-    "defeat": {
-      "1": "당신의 눈길을 일렉트릭네트로 뾰로롱!"
-    }
-  },
-  "larry": {
-    "encounter": {
-      "1": "그렇습니다. 심플한 것이 가장 강한 것입니다!"
-    },
-    "victory": {
-      "1": "허, 이걸로 한 방 먹은 게 되었군요."
-    },
-    "defeat": {
-      "1": "오늘은 저는 이만 실례하겠습니다."
-    }
-  },
-  "ryme": {
-    "encounter": {
-      "1": "나의 영혼 흔들어 봐 Come On!"
-    },
-    "victory": {
-      "1": "너의 Cool한 Youth 나의 Soul이 Move!"
-    },
-    "defeat": {
-      "1": "Bye Bye Baby~!"
-    }
-  },
-  "grusha": {
-    "encounter": {
-      "1": "내가 너를 철저하게 얼려 버리면 고민할 것도 없겠지!"
-    },
-    "victory": {
-      "1": "너의 그 열기… 싫지 않아."
-    },
-    "defeat": {
-      "1": "너에겐 아직 열기가 부족하구나."
-    }
-  },
-  "marnie_elite": {
-    "encounter": {
-      "1": "여기까지 왔구나? 포켓몬 다루는 실력 좀 볼까!",
-      "2": "최선을 다할 거니까, 쉽게 넘어갈 수 있을 거라고 생각하지 마!"
-    },
-    "victory": {
-      "1": "내가 지다니 믿을 수 없어… 그렇지만 네가 바란 것도 이런 승리였겠지. 잘했어!",
-      "2": "난 여전히 배울 게 많은 것 같아. 그래도, 멋진 승부였어!"
-    },
-    "defeat": {
-      "1": "잘 싸웠지만, 내가 위야! 다음에는 더 잘해봐!",
-      "2": "트레이닝이 제값을 하는 것 같네. 승부에 응해줘서 고마워!"
-    }
-  },
-  "nessa_elite": {
-    "encounter": {
-      "1": "조류가 오늘은 내 편인 것 같네. 휩쓸릴 준비 됐어?",
-      "2": "이번 승부로 파도를 일으키는 거야! 준비는 됐겠지!"
-    },
-    "victory": {
-      "1": "너 그런 바다를 완벽하게 버텨냈네… 잘했어!",
-      "2": "내 쪽의 해류가 너와 맞지 않았던 거 같네. 잘했어!"
-    },
-    "defeat": {
-      "1": "물은 항상 자기 길을 찾아 흐르지. 상쾌한 승부였어!",
-      "2": "잘 싸웠지만, 바다의 힘은 막을 수 없다고!"
-    }
-  },
-  "bea_elite": {
-    "encounter": {
-      "1": "준비는 되셨겠죠! 제 투지가 불타고 있습니다!",
-      "2": "가차 없는 제 속도를 따라잡으실 수 있는지 지켜보겠습니다!"
-    },
-    "victory": {
-      "1": "당신의 힘… 인상적이군요. 정말로 이기실 만합니다.",
-      "2": "이런 강렬함은 처음 느껴봅니다. 대단하군요!"
-    },
-    "defeat": {
-      "1": "치열했던 훈련으로 또 한번 승리를 거두게 뒀군요! 고생하셨습니다!",
-      "2": "당신도 힘냈겠지만, 제가 더 열심히 훈련했거든요. 좋은 배틀이었습니다!"
-    }
-  },
-  "allister_elite": {
-    "encounter": {
-      "1": "그림자가 떨어지네… 두려움에 맞설 준비는 됐어?",
-      "2": "내가 다루는 어둠을 감당할 수 있는지 지켜볼게."
-    },
-    "victory": {
-      "1": "너 그림자를 쫓아내 버렸구나… 일단은. 잘했어.",
-      "2": "네 빛이 어둠을 관통해 버렸네. 훌륭해."
-    },
-    "defeat": {
-      "1": "그림자가 말했어… 네 힘은 아직 부족한 것 같아.",
-      "2": "어둠의 승리… 다음번에는 빛을 보게 될 거야."
-    }
-  },
-  "raihan_elite": {
-    "encounter": {
-      "1": "폭풍이 몰아치는군! 네가 이 배틀에서도 견뎌낼 수 있는지 지켜보겠어!",
-      "2": "폭풍의 눈과 마주칠 준비는 됐겠지!"
-    },
-    "victory": {
-      "1": "폭풍을 이겨내다니… 정말 놀라운걸!",
-      "2": "너 바람에 완벽하게 올라탔구나… 대단한 승부였어!"
-    },
-    "defeat": {
-      "1": "폭풍을 견디고, 또 다른 승리도 잡아버렸네! 좋은 승부였어!",
-      "2": "넌 내 폭풍을 잡아냈잖아! 다음엔 더 잘해봐!"
-    }
-  },
-  "alder": {
-    "encounter": {
-      "1": "하나지방에서 가장 강한 트레이너를 상대할 준비는 됐나?"
-    },
-    "victory": {
-      "1": "장하구나! 실로 견줄 자가 천하에 없도다!"
-    },
-    "defeat": {
-      "1": "나의 마음에 상쾌한 바람이 지나갔다...\n$정말 대단한 노력이다!"
-    }
-  },
-  "kieran": {
-    "encounter": {
-      "1": "난 노력을 통해 강해지고 또 강해지지!\n$난 지지 않아."
-    },
-    "victory": {
-      "1": "믿을 수 없어...\n$정말 재밌고 가슴 뛰는 배틀이었어!"
-    },
-    "defeat": {
-      "1": "세상에 마상에! 정말 멋진 배틀이었어!\n$네가 더 열심히 훈련할 시간이야."
-    }
-  },
-  "rival": {
-    "encounter": {
-      "1": "@c{smile}오, 찾았다! 떠나려는 건 알고 있었지만\n인사정도는 해줄 줄 알았는데…\n$@c{smile_eclosed}그러니까 정말로 꿈을 좇겠다는 거지?\n듣고도 못 믿었다니까.\n$@c{serious_smile_fists}여기까지 온 김에, 배틀은 어때?\n준비가 됐나 보자구.\n$@c{serious_mopen_fists}망설이지 말고,\n너의 진면목을 보여봐!"
-    },
-    "victory": {
-      "1": "@c{shock}와… 정말 깔끔하게 당했네.\n초보자 맞아?\n$@c{smile}운이 따른 건지도 모르겠지만…\n그래도 정말 꿈을 이룰 지도.\n$그나저나, 박사님께서 이걸 전해달라고 하시더라.\n좋아 보이던데.\n$@c{serious_smile_fists}아무튼, 힘 내는거야!"
-    }
-  },
-  "rival_female": {
-    "encounter": {
-      "1": "@c{smile_wave}여깄구나! 찾고 있었어!\n@c{angry_mopen}절친한테 작별인사도 안 하는거야?\n$@c{smile_ehalf}꿈을 향해 떠나는거구나. 그렇지?\n이런 날이 오긴 하네…\n$@c{smile}아무튼, 날 까먹고 가버린 건 용서해주겠어.\n@c{smile_wave_wink}배틀을 해준다면 말야!\n$@c{angry_mopen}최선을 다 해 봐.\n모험을 시작과 동시에 끝내고 싶지 않다면!"
-    },
-    "victory": {
-      "1": "@c{shock}왜 벌써 이렇게 센 건데?!@d{96}\n@c{angry}아니면 뭔가 속임수, 그런 거?\n$@c{smile_wave_wink}농담, 농담!@d{64} @c{smile_eclosed}내가 진 거 맞아…\n너 정말 앞으로도 잘 하겠는데.\n$@c{smile}아 그래, 박사님께서 전해달라던 물건.\n도움이 되면 좋겠어!\n$@c{smile_wave}항상 최선을 다 하라구! 믿고 있을게!"
-    }
-  },
-  "rival_2": {
-    "encounter": {
-      "1": "@c{smile}어라, 너 여깄었구나?\n@c{smile_eclosed}아직도 전승 중이라, 이거지…?\n$@c{serious_mopen_fists}널 쫓아서 온 것 같아 보이겠지만, 오해야.\n$@c{serious_smile_fists}그래도 솔직히 그 때부터 쭉 재대결이 간절했어.\n$그 동안의 훈련도 있겠다 마침 좋은 기회같지?\n$@c{serious_mopen_fists}자, 전처럼!\n배틀이야!"
-    },
-    "victory": {
-      "1": "@c{neutral_eclosed}이런. 자신감이 과했나봐.\n$@c{smile}그래, 또 지고 말았네.\n@c{serious_mopen_fists}좀 더 열심히 훈련을 해야겠어!\n\n$@c{smile}너한테 도움이 필요할 것 같지는 않지만, 이거.\n남는 게 있어서 말이야.\n$@c{serious_smile_fists}물론 이번이 마지막이야, 알겠지?\n공평하게 하지 않으면 그게 내 핑계거리가 되고 말거야.\n$@c{smile}이제 갈게. 앞으로도 조심하고, 이벤트도 즐겁게 보내!"
-    }
-  },
-  "rival_2_female": {
-    "encounter": {
-      "1": "@c{smile_wave}우연이네, 이런 곳에서 만나고.\n아직 연전연승이구나? @c{angry_mopen}나쁘지 않아!\n$@c{angry_mopen}무슨 생각하고있는지 알겠어, 하지만 아냐.\n@c{smile_eclosed}우연히 근처에 있었을 뿐이라구.\n$@c{smile_ehalf}그래도 마침, 가끔은 지는것도 괜찮다고 알려주고 싶었는데.\n$@c{smile}우린 실수를 통해서도 성장할 수 있잖아.\n때로는 성공을 반복할 때보다도 더 많이 말야.\n$@c{angry_mopen}어쨌든간에, 나도 이런 때를 위해 훈련해왔으니까,\n너도 최선을 다 하는게 좋을 거야!"
-    },
-    "victory": {
-      "1": "@c{neutral}이… 번에도 져버릴 줄이야…\n$@c{smile}으, 그래. 더 열심히 훈련하면 되겠지!\n$@c{smile_wave}이것도 하나 더 챙겨왔으니 받아!\n@c{smile_wave_wink}감사 인사는 됐다구~.\n$@c{angry_mopen}하지만, 마지막이야!\n또 이렇게 공짜로 나눠주진 않을 테니까!\n$@c{smile_wave}그럼! 이벤트 잘 즐기고!"
-    },
-    "defeat": {
-      "1": "가끔은 지는 것도 괜찮아…"
-    }
-  },
-  "rival_3": {
-    "encounter": {
-      "1": "@c{smile}이게 누구야! 오랜만이야.\n@c{neutral}역시나… 쭉 이기고 있었구나?\n$@c{neutral_eclosed}상황이 좀… 그렇더라. \n혼자 마을로 돌아가봤자 너 없인 예전같아질 수 없겠지.\n$@c{serious}이기적인 이야기란건 알지만 말해야겠어.\n@c{neutral_eclosed}너 지금 좀 아닌 것 같아.\n$@c{serious}계속 이기기만 하겠다는 건 너무 비현실적이야.\n사람은 원래 꺾여가며 성장하는 거라고.\n$@c{neutral_eclosed}물론 지금까지는 잘 해왔다고 생각하겠지만,\n갈 길이 멀지. @c{neutral}대비는 되어 있어?\n$@c{serious_mopen_fists}그렇다면, 내게 증명해 줘."
-    },
-    "victory": {
-      "1": "@c{angry_mhalf}말도 안 돼… 한시도 쉬지 않고 훈련했는데…\n어째서 전혀 닿을 수 없는거야?"
-    }
-  },
-  "rival_3_female": {
-    "encounter": {
-      "1": "@c{smile_wave}오랜만이야! 아직도 안 졌구나.\n@c{angry}거슬리게 말야. @c{smile_wave_wink}농담이야!\n$@c{smile_ehalf}하지만 진짜, 고향이 그립진 않아? 집이나… 나는?\n나… 나는, 네가 정말 그리웠어.\n$@c{smile_eclosed}난 너의 꿈과 모든 것을 응원하지만,\n넌 언젠가 패배를 겪게 될 거야.\n$@c{smile}그 땐 언제나처럼 내가 곁에 있어줄게.\n@c{angry_mopen}내가 얼마나 강해졌는지도, 지금 보여 줄 테니까!"
-    },
-    "victory": {
-      "1": "@c{shock}이렇게까지 했는데도… 모자랐던 거야…?\n이러면 정말로 너는 이제 영영…"
-    },
-    "defeat": {
-      "1": "최선을 다 했지.\n집에 갈 시간이야."
-    }
-  },
-  "rival_4": {
-    "encounter": {
-      "1": "@c{neutral}안녕.\n$잡담은 넘어가자.\n@c{neutral_eclosed}너에게 이기기 위해 찾아왔어. 간단하지.\n$@c{serious_mhalf_fists}이제 잠재력을 끌어내는 법은 확실히 알겠어.\n$@c{smile}잠이나 사회적인 활동들.\n줄일 수 있는 불필요한 시간이 아주 많더라.\n$@c{serious_mopen_fists}오직 승리 뿐이야.\n이제 아무것도 중요하지 않아.\n$@c{neutral_eclosed}나도 이제 더 이상은 지지 않게 됐어.\n@c{smile_eclosed}네 그 철학이 완전히 틀린 건 아니었나봐.\n$@c{angry_mhalf}패배는 약자에게 주어지는 것이고, 난 더 이상 약하지 않아.\n$@c{serious_mopen_fists}준비해."
-    },
-    "victory": {
-      "1": "@c{neutral}너…@d{64} 너 대체 뭐야?"
-    }
-  },
-  "rival_4_female": {
-    "encounter": {
-      "1": "@c{neutral}나야! 날 잊어버리고 있던 건… 아니지?\n$@c{smile}네 업적에 자랑스러워 할 때가 됐어. 축하해!\n하지만 네 여행도 여기까지야.\n$@c{smile_eclosed}너는 나도 모르던 내 안의 무언가를 일깨웠어.\n이제 훈련 말고는 아무것도 하지 않아.\n$@c{smile_ehalf}먹지도 자지도 않고, 그저 하루종일.\n더 강해지고 있어.\n$@c{neutral}사실, 나… 이제 내가 뭔지도 잘 모르겠어.\n$그렇지만 기량만은, 정점에 다다랐지.\n아무도 내게 이길 수 없을거야.\n$그거 알아? 이게 전부 네 덕이야.\n@c{smile_ehalf}감사해야할지 증오해야할지 모르겠네.\n$@c{angry_mopen}준비해."
-    },
-    "victory": {
-      "1": "@c{neutral}너…@d{64} 너 대체 뭐야?"
-    },
-    "defeat": {
-      "1": "$@c{smile}네가 키운 상대야. 자랑스럽지?"
-    }
-  },
-  "rival_5": {
-    "encounter": {
-      "1": "@c{neutral}…"
-    },
-    "victory": {
-      "1": "@c{neutral}…"
-    }
-  },
-  "rival_5_female": {
-    "encounter": {
-      "1": "@c{neutral}…"
-    },
-    "victory": {
-      "1": "@c{neutral}…"
-    },
-    "defeat": {
-      "1": "$@c{smile_ehalf}…"
-    }
-  },
-  "rival_6": {
-    "encounter": {
-      "1": "@c{smile_eclosed}다시 만났구나.\n$@c{neutral}모든 걸 되짚어 봤어.\n이 기이함에도 이유가 있더라.\n$@c{neutral_eclosed}널 이기고자 하는 욕구, 아니면 네 꿈…\n이건 그저 더 큰 무언가의 일부일 뿐이었어.\n$@c{serious}개인의 문제가 아니라 세계 전체가 엮인 일이었고…\n@c{serious_mhalf_fists}난 널 한계까지 밀어붙이기 위한 도구였던 거지.\n$@c{neutral_eclosed}내가 잘 쓰였는진 모르겠지만 어쨌든 최선을 다 했고.\n$@c{neutral}끝끝내 도착한 이곳은 끔찍하지만…\n언젠가 와 본 것 같아.\n$@c{serious_mhalf_fists}너도 그렇게 느끼지?\n$@c{serious}…그리고 무언가가 이야기하고 있어.\n오랫동안 세상에 알려져온 무언가가.\n$우리가 함께했던 소중한 시간들은 이제 그저 아득해.\n$@c{neutral_eclosed}실제로 일어난 일이긴 할까?\n$@c{serious_mopen_fists}너는 계속 나아가야 해. 그렇지 않으면 끝나지 않아.\n오직 너만이 할 수 있어.\n$@c{serious_smile_fists}잘 모르겠지만, 하나만은 확실해.\n$@c{serious_mopen_fists}여기서 날 쓰러뜨리지 못한다면, 너에게 기회는 없을거란걸."
-    },
-    "victory": {
-      "1": "@c{smile_eclosed}내 역할은 여기까진 것 같아.\n$하나만 약속해 줘.\n@c{smile}세상을 원래대로 되돌리고 나면, 집으로 돌아오는거야."
-    }
-  },
-  "rival_6_female": {
-    "encounter": {
-      "1": "@c{smile_ehalf}또 이렇게 만났네.\n$@c{smile_eclosed}나 머릿속이 빙글빙글 도는 것 같아…\n$@c{smile_ehalf}모든 것이 이상하게 보이는 이유.\n분명 뭔가가 있어…\n$@c{smile}너는 너의 꿈이 있고,\n나는 나의 야망이 있지…\n$이 모든것, 우리가 하고 있는 모든 일들이\n더 큰 무언가를 위한 것임을 느낄 수밖에 없어.\n$@c{smile_eclosed}나는 아마 너를…\n한계까지 몰아붙여야 하는 거야.\n$@c{smile_ehalf}잘 해왔는지는 모르겠는데, 최선은 다 했어.\n$이 이상하고 무서운 곳…\n모든게 선명하게 보이고…\n$이건… 오래전부터 세상에 알려져온 전부.\n$@c{smile_eclosed}우리가 함께해온 추억들이, 이제는 거의 떠오르지 않아.\n$@c{smile_ehalf}실제로 일어났던 일일까? 너무 멀게만 느껴지는데…\n$@c{angry_mopen}계속 나아가야 해. 안 그러면, 영원히 끝나지 않을 거야. \n오직 너만이 할 수 있어.\n$@c{smile_ehalf}난… 이 모든게 무슨 의미가 있는지는 잘 모르겠지만…\n이거 하나는 느끼고 있어.\n$@c{neutral}여기서 날 쓰러뜨리지 못한다면, 너에게 기회는 없을거란걸."
-    },
-    "victory": {
-      "1": "@c{smile_ehalf}나… 내 소임을 다 한 기분이야…\n$@c{smile_eclosed}약속해 줘… 세상을 원래대로 되돌리고서… \n집으로… 무사히 돌아오는 거야.\n$@c{smile_ehalf}…고마워."
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/locales/ko/dialogue-misc-male.json b/src/locales/ko/dialogue-misc-male.json
deleted file mode 100644
index 8445c5c4810..00000000000
--- a/src/locales/ko/dialogue-misc-male.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "ending": "@c{smile}오? 이긴거야?@d{96} @c{smile_eclosed}진즉 알았어야 했는데.\n아무튼, 돌아왔구나.\n$@c{smile}다 끝난거야.@d{64} 네가 굴레를 끝장냈어.\n$@c{serious_smile_fists}네 꿈도 이뤄졌고말야.\n진짜로 한 번도 안 졌잖아.\n$@c{neutral}기억하는 건 우리들 뿐일 모양이지만.@d{96}\n그래도, 괜찮지?\n$@c{serious_smile_fists}오늘의 일은\n너와 나의 마음 속에 항상 함께할 거야.\n$@c{smile_eclosed}여기 구경도 충분히 했으니\n이제 집에 가자.\n$@c{serious_smile_fists}되돌아가서, 다시 배틀을 할 수도 있지 않을까?\n네가 원한다면 말야.",
-  "ending_female": "@c{shock}돌아왔구나?@d{32} 그 말은…@d{96} 이겼어?!\n@c{smile_ehalf}그럴 줄 알았다니까.\n$@c{smile_eclosed}물론… 언제나 느껴왔지.\n@c{smile}끝난 거, 맞지? 이 굴레를 말이야.\n$@c{smile_ehalf}네 꿈도 이뤘고 말이야.\n어떻게 한번도 안 졌대?\n$네가 한 일은 나만 기억하게 될 모양이지만.\n@c{angry_mopen}나, 안 까먹어볼 테니까!\n$@c{smile_wave_wink}농담이야!@d{64} @c{smile}절대 안 잊어버릴 거야.@d{32}\n마음 속엔 쭉 남아있을 수 있게.\n$@c{smile_wave}어쨌든,@d{64} 시간이 좀 늦었어…@d{96}\n이런 곳에서 할 말은 아닌가?\n$집에 가자. @c{smile_wave_wink}아마 내일은,\n추억을 되짚어보기 위한 배틀을 해볼 수 있을 거야.",
-  "ending_endless": "끝에 도달하신 것을 축하드립니다!\n더 많은 컨텐츠를 기다려주세요.",
-  "ending_name": "Devs"
-}
\ No newline at end of file
diff --git a/src/locales/ko/dialogue-misc-female.json b/src/locales/ko/dialogue-misc.json
similarity index 100%
rename from src/locales/ko/dialogue-misc-female.json
rename to src/locales/ko/dialogue-misc.json
diff --git a/src/locales/ko/dialogue-female.json b/src/locales/ko/dialogue.json
similarity index 94%
rename from src/locales/ko/dialogue-female.json
rename to src/locales/ko/dialogue.json
index 693b0704512..13fcd64a8d3 100644
--- a/src/locales/ko/dialogue-female.json
+++ b/src/locales/ko/dialogue.json
@@ -446,9 +446,9 @@
       "3": "……애널라이즈 ……하고 싶어 ……아하하하♪"
     },
     "victory": {
-      "1": "……바꿔줘 ……세계를",
+      "1": "……하아하아… ……으 …하아하아…",
       "2": "………예상대로 ………예상외 ………너 …………타깃 록 ………했으니까\n$……엑스페리먼트 ……할 테니까 ………너를………계속………아핫…♪",
-      "3": "……또 ……예상외 ………… ……역시 ……너…재미있어…! ………아하하…♪"
+      "3": "……예상외 ………… ……역시 ……너…재미있어…! ………아하하…♪"
     }
   },
   "shelly": {
@@ -465,14 +465,14 @@
   },
   "matt": {
     "encounter": {
-      "1": "후하하하하하! 뭐라 떠들고 있는 거야! 너 생긴 게 마크탕이랑 똑같네!",
-      "2": "음음! 네 녀석은! 재미있는 녀석!",
-      "3": "뭐야?! 우릴 따라온 거냐!"
+      "1": "…그래서 말이지, 리더님이 시간이 나실 때까진 내가 상대해 주마!",
+      "2": "후우하앗!! 맥시멈!! 끓어어!! 오르기 시작했다아아앗!!!!! 그래! 그래! 그래애앳!!! 힘이 다할 때까지 해보자아아!!!",
+      "3": "UPAAAAA!!! 짓뭉개주마아아아아!!"
     },
     "victory": {
-      "1": "…그래서 말이지, 리더님이 시간이 나실 때까진 내가 상대해 주마!",
+      "1": "흐~하하하핫!!! 졌지만 즐거운 승부였다!",
       "2": "확 확 느껴지는데! 네놈들의 강함이 말이야!\n$제대로 붙었다고 하기엔 조금 모자라지만 이제 타임오버 같네…",
-      "3": "재밌는데!! 역시 재미있어! 넌! 또 붙게 될 때를 기대하고 있겠어!"
+      "3": "오우오웃! 흥분되는 패배로다!"
     }
   },
   "mars": {
@@ -655,6 +655,86 @@
       "5": "네가 이긴 것 같네. 그렇지만 졌어도, 난 우아하게 퇴장할 거니까!"
     }
   },
+  "aether_grunt": {
+    "encounter": {
+      "1": "죽을 각오로 퇴치하겠습니다!",
+      "2": "소중한 연구라고! 애라도 가만두지 않겠어!",
+      "3": "어떤 트레이너든 물리치라고 들었다고!",
+      "4": "에테르파라다이스의 파워를 보여드리겠습니다!",
+      "5": "에테르파라다이스 중심의 어둠을 알아내다니. 이제 사라져 주셔야겠습니다!"
+    },
+    "victory": {
+      "1": "흥! 실력이 대단하시군요.",
+      "2": "이게 뭐하는 상황이지? 무슨 결과냐고!",
+      "3": "이런! 넌 너무 강해서 물리칠 방법도 없다고!",
+      "4": "으음… 제가 진 것처럼 보이네요.",
+      "5": "이 느낌을 한마디로 하면. 게에이~힝!!"
+    }
+  },
+  "faba": {
+    "encounter": {
+      "1": "나, 에테르재단의 자우보! 꼬맹이 녀석에게 현실을 보여주겠어요!",
+      "2": "에테르파라다이스 마지막 보루라고 불리는, 이 자우보에게 애를 상대하라고요?",
+      "3": "에테르재단의 지부장이라면 세계에 단 한 명… 이 자우보뿐입니다."
+    },
+    "victory": {
+      "1": "게에이~힝!!",
+      "2": "뭐 뭐뭐뭐 뭐가 어떻게 된 거죠? 내가 애를 상대로…",
+      "3": "이래서 애는… 좋아할 수가 없어요."
+    }
+  },
+  "skull_grunt": {
+    "encounter": {
+      "1": "나쁜 짓 안해-그냥 사는 게 힘들 뿐스컬!",
+      "2": "껌 하나 드실? 이게 우리가 인사하는 방식YO! 만나서 반갑스컬!",
+      "3": "우린 그냥 다른 사람의 포켓몬에 관심이 많을 뿐임다!",
+      "4": "어이 어이! 잘난 체하는 녀석한테 무시당하고 있잖스컬!!",
+      "5": "우리는 리프리젠트 땡땡이 스컬-! 집세는 못 내겠지만-! 정말 즐거웠지만, 청춘을 날려YO!"
+    },
+    "victory": {
+      "1": "엥? 벌써 끝났슴까?",
+      "2": "미는 엑시트! 유는 피쓰풀!",
+      "3": "꼬마 녀석의 이상한 포켓몬엔 관심 없어!",
+      "4": "뭐야-?! 너무 강해서 뼈도 못 추리겠어!",
+      "5": "우리가 포켓몬보다 아래야!? 소중히 대해주면 안 돼? 으응!?"
+    }
+  },
+  "plumeria": {
+    "encounter": {
+      "1": "…아무것도 느껴지지 않는 평~범한 애로 보이는데!",
+      "2": "워낙 애들 상대로 우물쭈물 하길래 오래 걸릴 줄 알았지…",
+      "3": "누구라도 스컬단 또 방해하면, 정말로 혼내줄 테니까!"
+    },
+    "victory": {
+      "1": "흥! 대단하군.",
+      "2": "흐음, 너 참 대단하군. 애들을 상대로 질질 끈 이유가 이해될 정도로 강해.",
+      "3": "흠. 이 손실은 그냥 안고 가야겠어."
+    }
+  },
+  "macro_grunt": {
+    "encounter": {
+      "1": "당신은 여기서 끝날 것 같네요!",
+      "2": "당신은 트레이너 맞죠? 하지만 우리를 방해하는 건 용납 못 합니다!",
+      "3": "매크로코스모스 생명입니다! 가입하신 실비보험은 있으신가요?"
+    },
+    "victory": {
+      "1": "순순히 물러나는 것 말고는 선택지가 없군요.",
+      "2": "용돈을 뺏기다니… 패배는 적자로 이어지는구나…",
+      "3": "매크로코스모스 생명에 관한 일이라면 누구에게도 지지 않을 텐데…"
+    }
+  },
+  "oleana": {
+    "encounter": {
+      "1": "로즈님을 방해하는 것은 절대로 용서할 수 없으니까요!",
+      "2": "저의 지시를 따르는 특별한 스태프들을 아무렇지도 않게 쓰러뜨리다니. …더 기대되는 것도 없네요.",
+      "3": "로즈님을 위해서라면! 질 수 없습니다!"
+    },
+    "victory": {
+      "1": "아아… 이기지 못하다니… 올리브… 넌 정말 구제 불능이구나.",
+      "2": "하아아…! 이런 실수를 하다니… 승리를 거듭한 트레이너의 실력을 너무 얕잡아봤던 모양이네요.",
+      "3": "아아… 이 올리브님 조금 지쳤어…"
+    }
+  },
   "rocket_boss_giovanni_1": {
     "encounter": {
       "1": "그래서! 여기까지 오다니, 감탄이 절로 나오는군!"
@@ -787,6 +867,72 @@
       "1": "우매한 자들이 이 아름다운 세상을 계속 더럽히고 있군."
     }
   },
+  "aether_boss_lusamine_1": {
+    "encounter": {
+      "1": "비스트가 놀라잖아! …우선은 너를 조용히 시켜야겠어."
+    },
+    "victory": {
+      "1": "……너무해!"
+    },
+    "defeat": {
+      "1": "흐음…"
+    }
+  },
+  "aether_boss_lusamine_2": {
+    "encounter": {
+      "1": "그렇게 말했는데도! …왜 이리 끈질긴 거야! 정말 진절머리가 나.\n$더 말해봐야 소용 없겠지… 텅비드의 힘으로 네가 여기까지 온 걸 후회하게 해줄게!"
+    },
+    "victory": {
+      "1": "………아아아웃!!"
+    },
+    "defeat": {
+      "1": "나는 비스트만 있으면 돼! 너희가 어떻게 되든 상관없어!"
+    }
+  },
+  "skull_boss_guzma_1": {
+    "encounter": {
+      "1": "박살 내고 박살 내도 절대 봐주지 않아…\n$모두가 싫어하는 구즈마가 여기 있다!"
+    },
+    "victory": {
+      "1": "쯧. 너는 내가 박살 내주겠어!"
+    },
+    "defeat": {
+      "1": "겨우 그걸 위해서 일부러 온 거야?"
+    }
+  },
+  "skull_boss_guzma_2": {
+    "encounter": {
+      "1": "누구든지 박살 낸다!\n$그것이 구즈마님의 아이덴티티!!"
+    },
+    "victory": {
+      "1": "구즈마!!! 뭐 하고 있는 거야?!"
+    },
+    "defeat": {
+      "1": "너희들 바보군!"
+    }
+  },
+  "macro_boss_rose_1": {
+    "encounter": {
+      "1": "내게는 모든 사람이 영원히 마음을 놓고 발전할 수 있도록…\n$무한한 에너지를 가져다 줘야 한다는 신념과 사명이 있단다!"
+    },
+    "victory": {
+      "1": "아직 무르군… 트레이너.\n$역사는 바뀔 것이네! 이 나의 손에 의해서 말이지"
+    },
+    "defeat": {
+      "1": "자네는 여전히 깨닫지 못했군!"
+    }
+  },
+  "macro_boss_rose_2": {
+    "encounter": {
+      "1": "나는 가라르를 포함한— 전 세계의 에너지 문제를 해결하기 위해 최선을 다하고 있어.\n$매크로코스모스를 성공으로 이끈 경험과 성과는 내 방식이 효율적이라는 증거란다.\n$생각을 바꿀 마음은 없어. 내가 지더라도."
+    },
+    "victory": {
+      "1": "포켓몬 승부는 좋군! 오랜만에 싸워보니 만족스러워…\n$제법 괜찮군. 패배를 인정하지."
+    },
+    "defeat": {
+      "1": "너희가 보기에는 내가 끔찍한 짓을 벌이고 있는 것처럼 보이겠지? 조금도 이해가 가지 않을 거야.\n$하지만 난 가라르지방의 영원한 번영을 위해서 무한한 에너지를 가져다줘야 해."
+    }
+  },
   "brock": {
     "encounter": {
       "1": "내 전문인 바위 타입 포켓몬으로 널 쓰러뜨려줄게! 덤벼!",
@@ -2542,4 +2688,4 @@
       "1": "@c{smile_ehalf}나… 내 소임을 다 한 기분이야…\n$@c{smile_eclosed}약속해 줘… 세상을 원래대로 되돌리고서… \n집으로… 무사히 돌아오는 거야.\n$@c{smile_ehalf}…고마워."
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/ko/menu-ui-handler.json b/src/locales/ko/menu-ui-handler.json
index c97b57396e3..7fecbf7c25f 100644
--- a/src/locales/ko/menu-ui-handler.json
+++ b/src/locales/ko/menu-ui-handler.json
@@ -3,7 +3,6 @@
   "ACHIEVEMENTS": "업적",
   "STATS": "통계",
   "RUN_HISTORY": "플레이 이력",
-  "VOUCHERS": "바우처",
   "EGG_LIST": "알 목록",
   "EGG_GACHA": "알 뽑기",
   "MANAGE_DATA": "데이터 관리",
diff --git a/src/locales/ko/menu.json b/src/locales/ko/menu.json
index 4369e8baaae..7976e0bedcf 100644
--- a/src/locales/ko/menu.json
+++ b/src/locales/ko/menu.json
@@ -41,6 +41,7 @@
   "score": "점수",
   "wave": "웨이브",
   "loading": "로딩 중…",
+  "loadingAsset": "리소스 로드 중: {{assetName}}",
   "playersOnline": "플레이어 온라인",
   "yes": "예",
   "no": "아니오",
@@ -51,4 +52,4 @@
   "rename": "닉네임 바꾸기",
   "nickname": "닉네임",
   "errorServerDown": "서버 연결 중 문제가 발생했습니다.\n\n이 창을 종료하지 않고 두면,\n게임은 자동으로 재접속됩니다."
-}
\ No newline at end of file
+}
diff --git a/src/locales/ko/modifier.json b/src/locales/ko/modifier.json
index 4a030c4e64f..281ecf61943 100644
--- a/src/locales/ko/modifier.json
+++ b/src/locales/ko/modifier.json
@@ -3,9 +3,10 @@
   "turnHealApply": "{{pokemonNameWithAffix}}[[는]]\n{{typeName}}[[로]] 인해 조금 회복했다.",
   "hitHealApply": "{{pokemonNameWithAffix}}[[는]]\n{{typeName}}[[로]] 인해 조금 회복했다.",
   "pokemonInstantReviveApply": "{{pokemonNameWithAffix}}[[는]] {{typeName}}[[로]]\n정신을 차려 싸울 수 있게 되었다!",
+  "pokemonResetNegativeStatStageApply": "{{pokemonNameWithAffix}}[[는]] {{typeName}}[[로]]\n상태를 원래대로 되돌렸다!",
   "moneyInterestApply": "{{typeName}}[[로]]부터\n₽{{moneyAmount}}[[를]] 받았다!",
   "turnHeldItemTransferApply": "{{pokemonName}}의 {{typeName}}[[는]]\n{{pokemonNameWithAffix}}의 {{itemName}}[[를]] 흡수했다!",
   "contactHeldItemTransferApply": "{{pokemonName}}의 {{typeName}}[[는]]\n{{pokemonNameWithAffix}}의 {{itemName}}[[를]] 가로챘다!",
   "enemyTurnHealApply": "{{pokemonNameWithAffix}}의\n체력이 약간 회복되었다!",
   "bypassSpeedChanceApply": "{{pokemonName}}[[는]] {{itemName}}[[로]]\n행동이 빨라졌다!"
-}
\ No newline at end of file
+}
diff --git a/src/locales/ko/move.json b/src/locales/ko/move.json
index a52d839aeb9..a06bb2b3e27 100644
--- a/src/locales/ko/move.json
+++ b/src/locales/ko/move.json
@@ -2913,7 +2913,7 @@
   },
   "zippyZap": {
     "name": "파찌파찌액셀",
-    "effect": "맹렬한 속도의 전격 공격. 반드시 선제공격할 수 있고 자신의 회피율을 높인다."
+    "effect": "맹렬한 속도의 전격 공격. 반드시 선제공격할 수 있고 급소에 맞는다."
   },
   "splishySplash": {
     "name": "참방참방서핑",
@@ -3807,4 +3807,4 @@
     "name": "악독사슬",
     "effect": "독으로 된 사슬로 상대를 휘감은 뒤 독소를 흘려보내어 해치운다. 맹독 상태로 만들 때가 있다."
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/ko/pokemon-form.json b/src/locales/ko/pokemon-form.json
index aad63a4df3a..885f9a9b891 100644
--- a/src/locales/ko/pokemon-form.json
+++ b/src/locales/ko/pokemon-form.json
@@ -64,6 +64,7 @@
   "landorusIncarnate": "화신폼",
   "keldeoOrdinary": "평상시 모습",
   "meloettaAria": "보이스폼",
+  "meloettaPirouette": "스텝폼",
   "froakieBattleBond": "유대변화",
   "scatterbugMeadow": "화원의 모양",
   "scatterbugIcySnow": "빙설의 모양",
diff --git a/src/locales/ko/pokemon-info.json b/src/locales/ko/pokemon-info.json
index d23f90eab6e..1e26af64d0f 100644
--- a/src/locales/ko/pokemon-info.json
+++ b/src/locales/ko/pokemon-info.json
@@ -13,7 +13,8 @@
     "SPD": "스피드",
     "SPDshortened": "스피드",
     "ACC": "명중률",
-    "EVA": "회피율"
+    "EVA": "회피율",
+    "HPStat": "HP"
   },
   "Type": {
     "UNKNOWN": "Unknown",
@@ -37,4 +38,4 @@
     "FAIRY": "페어리",
     "STELLAR": "스텔라"
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/ko/pokemon-summary.json b/src/locales/ko/pokemon-summary.json
index 5742058e45c..d9119623662 100644
--- a/src/locales/ko/pokemon-summary.json
+++ b/src/locales/ko/pokemon-summary.json
@@ -11,8 +11,8 @@
   "cancel": "그만둔다",
   "memoString": "{{natureFragment}}.\n{{metFragment}}",
   "metFragment": {
-    "normal": "{{biome}}에서\nLv{{level}}일 때 만났다.",
-    "apparently": "{{biome}}에서\nLv{{level}}일 때 만난 것 같다."
+    "normal": "{{biome}}에서\n레벨 {{level}}일 때 만났다.",
+    "apparently": "{{biome}}에서\n레벨 {{level}}일 때 만난 것 같다."
   },
   "natureFragment": {
     "Hardy": "{{nature}}하는 성격",
@@ -41,4 +41,4 @@
     "Careful": "{{nature}}한 성격",
     "Quirky": "{{nature}}스러운 성격"
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/ko/run-history-ui-handler.json b/src/locales/ko/run-history.json
similarity index 69%
rename from src/locales/ko/run-history-ui-handler.json
rename to src/locales/ko/run-history.json
index 387ed5fdeb5..dbf50efc632 100644
--- a/src/locales/ko/run-history-ui-handler.json
+++ b/src/locales/ko/run-history.json
@@ -4,12 +4,12 @@
   "defeatedTrainer": "트레이너에게 패배: ",
   "defeatedTrainerDouble": "더블 배틀에서 패배",
   "defeatedRival": "라이벌에게 패배",
-  "defeatedM": "패배",
-  "defeatedWildF": "야생에서 패배: ",
-  "defeatedTrainerF": "트레이너에게 패배: ",
-  "defeatedTrainerDoubleF": "더블 배틀에서 패배",
-  "defeatedRivalF": "라이벌에게 패배",
-  "defeatedF": "패배",
+  "defeated": "패배",
+  "defeatedWild_female": "야생에서 패배: ",
+  "defeatedTrainer_female": "트레이너에게 패배: ",
+  "defeatedTrainerDouble_female": "더블 배틀에서 패배",
+  "defeatedRival_female": "라이벌에게 패배",
+  "defeated_female": "패배",
   "luck": "행운",
   "score": "점수",
   "mode": "모드",
@@ -30,8 +30,8 @@
   "money": "소지금",
   "runLength": "플레이 타임",
   "viewHeldItems": "도구",
-  "hallofFameTextM": "전당 등록을 축하합니다!",
-  "hallofFameTextF": "전당 등록을 축하합니다!",
+  "hallofFameText": "전당 등록을 축하합니다!",
+  "hallofFameText_female": "전당 등록을 축하합니다!",
   "viewHallOfFame": "전당 보기",
   "viewEndingSplash": "엔딩 화면 보기"
-}
\ No newline at end of file
+}
diff --git a/src/locales/ko/settings.json b/src/locales/ko/settings.json
index 34fff42adb2..b7fc01cb148 100644
--- a/src/locales/ko/settings.json
+++ b/src/locales/ko/settings.json
@@ -61,7 +61,9 @@
   "typeHints": "상성 힌트",
   "masterVolume": "마스터 볼륨",
   "bgmVolume": "BGM 볼륨",
+  "fieldVolume": "전투효과 볼륨",
   "seVolume": "SE 볼륨",
+  "uiVolume": "UI 볼륨",
   "musicPreference": "음악 설정",
   "mixed": "믹스",
   "gamepadPleasePlug": "게임패드를 연결하거나 버튼을 입력하세요",
diff --git a/src/locales/ko/trainer-classes.json b/src/locales/ko/trainer-classes.json
index 555e487b4a3..da6c6f4aceb 100644
--- a/src/locales/ko/trainer-classes.json
+++ b/src/locales/ko/trainer-classes.json
@@ -117,5 +117,14 @@
   "plasma_grunts": "플라스마단 조무래기들",
   "flare_grunt": "플레어단 조무래기",
   "flare_grunt_female": "플레어단 조무래기",
-  "flare_grunts": "플레어단 조무래기들"
-}
\ No newline at end of file
+  "flare_grunts": "플레어단 조무래기들",
+  "aether_grunt": "에테르재단 직원",
+  "aether_grunt_female": "에테르재단 직원",
+  "aether_grunts": "에테르재단 직원들",
+  "skull_grunt": "스컬단 조무래기",
+  "skull_grunt_female": "스컬단 조무래기",
+  "skull_grunts": "스컬단 조무래기들",
+  "macro_grunt": "매크로코스모스 직원",
+  "macro_grunt_female": "매크로코스모스 직원",
+  "macro_grunts": "매크로코스모스 직원들"
+}
diff --git a/src/locales/ko/trainer-names.json b/src/locales/ko/trainer-names.json
index bc24d0f3183..f1357a428ba 100644
--- a/src/locales/ko/trainer-names.json
+++ b/src/locales/ko/trainer-names.json
@@ -138,11 +138,19 @@
   "rood": "로트",
   "xerosic": "크세로시키",
   "bryony": "바라",
+  "faba": "자우보",
+  "plumeria": "플루메리",
+  "oleana": "올리브",
+
   "maxie": "마적",
   "archie": "아강",
   "cyrus": "태홍",
   "ghetsis": "게치스",
   "lysandre": "플라드리",
+  "lusamine": "루자미네",
+  "guzma": "구즈마",
+  "rose": "로즈",
+
   "blue_red_double": "그린 & 레드",
   "red_blue_double": "레드 & 그린",
   "tate_liza_double": "풍 & 란",
@@ -153,4 +161,4 @@
   "iris_alder_double": "아이리스 & 노간주",
   "marnie_piers_double": "마리 & 두송",
   "piers_marnie_double": "두송 & 마리"
-}
\ No newline at end of file
+}
diff --git a/src/locales/ko/trainer-titles.json b/src/locales/ko/trainer-titles.json
index 4e627392e0b..7cff2207817 100644
--- a/src/locales/ko/trainer-titles.json
+++ b/src/locales/ko/trainer-titles.json
@@ -16,6 +16,10 @@
   "galactic_boss": "갤럭시단 보스",
   "plasma_boss": "플라스마단 보스",
   "flare_boss": "플레어단 보스",
+  "aether_boss": "에테르재단 대표",
+  "skull_boss": "스컬단 보스",
+  "macro_boss": "매크로코스모스 사장",
+
   "rocket_admin": "로켓단 간부",
   "rocket_admin_female": "로켓단 간부",
   "magma_admin": "마그마단 간부",
@@ -27,5 +31,8 @@
   "plasma_sage": "플라스마단 현인",
   "plasma_admin": "플라스마단 간부",
   "flare_admin": "플레어단 간부",
-  "flare_admin_female": "플레어단 간부"
-}
\ No newline at end of file
+  "flare_admin_female": "플레어단 간부",
+  "aether_admin": "에테르재단 지부장",
+  "skull_admin": "스컬단 간부",
+  "macro_admin": "매크로코스모스 간부"
+}
diff --git a/src/locales/pt_BR/ability.json b/src/locales/pt_BR/ability.json
index 5b885504bd1..c4180ff01dd 100644
--- a/src/locales/pt_BR/ability.json
+++ b/src/locales/pt_BR/ability.json
@@ -257,7 +257,7 @@
   },
   "overgrow": {
     "name": "Overgrow",
-    "description": "Fortalece os movimentos do tipo Planta quando o Pokémon está com poucos PS."
+    "description": "Fortalece os movimentos do tipo Grama quando o Pokémon está com poucos PS."
   },
   "blaze": {
     "name": "Blaze",
@@ -625,7 +625,7 @@
   },
   "sapSipper": {
     "name": "Sap Sipper",
-    "description": "Se for atingido por um movimento do tipo Planta, ao invés de receber dano, aumenta seu Ataque."
+    "description": "Se for atingido por um movimento do tipo Grama, ao invés de receber dano, aumenta seu Ataque."
   },
   "prankster": {
     "name": "Prankster",
@@ -661,7 +661,7 @@
   },
   "flowerVeil": {
     "name": "Flower Veil",
-    "description": "Pokémon aliados do tipo Planta são protegidos de mudanças de estado e diminuição de seus atributos."
+    "description": "Pokémon aliados do tipo Grama são protegidos de mudanças de estado e diminuição de seus atributos."
   },
   "cheekPouch": {
     "name": "Cheek Pouch",
@@ -927,6 +927,10 @@
     "name": "Prism Armor",
     "description": "Reduz o dano recebido por movimentos supereficazes."
   },
+  "neuroforce": {
+    "name": "Neuroforce",
+    "description": "Fortalece movimentos supereficazes."
+  },
   "intrepidSword": {
     "name": "Intrepid Sword",
     "description": "Aumenta o atributo de Ataque ao entrar em batalha."
@@ -1055,9 +1059,9 @@
     "name": "Grim Neigh",
     "description": "Quando o Pokémon derrota um alvo, emite um relincho assustador que aumenta seu Ataque Esp."
   },
-  "asOneGlacier": {
+  "asOneGlastrier": {
     "name": "As One",
-    "description": "Essa Habilidade combina os efeitos das Habilidades Enervar de Calyrex e Relincho Branco de Glastrier."
+    "description": "Esta habilidade combina os efeitos da habilidade Unnerve de Calyrex e da habilidade Chilling Neigh de Glastrier."
   },
   "asOneSpectrier": {
     "name": "As One",
@@ -1235,4 +1239,4 @@
     "name": "Poison Puppeteer",
     "description": "Pokémon envenenados pelos movimentos de Pecharunt também ficarão confusos."
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/pt_BR/achv-male.json b/src/locales/pt_BR/achv-male.json
deleted file mode 100644
index 428dd5c633b..00000000000
--- a/src/locales/pt_BR/achv-male.json
+++ /dev/null
@@ -1,264 +0,0 @@
-{
-  "Achievements": {
-    "name": "Conquistas"
-  },
-  "Locked": {
-    "name": "Não conquistado"
-  },
-  "MoneyAchv": {
-    "description": "Acumule um total de ₽{{moneyAmount}}"
-  },
-  "10K_MONEY": {
-    "name": "Chuva de Dinheiro"
-  },
-  "100K_MONEY": {
-    "name": "Tô Rica!"
-  },
-  "1M_MONEY": {
-    "name": "Quem Quer Ser Um Milionário?"
-  },
-  "10M_MONEY": {
-    "name": "Tio Patinhas"
-  },
-  "DamageAchv": {
-    "description": "Inflija {{damageAmount}} de dano em um único golpe"
-  },
-  "250_DMG": {
-    "name": "Essa Doeu!"
-  },
-  "1000_DMG": {
-    "name": "Essa Doeu Mais!"
-  },
-  "2500_DMG": {
-    "name": "Essa Doeu Muito!"
-  },
-  "10000_DMG": {
-    "name": "Essa Doeu Pra Caramba!"
-  },
-  "HealAchv": {
-    "description": "Cure {{healAmount}} {{HP}} de uma vez só com um movimento, habilidade ou item segurado"
-  },
-  "250_HEAL": {
-    "name": "Residente"
-  },
-  "1000_HEAL": {
-    "name": "Enfermeiro"
-  },
-  "2500_HEAL": {
-    "name": "Médico"
-  },
-  "10000_HEAL": {
-    "name": "Médico de Plantão"
-  },
-  "LevelAchv": {
-    "description": "Aumente o nível de um Pokémon para o Nv{{level}}"
-  },
-  "LV_100": {
-    "name": "Calma Que Tem Mais!"
-  },
-  "LV_250": {
-    "name": "Treinador de Elite"
-  },
-  "LV_1000": {
-    "name": "Ao Infinito e Além!"
-  },
-  "RibbonAchv": {
-    "description": "Acumule um total de {{ribbonAmount}} Fitas"
-  },
-  "10_RIBBONS": {
-    "name": "Fita de Bronze"
-  },
-  "25_RIBBONS": {
-    "name": "Fita de Prata"
-  },
-  "50_RIBBONS": {
-    "name": "Fita de Ouro"
-  },
-  "75_RIBBONS": {
-    "name": "Fita de Platina"
-  },
-  "100_RIBBONS": {
-    "name": "Fita de Diamante"
-  },
-  "TRANSFER_MAX_BATTLE_STAT": {
-    "name": "Trabalho em Equipe",
-    "description": "Use Baton Pass com pelo menos um atributo aumentado ao máximo"
-  },
-  "MAX_FRIENDSHIP": {
-    "name": "Melhores Amigos",
-    "description": "Alcance a amizade máxima com um Pokémon"
-  },
-  "MEGA_EVOLVE": {
-    "name": "Megamorfose",
-    "description": "Megaevolua um Pokémon"
-  },
-  "GIGANTAMAX": {
-    "name": "Ficou Gigante!",
-    "description": "Gigantamax um Pokémon"
-  },
-  "TERASTALLIZE": {
-    "name": "Terastalização",
-    "description": "Terastalize um Pokémon"
-  },
-  "STELLAR_TERASTALLIZE": {
-    "name": "Estrela Cadente",
-    "description": "Terastalize um Pokémon para o tipo Estelar"
-  },
-  "SPLICE": {
-    "name": "Fusão!",
-    "description": "Funda dois Pokémon com um Splicer de DNA"
-  },
-  "MINI_BLACK_HOLE": {
-    "name": "Buraco Sem Fundo",
-    "description": "Adquira um Mini Buraco Negro"
-  },
-  "CATCH_MYTHICAL": {
-    "name": "Mítico",
-    "description": "Capture um Pokémon Mítico"
-  },
-  "CATCH_SUB_LEGENDARY": {
-    "name": "Quase Lendário",
-    "description": "Capture um Pokémon Semi-Lendário"
-  },
-  "CATCH_LEGENDARY": {
-    "name": "Lendário",
-    "description": "Capture um Pokémon Lendário"
-  },
-  "SEE_SHINY": {
-    "name": "Ué, Tá Brilhando?",
-    "description": "Encontre um Pokémon Shiny selvagem"
-  },
-  "SHINY_PARTY": {
-    "name": "Tá Todo Mundo Brilhando!",
-    "description": "Tenha uma equipe formada por 6 Pokémon Shiny"
-  },
-  "HATCH_MYTHICAL": {
-    "name": "Ovo Mítico",
-    "description": "Choque um Pokémon Mítico"
-  },
-  "HATCH_SUB_LEGENDARY": {
-    "name": "Ovo Semi-Lendário",
-    "description": "Choque um Pokémon Semi-Lendário"
-  },
-  "HATCH_LEGENDARY": {
-    "name": "Ovo Lendário",
-    "description": "Choque um Pokémon Lendário"
-  },
-  "HATCH_SHINY": {
-    "name": "Ovo Shiny",
-    "description": "Choque um Pokémon Shiny"
-  },
-  "HIDDEN_ABILITY": {
-    "name": "Potencial Oculto",
-    "description": "Capture um Pokémon com uma Habilidade Oculta"
-  },
-  "PERFECT_IVS": {
-    "name": "Perfeição Certificada",
-    "description": "Obtenha IVs perfeitos em um Pokémon"
-  },
-  "CLASSIC_VICTORY": {
-    "name": "Invencível",
-    "description": "Vença o jogo no modo clássico"
-  },
-  "UNEVOLVED_CLASSIC_VICTORY": {
-    "name": "Tire as Crianças da Sala",
-    "description": "Vença o jogo no Modo Clássico com pelo menos um membro da equipe não evoluído."
-  },
-  "MONO_GEN_ONE": {
-    "name": "O Início de Tudo",
-    "description": "Complete o desafio da geração um."
-  },
-  "MONO_GEN_TWO": {
-    "name": "Geração 1.5",
-    "description": "Complete o desafio da geração dois."
-  },
-  "MONO_GEN_THREE": {
-    "name": "Será que tem muita água?",
-    "description": "Complete o desafio da geração três."
-  },
-  "MONO_GEN_FOUR": {
-    "name": "Essa foi a mais difícil?",
-    "description": "Complete o desafio da geração quatro."
-  },
-  "MONO_GEN_FIVE": {
-    "name": "Nada original",
-    "description": "Complete o desafio da geração cinco."
-  },
-  "MONO_GEN_SIX": {
-    "name": "Esse croissant tem recheio?",
-    "description": "Complete o desafio da geração seis."
-  },
-  "MONO_GEN_SEVEN": {
-    "name": "Z-Move ou Se vira nos 30?",
-    "description": "Complete o desafio da geração sete."
-  },
-  "MONO_GEN_EIGHT": {
-    "name": "Finalmente ele ganhou!",
-    "description": "Complete o desafio da geração oito."
-  },
-  "MONO_GEN_NINE": {
-    "name": "Isso aqui tá muito fácil!",
-    "description": "Complete o desafio da geração nove."
-  },
-  "MonoType": {
-    "description": "Complete o desafio de monotipo {{type}}."
-  },
-  "MONO_NORMAL": {
-    "name": "Extra Ordinário"
-  },
-  "MONO_FIGHTING": {
-    "name": "Briga de Rua"
-  },
-  "MONO_FLYING": {
-    "name": "Rinha de Pidgeys"
-  },
-  "MONO_POISON": {
-    "name": "Menina Veneno"
-  },
-  "MONO_GROUND": {
-    "name": "Comendo Poeira"
-  },
-  "MONO_ROCK": {
-    "name": "...Tanto Bate Até Que Fura"
-  },
-  "MONO_BUG": {
-    "name": "Vida de Inseto"
-  },
-  "MONO_GHOST": {
-    "name": "Fantasminha Camarada"
-  },
-  "MONO_STEEL": {
-    "name": "Levantando Ferro"
-  },
-  "MONO_FIRE": {
-    "name": "Tá Pegando Fogo, Bicho!"
-  },
-  "MONO_WATER": {
-    "name": "Água Mole em Pedra Dura..."
-  },
-  "MONO_GRASS": {
-    "name": "Jardim Botânico"
-  },
-  "MONO_ELECTRIC": {
-    "name": "Choque de Realidade"
-  },
-  "MONO_PSYCHIC": {
-    "name": "Preciso de Terapia"
-  },
-  "MONO_ICE": {
-    "name": "Era do Gelo"
-  },
-  "MONO_DRAGON": {
-    "name": "Caverna do Dragão"
-  },
-  "MONO_DARK": {
-    "name": "É Só Uma Fase"
-  },
-  "MONO_FAIRY": {
-    "name": "Clube das Winx"
-  },
-  "FRESH_START": {
-    "name": "De Primeira!",
-    "description": "Complete o desafio de novo começo."
-  }
-}
\ No newline at end of file
diff --git a/src/locales/pt_BR/achv-female.json b/src/locales/pt_BR/achv.json
similarity index 93%
rename from src/locales/pt_BR/achv-female.json
rename to src/locales/pt_BR/achv.json
index e81cba6f9ca..acdec1ae306 100644
--- a/src/locales/pt_BR/achv-female.json
+++ b/src/locales/pt_BR/achv.json
@@ -42,13 +42,16 @@
     "name": "Residente"
   },
   "1000_HEAL": {
-    "name": "Enfermeira"
+    "name": "Enfermeiro",
+    "name_female": "Enfermeira"
   },
   "2500_HEAL": {
-    "name": "Médica"
+    "name": "Médico",
+    "name_female": "Médica"
   },
   "10000_HEAL": {
-    "name": "Médica de Plantão"
+    "name": "Médico de Plantão",
+    "name_female": "Médica de Plantão"
   },
   "LevelAchv": {
     "description": "Aumente o nível de um Pokémon para o Nv{{level}}"
@@ -57,7 +60,8 @@
     "name": "Calma Que Tem Mais!"
   },
   "LV_250": {
-    "name": "Treinadora de Elite"
+    "name": "Treinador de Elite",
+    "name_female": "Treinadora de Elite"
   },
   "LV_1000": {
     "name": "Ao Infinito e Além!"
@@ -260,5 +264,9 @@
   "FRESH_START": {
     "name": "De Primeira!",
     "description": "Complete o desafio de novo começo."
+  },
+  "INVERSE_BATTLE": {
+    "name": "A torre da derrotA",
+    "description": "Complete o desafio da Batalha Inversa.\n.asrevnI ahlataB ad oifased o etelpmoC"
   }
 }
\ No newline at end of file
diff --git a/src/locales/pt_BR/arena-flyout.json b/src/locales/pt_BR/arena-flyout.json
index 7ef11bea17f..e221fa6c0a5 100644
--- a/src/locales/pt_BR/arena-flyout.json
+++ b/src/locales/pt_BR/arena-flyout.json
@@ -15,5 +15,26 @@
   "misty": "Terreno Enevoado",
   "electric": "Terreno Elétrico",
   "grassy": "Terreno de Planta",
-  "psychic": "Terreno Psíquico"
-}
\ No newline at end of file
+  "psychic": "Terreno Psíquico",
+  "mudSport": "Mud Sport",
+  "waterSport": "Water Sport",
+  "spikes": "Spikes",
+  "toxicSpikes": "Toxic Spikes",
+  "mist": "Mist",
+  "futureSight": "Future Sight",
+  "doomDesire": "Doom Desire",
+  "wish": "Wish",
+  "stealthRock": "Stealth Rock",
+  "stickyWeb": "Sticky Web",
+  "trickRoom": "Trick Room",
+  "gravity": "Gravity",
+  "reflect": "Reflect",
+  "lightScreen": "Light Screen",
+  "auroraVeil": "Aurora Veil",
+  "quickGuard": "Quick Guard",
+  "wideGuard": "Wide Guard",
+  "matBlock": "Mat Block",
+  "craftyShield": "Crafty Shield",
+  "tailwind": "Tailwind",
+  "happyHour": "Happy Hour"
+}
diff --git a/src/locales/pt_BR/battle.json b/src/locales/pt_BR/battle.json
index b48d97ef4e9..e34ce8efdca 100644
--- a/src/locales/pt_BR/battle.json
+++ b/src/locales/pt_BR/battle.json
@@ -38,7 +38,7 @@
   "learnMoveNotLearned": "{{pokemonName}} não aprendeu {{moveName}}.",
   "learnMoveForgetQuestion": "Qual movimento quer esquecer?",
   "learnMoveForgetSuccess": "{{pokemonName}} esqueceu como usar {{moveName}}.",
-  "countdownPoof": "@d{32}1, @d{15}2, @d{15}e@d{15}… @d{15}… @d{15}… @d{15}@s{pb_bounce_1}Puf!",
+  "countdownPoof": "@d{32}1, @d{15}2, @d{15}e@d{15}… @d{15}… @d{15}… @d{15}@s{se/pb_bounce_1}Puf!",
   "learnMoveAnd": "E…",
   "levelCapUp": "O nível máximo aumentou\npara {{levelCap}}!",
   "moveNotImplemented": "{{moveName}} ainda não foi implementado e não pode ser usado.",
diff --git a/src/locales/pt_BR/bgm-name.json b/src/locales/pt_BR/bgm-name.json
index bfce77e3a69..86d8ce3e790 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",
@@ -78,11 +80,21 @@
   "battle_galactic_grunt": "BDSP Batalha da Equipe Galáctica",
   "battle_plasma_grunt": "BW Batalha da Equipe Plasma",
   "battle_flare_grunt": "XY Batalha da Equipe Flare",
+  "battle_aether_grunt": "SM Batalha da Fundação Aether",
+  "battle_skull_grunt": "SM Batalha da Equipe Skull",
+  "battle_macro_grunt": "SWSH Batalha de Treinador",
+  "battle_galactic_admin": "BDSP Batalha com Admin da Equipe Galáctica",
+  "battle_skull_admin": "SM Batalha com Admin da Euipe Skull",
+  "battle_oleana": "SWSH Batalha da Oleana",
   "battle_rocket_boss": "USUM Batalha do Giovanni",
   "battle_aqua_magma_boss": "ORAS Batalha do Maxie & Archie",
   "battle_galactic_boss": "BDSP Batalha do Cyrus",
   "battle_plasma_boss": "B2W2 Batalha do Ghetsis",
   "battle_flare_boss": "XY Batalha do Lysandre",
+  "battle_aether_boss":  "SM Batalha da Lusamine",
+  "battle_skull_boss": "SM Batalha do Guzma",
+  "battle_macro_boss": "SWSH Batalha do Rose",
+
   "abyss": "PMD EoS Dark Crater",
   "badlands": "PMD EoS Barren Valley",
   "beach": "PMD EoS Drenched Bluff",
@@ -135,4 +147,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/challenges.json b/src/locales/pt_BR/challenges.json
index 43a40e29b56..6b20a92f4f6 100644
--- a/src/locales/pt_BR/challenges.json
+++ b/src/locales/pt_BR/challenges.json
@@ -25,5 +25,12 @@
     "desc": "Você só pode usar os iniciais originais, como se tivesse acabado de começar o PokéRogue.",
     "value.0": "Desligado",
     "value.1": "Ligado"
+  },
+  "inverseBattle": {
+    "name": "Batalha Inversa",
+    "shortName": "Inversa",
+    "desc": "Fraquezas e resistências de tipos são invertidas e nenhum tipo é imune a outro tipo.\nDesativa as conquistas de outros desafios.",
+    "value.0": "Desligado",
+    "value.1": "Ligado"
   }
 }
\ No newline at end of file
diff --git a/src/locales/pt_BR/config.ts b/src/locales/pt_BR/config.ts
index 74dce2dec3e..9e8377149c1 100644
--- a/src/locales/pt_BR/config.ts
+++ b/src/locales/pt_BR/config.ts
@@ -4,8 +4,7 @@ import ability from "./ability.json";
 import abilityTriggers from "./ability-trigger.json";
 import arenaFlyout from "./arena-flyout.json";
 import arenaTag from "./arena-tag.json";
-import achvMale from "./achv-male.json";
-import achvFemale from "./achv-female.json";
+import achv from "./achv.json";
 import battle from "./battle.json";
 import battleScene from "./battle-scene.json";
 import battleInfo from "./battle-info.json";
@@ -16,14 +15,10 @@ import bgmName from "./bgm-name.json";
 import biome from "./biome.json";
 import challenges from "./challenges.json";
 import commandUiHandler from "./command-ui-handler.json";
-import dialogueMale from "./dialogue-male.json";
-import dialogueFemale from "./dialogue-female.json";
-import dialogueEndbossMale from "./dialogue-final-boss-male.json";
-import dialogueEndbossFemale from "./dialogue-final-boss-female.json";
-import dialogueMiscMale from "./dialogue-misc-male.json";
-import dialogueMiscFemale from "./dialogue-misc-female.json";
-import dialogueDoubleBattleMale from "./dialogue-double-battle-male.json";
-import dialogueDoubleBattleFemale from "./dialogue-double-battle-female.json";
+import dialogue from "./dialogue.json";
+import battleSpecDialogue from "./dialogue-final-boss.json";
+import miscDialogue from "./dialogue-misc.json";
+import doubleBattleDialogue from "./dialogue-double-battle.json";
 import egg from "./egg.json";
 import fightUiHandler from "./fight-ui-handler.json";
 import filterBar from "./filter-bar.json";
@@ -57,7 +52,7 @@ import weather from "./weather.json";
 import terrain from "./terrain.json";
 import modifierSelectUiHandler from "./modifier-select-ui-handler.json";
 import moveTriggers from "./move-trigger.json";
-import runHistory from "./run-history-ui-handler.json";
+import runHistory from "./run-history.json";
 
 export const ptBrConfig = {
   ability,
@@ -76,16 +71,11 @@ export const ptBrConfig = {
   challenges,
   commandUiHandler,
   common,
-  PGMachv: achvMale,
-  PGFachv: achvFemale,
-  PGMdialogue: dialogueMale,
-  PGFdialogue: dialogueFemale,
-  PGMbattleSpecDialogue: dialogueEndbossMale,
-  PGFbattleSpecDialogue: dialogueEndbossFemale,
-  PGMmiscDialogue: dialogueMiscMale,
-  PGFmiscDialogue: dialogueMiscFemale,
-  PGMdoubleBattleDialogue: dialogueDoubleBattleMale,
-  PGFdoubleBattleDialogue: dialogueDoubleBattleFemale,
+  achv,
+  dialogue,
+  battleSpecDialogue,
+  miscDialogue,
+  doubleBattleDialogue,
   egg,
   fightUiHandler,
   filterBar,
diff --git a/src/locales/pt_BR/dialogue-double-battle-female.json b/src/locales/pt_BR/dialogue-double-battle-female.json
deleted file mode 100644
index d8c28a51796..00000000000
--- a/src/locales/pt_BR/dialogue-double-battle-female.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "blue_red_double": {
-    "encounter": {
-      "1": "Blue: Ei Red, vamos mostrar do que somos feitos!\n$Red: ...\n$Blue: Este é o poder da Cidade de Pallet!"
-    },
-    "victory": {
-      "1": "Blue: Essa foi uma ótima batalha!\n$Red: ..."
-    }
-  },
-  "red_blue_double": {
-    "encounter": {
-      "1": "Red: ...!\n$Blue: Ele nunca fala muito.\n$Blue: Mas não se deixe enganar! Ele é um campeão, afinal!"
-    },
-    "victory": {
-      "1": "Red: ...!\n$Blue: Da próxima vez, vamos vencer você!"
-    }
-  },
-  "tate_liza_double": {
-    "encounter": {
-      "1": "Tate: Está surpreso?\n$Liza: Somos dois líderes de ginásio ao mesmo tempo!\n$Tate: Somos gêmeos!\n$Liza: Não precisamos falar para nos entender!\n$Tate: Duas vezes o poder...\n$Liza: Você consegue lidar com isso?"
-    },
-    "victory": {
-      "1": "Tate: O quê? Nossa combinação foi perfeita!\n$Liza: Parece que precisamos treinar mais..."
-    }
-  },
-  "liza_tate_double": {
-    "encounter": {
-      "1": "Liza: Hihihi... Está surpreso?\n$Tate: Sim, somos realmente dois líderes de ginásio ao mesmo tempo!\n$Liza: Este é meu irmão gêmeo Tate!\n$Tate: E esta é minha irmã gêmea Liza!\n$Liza: Não acha que somos uma combinação perfeita?"
-    },
-    "victory": {
-      "1": "Liza: Nós somos...\n$Tate: ...não tão fortes quanto pensávamos?"
-    }
-  },
-  "wallace_steven_double": {
-    "encounter": {
-      "1": "Steven: Wallace, vamos mostrar a eles o poder dos campeões!\n$Wallace: Vamos mostrar o poder de Hoenn!\n$Steven: Vamos lá!"
-    },
-    "victory": {
-      "1": "Steven: Essa foi uma ótima batalha!\n$Wallace: Vamos vencer da próxima vez!"
-    }
-  },
-  "steven_wallace_double": {
-    "encounter": {
-      "1": "Steven: Você tem algum Pokémon raro?\n$Wallace: Steven... Estamos aqui para uma batalha, não para mostrar nossos Pokémon.\n$Steven: Ah... Entendi... Vamos lá então!"
-    },
-    "victory": {
-      "1": "Steven: Agora que terminamos a batalha, vamos mostrar nossos Pokémon!\n$Wallace: Steven..."
-    }
-  },
-  "alder_iris_double": {
-    "encounter": {
-      "1": "Alder: Somos os treinadores mais fortes de Unova!\n$Iris: Lutas contra treinadores fortes são as melhores!"
-    },
-    "victory": {
-      "1": "Alder: Uau! Você é super forte!\n$Iris: Vamos vencer da próxima vez!"
-    }
-  },
-  "iris_alder_double": {
-    "encounter": {
-      "1": "Iris: Bem-vinda, Desafiante! Eu sou A Campeã de Unova!\n$Alder: Iris, você não está um pouco empolgada demais?"
-    },
-    "victory": {
-      "1": "Iris: Uma derrota como essa não é fácil de engolir...\n$Alder: Mas só ficaremos mais fortes a cada derrota!"
-    }
-  },
-  "piers_marnie_double": {
-    "encounter": {
-      "1": "Marnie: Irmão, vamos mostrar a eles o poder de Spikemuth!\n$Piers: Nós trazemos a escuridão!"
-    },
-    "victory": {
-      "1": "Marnie: Você trouxe luz para nossa escuridão!\n$Piers: Está muito claro..."
-    }
-  },
-  "marnie_piers_double": {
-    "encounter": {
-      "1": "Piers: Prontos para um show?\n$Marnie: Irmão... Eles estão aqui para lutar, não para cantar..."
-    },
-    "victory": {
-      "1": "Piers: Agora esse foi um ótimo show!\n$Marnie: Irmão..."
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/locales/pt_BR/dialogue-double-battle-male.json b/src/locales/pt_BR/dialogue-double-battle.json
similarity index 93%
rename from src/locales/pt_BR/dialogue-double-battle-male.json
rename to src/locales/pt_BR/dialogue-double-battle.json
index 4c2196de7f6..4d1c7d90c9b 100644
--- a/src/locales/pt_BR/dialogue-double-battle-male.json
+++ b/src/locales/pt_BR/dialogue-double-battle.json
@@ -57,7 +57,8 @@
   },
   "iris_alder_double": {
     "encounter": {
-      "1": "Iris: Bem-vindo, Desafiante! Eu sou A Campeã de Unova!\n$Alder: Iris, você não está um pouco empolgada demais?"
+      "1": "Iris: Bem-vindo, Desafiante! Eu sou A Campeã de Unova!\n$Alder: Iris, você não está um pouco empolgada demais?",
+      "1_female": "Iris: Bem-vinda, Desafiante! Eu sou A Campeã de Unova!\n$Alder: Iris, você não está um pouco empolgada demais?"
     },
     "victory": {
       "1": "Iris: Uma derrota como essa não é fácil de engolir...\n$Alder: Mas só ficaremos mais fortes a cada derrota!"
diff --git a/src/locales/pt_BR/dialogue-female.json b/src/locales/pt_BR/dialogue-female.json
deleted file mode 100644
index 7f4dfe8865d..00000000000
--- a/src/locales/pt_BR/dialogue-female.json
+++ /dev/null
@@ -1,2511 +0,0 @@
-{
-  "youngster": {
-    "encounter": {
-      "1": "Eai, quer batalhar?",
-      "2": "Você também é uma treinadora nova?",
-      "3": "Eai, nunca te vi antes. Vamos batalhar!",
-      "4": "Acabei de perder, então estou tentando encontrar mais Pokémon.\nEspera! Você parece fraca! Vamos batalhar!",
-      "5": "A gente já se conheceu antes? Não lembro muito bem. Enfim, prazer te conhecer!",
-      "6": "Beleza! Vamos nessa!",
-      "7": "Beleza! Lá vou eu! Vou te mostrar meu poder!",
-      "8": "Hahaha... Vou te mostrar o quão incríveis são meus Pokémon!",
-      "9": "Sem perder tempo com cumprimentos. Vamos logo, quando estiver pronta!",
-      "10": "Não baixe a guarda, ou você pode acabar chorando quando uma criança te vencer.",
-      "11": "Eu criei meus Pokémon com muito cuidado. Você não tem permissão para machucá-los!",
-      "12": "Que bom que você chegou! Não vai ser fácil daqui pra frente.",
-      "13": "As batalhas continuam para sempre! Bem-vinda ao mundo sem fim!"
-    },
-    "victory": {
-      "1": "Uau! Você é forte!",
-      "2": "Eu não tive chance, né?",
-      "3": "Vou te encontrar de novo quando for mais velho e te vencer!",
-      "4": "Ugh. Não tenho mais Pokémon.",
-      "5": "Não acredito… NÃO ACREDITO! Como pude de novo…",
-      "6": "Não! Eu perdi!",
-      "7": "Uau! Você é incrível! Estou surpreso!",
-      "8": "Pode ser… Como… Eu e meus Pokémon somos os mais fortes, porém…",
-      "9": "Não vou perder da próxima vez! Vamos batalhar de novo algum dia!",
-      "10": "Aff! Não vê que sou apenas uma criança? Não foi justo você ir com tudo!",
-      "11": "Seus Pokémon são incríveis! Troca comigo!",
-      "12": "Me empolguei um pouco antes, mas sobre qual trabalho eu estava falando?",
-      "13": "Ahaha! É isso aí! Você já está em casa nesse mundo!"
-    }
-  },
-  "lass": {
-    "encounter": {
-      "1": "Vamos batalhar, pode ser?",
-      "2": "Você parece uma treinadora nova. Vamos batalhar!",
-      "3": "Não te reconheço. Que tal uma batalha?",
-      "4": "Vamos ter uma batalha Pokémon divertida!",
-      "5": "Vou te mostrar como realmente usar Pokémon!",
-      "6": "Uma batalha séria começa com um começo sério! Tem certeza que está pronta?",
-      "7": "Você só é jovem uma vez. E só tem uma chance em cada batalha. Logo, você será apenas uma memória.",
-      "8": "Vai com calma comigo, tá? Mas vou lutar sério!",
-      "9": "A escola é chata. Não tenho nada para fazer. Só estou batalhando para passar o tempo."
-    },
-    "victory": {
-      "1": "Isso foi impressionante! Tenho muito a aprender.",
-      "2": "Não pensei que você me venceria tão fácil…",
-      "3": "Espero que possamos ter uma revanche um dia.",
-      "4": "Isso foi incrivelmente divertido! Você me esgotou totalmente…",
-      "5": "Você realmente me ensinou uma lição! Você é incrível!",
-      "6": "Sério, eu perdi. Isso é, tipo, seriamente deprimente, mas você foi seriamente legal.",
-      "7": "Não preciso de memórias como essa. Deletando memória…",
-      "8": "Ei! Eu te disse para pegar leve comigo! Mesmo assim, você é legal quando fica séria.",
-      "9": "Estou realmente cansando de batalhar… Deve haver algo novo para fazer…"
-    }
-  },
-  "breeder": {
-    "encounter": {
-      "1": "Pokémon obedientes, Pokémon egoístas… Pokémon têm características únicas.",
-      "2": "Embora minha criação e comportamento sejam ruins, criei meus Pokémon bem.",
-      "3": "Hmm, você disciplina seus Pokémon? Mimar demais não é bom."
-    },
-    "victory": {
-      "1": "É importante nutrir e treinar as características de cada Pokémon.",
-      "2": "Ao contrário do meu lado diabólico, esses são bons Pokémon.",
-      "3": "Muito elogio pode estragar tanto Pokémon quanto pessoas."
-    },
-    "defeat": {
-      "1": "Você não deve ficar com raiva dos seus Pokémon, mesmo se perder uma batalha.",
-      "2": "Certo? Pokémon bons, né? Eu sou adequado para criar coisas.",
-      "3": "Não importa o quanto você ame seus Pokémon, ainda precisa discipliná-los quando se comportam mal."
-    }
-  },
-  "breeder_female": {
-    "encounter": {
-      "1": "Pokémon nunca te traem. Eles retribuem todo o amor que você dá a eles.",
-      "2": "Quer uma dica para treinar bons Pokémon?",
-      "3": "Eu criei esses Pokémon muito especiais usando um método especial."
-    },
-    "victory": {
-      "1": "Ugh… Não era para ser assim. Será que administrei a mistura errada?",
-      "2": "Como isso aconteceu com meus Pokémon… O que você está dando de comer aos seus Pokémon?",
-      "3": "Se eu perder, isso significa que eu estava só matando o tempo. Não machuca meu ego nem um pouco."
-    },
-    "defeat": {
-      "1": "Isso prova que meus Pokémon aceitaram meu amor.",
-      "2": "O verdadeiro truque para treinar bons Pokémon é capturar bons Pokémon.",
-      "3": "Pokémon serão fortes ou fracos dependendo de como você os cria."
-    }
-  },
-  "fisherman": {
-    "encounter": {
-      "1": "Anem! Você me fez perder uma fisgada!\nO que vai fazer sobre isso?",
-      "2": "Sai daqui! Você está assustando os Pokémon!",
-      "3": "Vamos ver se você consegue fisgar uma vitória!"
-    },
-    "victory": {
-      "1": "Esqueça isso.",
-      "2": "Da próxima vez, eu vou pescar a vitória!",
-      "3": "Acho que subestimei a força das correntes dessa vez."
-    }
-  },
-  "fisherman_female": {
-    "encounter": {
-      "1": "Uau! Peguei um grande!",
-      "2": "Linha lançada, pronta para pescar o sucesso!",
-      "3": "Pronta para fazer ondas!"
-    },
-    "victory": {
-      "1": "Vou voltar com um anzol mais forte.",
-      "2": "Vou pescar a vitória na próxima vez.",
-      "3": "Estou só afiando meus anzóis para a revanche!"
-    }
-  },
-  "swimmer": {
-    "encounter": {
-      "1": "Hora de mergulhar!",
-      "2": "Vamos surfar nas ondas da vitória!",
-      "3": "Pronto para fazer um splash!"
-    },
-    "victory": {
-      "1": "Molhado na derrota!",
-      "2": "Uma onda de derrota!",
-      "3": "De volta à praia, eu acho."
-    }
-  },
-  "backpacker": {
-    "encounter": {
-      "1": "Prepare-se, vamos começar!",
-      "2": "Vamos ver se você consegue acompanhar!",
-      "3": "Prepare-se, desafiante!",
-      "4": "Passei 20 anos tentando me encontrar… Mas onde estou?"
-    },
-    "victory": {
-      "1": "Dessa vez tropecei!",
-      "2": "Ah, acho que estou perdido.",
-      "3": "Caminho sem saída!",
-      "4": "Espere um segundo! Ei! Você não sabe quem eu sou?"
-    }
-  },
-  "ace_trainer": {
-    "encounter": {
-      "1": "Você parece bastante confiante.",
-      "2": "Seus Pokémon… Mostre-os para mim…",
-      "3": "Como sou um Treinador Ás, as pessoas acham que sou forte.",
-      "4": "Você sabe o que é preciso para ser um Treinador Ás?"
-    },
-    "victory": {
-      "1": "Sim… Você tem bons Pokémon…",
-      "2": "O quê?! Mas sou um gênio das batalhas!",
-      "3": "Claro, você é a personagem principal!",
-      "4": "OK! OK! Você poderia ser uma Treinador Ás!"
-    },
-    "defeat": {
-      "1": "Estou dedicando corpo e alma às batalhas de Pokémon!",
-      "2": "Tudo dentro das minhas expectativas… Nada para se surpreender…",
-      "3": "Eu achava que cresceria para ser uma pessoa frágil que parecia que quebraria se você apertasse muito.",
-      "4": "Claro que sou forte e não perco. É importante ganhar com graça."
-    }
-  },
-  "parasol_lady": {
-    "encounter": {
-      "1": "Hora de embelezar o campo de batalha com elegância e postura!"
-    },
-    "victory": {
-      "1": "Minha elegância permanece inabalável!"
-    }
-  },
-  "twins": {
-    "encounter": {
-      "1": "Prepare-se, porque quando nos unimos, é o dobro do problema!",
-      "2": "Dois corações, uma estratégia – vamos ver se você consegue acompanhar nosso poder de gêmeos!",
-      "3": "Espero que esteja pronta para o dobro do problema, porque estamos prestes a causar!"
-    },
-    "victory": {
-      "1": "Podemos ter perdido essa rodada, mas nosso vínculo permanece inquebrável!",
-      "2": "Nosso espírito de gêmeos não será apagado por muito tempo.",
-      "3": "Voltaremos mais fortes como uma dupla dinâmica!"
-    },
-    "defeat": {
-      "1": "O poder dos gêmeos reina supremo!",
-      "2": "Dois corações, um triunfo!",
-      "3": "Dobro de sorrisos, dobro da dança da vitória!"
-    }
-  },
-  "cyclist": {
-    "encounter": {
-      "1": "Prepare-se para comer poeira!",
-      "2": "Prepare-se, desafiante! Estou prestes a te deixar para trás!",
-      "3": "Pé no pedal, vamos ver se você consegue acompanhar!"
-    },
-    "victory": {
-      "1": "As rodas podem estar paradas, mas a determinação continua a pedalar.",
-      "2": "Fui mais rápido!",
-      "3": "O caminho para a vitória tem muitas curvas e voltas para explorar."
-    }
-  },
-  "black_belt": {
-    "encounter": {
-      "1": "Elogio sua coragem ao me desafiar! Pois eu sou o que tem o chute mais forte!",
-      "2": "Oh, entendo. Você gostaria de ser cortada em pedaços? Ou prefere o papel de saco de pancadas?"
-    },
-    "victory": {
-      "1": "Oh. Os Pokémon fizeram a luta. Meu chute forte não ajudou em nada.",
-      "2": "Hmmm… Se eu ia perder de qualquer maneira, esperava ficar totalmente destruído no processo."
-    }
-  },
-  "battle_girl": {
-    "encounter": {
-      "1": "Você não precisa tentar me impressionar. Você pode perder contra mim."
-    },
-    "victory": {
-      "1": "É difícil dizer adeus, mas estamos ficando sem tempo…"
-    }
-  },
-  "hiker": {
-    "encounter": {
-      "1": "Minha barriga de meia-idade me deu tanta gravidade quanto as montanhas que eu escalo!",
-      "2": "Herdei esse corpo ossudo dos meus pais… Sou como uma cadeia de montanhas viva…"
-    },
-    "victory": {
-      "1": "Pelo menos não posso perder quando se trata de IMC!",
-      "2": "Não é suficiente… Nunca é suficiente. Meu colesterol ruim não está alto o suficiente…"
-    }
-  },
-  "ranger": {
-    "encounter": {
-      "1": "Quando estou cercado pela natureza, a maioria das outras coisas deixa de importar.",
-      "2": "Quando estou vivendo sem natureza na minha vida, às vezes sinto uma crise de ansiedade se aproximando."
-    },
-    "victory": {
-      "1": "Não importa para a vastidão da natureza se eu ganhar ou perder…",
-      "2": "Algo assim é bastante trivial comparado aos sentimentos sufocantes da vida na cidade."
-    },
-    "defeat": {
-      "1": "Ganhei a batalha. Mas a vitória não é nada comparada à vastidão da natureza…",
-      "2": "Tenho certeza de que como você se sente não é tão ruim se comparar aos meus ataques de ansiedade…"
-    }
-  },
-  "scientist": {
-    "encounter": {
-      "1": "Minha pesquisa levará este mundo à paz e alegria."
-    },
-    "victory": {
-      "1": "Sou um gênio… Não devo perder para alguém como você…"
-    }
-  },
-  "school_kid": {
-    "encounter": {
-      "1": "Heehee. Estou confiante nos meus cálculos e análises.",
-      "2": "Estou ganhando o máximo de experiência que posso porque quero ser um Líder de Ginásio um dia."
-    },
-    "victory": {
-      "1": "Aff… Cálculo e análise talvez não sejam páreo para o acaso…",
-      "2": "Até experiências difíceis e desafiadoras têm seu propósito, eu acho."
-    }
-  },
-  "artist": {
-    "encounter": {
-      "1": "Eu costumava ser popular, mas agora estou acabado."
-    },
-    "victory": {
-      "1": "À medida que os tempos mudam, os valores também mudam. Percebi isso tarde demais."
-    }
-  },
-  "guitarist": {
-    "encounter": {
-      "1": "Prepare-se para sentir o ritmo da derrota enquanto eu toco minha vitória!"
-    },
-    "victory": {
-      "1": "Silenciado por agora, mas minha melodia de resiliência continuará a tocar."
-    }
-  },
-  "worker": {
-    "encounter": {
-      "1": "Me incomoda que as pessoas sempre me entendam mal. Sou muito mais puro do que todos pensam."
-    },
-    "victory": {
-      "1": "Eu realmente não quero que minha pele queime, então quero ficar na sombra enquanto trabalho."
-    }
-  },
-  "worker_female": {
-    "encounter": {
-      "1": "Me incomoda que as pessoas sempre me entendam mal.\n$Sou muito mais pura do que todos pensam."
-    },
-    "victory": {
-      "1": "Eu realmente não quero que minha pele queime, então quero ficar na sombra enquanto trabalho."
-    },
-    "defeat": {
-      "1": "Meu corpo e mente nem sempre estão necessariamente em sincronia."
-    }
-  },
-  "worker_double": {
-    "encounter": {
-      "1": "Vou te mostrar que podemos te quebrar. Estamos treinando no campo!"
-    },
-    "victory": {
-      "1": "Que estranho… Como isso pode ser… Não deveria ter sido superado."
-    }
-  },
-  "hex_maniac": {
-    "encounter": {
-      "1": "Normalmente, só escuto música clássica, mas se eu perder, acho que vou tentar um pouco de new age!",
-      "2": "Eu fico mais forte a cada lágrima que derramo."
-    },
-    "victory": {
-      "1": "É o início da era de Aquário?",
-      "2": "Agora posso ficar ainda mais forte. Cresço com cada rancor."
-    },
-    "defeat": {
-      "1": "New age se refere simplesmente aos compositores clássicos do século XX, certo?",
-      "2": "Não fique presa na tristeza ou frustração. Você pode usar seus rancores para se motivar."
-    }
-  },
-  "psychic": {
-    "encounter": {
-      "1": "Oi! Concentre-se!"
-    },
-    "victory": {
-      "1": "Perdi minha concentração!"
-    }
-  },
-  "officer": {
-    "encounter": {
-      "1": "Prepare-se, porque a justiça está prestes a ser servida!",
-      "2": "Pronto para defender a lei e servir a justiça no campo de batalha!"
-    },
-    "victory": {
-      "1": "O peso da justiça parece mais pesado do que nunca…",
-      "2": "As sombras da derrota pairam no distrito."
-    }
-  },
-  "beauty": {
-    "encounter": {
-      "1": "Minha última batalha… É assim que eu gostaria que víssemos esta partida…"
-    },
-    "victory": {
-      "1": "Foi divertido… Vamos ter outra última batalha algum dia…"
-    }
-  },
-  "baker": {
-    "encounter": {
-      "1": "Espero que esteja pronta para saborear a derrota!"
-    },
-    "victory": {
-      "1": "Vou assar uma revanche."
-    }
-  },
-  "biker": {
-    "encounter": {
-      "1": "Hora de acelerar e te deixar na poeira!"
-    },
-    "victory": {
-      "1": "Vou me ajustar para a próxima corrida."
-    }
-  },
-  "firebreather": {
-    "encounter": {
-      "1": "Minhas chamas irão te consumir!",
-      "2": "Minha alma está pegando fogo. Irei te mostrar como queima!",
-      "3": "Cola aqui e dá uma olhada!"
-    },
-    "victory": {
-      "1": "Fui reduzido a cinzas…",
-      "2": "Uau! Isso foi quente!",
-      "3": "Ai! Queimei minha língua!"
-    }
-  },
-  "sailor": {
-    "encounter": {
-      "1": "Mano, você vai andar na prancha se perder!",
-      "2": "Vem com tudo! Sou um marinheiro com orgulho!",
-      "3": "Ahoy maruja! Tá enjoada, é?!"
-    },
-    "victory": {
-      "1": "Argh! Perdi pra uma criança!",
-      "2": "Sua vontade de ganhar me afogou!",
-      "3": "Estou achando que quem tá enjoado sou eu..."
-    }
-  },
-  "archer": {
-    "encounter": {
-      "1": "Antes de você ir mais longe, vamos ver como você se sai contra nós, Equipe Rocket!",
-      "2": "Eu tenho recebido relatórios de que suas habilidades não são insignificantes. Vamos ver se são verdadeiros.",
-      "3": "Eu sou Archer, um Admin da Equipe Rocket. E não tenho piedade dos inimigos da nossa organização."
-    },
-    "victory": {
-      "1": "Que vexame!",
-      "2": "Com minhas habilidades atuais, eu não estava à altura da tarefa, afinal.",
-      "3": "M-me perdoe, Giovanni... Por ser derrotado por um mero treinador..."
-    }
-  },
-  "ariana": {
-    "encounter": {
-      "1": "Pera aí! Não podemos deixar alguém solto por aí. Isso é prejudicial para o orgulho da Equipe Rocket, entende?",
-      "2": "Eu não sei ou me importo se o que estou fazendo é certo ou errado... Eu apenas coloco minha fé em Giovanni e faço o que me é dito.",
-      "3": "Sua viagem termina aqui. Vou te derrubar!"
-    },
-    "victory": {
-      "1": "Uau, você é forte. Que desperdício. Se você se juntasse à Equipe Rocket, poderia se tornar uma Executiva.",
-      "2": "Eu... Eu estou arrasada...",
-      "3": "Aaaieeeee! Isso não pode estar acontecendo! Eu lutei muito, mas ainda perdi…"
-    }
-  },
-  "proton": {
-    "encounter": {
-      "1": "O que você quer? Se você interromper nosso trabalho, não espere misericórdia!",
-      "2": "O que temos aqui? Costumam me chamar de o cara mais assustador e cruel da Equipe Rocket… Eu recomendo fortemente que você não interfira nos nossos negócios!",
-      "3": "Eu sou Proton, um Admin da Equipe Rocket. Estou aqui para acabar com a sua intromissão!"
-    },
-    "victory": {
-      "1": "A fortaleza caiu!",
-      "2": "Você pode ter vencido desta vez… Mas tudo o que fez foi aumentar a ira da Equipe Rocket…",
-      "3": "Fui derrotado… Mas não esquecerei disso!"
-    }
-  },
-  "petrel": {
-    "encounter": {
-      "1": "Muhahaha, estávamos esperando por você. Eu? Você não sabe quem eu sou? Sou eu, Giovanni. O majestoso Giovanni em pessoa! Wahahaha! ...Huh? Eu não pareço nada com Giovanni? Eu nem mesmo pareço com Giovanni? Como assim? Trabalhei tanto para imitá-lo!",
-      "2": "Eu sou Petrel, um Admin da Equipe Rocket. Não permitirei que você interfira em nossos planos!",
-      "3": "O Executivo da Rocket, Petrel, vai lidar com este intruso!"
-    },
-    "victory": {
-      "1": "OK, OK. Vou te contar onde ele está.",
-      "2": "Eu... Eu não consegui fazer nada... Giovanni, por favor, me perdoe...",
-      "3": "Não, eu não posso deixar isso me afetar. Tenho que informar os outros…"
-    }
-  },
-  "tabitha": {
-    "encounter": {
-      "1": "Hehehe! Então você veio até aqui! Mas você chegou tarde demais!",
-      "2": "Hehehe... Já chegou aqui, não é? Nós subestimamos você! Mas é isso! Eu sou um passo acima dos Capangas que você viu até agora. Não estou ganhando tempo. Vou te pulverizar!",
-      "3": "Vou te dar um gostinho da dor! Resigne-se a isso!"
-    },
-    "victory": {
-      "1": "Hehehe! Você pode ter me derrotado, mas não tem chance contra o Chefe! Se você se perder agora, não terá que enfrentar uma surra sonora!",
-      "2": "Hehehe... Então, eu também perdi...",
-      "3": "Ahya! Como isso pode ser? Para um Admin como eu perder para uma treinadora qualquer..."
-    }
-  },
-  "courtney": {
-    "encounter": {
-      "1": "A coisa... A coisa que você segura... É o que... É o que nós da Equipe Magma procuramos...",
-      "2": "... Bem então... Deletando...",
-      "3": "...Ha. ...Analisando... ...Hah♪"
-    },
-    "victory": {
-      "1": "... ...Mudar...o mundo.",
-      "2": "Como antecipado. Não antecipado. Você. Bloqueio de alvo... concluído. Iniciando... experimento. Você. Para sempre. Aha... ♪",
-      "3": "... De novo? Isso não foi antecipado. ...Eu sabia. Você... é interessante! ...Haha. ♪"
-    }
-  },
-  "shelly": {
-    "encounter": {
-      "1": "Ahahahaha! Você vai se meter nos assuntos da Equipe Aqua? Você é absolutamente destemida, simplesmente ignorante ou ambos! Você é tão fofa que chega a ser nojenta! Vou te derrubar",
-      "2": "O que é isso? Quem é essa criança mimada?",
-      "3": "Relaxe. Seja paciente. Vou te esmagar em breve."
-    },
-    "victory": {
-      "1": "Ahahahaha! Fomos surpreendidos inesperadamente! Estamos sem opções. Teremos que recuar. Mas esta não é a última vez que você verá a Equipe Aqua! Temos outros planos! Não se esqueça disso!",
-      "2": "Ahhh?! Fui muito fácil com você?!",
-      "3": "Uh. Você está me dizendo que melhorou seu jogo ainda mais durante a luta? Você é uma pirralha com um futuro brilhante… Meu Pokémon e eu não temos mais forças para lutar… Vá em frente… Vá e seja destruída por Archie."
-    }
-  },
-  "matt": {
-    "encounter": {
-      "1": "Hoohahaha! O que, você tem um parafuso solto ou algo assim? Olhe para você, pequena pessoa Makuhita!",
-      "2": "Oho! Você! Você é aquela criança engraçada!",
-      "3": "O que você está fazendo aqui? Você nos seguiu?"
-    },
-    "victory": {
-      "1": "Muito bem, até que o Chefe tenha tempo para você, serei seu oponente!",
-      "2": "Posso sentir! Posso sentir, tudo bem! A força saindo de você! Mais! Eu ainda quero mais! Mas parece que estamos sem tempo...",
-      "3": "Isso foi divertido! Eu sabia que você me mostraria um bom tempo! Estou ansioso para enfrentá-la novamente algum dia!"
-    }
-  },
-  "mars": {
-    "encounter": {
-      "1": "Sou Mars, uma das principais Comandantes da Equipe Galáctica.",
-      "2": "A visão da Equipe Galáctica para o futuro é inabalável. A oposição será esmagada sem piedade!",
-      "3": "Sentindo-se nervosa? Você deveria estar!"
-    },
-    "victory": {
-      "1": "Isso não pode estar acontecendo! Como eu perdi?!",
-      "2": "Você tem alguma habilidade, eu admito isso.",
-      "3": "Derrotada... Este foi um erro caro."
-    }
-  },
-  "jupiter": {
-    "encounter": {
-      "1": "Júpiter, Comandante da Equipe Galáctica, ao seu serviço.",
-      "2": "A resistência é inútil. A Equipe Galáctica prevalecerá!",
-      "3": "Você está tremendo... já está com medo?"
-    },
-    "victory": {
-      "1": "De jeito nenhum... Eu perdi?!",
-      "2": "Impressionante, você tem coragem!",
-      "3": "Perder assim... Que embaraço."
-    }
-  },
-  "saturn": {
-    "encounter": {
-      "1": "Eu sou Saturno, Comandante da Equipe Galáctica.",
-      "2": "Nossa missão é absoluta. Qualquer obstáculo será obliterado!",
-      "3": "É medo o que vejo em seus olhos?"
-    },
-    "victory": {
-      "1": "Impossível... Derrotado por você?!",
-      "2": "Você provou ser um adversário digno.",
-      "3": "Derrotado... Isso é inaceitável."
-    }
-  },
-  "zinzolin": {
-    "encounter": {
-      "1": "Você poderia se tornar uma ameaça para a Equipe Plasma, então vamos eliminá-la aqui e agora!",
-      "2": "Oh, pelo amor de Deus... Eu não esperava ter que lutar neste frio congelante!",
-      "3": "Você é uma treinadora impressionante para ter chegado tão longe. Mas termina aqui."
-    },
-    "victory": {
-      "1": "Ghetsis... Eu falhei com você...",
-      "2": "Está amargamente frio. Estou tremendo. Estou sofrendo. Ainda assim, estou vitorioso.",
-      "3": "Hmph. Você é uma treinadora mais esperta do que eu esperava, mas não esperta o suficiente."
-    }
-  },
-  "rood": {
-    "encounter": {
-      "1": "Você é uma ameaça para a Equipe Plasma. Não podemos deixá-la ir embora daqui e agora!",
-      "2": "Oh, este vento gelado... Eu nunca pensei que teria que lutar aqui!",
-      "3": "Você é uma treinadora notável para ter chegado tão longe. Mas é aqui que termina."
-    },
-    "victory": {
-      "1": "Ghetsis... Eu falhei em minha missão...",
-      "2": "O frio é penetrante. Estou tremendo. Estou sofrendo. Ainda assim, triunfei.",
-      "3": "Hm. Você é uma treinadora talentosa, mas infelizmente não talentosa o suficiente."
-    }
-  },
-  "xerosic": {
-    "encounter": {
-      "1": "Ah ha ha! Será um prazer. Vamos lá, pequena treinadora! Vamos ver o que você tem!",
-      "2": "Hmm... Você é mais poderosa do que parece. Eu me pergunto quanta energia há dentro de você.",
-      "3": "Eu estava esperando por você! Preciso fazer uma pequena pesquisa sobre você! Vamos começar!"
-    },
-    "victory": {
-      "1": "Ah, você é bastante forte. Oh sim—muito forte, de fato.",
-      "2": "Ding-ding-ding! Você conseguiu! À vencedora, os despojos!",
-      "3": "Maravilhoso! Incrível! Você tem uma tremenda habilidade e coragem!"
-    }
-  },
-  "bryony": {
-    "encounter": {
-      "1": "Eu sou Bryony, e será um prazer lutar com você. Mostre-me o que você tem.",
-      "2": "Impressionante... Você é mais poderosa do que parece. Vamos ver a verdadeira extensão de sua energia.",
-      "3": "Eu antecipei sua chegada. É hora de um pequeno teste. Vamos começar?"
-    },
-    "victory": {
-      "1": "Você é bastante forte. Oh sim—muito forte, de fato.",
-      "2": "Ding-ding-ding! Você se saiu bem. A vitória é sua.",
-      "3": "Maravilhoso! Notável! Sua habilidade e coragem são admiráveis."
-    }
-  },
-  "rocket_grunt": {
-    "encounter": {
-      "1": "Se prepara pra encrenca!",
-      "2": "Estamos realizando um grande trabalho aqui! Cai fora, garota!",
-      "3": "Entregue seus Pokémon ou enfrente a ira da Equipe Rocket!",
-      "4": "Você está prestes a experimentar o verdadeiro terror da Equipe Rocket!",
-      "5": "Ei, garota! Eu sou um tipo de cara da Equipe Rocket!"
-    },
-    "victory": {
-      "1": "Equipe Rocket decolando de novo!",
-      "2": "Oh não! Eu deixei a Chave de Elevação cair!",
-      "3": "Eu estraguei tudo!",
-      "4": "Meus associados não vão tolerar isso!",
-      "5": "Você diz o que? Equipe Rocket tchau-tchau a vai-vai? Quebrado é diz você?"
-    }
-  },
-  "magma_grunt": {
-    "encounter": {
-      "1": "Se você se meter com a Equipe Magma, não teremos piedade!",
-      "2": "É melhor você não interferir em nossos planos! Estamos tornando o mundo um lugar melhor!",
-      "3": "Você está no caminho! A Equipe Magma não tem tempo para crianças como você!",
-      "4": "Espero que você tenha trazido marshmallows porque as coisas estão prestes a esquentar!",
-      "5": "Vamos usar o poder de um vulcão! Vai ser... explosivo! Entendeu? Heh heh!"
-    },
-    "victory": {
-      "1": "Ahn? Eu perdi?!",
-      "2": "Não posso acreditar que perdi! Até pulei o almoço por isso.",
-      "3": "De jeito nenhum! Você é apenas uma criança!",
-      "4": "Urrrgh... Eu deveria ter me escondido em nosso esconderijo imediatamente...",
-      "5": "Você me venceu... Você acha que o chefe vai cortar meu salário por isso?"
-    }
-  },
-  "aqua_grunt": {
-    "encounter": {
-      "1": "Não pegamos leve com quem se mete com a Equipe Aqua, nem mesmo crianças!",
-      "2": "Grrr... Você tem coragem de se intrometer com a Equipe Aqua!",
-      "3": "Você está prestes a se molhar! E não apenas por causa dos meus Pokémon aquáticos!",
-      "4": "Nós, da Equipe Aqua, existimos para o bem de todos!",
-      "5": "Prepare-se para ser levado pelas ondas do meu... uh, Pokémon! Sim, meu Pokémon!"
-    },
-    "victory": {
-      "1": "Tá de brincadeira!",
-      "2": "Arrgh, eu não contei que seria atrapalhado por uma criança intrometida!",
-      "3": "Eu perdi?! Acho que vou ter que nadar de volta para o esconderijo agora...",
-      "4": "Oh, cara, que desastre... O chefe vai ficar furioso...",
-      "5": "Você me venceu... Você acha que o chefe vai me fazer andar na prancha por isso?"
-    }
-  },
-  "galactic_grunt": {
-    "encounter": {
-      "1": "Não mexa com a Equipe Galáctica!",
-      "2": "Presencie o poder da nossa tecnologia e o futuro que vislumbramos!",
-      "3": "Em nome da Equipe Galáctica, eliminarei qualquer um que ficar em nosso caminho!",
-      "4": "Prepare-se para perder!",
-      "5": "Espero que você esteja pronta para uma surra cósmica!"
-    },
-    "victory": {
-      "1": "Fui amassado...",
-      "2": "Este contratempo não significa nada no grande esquema.",
-      "3": "Nossos planos são maiores que esta derrota.",
-      "4": "Como?!",
-      "5": "Nota para mim mesmo: praticar batalhas Pokémon, o mais rápido possível."
-    }
-  },
-  "plasma_grunt": {
-    "encounter": {
-      "1": "Não toleramos pessoas que pensam diferente de nós!",
-      "2": "Se eu ganhar de você, liberte seus Pokémon!",
-      "3": "Se você atrapalhar a Equipe Plasma, eu cuidarei de você!",
-      "4": "A Equipe Plasma vai libertar os Pokémon de humanos egoístas como você!",
-      "5": "Nossos penteados são de outro mundo... mas nossas habilidades de batalha? Você descobrirá em breve."
-    },
-    "victory": {
-      "1": "Plasmaaaaaaaaa!",
-      "2": "Como eu pude perder...",
-      "3": "...Que Pokémon fraco, vou ter que roubar alguns melhores!",
-      "4": "Grandes planos são sempre interrompidos.",
-      "5": "Isso é ruim... Ruim ruim ruim ruim ruim ruim ruim! Ruim para a Equipe Plasma! Ou Plasruim, para abreviar!"
-    }
-  },
-  "flare_grunt": {
-    "encounter": {
-      "1": "Seus Pokémon não são páreo para a elegância da Equipe Flare.",
-      "2": "Espero que você tenha trazido seus óculos de sol, porque as coisas vão ficar brilhantes!",
-      "3": "A Equipe Flare vai purificar o mundo da imperfeição!",
-      "4": "Prepare-se para enfrentar o brilho da Equipe Flare!",
-      "5": "A moda é o mais importante para nós!"
-    },
-    "victory": {
-      "1": "O futuro não parece brilhante para mim.",
-      "2": "Talvez haja mais na batalha do que eu pensei. De volta à prancheta.",
-      "3": "Gahh?! Eu perdi?!",
-      "4": "Mesmo na derrota, a elegância da Equipe Flare brilha.",
-      "5": "Você pode ter me vencido, mas quando eu perco, eu saio com estilo!"
-    }
-  },
-  "rocket_boss_giovanni_1": {
-    "encounter": {
-      "1": "Tenho que admitir, estou impressionado que tenha chegado até aqui!"
-    },
-    "victory": {
-      "1": "QUÊ! Isso não é possível!"
-    },
-    "defeat": {
-      "1": "Guarde minhas palavras.\nNão ser capaz de medir sua própria força mostra que você ainda é uma criança."
-    }
-  },
-  "rocket_boss_giovanni_2": {
-    "encounter": {
-      "1": "Meus antigos associados precisam de mim... Você vai ficar no meu caminho?"
-    },
-    "victory": {
-      "1": "Como isso é possível...?\nO precioso sonho da Equipe Rocket se tornou pouco mais que uma ilusão..."
-    },
-    "defeat": {
-      "1": "A Equipe Rocket renascerá, e eu dominarei o mundo!"
-    }
-  },
-  "magma_boss_maxie_1": {
-    "encounter": {
-      "1": "Eu vou te enterrar com minhas próprias mãos.\nEspero que você aprecie essa honra!"
-    },
-    "victory": {
-      "1": "Ugh! Você é... bastante capaz...\nEu fiquei para trás, mas apenas por um triz..."
-    },
-    "defeat": {
-      "1": "A Equipe Magma vai prevalecer!"
-    }
-  },
-  "magma_boss_maxie_2": {
-    "encounter": {
-      "1": "Você é o último obstáculo entre mim e meus objetivos.\nPrepare-se para meu ataque final! Fuhahaha!"
-    },
-    "victory": {
-      "1": "Isso... Isso não é... Ngh..."
-    },
-    "defeat": {
-      "1": "E agora... Eu transformarei este planeta em uma terra ideal para a humanidade."
-    }
-  },
-  "aqua_boss_archie_1": {
-    "encounter": {
-      "1": "Eu sou o líder da Equipe Aqua, então temo que esse seja o fim da linha para você."
-    },
-    "victory": {
-      "1": "Vamos nos encontrar de novo em algum lugar. Eu vou ter certeza de lembrar desse rosto."
-    },
-    "defeat": {
-      "1": "Brilhante! Nada vai parar minha equipe agora!"
-    }
-  },
-  "aqua_boss_archie_2": {
-    "encounter": {
-      "1": "Estive esperando tanto tempo por este dia.\nEste é o verdadeiro poder da minha equipe!"
-    },
-    "victory": {
-      "1": "Como eu suspeitava..."
-    },
-    "defeat": {
-      "1": "Eu vou voltar tudo neste mundo ao seu estado puro e original!!"
-    }
-  },
-  "galactic_boss_cyrus_1": {
-    "encounter": {
-      "1": "Você foi compelida a vir aqui por tal sentimentalismo vazio\nEu farei você se arrepender de ter ouvido seu coração!"
-    },
-    "victory": {
-      "1": "Interessante. E bastante curioso."
-    },
-    "defeat": {
-      "1": "Eu criarei meu novo mundo..."
-    }
-  },
-  "galactic_boss_cyrus_2": {
-    "encounter": {
-      "1": "Nos encontramos novamente. Parece que nossos destinos estão entrelaçados.\nMas aqui e agora, eu finalmente quebrarei esse vínculo!"
-    },
-    "victory": {
-      "1": "Como? Como? COMO?!"
-    },
-    "defeat": {
-      "1": "Até logo."
-    }
-  },
-  "plasma_boss_ghetsis_1": {
-    "encounter": {
-      "1": "Ninguém pode me deter! Não importa quem seja ou o que faça!"
-    },
-    "victory": {
-      "1": "Como isso é possível? Eu sou o criador da Equipe Plasma! Eu sou perfeito!"
-    },
-    "defeat": {
-      "1": "Eu sou o governante perfeito de um novo mundo perfeito! Mwa ha ha!"
-    }
-  },
-  "plasma_boss_ghetsis_2": {
-    "encounter": {
-      "1": "Vamos! Eu quero ver sua cara depois que você perder toda a esperança!"
-    },
-    "victory": {
-      "1": "Meus cálculos... Não! Meus planos cuidadosos! O mundo deveria ser meu!"
-    },
-    "defeat": {
-      "1": "Kyurem! Use Absofusion!"
-    }
-  },
-  "flare_boss_lysandre_1": {
-    "encounter": {
-      "1": "Você está aqui para me deter? Mostre-me em batalha."
-    },
-    "victory": {
-      "1": "Você está aqui para me deter. Mas eu peço que você espere."
-    },
-    "defeat": {
-      "1": "Pokémon... não devem mais existir."
-    }
-  },
-  "flare_boss_lysandre_2": {
-    "encounter": {
-      "1": "O futuro que você quer, ou o futuro que eu quero... Vamos ver qual é o mais merecedor, não é mesmo?"
-    },
-    "victory": {
-      "1": "Uau!"
-    },
-    "defeat": {
-      "1": "Tolos sem visão continuarão a poluir este belo mundo."
-    }
-  },
-  "brock": {
-    "encounter": {
-      "1": "Minha especialidade em Pokémon do tipo Pedra vai te derrubar! Vamos lá!",
-      "2": "Minha vontade firme como pedra vai te sobrecarregar!",
-      "3": "Permita-me mostrar a verdadeira força dos meus Pokémon!"
-    },
-    "victory": {
-      "1": "A força dos seus Pokémon superou minhas defesas de pedra!",
-      "2": "O mundo é enorme! Estou feliz por ter tido a chance de batalhar com você.",
-      "3": "Talvez eu deva voltar a perseguir meu sonho de ser Criador de Pokémon…"
-    },
-    "defeat": {
-      "1": "A melhor defesa é um bom ataque!\nEssa é a minha maneira de fazer as coisas!",
-      "2": "Venha estudar rochas comigo da próxima vez para aprender melhor a combatê-las!",
-      "3": "Hah, todas as minhas viagens pelas regiões estão valendo a pena!"
-    }
-  },
-  "misty": {
-    "encounter": {
-      "1": "Minha política é um ataque total com Pokémon do tipo Água!",
-      "2": "Oi, vou mostrar a força dos meus Pokémon aquáticos!",
-      "3": "Meu sonho era viajar e batalhar com treinadores poderosos…\nVocê será um desafio suficiente?"
-    },
-    "victory": {
-      "1": "Você realmente é forte… Vou admitir que você é habilidosa…",
-      "2": "Hmm… Você sabe que só teve sorte, certo?!",
-      "3": "Uau, você é demais! Não acredito que me venceu!"
-    },
-    "defeat": {
-      "1": "A poderosa Misty foi demais para você?",
-      "2": "Espero que você tenha visto as técnicas de natação elegantes dos meus Pokémon!",
-      "3": "Seus Pokémon não foram páreo para meus orgulhos e alegrias!"
-    }
-  },
-  "lt_surge": {
-    "encounter": {
-      "1": "Meus Pokémon Elétricos me salvaram durante a guerra! Vou te mostrar como!",
-      "2": "Em sentido! Vou te chocar até você se render!",
-      "3": "Vou te eletrizar como faço com todos os meus inimigos na batalha!"
-    },
-    "victory": {
-      "1": "Whoa! Seu time é de verdade, garota!",
-      "2": "Uau, você é forte! Até meus truques elétricos perderam para você.",
-      "3": "Isso foi uma derrota absolutamente chocante!"
-    },
-    "defeat": {
-      "1": "Oh sim! Quando se trata de Pokémon do tipo Elétrico, sou o número um do mundo!",
-      "2": "Hahaha! Foi uma batalha eletrizante, garota!",
-      "3": "Uma batalha de Pokémon é guerra, e eu te mostrei combate em primeira mão!"
-    }
-  },
-  "erika": {
-    "encounter": {
-      "1": "Ah, o tempo está adorável aqui…\nOh, uma batalha? Muito bem então.",
-      "2": "Minhas habilidades de batalha Pokémon rivalizam com minhas habilidades de arranjo de flores.",
-      "3": "Oh, espero que o aroma agradável dos meus Pokémon não me faça dormir de novo…",
-      "4": "Ver flores em um jardim é tão calmante."
-    },
-    "victory": {
-      "1": "Oh! Eu concedo a derrota.",
-      "2": "Aquela partida foi muito agradável.",
-      "3": "Ah, parece que perdi…",
-      "4": "Oh, meu Deus."
-    },
-    "defeat": {
-      "1": "Tinha medo de adormecer…",
-      "2": "Oh, meu Deus, parece que meus Pokémon de Grama te dominaram.",
-      "3": "Essa batalha foi uma experiência tão calmante.",
-      "4": "Oh… É só isso?"
-    }
-  },
-  "janine": {
-    "encounter": {
-      "1": "Estou dominando a arte dos ataques venenosos.\nVou lutar com você hoje!",
-      "2": "Meu pai confia que posso me defender.\nVou provar que ele está certo!",
-      "3": "Minhas técnicas de ninja só perdem para as do meu pai!\nVocê consegue acompanhar?"
-    },
-    "victory": {
-      "1": "Ainda preciso de treinamento… Entendi.",
-      "2": "Sua técnica de batalha superou a minha.",
-      "3": "Vou me aplicar de verdade e melhorar minhas habilidades."
-    },
-    "defeat": {
-      "1": "Hehe… o veneno drenou todas as suas forças para lutar.",
-      "2": "Ha! Você não teve chance contra minhas habilidades superiores de ninja!",
-      "3": "A fé do meu pai em mim não foi mal colocada."
-    }
-  },
-  "sabrina": {
-    "encounter": {
-      "1": "Através da minha habilidade psíquica, tive uma visão da sua chegada!",
-      "2": "Não gosto de lutar, mas se você quiser, vou mostrar meus poderes!",
-      "3": "Posso sentir grande ambição em você. Vou ver se não é infundada."
-    },
-    "victory": {
-      "1": "Seu poder… Ele supera o que eu previa…",
-      "2": "Não consegui prever seu poder com precisão.",
-      "3": "Mesmo com meus imensos poderes psíquicos, não consigo sentir outro tão forte quanto você."
-    },
-    "defeat": {
-      "1": "Essa vitória… É exatamente como previ nas minhas visões!",
-      "2": "Talvez fosse outra pessoa que eu sentisse um grande desejo…",
-      "3": "Aprimore suas habilidades antes de entrar em batalha precipitadamente.\nVocê nunca sabe o que o futuro pode reservar se fizer isso…"
-    }
-  },
-  "blaine": {
-    "encounter": {
-      "1": "Hah! Espero que tenha trazido uma Cura de Queimadura!",
-      "2": "Meus Pokémon de Fogo vão incinerar todos os desafiantes!",
-      "3": "Prepare-se para brincar com fogo!"
-    },
-    "victory": {
-      "1": "Queimei até não restar nada! Nem cinzas sobraram!",
-      "2": "Não acendi as chamas alto o suficiente?",
-      "3": "Estou completamente exausto… Mas isso faz minha motivação para melhorar queimar ainda mais!"
-    },
-    "defeat": {
-      "1": "Meu inferno ardente não pode ser apagado!",
-      "2": "Meus Pokémon foram fortalecidos com o calor desta vitória!",
-      "3": "Hah! Minha paixão queima mais do que a sua!"
-    }
-  },
-  "giovanni": {
-    "encounter": {
-      "1": "Eu, o líder da Equipe Rocket, vou te fazer sentir um mundo de dor!",
-      "2": "Meu treinamento aqui será vital antes de enfrentar meus antigos associados novamente.",
-      "3": "Não acho que você está preparada para o nível de fracasso que está prestes a experimentar!"
-    },
-    "victory": {
-      "1": "O QUE! Eu, perder?! Não tenho nada a dizer a você!",
-      "2": "Hmm… Você nunca entenderia o que quero alcançar.",
-      "3": "Esta derrota está apenas adiando o inevitável.\nVou ressurgir a Equipe Rocket das cinzas a tempo."
-    },
-    "defeat": {
-      "1": "Não ser capaz de medir sua própria força mostra que você ainda é apenas uma criança.",
-      "2": "Não tente interferir comigo novamente.",
-      "3": "Espero que entenda o quão tolo foi me desafiar."
-    }
-  },
-  "roxanne": {
-    "encounter": {
-      "1": "Você poderia gentilmente demonstrar como batalha?",
-      "2": "Você pode aprender muitas coisas batalhando com muitos treinadores.",
-      "3": "Oh, você me pegou estrategizando.\nGostaria de batalhar?"
-    },
-    "victory": {
-      "1": "Oh, parece que perdi.\nEu entendo.",
-      "2": "Parece que ainda tenho muito mais a aprender quando se trata de batalhas.",
-      "3": "Vou levar o que aprendi aqui hoje a sério."
-    },
-    "defeat": {
-      "1": "Aprendi muitas coisas com nossa batalha.\nEspero que você também tenha aprendido.",
-      "2": "Espero batalhar com você novamente.\nEspero que use o que aprendeu aqui.",
-      "3": "Venci devido a tudo o que aprendi."
-    }
-  },
-  "brawly": {
-    "encounter": {
-      "1": "Oh cara, uma desafiante!\nVamos ver o que você pode fazer!",
-      "2": "Você parece uma grande onda.\nVamos batalhar!",
-      "3": "Hora de criar uma tempestade!\nVamos!"
-    },
-    "victory": {
-      "1": "Uau, você me derrotou!",
-      "2": "Você surfou minha onda e me derrubou!",
-      "3": "Sinto-me perdido na Caverna Granito!"
-    },
-    "defeat": {
-      "1": "Haha, eu surfei a grande onda!\nDesafie-me novamente algum dia.",
-      "2": "Surfe comigo novamente algum dia!",
-      "3": "Assim como as marés vão e vêm, espero que você volte para me desafiar novamente."
-    }
-  },
-  "wattson": {
-    "encounter": {
-      "1": "Hora de levar um choque!\nWahahahaha!",
-      "2": "Vou fazer faíscas voarem!\nWahahahaha!",
-      "3": "Espero que tenha trazido Cura de Paralisia!\nWahahahaha!"
-    },
-    "victory": {
-      "1": "Parece que estou sem carga!\nWahahahaha!",
-      "2": "Você me aterrissou completamente!\nWahahahaha!",
-      "3": "Obrigado pela emoção!\nWahahahaha!"
-    },
-    "defeat": {
-      "1": "Você está totalmente carregada agora!\nWahahahaha!",
-      "2": "Espero ver você faíscando em batalhas futuras!\nWahahahaha!",
-      "3": "Wahahahaha! Que batalha eletrizante!"
-    }
-  },
-  "flannery": {
-    "encounter": {
-      "1": "Meus Pokémon de fogo estão prontos para queimar a concorrência!\nVamos nessa!",
-      "2": "Prepare-se para sentir o calor da minha determinação!\nNão vou segurar nada!",
-      "3": "Minhas habilidades vão incinerar você!\nPrepare-se para a batalha mais quente da sua vida!"
-    },
-    "victory": {
-      "1": "Essa derrota só faz minha determinação queimar mais!",
-      "2": "Essa perda não apagará minhas chamas!\nEstarei de volta mais forte!",
-      "3": "Vou usar essa experiência para reacender meu espírito competitivo!"
-    },
-    "defeat": {
-      "1": "Minhas chamas nunca se apagarão!\nSou muito apaixonada por isso!",
-      "2": "Você foi incrível!\nVamos fazer isso de novo algum dia!",
-      "3": "Que batalha ardente!\nMal posso esperar pela próxima!"
-    }
-  },
-  "norman": {
-    "encounter": {
-      "1": "Você está pronto para enfrentar a força pura do meu time?\nVou te mostrar o poder do equilíbrio!",
-      "2": "Minha experiência em batalha vai fazer você suar!\nPrepare-se!",
-      "3": "Treinei meu time rigorosamente.\nVamos ver se você consegue igualar!"
-    },
-    "victory": {
-      "1": "Parece que subestimei você.\nFoi uma batalha dura.",
-      "2": "Você é forte, mas ainda há muito para aprender.",
-      "3": "Essa derrota não abalará minha determinação.\nEstarei de volta mais forte!"
-    },
-    "defeat": {
-      "1": "Você lutou bravamente!\nEspero batalhar com você novamente.",
-      "2": "Sua força é incrível!\nNão posso esperar pela nossa próxima batalha.",
-      "3": "Foi uma honra batalhar com você!\nAté a próxima!"
-    }
-  },
-  "winona": {
-    "encounter": {
-      "1": "Tenho sobrevoado os céus em busca de presas...\nE você é meu alvo!",
-      "2": "Não importa como será nossa batalha, meus Pokémon Voadores e eu triunfaremos com graça. Vamos batalhar!",
-      "3": "Espero que você não tenha medo de altura.\nVamos subir!"
-    },
-    "victory": {
-      "1": "Você é a primeira Treinadora que vejo com mais graça do que eu.\nJogou excelentemente.",
-      "2": "Oh, meus Pokémon Voadores despencaram!\nMuito bem.",
-      "3": "Embora eu tenha caído, meus Pokémon continuarão a voar!"
-    },
-    "defeat": {
-      "1": "Meus Pokémon Voadores e eu sempre dançaremos com elegância!",
-      "2": "Espero que tenha gostado do nosso show.\nNossa dança graciosa terminou.",
-      "3": "Você não quer ver nossa coreografia elegante novamente?"
-    }
-  },
-  "tate": {
-    "encounter": {
-      "1": "Hehehe... Ficou surpresa de me ver sem minha irmã?",
-      "2": "Posso ver o que você está pensando...\nVocê quer batalhar!",
-      "3": "Como você pode derrotar alguém...\nQue sabe todos os seus movimentos?"
-    },
-    "victory": {
-      "1": "Não pode ser ajudado...\nSinto falta da Liza...",
-      "2": "Seu vínculo com seus Pokémon era mais forte que o meu.",
-      "3": "Se eu estivesse com Liza, teríamos vencido.\nConseguimos completar os pensamentos um do outro!"
-    },
-    "defeat": {
-      "1": "Meus Pokémon e eu somos superiores!",
-      "2": "Se você não consegue nem me derrotar, nunca será capaz de derrotar Liza também.",
-      "3": "Tudo graças ao meu treinamento rigoroso com Liza.\nPosso me tornar um com os Pokémon."
-    }
-  },
-  "liza": {
-    "encounter": {
-      "1": "Fufufu... Ficou surpresa de me ver sem meu irmão?",
-      "2": "Posso determinar o que você deseja...\nVocê quer batalhar, não quer?",
-      "3": "Como você pode derrotar alguém...\nQue é um com seus Pokémon?"
-    },
-    "victory": {
-      "1": "Não pode ser ajudado...\nSinto falta do Tate...",
-      "2": "Seu vínculo com seus Pokémon...\nÉ mais forte que o meu.",
-      "3": "Se eu estivesse com Tate, teríamos vencido.\nPodemos terminar as frases um do outro!"
-    },
-    "defeat": {
-      "1": "Meus Pokémon e eu somos vitoriosos.",
-      "2": "Se você não consegue nem me derrotar, nunca será capaz de derrotar Tate também.",
-      "3": "Tudo graças ao meu treinamento rigoroso com Tate.\nPosso me sincronizar com meus Pokémon."
-    }
-  },
-  "juan": {
-    "encounter": {
-      "1": "Agora não é hora de agir timidamente.\nVamos batalhar!",
-      "2": "Ahahaha, você será testemunha da minha arte com Pokémon de Água!",
-      "3": "Um tufão se aproxima!\nVocê será capaz de me testar?",
-      "4": "Por favor, você será testemunha da nossa arte.\nUma grande ilusão de água esculpida por meus Pokémon e por mim!"
-    },
-    "victory": {
-      "1": "Você pode ser um gênio que pode enfrentar Wallace!",
-      "2": "Eu me concentrei na elegância enquanto você treinava.\nÉ natural que você me derrotasse.",
-      "3": "Ahahaha!\nMuito bem, você venceu desta vez.",
-      "4": "De você, sinto o brilho brilhante da habilidade que superará tudo."
-    },
-    "defeat": {
-      "1": "Meus Pokémon e eu esculpimos uma ilusão de Água e saímos vitoriosos.",
-      "2": "Ahahaha, eu venci, e você perdeu.",
-      "3": "Posso emprestar meu traje? Pode te ajudar a batalhar!\nAhahaha, estou brincando!",
-      "4": "Eu sou o vencedor! O que quer dizer, você perdeu."
-    }
-  },
-  "crasher_wake": {
-    "encounter": {
-      "1": "Crash! Crash! Cuidado!\nDemolidor Wake… está… aqui!",
-      "2": "Crash! Crash! Demolidor Wake!",
-      "3": "Sou a onda de poder que vai te lavar!"
-    },
-    "victory": {
-      "1": "Isso coloca um sorriso no meu rosto!\nGuhahaha! Foi uma explosão!",
-      "2": "Hunwah! Acabou e terminou!\nComo vou dizer isso...\nQuero mais! Queria batalhar muito mais!",
-      "3": "O QUÊ?!"
-    },
-    "defeat": {
-      "1": "Siiiiim! Isso mesmo!",
-      "2": "Eu venci, mas quero mais! Queria batalhar muito mais!",
-      "3": "Até logo!"
-    }
-  },
-  "falkner": {
-    "encounter": {
-      "1": "Vou mostrar o verdadeiro poder dos magníficos Pokémon pássaros!",
-      "2": "Ventos, fiquem comigo!",
-      "3": "Pai! Espero que esteja vendo minha batalha de cima!"
-    },
-    "victory": {
-      "1": "Eu entendo... Vou sair graciosamente.",
-      "2": "Uma derrota é uma derrota. Você é realmente forte.",
-      "3": "...Droga! Sim, eu perdi."
-    },
-    "defeat": {
-      "1": "Pai! Venci com seus amados Pokémon pássaros...",
-      "2": "Pokémon pássaros são os melhores afinal!",
-      "3": "Sinto que estou alcançando meu pai!"
-    }
-  },
-  "nessa": {
-    "encounter": {
-      "1": "Não importa que tipo de plano sua mente refinada possa estar tramando, meu parceiro e eu vamos afundá-la.",
-      "2": "Não estou aqui para conversar. Estou aqui para vencer!",
-      "3": "Este é um pequeno presente dos meus Pokémon... Espero que você possa recebê-la!"
-    },
-    "victory": {
-      "1": "Você e seus Pokémon são demais...",
-      "2": "Como...? Como isso pode ser?!",
-      "3": "Fui totalmente arrastada!"
-    },
-    "defeat": {
-      "1": "A onda furiosa ataca novamente!",
-      "2": "Hora de surfar na onda da vitória!",
-      "3": "Hehe!"
-    }
-  },
-  "melony": {
-    "encounter": {
-      "1": "Não vou me segurar!",
-      "2": "Tudo bem, acho que devemos começar.",
-      "3": "Vou congelar você completamente!"
-    },
-    "victory": {
-      "1": "Você... Você é muito boa, hein?",
-      "2": "Se você encontrar Gordie por aí, certifique-se de dar uma boa surra nele, ok?",
-      "3": "Acho que você levou a quebra de gelo um pouco literalmente demais..."
-    },
-    "defeat": {
-      "1": "Agora você vê como as batalhas podem ser severas?",
-      "2": "Hee! Parece que ganhei de novo!",
-      "3": "Você está segurando?"
-    }
-  },
-  "marlon": {
-    "encounter": {
-      "1": "Você parece forte! Vamos começar!",
-      "2": "Sou forte como a amplitude do oceano. Você vai ser varrida, com certeza.",
-      "3": "Oh ho, então estou enfrentando você! Isso é fora do comum."
-    },
-    "victory": {
-      "1": "Você foi incrível! Está criando alguns Pokémon incríveis. Você dominou a coisa de Treinadora!",
-      "2": "Você não apenas parece forte, você é forte de verdade! Eh, eu também fui varrido!",
-      "3": "Você é forte como uma onda impressionante!"
-    },
-    "defeat": {
-      "1": "Você é forte, mas não é o suficiente para mudar o mar, ok!",
-      "2": "Hee! Parece que ganhei de novo!",
-      "3": "Doce, doce vitória!"
-    }
-  },
-  "shauntal": {
-    "encounter": {
-      "1": "Com licença. Você é uma desafiante, certo?\nSou a usuária de Pokémon do tipo Fantasma da Elite dos Quatro, Shauntal, e serei sua oponente.",
-      "2": "Adoro escrever sobre Treinadores que vêm aqui e os Pokémon que treinam.\nPosso usar você e seus Pokémon como tema?",
-      "3": "Cada pessoa que trabalha com Pokémon tem uma história para contar.\nQue história está prestes a ser contada?"
-    },
-    "victory": {
-      "1": "Uau. Estou sem palavras!",
-      "2": "D-desculpe! Primeiro, preciso me desculpar com meus Pokémon...\n\nLamento muito que você tenha tido uma experiência ruim por minha causa!",
-      "3": "Mesmo com isso, ainda sou uma da Elite dos Quatro!"
-    },
-    "defeat": {
-      "1": "Hehe.",
-      "2": "Isso me deu um excelente material para meu próximo romance!",
-      "3": "E assim, outra história termina..."
-    }
-  },
-  "marshal": {
-    "encounter": {
-      "1": "Meu mentor, Alder, vê seu potencial como Treinadora e está interessado em você.\nMeu objetivo é testá-la—levar você aos limites da sua força. Kiai!",
-      "2": "Vitória, vitória decisiva, é meu objetivo! Desafiante, aqui vou eu!",
-      "3": "Em mim mesmo, procuro desenvolver a força de um lutador e eliminar qualquer fraqueza em mim!\nPrevalecendo com a força de minhas convicções!"
-    },
-    "victory": {
-      "1": "Ufa! Bem feito!",
-      "2": "À medida que suas batalhas continuarem, mire em alturas ainda maiores!",
-      "3": "A força demonstrada por você e seus Pokémon me impressionou profundamente..."
-    },
-    "defeat": {
-      "1": "Hmm.",
-      "2": "Isso foi uma boa batalha.",
-      "3": "Haaah! Haaah! Haiyaaaah!"
-    }
-  },
-  "cheren": {
-    "encounter": {
-      "1": "Você me lembra um velho amigo. Isso me deixa animado para essa batalha Pokémon!",
-      "2": "As batalhas Pokémon não têm sentido se você não pensa por que você batalha.\nOu melhor, isso torna as batalhas junto com Pokémon sem sentido.",
-      "3": "Meu nome é Cheren! Sou um Líder de Ginásio e professor! Prazer em conhecê-la."
-    },
-    "victory": {
-      "1": "Obrigado! Vi o que estava faltando em mim.",
-      "2": "Obrigado! Sinto que vi um pouco do caminho em direção aos meus ideais.",
-      "3": "Hmm... Isso é problemático."
-    },
-    "defeat": {
-      "1": "Como Líder de Ginásio, meu objetivo é ser um obstáculo para você superar.",
-      "2": "Tudo bem!",
-      "3": "Cheguei onde estou porque os Pokémon estavam ao meu lado.\nTalvez precisemos pensar por que os Pokémon nos ajudam, não em termos de Pokémon e Treinadores, mas como uma relação entre seres vivos."
-    }
-  },
-  "roark": {
-    "encounter": {
-      "1": "Preciso ver seu potencial como Treinadora. E, vou precisar ver a dureza dos Pokémon que batalham com você!",
-      "2": "Vamos lá! Estes são meus Pokémon de pedra, meu orgulho e alegria!",
-      "3": "Pokémon do tipo Pedra são simplesmente os melhores!",
-      "4": "Preciso ver seu potencial como Treinadora. E, vou precisar ver a dureza dos Pokémon que batalham com você!"
-    },
-    "victory": {
-      "1": "O-o que? Isso não pode ser! Meus Pokémon fortificados!",
-      "2": "...Perdemos o controle. Da próxima vez, gostaria de desafiá-la a uma corrida de escavação de fósseis no subsolo.",
-      "3": "Com habilidade como a sua, é natural que você vença.",
-      "4": "O-o que?! Não pode ser! Nem isso foi suficiente?",
-      "5": "Eu estraguei tudo."
-    },
-    "defeat": {
-      "1": "Veja? Estou orgulhoso do meu estilo de batalha rochoso!",
-      "2": "Obrigado! A batalha me deu confiança de que talvez eu consiga vencer meu pai!",
-      "3": "Sinto como se tivesse acabado de quebrar uma pedra muito teimosa!"
-    }
-  },
-  "morty": {
-    "encounter": {
-      "1": "Com um pouco mais, eu poderia ver um futuro em que encontro o Pokémon lendário.\nVocê vai me ajudar a alcançar esse nível!",
-      "2": "Dizem que um Pokémon com cores de arco-íris aparecerá diante de um Treinador verdadeiramente poderoso.\nAcreditei nessa história, então treinei secretamente aqui a vida toda. Como resultado, agora posso ver o que os outros não podem.\nVejo uma sombra da pessoa que fará o Pokémon aparecer.\nAcredito que essa pessoa sou eu! Você vai me ajudar a alcançar esse nível!",
-      "3": "Quer você escolha acreditar ou não, o poder místico existe.",
-      "4": "Você pode testemunhar os frutos do meu treinamento.",
-      "5": "Você deve fazer sua alma se tornar uma com a dos Pokémon. Você pode fazer isso?",
-      "6": "Diga, você quer fazer parte do meu treinamento?"
-    },
-    "victory": {
-      "1": "Ainda não sou bom o suficiente...",
-      "2": "Eu vejo... Sua jornada a levou a lugares distantes e você testemunhou muito mais do que eu.\nEu invejo você por isso...",
-      "3": "Como isso é possível...",
-      "4": "Não acho que nossos potenciais sejam tão diferentes.\nMas você parece ter algo mais do que isso... Que seja.",
-      "5": "Acho que preciso de mais treinamento.",
-      "6": "Isso é uma pena."
-    },
-    "defeat": {
-      "1": "Eu me movi... mais um passo adiante.",
-      "2": "Fufufu...",
-      "3": "O-o que?! Não pode ser! Nem isso foi suficiente?",
-      "4": "Sinto como se tivesse acabado de quebrar uma pedra muito teimosa!",
-      "5": "Ahahahah!",
-      "6": "Eu sabia que venceria!"
-    }
-  },
-  "crispin": {
-    "encounter": {
-      "1": "Quero vencer, então é exatamente isso que vou fazer!",
-      "2": "Eu batalho porque quero batalhar! E sabe de uma coisa? É assim que deve ser!"
-    },
-    "victory": {
-      "1": "Queria vencer... mas perdi!",
-      "2": "Eu perdi... porque não consegui vencer!"
-    },
-    "defeat": {
-      "1": "Ei, espere um segundo. Eu acabei de vencer? Acho que acabei de vencer! Que satisfação!",
-      "2": "Uou! Isso foi incrível!"
-    }
-  },
-  "amarys": {
-    "encounter": {
-      "1": "Quero ser a pessoa a ajudar alguém em particular. Sendo assim, não posso me dar ao luxo de perder.\n... Nossa batalha começa agora."
-    },
-    "victory": {
-      "1": "Eu sou... não o suficiente, eu vejo."
-    },
-    "defeat": {
-      "1": "A vitória pertence a mim. Bem lutado."
-    }
-  },
-  "lacey": {
-    "encounter": {
-      "1": "Vou enfrentar você com meu time usual como membro da Elite dos Quatro."
-    },
-    "victory": {
-      "1": "Foi uma excelente batalha. Estou ansiosa para o próximo desafio."
-    },
-    "defeat": {
-      "1": "Fufufu... Nada mal.\nDesafiantes que derrotam a Elite dos Quatro são dignos de notar."
-    }
-  },
-  "drayton": {
-    "encounter": {
-      "1": "Cara, eu amo cadeiras. Você não ama cadeiras? Que salva-vidas.\n$Não entendo por que todo mundo não fica sentado o tempo todo. Ficar de pé é cansativo!"
-    },
-    "victory": {
-      "1": "Acho que deveria ter esperado por isso!"
-    },
-    "defeat": {
-      "1": "Heh heh! Não ligue para mim, só pegando uma vitória aqui. Entendo se você estiver chateada, mas não vá dar uma de Kieran comigo, OK?"
-    }
-  },
-  "ramos": {
-    "encounter": {
-      "1": "Você gostou do jardim de diversão que fiz com todas essas plantas resistentes minhas?\n$A força delas é um sinal da minha força como jardineiro e Líder de Ginásio! Você tem certeza de que está pronta para enfrentar tudo isso?"
-    },
-    "victory": {
-      "1": "Você acredita nos seus Pokémon... E eles acreditam em você também... Foi uma boa batalha, broto."
-    },
-    "defeat": {
-      "1": "Hohoho... De fato. Pequenas lâminas frágeis de grama conseguem quebrar até mesmo concreto."
-    }
-  },
-  "viola": {
-    "encounter": {
-      "1": "Seja as lágrimas de frustração que seguem uma derrota ou o florescer da alegria que vem com a vitória…\n$Ambos são ótimos temas para minha câmera! Fantástico! Isso vai ser simplesmente fantástico!\n$Agora venha para cima de mim!",
-      "2": "Minha lente está sempre focada na vitória – não vou deixar nada estragar esta foto!"
-    },
-    "victory": {
-      "1": "Você e seus Pokémon me mostraram uma nova profundidade de campo! Fantástico! Simplesmente fantástico!",
-      "2": "O mundo que você vê através de uma lente, e o mundo que você vê com um Pokémon ao seu lado…\n$O mesmo mundo pode parecer completamente diferente dependendo do seu ponto de vista."
-    },
-    "defeat": {
-      "1": "A foto do momento da minha vitória vai ser um verdadeiro sucesso!",
-      "2": "Sim! Tirei ótimas fotos!"
-    }
-  },
-  "candice": {
-    "encounter": {
-      "1": "Você quer desafiar a Candice? Com certeza! Eu estava esperando por alguém forte!\n$Mas devo te avisar, sou forte porque sei como focar.",
-      "2": "Pokémon, moda, romance… É tudo uma questão de foco!\n$Vou te mostrar exatamente o que quero dizer. Prepare-se para perder!"
-    },
-    "victory": {
-      "1": "Devo dizer, estou aquecida para você! Posso até te admirar um pouco.",
-      "2": "Uau! Você é ótima! Ganhou meu respeito!\n$Acho que seu foco e vontade nos derrubaram totalmente."
-    },
-    "defeat": {
-      "1": "Eu senti sua vontade de vencer, mas eu não perco!",
-      "2": "Viu? O foco da Candice! O foco dos meus Pokémon também é ótimo!"
-    }
-  },
-  "gardenia": {
-    "encounter": {
-      "1": "Você tem uma aura vencedora. Então, de qualquer forma, isso vai ser divertido. Vamos ter nossa batalha!"
-    },
-    "victory": {
-      "1": "Incrível! Você é muito boa, não é?"
-    },
-    "defeat": {
-      "1": "Sim! Meus Pokémon e eu somos perfeitamente bons!"
-    }
-  },
-  "aaron": {
-    "encounter": {
-      "1": "Ok! Deixe-me enfrentar você!"
-    },
-    "victory": {
-      "1": "Batalhar é um assunto profundo e complexo..."
-    },
-    "defeat": {
-      "1": "Vencer um membro da Elite dos Quatro não é fácil."
-    }
-  },
-  "cress": {
-    "encounter": {
-      "1": "Isso mesmo! Serei eu e meus estimados tipos Água que você deve enfrentar na batalha!"
-    },
-    "victory": {
-      "1": "Perder? Eu? Não acredito nisso."
-    },
-    "defeat": {
-      "1": "Este é o resultado apropriado quando eu sou seu oponente."
-    }
-  },
-  "allister": {
-    "encounter": {
-      "1": "Sou Allister.\nA-aqui... vou eu..."
-    },
-    "victory": {
-      "1": "Quase perdi minha máscara de tanto choque... Isso foi…\n$Uau. Posso ver sua habilidade pelo que ela é."
-    },
-    "defeat": {
-      "1": "I-isso foi incrível!"
-    }
-  },
-  "clay": {
-    "encounter": {
-      "1": "Harrumph! Me deixou esperando, não foi, garota? Tudo bem, hora de ver o que você pode fazer!"
-    },
-    "victory": {
-      "1": "Cara, como é bom dar tudo de si e ainda assim ser derrotado!"
-    },
-    "defeat": {
-      "1": "O que importa é como você reage à derrota.\n$É por isso que as pessoas que usam a derrota como combustível para melhorar são duras."
-    }
-  },
-  "kofu": {
-    "encounter": {
-      "1": "Vou te servir um prato completo de Pokémon do tipo Água! Mas não tente comê-los!"
-    },
-    "victory": {
-      "1": "Vaultin' Veluza! Você é animada, não é! Um pouco ANIMADA DEMAIS, se me permite dizer!"
-    },
-    "defeat": {
-      "1": "Volte para me ver novamente, ouviu?"
-    }
-  },
-  "tulip": {
-    "encounter": {
-      "1": "Permita-me usar minhas habilidades para deixar seus lindos Pokémon ainda mais bonitos!"
-    },
-    "victory": {
-      "1": "Sua força tem uma magia que não pode ser apagada."
-    },
-    "defeat": {
-      "1": "Você sabe, na minha linha de trabalho, pessoas que carecem de talento em uma área ou outra frequentemente desaparecem rapidamente - nunca mais se ouve falar delas."
-    }
-  },
-  "sidney": {
-    "encounter": {
-      "1": "Gostei desse olhar que você me deu. Acho que você vai ser um bom desafio.\n$Isso é ótimo! Parece muito bom! Vamos nessa!\n$Você e eu, vamos curtir uma batalha que só pode acontecer aqui!"
-    },
-    "victory": {
-      "1": "E aí, gostou? Eu perdi! Mas foi divertido, então não importa."
-    },
-    "defeat": {
-      "1": "Sem ressentimentos, beleza?"
-    }
-  },
-  "phoebe": {
-    "encounter": {
-      "1": "Enquanto treinava, adquiri a habilidade de me comunicar com Pokémon do tipo Fantasma. \n$Sim, o vínculo que desenvolvi com os Pokémon é extremamente forte. \n$Então, vamos lá, tente ver se você consegue até mesmo causar dano aos meus Pokémon!"
-    },
-    "victory": {
-      "1": "Ah, droga. Eu perdi."
-    },
-    "defeat": {
-      "1": "Estou ansiosa para batalhar com você de novo algum dia!"
-    }
-  },
-  "glacia": {
-    "encounter": {
-      "1": "Tudo o que vi foram desafios de Treinadores fracos e seus Pokémon. \n$E você? Ficaria extremamente satisfeita se pudesse dar tudo de mim contra você!"
-    },
-    "victory": {
-      "1": "Você e seus Pokémon… Como seus espíritos queimam!\n$O calor consumido é esmagador. \n$Não é surpresa que minhas habilidades geladas falharam em te machucar."
-    },
-    "defeat": {
-      "1": "Uma batalha intensamente apaixonada, sem dúvida."
-    }
-  },
-  "drake": {
-    "encounter": {
-      "1": "Para nós, batalhar com Pokémon como parceiros, você sabe o que é necessário? Você sabe o que precisa? \n$Se não souber, nunca prevalecerá contra mim!"
-    },
-    "victory": {
-      "1": "Excelente, deve-se dizer."
-    },
-    "defeat": {
-      "1": "Dei meu máximo nessa batalha!"
-    }
-  },
-  "wallace": {
-    "encounter": {
-      "1": "Há algo em você… Uma diferença na sua postura. \n$Acho que sinto isso em você. Agora, me mostre. Mostre-me o poder que você tem com seus Pokémon. \n$E eu, por minha vez, apresentarei uma performance de ilusões na água com meus Pokémon!"
-    },
-    "victory": {
-      "1": "Bravo. Agora percebo sua autenticidade e magnificência como Treinadora de Pokémon. \n$Tenho muita alegria em ter conhecido você e seus Pokémon. Você se mostrou digna."
-    },
-    "defeat": {
-      "1": "Uma grande ilusão!"
-    }
-  },
-  "lorelei": {
-    "encounter": {
-      "1": "Ninguém me supera quando se trata de Pokémon gelados! Movimentos congelantes são poderosos!\n$Seus Pokémon estarão à minha mercê quando estiverem congelados! Hahaha! Está pronta?"
-    },
-    "victory": {
-      "1": "Como ousa!"
-    },
-    "defeat": {
-      "1": "Não há nada que você possa fazer quando está congelada."
-    }
-  },
-  "will": {
-    "encounter": {
-      "1": "Treinei por todo o mundo, tornando meus Pokémon psíquicos poderosos.\n$Eu só posso melhorar! Perder não é uma opção!"
-    },
-    "victory": {
-      "1": "Eu… Eu não… acredito…"
-    },
-    "defeat": {
-      "1": "Isso foi por pouco. Me pergunto o que está faltando em você."
-    }
-  },
-  "malva": {
-    "encounter": {
-      "1": "Sinto que meu coração pode explodir em chamas. \n$Estou ardendo de ódio por você, pirralha!"
-    },
-    "victory": {
-      "1": "Que novidade… Uma nova desafiadora derrotou Malva!"
-    },
-    "defeat": {
-      "1": "Estou encantada! Sim, encantada por poder esmagar você sob meu calcanhar."
-    }
-  },
-  "hala": {
-    "encounter": {
-      "1": "O velho Hala está aqui para fazer você gritar!"
-    },
-    "victory": {
-      "1": "Pude sentir o poder que você ganhou na sua jornada."
-    },
-    "defeat": {
-      "1": "Haha! Que batalha deliciosa!"
-    }
-  },
-  "molayne": {
-    "encounter": {
-      "1": "Dei a posição de capitão ao meu primo Sophocles, mas estou confiante na minha habilidade. \n$Minha força é como a de uma supernova!"
-    },
-    "victory": {
-      "1": "Certamente encontrei uma Treinadora interessante para enfrentar!"
-    },
-    "defeat": {
-      "1": "Ahaha. Que batalha interessante."
-    }
-  },
-  "rika": {
-    "encounter": {
-      "1": "Eu diria que vou pegar leve com você, mas… estaria mentindo! Pense rápido!"
-    },
-    "victory": {
-      "1": "Nada mal, garota."
-    },
-    "defeat": {
-      "1": "Nahahaha! Você realmente é algo mais, garota!"
-    }
-  },
-  "bruno": {
-    "encounter": {
-      "1": "Nós vamos te triturar com nosso poder superior! Hoo hah!"
-    },
-    "victory": {
-      "1": "Por quê? Como eu poderia perder?"
-    },
-    "defeat": {
-      "1": "Você pode me desafiar o quanto quiser, mas os resultados nunca vão mudar!"
-    }
-  },
-  "bugsy": {
-    "encounter": {
-      "1": "Sou Bugsy! Eu nunca perco quando se trata de Pokémon do tipo Inseto!"
-    },
-    "victory": {
-      "1": "Uau, incrível! Você é uma especialista em Pokémon!\nMinha pesquisa ainda não está completa. OK, você venceu."
-    },
-    "defeat": {
-      "1": "Obrigado! Graças à nossa batalha, eu também pude fazer progressos na minha pesquisa!"
-    }
-  },
-  "koga": {
-    "encounter": {
-      "1": "Fwahahahaha! Pokémon não são apenas sobre força bruta--você verá em breve!"
-    },
-    "victory": {
-      "1": "Ah! Você provou seu valor!"
-    },
-    "defeat": {
-      "1": "Você aprendeu a temer as técnicas do ninja?"
-    }
-  },
-  "bertha": {
-    "encounter": {
-      "1": "Bem, você mostraria a esta velha senhora o quanto aprendeu?"
-    },
-    "victory": {
-      "1": "Bem! Querida criança, devo dizer, isso foi muito impressionante. \n$Seus Pokémon acreditaram em você e fizeram o melhor para te dar a vitória. \n$Mesmo tendo perdido, me encontro com esse sorriso bobo!"
-    },
-    "defeat": {
-      "1": "Hahahahah! Parece que esta velha senhora ganhou!"
-    }
-  },
-  "lenora": {
-    "encounter": {
-      "1": "Bem, desafiadora, vou pesquisar como você batalha com os Pokémon que criou com tanto carinho!"
-    },
-    "victory": {
-      "1": "Minha teoria sobre você estava correta. Você é mais do que talentosa… Você é motivada! Eu te saúdo!"
-    },
-    "defeat": {
-      "1": "Ah ha ha! Se você perder, certifique-se de analisar o porquê e use esse conhecimento na próxima batalha!"
-    }
-  },
-  "siebold": {
-    "encounter": {
-      "1": "Enquanto eu estiver vivo, continuarei em busca da culinária suprema... e dos oponentes mais fortes em batalha!"
-    },
-    "victory": {
-      "1": "Guardarei minha memória de você e seus Pokémon para sempre em meu coração."
-    },
-    "defeat": {
-      "1": "Nossa batalha Pokémon foi como alimento para minha alma. Isso vai me manter em frente. \n$É assim que vou prestar meus respeitos a você por dar tudo de si na batalha!"
-    }
-  },
-  "roxie": {
-    "encounter": {
-      "1": "Prepare-se! Vou arrancar algum senso de você!"
-    },
-    "victory": {
-      "1": "Selvagem! Sua razão já é mais tóxica que a minha!"
-    },
-    "defeat": {
-      "1": "Ei, vamos lá! Seja séria! Você tem que dar mais de si!"
-    }
-  },
-  "olivia": {
-    "encounter": {
-      "1": "Não precisa de introdução aqui. Hora de batalhar comigo, Olivia!"
-    },
-    "victory": {
-      "1": "Realmente encantador… Tanto você quanto seus Pokémon…"
-    },
-    "defeat": {
-      "1": "Mmm-hmm."
-    }
-  },
-  "poppy": {
-    "encounter": {
-      "1": "Oooh! Você quer ter uma batalha Pokémon comigo?"
-    },
-    "victory": {
-      "1": "Uagh?! Mmmuuuggghhh…"
-    },
-    "defeat": {
-      "1": "Yaaay! Eu consegui! Eu der-ro-tei você! Você pode vir para… Para… Uma revanche? \n$Venha para uma revanche quando quiser!"
-    }
-  },
-  "agatha": {
-    "encounter": {
-      "1": "Pokémon são para batalhas! Vou te mostrar como um verdadeiro Treinador batalha!"
-    },
-    "victory": {
-      "1": "Oh meu! Você é algo especial, criança!"
-    },
-    "defeat": {
-      "1": "Bahaha. É assim que uma batalha adequada é feita!"
-    }
-  },
-  "flint": {
-    "encounter": {
-      "1": "Espero que você esteja aquecida, porque aqui vem o Big Bang!"
-    },
-    "victory": {
-      "1": "Incrível! Seus movimentos são tão quentes que fazem os meus parecerem mornos!"
-    },
-    "defeat": {
-      "1": "Huh? Isso é tudo? Acho que você precisa de um pouco mais de paixão."
-    }
-  },
-  "grimsley": {
-    "encounter": {
-      "1": "O vencedor leva tudo, e não sobra nada para o perdedor."
-    },
-    "victory": {
-      "1": "Quando se perde, perde-se tudo… A próxima coisa que vou procurar será a vitória, também!"
-    },
-    "defeat": {
-      "1": "Se alguém vence, a pessoa que lutou contra essa pessoa perde."
-    }
-  },
-  "caitlin": {
-    "encounter": {
-      "1": "Sou eu que apareci quando a flor se abriu. Você que estava esperando…\n$Você parece uma Treinadora de Pokémon com força refinada e bondade profunda. \n$O que eu procuro no meu oponente é uma força soberba… \n$Por favor, libere seu poder ao máximo!"
-    },
-    "victory": {
-      "1": "Meus Pokémon e eu aprendemos muito! Agradeço a você."
-    },
-    "defeat": {
-      "1": "Aspiro a reivindicar a vitória com elegância e graça."
-    }
-  },
-  "diantha": {
-    "encounter": {
-      "1": "Batalhar contra você e seus Pokémon, todos vocês cheios de esperança para o futuro… \n$Honestamente, isso apenas me enche da energia que preciso para continuar enfrentando cada novo dia! Sim!"
-    },
-    "victory": {
-      "1": "Testemunhar os espíritos nobres de você e seus Pokémon em batalha realmente tocou meu coração…"
-    },
-    "defeat": {
-      "1": "Oh, fantástico! O que achou? Minha equipe foi bem legal, né?"
-    }
-  },
-  "wikstrom": {
-    "encounter": {
-      "1": "Bem encontrado, jovem desafiadora! Verdadeiramente sou a lâmina famosa de aço endurecido, Duque Wikstrom! \n$Que a batalha comece! En garde!"
-    },
-    "victory": {
-      "1": "Gloriosa! A confiança que você compartilha com seu honrado Pokémon supera até mesmo a minha!"
-    },
-    "defeat": {
-      "1": "Que tipo de magia é essa? Meu coração bate incessantemente no meu peito! \n$Vencer contra uma oponente tão digna dá asas à minha alma--assim eu voo!"
-    }
-  },
-  "acerola": {
-    "encounter": {
-      "1": "Batalhar é simplesmente divertido! Vamos lá, eu posso te derrotar!"
-    },
-    "victory": {
-      "1": "Eu… Estou sem palavras! Como você conseguiu?!"
-    },
-    "defeat": {
-      "1": "Ehaha! Que vitória incrível!"
-    }
-  },
-  "larry_elite": {
-    "encounter": {
-      "1": "Olá… Sou eu, Larry.\n$Eu também sou membro da Elite dos Quatro, sim… Infelizmente para mim."
-    },
-    "victory": {
-      "1": "Bem, isso tirou o vento debaixo das nossas asas…"
-    },
-    "defeat": {
-      "1": "É hora de uma reunião com o chefe."
-    }
-  },
-  "lance": {
-    "encounter": {
-      "1": "Estive esperando por você. Permita-me testar suas habilidades.",
-      "2": "Achei que você conseguiria chegar tão longe. Vamos começar."
-    },
-    "victory": {
-      "1": "Você me pegou. Você é magnífica!",
-      "2": "Nunca esperei que outra Treinadora me derrotasse… Estou surpreso."
-    },
-    "defeat": {
-      "1": "Isso foi por pouco. Quer tentar de novo?",
-      "2": "Não é que você seja fraca. Não se incomode com isso."
-    }
-  },
-  "karen": {
-    "encounter": {
-      "1": "Eu sou Karen. Você gostaria de um duelo com meus Pokémon do tipo Sombrio?",
-      "2": "Sou diferente daqueles que você já conheceu.",
-      "3": "Você montou uma equipe charmosa. Nossa batalha deve ser boa."
-    },
-    "victory": {
-      "1": "Não! Eu não posso vencer. Como você ficou tão forte?",
-      "2": "Não me desviarei do meu caminho escolhido.",
-      "3": "O Campeão está ansioso para te conhecer."
-    },
-    "defeat": {
-      "1": "Isso era o que eu esperava.",
-      "2": "Bem, isso foi relativamente divertido.",
-      "3": "Venha me visitar a qualquer momento."
-    }
-  },
-  "milo": {
-    "encounter": {
-      "1": "Parece que você entende bem os Pokémon. \n$Isso vai ser uma batalha e tanto! \n$Vou ter que usar a Dynamax no meu Pokémon se eu quiser vencer!"
-    },
-    "victory": {
-      "1": "O poder da Grama murchou… Que desafiadora incrível!"
-    },
-    "defeat": {
-      "1": "Isso realmente vai te deixar em choque e admiração."
-    }
-  },
-  "lucian": {
-    "encounter": {
-      "1": "Só um momento, por favor. O livro que estou lendo está quase no clímax emocionante… \n$O herói obteve uma espada mística e está prestes a enfrentar sua prova final… Ah, tanto faz. \n$Já que você chegou tão longe, vou deixar isso de lado e batalhar com você. \n$Deixe-me ver se você alcançará tanta glória quanto o herói do meu livro!"
-    },
-    "victory": {
-      "1": "Eu vejo… Parece que você me colocou em xeque-mate."
-    },
-    "defeat": {
-      "1": "Tenho uma reputação a manter."
-    }
-  },
-  "drasna": {
-    "encounter": {
-      "1": "Você deve ser uma Treinadora forte. Sim, bastante forte…\n$Isso é uma notícia maravilhosa! Enfrentar oponentes como você e sua equipe fará meus Pokémon crescerem como ervas daninhas!"
-    },
-    "victory": {
-      "1": "Oh, meu Deus. Isso foi uma batalha rápida… Espero que você volte novamente algum dia!"
-    },
-    "defeat": {
-      "1": "Como isso é possível?"
-    }
-  },
-  "kahili": {
-    "encounter": {
-      "1": "Então, aqui está você… Por que não vemos para quem os ventos favorecem hoje, você… ou eu?"
-    },
-    "victory": {
-      "1": "É frustrante para mim como membro da Elite dos Quatro, mas parece que sua força é real."
-    },
-    "defeat": {
-      "1": "Essa foi uma jogada de mestre!"
-    }
-  },
-  "hassel": {
-    "encounter": {
-      "1": "Prepare-se para aprender em primeira mão como é a respiração ardente de uma batalha feroz!"
-    },
-    "victory": {
-      "1": "A sorte sorriu para mim desta vez, mas… \n$Julgando pelo andamento da luta, quem sabe se serei tão sortudo na próxima vez."
-    },
-    "defeat": {
-      "1": "Essa foi uma jogada de mestre!"
-    }
-  },
-  "blue": {
-    "encounter": {
-      "1": "Você deve ser muito boa para chegar tão longe."
-    },
-    "victory": {
-      "1": "Só perdi para ele e agora para você… Ele? Hee, hee…"
-    },
-    "defeat": {
-      "1": "Viu? Meu poder é o que me trouxe até aqui."
-    }
-  },
-  "piers": {
-    "encounter": {
-      "1": "Prepare-se para uma mosh pit comigo e minha galera! Spikemuth, é hora de roquear!"
-    },
-    "victory": {
-      "1": "Eu e minha equipe demos o nosso melhor. Vamos nos encontrar novamente para uma batalha algum dia…"
-    },
-    "defeat": {
-      "1": "Minha garganta está desgastada de tanto gritar… Mas essa foi uma batalha empolgante!"
-    }
-  },
-  "red": {
-    "encounter": {
-      "1": "…!"
-    },
-    "victory": {
-      "1": "…?"
-    },
-    "defeat": {
-      "1": "…!"
-    }
-  },
-  "jasmine": {
-    "encounter": {
-      "1": "Oh… Seus Pokémon são impressionantes. Acho que vou gostar disso."
-    },
-    "victory": {
-      "1": "Você é realmente forte. Vou ter que me esforçar muito mais também."
-    },
-    "defeat": {
-      "1": "Eu nunca esperei ganhar."
-    }
-  },
-  "lance_champion": {
-    "encounter": {
-      "1": "Ainda sou o Campeão. Não vou segurar nada."
-    },
-    "victory": {
-      "1": "Esta é a emergência de uma nova Campeã."
-    },
-    "defeat": {
-      "1": "Defendi com sucesso meu Campeonato."
-    }
-  },
-  "steven": {
-    "encounter": {
-      "1": "Diga-me… O que você viu na sua jornada com seus Pokémon? \n$O que você sentiu, encontrando tantos outros Treinadores por aí? \n$Viajar por esta terra rica… Isso despertou algo dentro de você? \n$Quero que você venha até mim com tudo o que aprendeu. \n$Meus Pokémon e eu responderemos com tudo o que sabemos!"
-    },
-    "victory": {
-      "1": "Então eu, o Campeão, caio em derrota…"
-    },
-    "defeat": {
-      "1": "Esse tempo foi bem gasto! Obrigado!"
-    }
-  },
-  "cynthia": {
-    "encounter": {
-      "1": "Eu, Cynthia, aceito seu desafio! Não haverá nenhuma trégua da minha parte!"
-    },
-    "victory": {
-      "1": "Não importa o quão divertida a batalha seja, ela sempre terminará algum dia…"
-    },
-    "defeat": {
-      "1": "Mesmo que você perca, nunca perca o amor pelos Pokémon."
-    }
-  },
-  "iris": {
-    "encounter": {
-      "1": "Sabe de uma coisa? Estou realmente ansiosa para ter batalhas sérias com Treinadores fortes! \n$Quero dizer, vamos lá! Os Treinadores que chegam aqui são Treinadores que desejam a vitória com todas as fibras do seu ser! \n$E eles estão batalhando ao lado de Pokémon que passaram por inúmeras batalhas difíceis! \n$Se eu batalhar com pessoas assim, não só eu ficarei mais forte, meus Pokémon também! \n$E nós vamos nos conhecer ainda melhor! OK! Prepare-se! \n$Sou Iris, a Campeã da Liga Pokémon, e vou te derrotar!"
-    },
-    "victory": {
-      "1": "Aghhhh… Eu dei o meu melhor, mas nós perdemos…"
-    },
-    "defeat": {
-      "1": "Yay! Nós vencemos!"
-    }
-  },
-  "hau": {
-    "encounter": {
-      "1": "Eu me pergunto se um Treinador batalha de maneira diferente dependendo se ele é de uma região quente ou fria.\n$Vamos testar isso!"
-    },
-    "victory": {
-      "1": "Isso foi incrível! Acho que entendi um pouco melhor seu estilo agora!"
-    },
-    "defeat": {
-      "1": "Cara, essa foi uma batalha e tanto!"
-    }
-  },
-  "geeta": {
-    "encounter": {
-      "1": "Decidi entrar na batalha mais uma vez. \n$Venha agora… Mostre-me os frutos do seu treinamento."
-    },
-    "victory": {
-      "1": "Estou ansiosa para notícias de todas as suas conquistas!"
-    },
-    "defeat": {
-      "1": "Qual o problema? Isso é tudo?"
-    }
-  },
-  "nemona": {
-    "encounter": {
-      "1": "Yesss! Estou tão empolgada! Hora de soltar tudo!"
-    },
-    "victory": {
-      "1": "Bem, isso foi ruim, mas ainda me diverti! Eu te pego na próxima!"
-    },
-    "defeat": {
-      "1": "Bem, essa foi uma ótima batalha! Frutífera, com certeza."
-    }
-  },
-  "leon": {
-    "encounter": {
-      "1": "Vamos ter um tempo absolutamente campeão!"
-    },
-    "victory": {
-      "1": "Meu tempo como Campeão acabou… \n$Mas que tempo campeão foi! \n$Obrigado pela melhor batalha que já tive!"
-    },
-    "defeat": {
-      "1": "Um tempo absolutamente campeão, foi!"
-    }
-  },
-  "whitney": {
-    "encounter": {
-      "1": "Eai! Você não acha que os Pokémon são, tipo, super fofos?"
-    },
-    "victory": {
-      "1": "Waaah! Waaah! Você é tão má!"
-    },
-    "defeat": {
-      "1": "E é isso!"
-    }
-  },
-  "chuck": {
-    "encounter": {
-      "1": "Hah! Você quer me desafiar? É corajosa ou apenas ignorante?"
-    },
-    "victory": {
-      "1": "Você é forte! Por favor, me faça seu aprendiz?"
-    },
-    "defeat": {
-      "1": "Aí está. Você percebe o quanto sou mais poderoso que você?"
-    }
-  },
-  "katy": {
-    "encounter": {
-      "1": "Não baixe a guarda, a menos que queira se ver jogada no chão!"
-    },
-    "victory": {
-      "1": "Todos os meus adoráveis Pokémon caíram como moscas!"
-    },
-    "defeat": {
-      "1": "Coma, meu adorável Vivillon!"
-    }
-  },
-  "pryce": {
-    "encounter": {
-      "1": "A juventude sozinha não garante a vitória! Experiência é o que conta."
-    },
-    "victory": {
-      "1": "Excelente! Isso foi perfeito. Tente não esquecer o que sente agora."
-    },
-    "defeat": {
-      "1": "Exatamente como eu imaginei."
-    }
-  },
-  "clair": {
-    "encounter": {
-      "1": "Você sabe quem eu sou? E ainda se atreve a me desafiar?"
-    },
-    "victory": {
-      "1": "Eu me pergunto até onde você pode ir com seu nível de habilidade. Isso deve ser fascinante."
-    },
-    "defeat": {
-      "1": "E é isso."
-    }
-  },
-  "maylene": {
-    "encounter": {
-      "1": "Vim desafiá-la agora e não vou segurar nada. \n$Por favor, prepare-se para a batalha!"
-    },
-    "victory": {
-      "1": "Eu admito a derrota…"
-    },
-    "defeat": {
-      "1": "Isso foi incrível."
-    }
-  },
-  "fantina": {
-    "encounter": {
-      "1": "Você vai me desafiar, não é? Mas eu vou ganhar. \n$É o que a Líder do Ginásio de Hearthome faz, não?"
-    },
-    "victory": {
-      "1": "Você é tão incrivelmente forte. Sei porque perdi."
-    },
-    "defeat": {
-      "1": "Estou tão, tão, muito feliz!"
-    }
-  },
-  "byron": {
-    "encounter": {
-      "1": "Treinadora! Você é jovem, assim como meu filho, Roark. \n$Com mais Treinadores jovens assumindo o comando, o futuro dos Pokémon é brilhante! \n$Então, como uma parede para os jovens, aceitarei seu desafio!"
-    },
-    "victory": {
-      "1": "Hmm! Meus Pokémon robustos--derrotados!"
-    },
-    "defeat": {
-      "1": "Gwahahaha! Como foram meus Pokémon robustos?!"
-    }
-  },
-  "olympia": {
-    "encounter": {
-      "1": "Um costume antigo decidindo o destino de alguém. A batalha começa!"
-    },
-    "victory": {
-      "1": "Crie seu próprio caminho. Não deixe nada te atrapalhar. Seu destino, seu futuro."
-    },
-    "defeat": {
-      "1": "Nosso caminho está claro agora."
-    }
-  },
-  "volkner": {
-    "encounter": {
-      "1": "Já que você chegou tão longe, deve ser bastante forte…\n$Espero que você seja a Treinadora que me faça lembrar como é divertido batalhar!"
-    },
-    "victory": {
-      "1": "Você me venceu…\n$Seu desejo e a maneira nobre como seus Pokémon batalharam por você… \n$Eu até me senti emocionado durante nossa luta. Foi uma batalha muito boa."
-    },
-    "defeat": {
-      "1": "Não foi nada chocante…\n$Isso não é o que eu queria!"
-    }
-  },
-  "burgh": {
-    "encounter": {
-      "1": "M'hm… Se eu ganhar esta batalha, sinto que posso desenhar um quadro diferente de qualquer outro. \n$OK! Posso ouvir minha musa da batalha claramente. Vamos direto ao ponto!",
-      "2": "Claro, estou realmente orgulhoso de todos os meus Pokémon! \n$Bem agora… Vamos direto ao ponto!"
-    },
-    "victory": {
-      "1": "Acabou? Minha musa me abandonou?",
-      "2": "Hmm… Acabou! Você é incrível!"
-    },
-    "defeat": {
-      "1": "Uau… É bonito de alguma forma, não é…",
-      "2": "Às vezes ouço as pessoas dizerem que foi uma vitória feia. \n$Acho que se você está dando o seu melhor, qualquer vitória é bonita."
-    }
-  },
-  "elesa": {
-    "encounter": {
-      "1": "C'est fini! Quando tenho certeza disso, sinto um choque elétrico percorrer meu corpo! \n$Quero sentir essa sensação, então agora meus amados Pokémon vão fazer sua cabeça girar!"
-    },
-    "victory": {
-      "1": "Eu queria fazer sua cabeça girar, mas você me surpreendeu."
-    },
-    "defeat": {
-      "1": "Isso foi insatisfatório de alguma forma… Você dará tudo de si na próxima vez?"
-    }
-  },
-  "skyla": {
-    "encounter": {
-      "1": "Finalmente é hora do confronto! Isso significa a batalha Pokémon que decide quem está no topo, certo? \n$Eu amo estar no topo! Porque você pode ver para sempre e sempre de lugares altos! \n$Então, que tal nós nos divertirmos?"
-    },
-    "victory": {
-      "1": "Ser seu oponente na batalha é uma nova fonte de força para mim. Obrigada!"
-    },
-    "defeat": {
-      "1": "Ganhar ou perder, você sempre ganha algo com uma batalha, certo?"
-    }
-  },
-  "brycen": {
-    "encounter": {
-      "1": "Há também força em estar com outras pessoas e Pokémon. \n$Receber o apoio deles te fortalece. Vou te mostrar esse poder!"
-    },
-    "victory": {
-      "1": "A maravilhosa combinação de você e seus Pokémon! Que amizade linda!"
-    },
-    "defeat": {
-      "1": "Condições extremas realmente testam e treinam você!"
-    }
-  },
-  "drayden": {
-    "encounter": {
-      "1": "O que eu quero encontrar é um jovem Treinador que possa me mostrar um futuro brilhante. \n$Vamos batalhar com tudo o que temos: sua habilidade, minha experiência e o amor com que criamos nossos Pokémon!"
-    },
-    "victory": {
-      "1": "Esse sentimento intenso que me invade após uma derrota… Não sei como descrevê-lo."
-    },
-    "defeat": {
-      "1": "Harrumph! Sei que sua habilidade é maior que isso!"
-    }
-  },
-  "grant": {
-    "encounter": {
-      "1": "Só há uma coisa que desejo. \n$Que, superando um ao outro, encontremos um caminho para alturas ainda maiores."
-    },
-    "victory": {
-      "1": "Você é uma parede que não consigo superar!"
-    },
-    "defeat": {
-      "1": "Não desista. \n$Isso é tudo o que realmente importa. \n$As lições mais importantes da vida são simples."
-    }
-  },
-  "korrina": {
-    "encounter": {
-      "1": "Hora da grande aparição de Lady Korrina!"
-    },
-    "victory": {
-      "1": "É o seu próprio ser que permite que seus Pokémon evoluam!"
-    },
-    "defeat": {
-      "1": "Que batalha explosiva!"
-    }
-  },
-  "clemont": {
-    "encounter": {
-      "1": "Oh! Estou feliz por termos nos encontrado!"
-    },
-    "victory": {
-      "1": "Sua paixão pela batalha me inspira!"
-    },
-    "defeat": {
-      "1": "Parece que minha Máquina Treinadora-Crescer-Forte, Mach 2 está realmente funcionando!"
-    }
-  },
-  "valerie": {
-    "encounter": {
-      "1": "Oh, se não é uma jovem Treinadora… É adorável conhecê-la assim. \n$Então, suponho que você ganhou o direito a uma batalha, como recompensa por seus esforços. \n$Uma elusiva Fada pode parecer frágil como a brisa e delicado como uma flor, mas é forte."
-    },
-    "victory": {
-      "1": "Espero que você encontre coisas para sorrir amanhã…"
-    },
-    "defeat": {
-      "1": "Oh meu Deus, que pena…"
-    }
-  },
-  "wulfric": {
-    "encounter": {
-      "1": "Sabe de uma coisa? Todos falamos muito sobre o que você aprende com as batalhas e os laços e tudo mais…\n$Mas realmente, eu só faço isso porque é divertido. \n$Quem se importa com o grandioso? Vamos batalhar!"
-    },
-    "victory": {
-      "1": "Incrível! Sou duro como um iceberg, mas você me quebrou por completo!"
-    },
-    "defeat": {
-      "1": "Lute comigo e é isso que acontece!"
-    }
-  },
-  "kabu": {
-    "encounter": {
-      "1": "Todo Treinador e Pokémon treina duro em busca da vitória. \n$Mas isso significa que seu oponente também está se esforçando para vencer. \n$No final, a partida é decidida por qual lado é capaz de liberar seu verdadeiro potencial."
-    },
-    "victory": {
-      "1": "Estou feliz por poder lutar com você hoje!"
-    },
-    "defeat": {
-      "1": "É uma ótima maneira de sentir meu próprio crescimento!"
-    }
-  },
-  "bea": {
-    "encounter": {
-      "1": "Você tem um espírito inabalável que não será movido, não importa como você seja atacado? \n$Acho que vou testar isso, certo?"
-    },
-    "victory": {
-      "1": "Senti o espírito de luta de seus Pokémon enquanto você os liderava na batalha."
-    },
-    "defeat": {
-      "1": "Essa foi a melhor partida que alguém poderia esperar."
-    }
-  },
-  "opal": {
-    "encounter": {
-      "1": "Deixe-me ver como você e seu Pokémon parceiro se comportam!"
-    },
-    "victory": {
-      "1": "Seu rosa ainda está faltando, mas você é uma Treinadora excelente com Pokémon excelentes."
-    },
-    "defeat": {
-      "1": "Muito ruim para você, eu acho."
-    }
-  },
-  "bede": {
-    "encounter": {
-      "1": "Suponho que devo provar além de qualquer dúvida o quão patética você é e quão forte eu sou."
-    },
-    "victory": {
-      "1": "Eu vejo… Bem, tudo bem. Eu não estava me esforçando muito de qualquer maneira."
-    },
-    "defeat": {
-      "1": "Bom trabalho, eu suponho."
-    }
-  },
-  "gordie": {
-    "encounter": {
-      "1": "Então, vamos acabar com isso."
-    },
-    "victory": {
-      "1": "Eu só quero me enterrar em um buraco… Bem, acho que seria mais como cair daqui."
-    },
-    "defeat": {
-      "1": "Batalhe como sempre faz, a vitória seguirá!"
-    }
-  },
-  "marnie": {
-    "encounter": {
-      "1": "A verdade é que, quando tudo está dito e feito… Eu realmente só quero me tornar Campeã por mim mesma! \n$Então, não leve para o pessoal quando eu chutar seu traseiro!"
-    },
-    "victory": {
-      "1": "OK, então eu perdi… Mas consegui ver muitos dos pontos bons de você e seus Pokémon!"
-    },
-    "defeat": {
-      "1": "Espero que você tenha gostado das nossas táticas de batalha."
-    }
-  },
-  "raihan": {
-    "encounter": {
-      "1": "Vou derrotar o Campeão, vencer todo o torneio e provar ao mundo o quão forte o grande Raihan realmente é!"
-    },
-    "victory": {
-      "1": "Eu pareço bem mesmo quando perco. \n$É uma verdadeira maldição. \n$Acho que é hora de mais uma selfie!"
-    },
-    "defeat": {
-      "1": "Vamos tirar uma selfie para lembrar disso."
-    }
-  },
-  "brassius": {
-    "encounter": {
-      "1": "Pressuponho que você está pronta? Que nossa obra de arte colaborativa comece!"
-    },
-    "victory": {
-      "1": "Ahhh…avant-garde!"
-    },
-    "defeat": {
-      "1": "Começarei uma nova peça imediatamente!"
-    }
-  },
-  "iono": {
-    "encounter": {
-      "1": "Como você está se sentindo sobre esta batalha?\n$...\n$Vamos começar o show! Quão forte é o nossa desafiadora? \n$Eu não sei! Vamos descobrir juntos!"
-    },
-    "victory": {
-      "1": "Você é tão chamativa e brilhante quanto um Raio do Trovão de 10.000.000 volts, amiga!"
-    },
-    "defeat": {
-      "1": "Seus olhos são MEUS!"
-    }
-  },
-  "larry": {
-    "encounter": {
-      "1": "Quando tudo está dito e feito, a simplicidade é mais forte."
-    },
-    "victory": {
-      "1": "Uma porção de derrota, hein?"
-    },
-    "defeat": {
-      "1": "Vou encerrar o dia."
-    }
-  },
-  "ryme": {
-    "encounter": {
-      "1": "Vamos lá, baby! Me agite até os ossos!"
-    },
-    "victory": {
-      "1": "Você é legal, minha amiga, você move minha ALMA!"
-    },
-    "defeat": {
-      "1": "Até mais, baby!"
-    }
-  },
-  "grusha": {
-    "encounter": {
-      "1": "Tudo o que preciso fazer é garantir que o poder do meu Pokémon te arrependa até os ossos!"
-    },
-    "victory": {
-      "1": "Sua paixão ardente... Eu meio que gosto, para ser honesto."
-    },
-    "defeat": {
-      "1": "As coisas não esquentaram para você."
-    }
-  },
-  "marnie_elite": {
-    "encounter": {
-      "1": "Você chegou até aqui, hein? Vamos ver se você pode lidar com meus Pokémon!",
-      "2": "Vou dar o meu melhor, mas não pense que vou pegar leve com você!"
-    },
-    "victory": {
-      "1": "Não acredito que perdi... Mas você mereceu essa vitória. Bem feito!",
-      "2": "Parece que ainda tenho muito a aprender. Porém, grande batalha!"
-    },
-    "defeat": {
-      "1": "Você lutou bem, mas eu tenho a vantagem! Melhor sorte na próxima vez!",
-      "2": "Parece que meu treinamento valeu a pena. Obrigado pela batalha!"
-    }
-  },
-  "nessa_elite": {
-    "encounter": {
-      "1": "As marés estão mudando a meu favor. Pronta para ser levada pela corrente?",
-      "2": "Vamos fazer ondas com esta batalha! Espero que esteja preparada!"
-    },
-    "victory": {
-      "1": "Você navegou nessas águas perfeitamente... Bem feito!",
-      "2": "Parece que minhas correntes não foram páreo para você. Bom trabalho!"
-    },
-    "defeat": {
-      "1": "A água sempre encontra um caminho. Essa foi uma batalha refrescante!",
-      "2": "Você lutou bem, mas o poder do oceano é imparável!"
-    }
-  },
-  "bea_elite": {
-    "encounter": {
-      "1": "Prepare-se! Meu espírito de luta brilha intensamente!",
-      "2": "Vamos ver se você consegue acompanhar meu ritmo implacável!"
-    },
-    "victory": {
-      "1": "Sua força... É impressionante. Você realmente merece essa vitória.",
-      "2": "Nunca senti essa intensidade antes. Trabalho incrível!"
-    },
-    "defeat": {
-      "1": "Outra vitória para meu rigoroso regime de treinamento! Bem feito!",
-      "2": "Você tem força, mas eu treinei mais. Grande batalha!"
-    }
-  },
-  "allister_elite": {
-    "encounter": {
-      "1": "As sombras caem... Você está pronta para enfrentar seus medos?",
-      "2": "Vamos ver se você pode lidar com a escuridão que eu comando."
-    },
-    "victory": {
-      "1": "Você dissipou as sombras... Por enquanto. Bem feito.",
-      "2": "Sua luz atravessou minha escuridão. Ótimo trabalho."
-    },
-    "defeat": {
-      "1": "As sombras falaram... Sua força não é suficiente.",
-      "2": "A escuridão triunfa... Talvez na próxima vez você veja a luz."
-    }
-  },
-  "raihan_elite": {
-    "encounter": {
-      "1": "Tempestade se formando! Vamos ver se você aguenta essa luta!",
-      "2": "Prepare-se para enfrentar o olho da tempestade!"
-    },
-    "victory": {
-      "1": "Você enfrentou a tempestade... Trabalho incrível!",
-      "2": "Você navegou nos ventos perfeitamente... Grande batalha!"
-    },
-    "defeat": {
-      "1": "Outra tempestade enfrentada, outra vitória conquistada! Bem lutado!",
-      "2": "Você foi pega na minha tempestade! Melhor sorte na próxima vez!"
-    }
-  },
-  "alder": {
-    "encounter": {
-      "1": "Se prepare para uma batalha contra o Treinador mais forte de Unova!"
-    },
-    "victory": {
-      "1": "Muito bem! Você certamente é um talento incomparável."
-    },
-    "defeat": {
-      "1": "Um vento fresco sopra em meu coração...\n$Que esforço extraordinário!"
-    }
-  },
-  "kieran": {
-    "encounter": {
-      "1": "Através do trabalho duro, eu me torno cada vez mais forte!\n$Eu não perco."
-    },
-    "victory": {
-      "1": "Eu não acredito...\n$Que batalha divertida e emocionante!"
-    },
-    "defeat": {
-      "1": "Uau, que batalha!\n$Hora de você treinar ainda mais."
-    }
-  },
-  "rival": {
-    "encounter": {
-      "1": "@c{smile}Eai, estava procurando você! Sabia que você estava ansiosa para começar, mas esperava pelo menos um tchau…\n$@c{smile_eclosed}Então você está realmente perseguindo seu sonho, hein?\n Quase não consigo acreditar.\n$@c{serious_smile_fists}Já que estamos aqui, que tal uma batalha?\nAfinal, quero ter certeza de que você está pronta.\n$@c{serious_mopen_fists}Não se segure, quero que você dê tudo de si!"
-    },
-    "victory": {
-      "1": "@c{shock}Caramba… Você me limpou.\nVocê é mesmo uma novata?\n$@c{smile}Talvez tenha sido um pouco de sorte, mas…\nQuem sabe você consiga chegar até o fim.\n$Aliás, o professor me pediu para te dar esses itens. Eles parecem bem legais.\n$@c{serious_smile_fists}Boa sorte lá fora!"
-    }
-  },
-  "rival_female": {
-    "encounter": {
-      "1": "@c{smile_wave}Aí está você! Procurei você em todo lugar!\n@c{angry_mopen}Esqueceu de se despedir da sua melhor amiga?\n$@c{smile_ehalf}Você está indo atrás do seu sonho, né?\nEsse dia realmente chegou, não é…\n$@c{smile}Enfim, vou te perdoar por ter me esquecido, mas com uma condição. @c{smile_wave_wink}Você tem que lutar comigo!\n$@c{angry_mopen}Dê o seu melhor! Não quer que sua aventura acabe antes de começar, né?"
-    },
-    "victory": {
-      "1": "@c{shock}Você acabou de começar e já está tão forte?!@d{96}\n@c{angry}Você trapaceou, não foi?\n$@c{smile_wave_wink}Brincadeirinha!@d{64} @c{smile_eclosed}Eu perdi de forma justa… Tenho a sensação de que você vai se sair muito bem lá fora.\n$@c{smile}Aliás, o professor pediu para eu te dar alguns itens. Espero que sejam úteis!\n$@c{smile_wave}Dê o seu melhor, como sempre! Eu acredito em você!"
-    }
-  },
-  "rival_2": {
-    "encounter": {
-      "1": "@c{smile}Eai, você também está aqui?\n@c{smile_eclosed}Ainda com um recorde perfeito, hein…?\n$@c{serious_mopen_fists}Sei que parece que eu te segui até aqui, mas isso não é totalmente verdade.\n$@c{serious_smile_fists}Sinceramente, tenho estado ansioso por uma revanche desde que você me venceu em casa.\n$Tenho treinado bastante, então vou dar uma luta difícil desta vez.\n$@c{serious_mopen_fists}Não se segure, assim como antes!\nVamos lá!"
-    },
-    "victory": {
-      "1": "@c{neutral_eclosed}Ah. Acho que fui confiante demais.\n$@c{smile}Tudo bem, no entanto. Eu imaginei que isso poderia acontecer.\n@c{serious_mopen_fists}Isso só significa que preciso me esforçar mais para a próxima vez!\n\n$@c{smile}Ah, não que você precise realmente de ajuda, mas eu tinha um extra desses itens e pensei que você poderia querer.\n$@c{serious_smile_fists}Não espere outro depois deste!\nNão posso continuar dando vantagem ao meu oponente.\n$@c{smile}Enfim, cuide-se, e aproveite o evento!"
-    }
-  },
-  "rival_2_female": {
-    "encounter": {
-      "1": "@c{smile_wave}Oh, que surpresa te encontrar aqui. Parece que você ainda está invicta. @c{angry_mopen}Hum… Nada mal!\n$@c{angry_mopen}Eu sei o que você está pensando, e não, eu não estava te espionando. @c{smile_eclosed}Acontece que eu estava na área.\n$@c{smile_ehalf}Estou feliz por você, mas só quero te avisar que está tudo bem perder às vezes.\n$@c{smile}Aprendemos com nossos erros, muitas vezes mais do que se continuássemos vencendo.\n$@c{angry_mopen}De qualquer forma, tenho treinado duro para nossa revanche, então é melhor você dar o seu melhor!"
-    },
-    "victory": {
-      "1": "@c{neutral}Eu… não era para eu perder dessa vez…\n$@c{smile}Ah bem. Isso só significa que vou ter que treinar ainda mais para a próxima vez!\n$@c{smile_wave}Também consegui mais dois desses para você!\n@c{smile_wave_wink}Não precisa me agradecer~.\n$@c{angry_mopen}Estes são os últimos, hein! Você não vai ganhar mais nenhum presente de mim depois desse!\n$@c{smile_wave}Continue assim, e aproveite o evento!"
-    },
-    "defeat": {
-      "1": "Está tudo bem perder às vezes…"
-    }
-  },
-  "rival_3": {
-    "encounter": {
-      "1": "@c{smile}Eai, olha quem é! Faz um tempo.\n@c{neutral}Você… ainda está invicta? Hum.\n$@c{neutral_eclosed}As coisas têm sido meio… estranhas.\nNão é a mesma coisa em casa sem você.\n$@c{serious}Eu sei que é egoísta, mas preciso desabafar.\n@c{neutral_eclosed}Acho que você está se metendo em algo grande demais aqui.\n$@c{serious}Nunca perder é irrealista.\nPrecisamos perder às vezes para crescer.\n$@c{neutral_eclosed}Você teve uma grande jornada, mas ainda há muito pela frente, e só vai ficar mais difícil. @c{neutral}Você está preparada para isso?\n$@c{serious_mopen_fists}Se sim, prove para mim."
-    },
-    "victory": {
-      "1": "@c{angry_mhalf}Isso é ridículo… Eu mal parei de treinar…\nComo ainda estamos tão distantes?"
-    }
-  },
-  "rival_3_female": {
-    "encounter": {
-      "1": "@c{smile_wave}Quanto tempo! Ainda não perdeu, né.\n@c{angry}Você está começando a me irritar. @c{smile_wave_wink}Brincadeirinha!\n$@c{smile_ehalf}Mas sério, você não sente saudades de casa? Ou… de mim?\nEu… Eu quero dizer, sentimos muito a sua falta.\n$@c{smile_eclosed}Eu apoio o seu sonho e tudo mais, mas a realidade é que você vai perder mais cedo ou mais tarde.\n$@c{smile}E quando isso acontecer, estarei lá para você, como sempre.\n@c{angry_mopen}Agora, deixe-me mostrar o quão forte eu me tornei!"
-    },
-    "victory": {
-      "1": "@c{shock}Depois de tudo isso… não foi o suficiente…?\nVocê nunca vai voltar a esse ritmo…"
-    },
-    "defeat": {
-      "1": "Você deu o seu melhor, agora vamos para casa."
-    }
-  },
-  "rival_4": {
-    "encounter": {
-      "1": "@c{neutral}Oi.\n$Não vou enrolar com você.\n@c{neutral_eclosed}Estou aqui para vencer, simples assim.\n$@c{serious_mhalf_fists}Aprendi a maximizar meu potencial dedicando todo o meu tempo ao treino.\n$@c{smile}Você ganha muito tempo extra quando corta o sono e a interação social desnecessários.\n$@c{serious_mopen_fists}Nada disso importa mais, não até eu vencer.\n$@c{neutral_eclosed}Cheguei ao ponto de não perder mais.\n@c{smile_eclosed}Acho que sua filosofia não estava tão errada afinal.\n$@c{angry_mhalf}Perder é para os fracos, e eu não sou mais fraco.\n$@c{serious_mopen_fists}Prepare-se."
-    },
-    "victory": {
-      "1": "@c{neutral}O que…@d{64} O que é você?"
-    }
-  },
-  "rival_4_female": {
-    "encounter": {
-      "1": "@c{neutral}Sou eu! Você não esqueceu de mim de novo… esqueceu?\n$@c{smile}Você deveria se orgulhar de até onde chegou. Parabéns!\nMas parece que é o fim da sua jornada.\n$@c{smile_eclosed}Você despertou algo em mim que eu nunca soube que existia.\nParece que agora tudo o que faço é treinar.\n$@c{smile_ehalf}Eu mal como ou durmo agora, só treino meus Pokémon o dia todo, ficando mais forte a cada vez.\n$@c{neutral}Na verdade, eu… mal me reconheço.\n$E agora, finalmente atingi o desempenho máximo.\nNão acho que alguém poderia me vencer agora.\n$E sabe de uma coisa? É tudo por sua causa.\n@c{smile_ehalf}Eu não sei se te agradeço ou te odeio.\n$@c{angry_mopen}Prepare-se."
-    },
-    "victory": {
-      "1": "@c{neutral}O que…@d{64} O que é você?"
-    },
-    "defeat": {
-      "1": "$@c{smile}Você deveria se orgulhar de até onde chegou."
-    }
-  },
-  "rival_5": {
-    "encounter": {
-      "1": "@c{neutral}…"
-    },
-    "victory": {
-      "1": "@c{neutral}…"
-    }
-  },
-  "rival_5_female": {
-    "encounter": {
-      "1": "@c{neutral}…"
-    },
-    "victory": {
-      "1": "@c{neutral}…"
-    },
-    "defeat": {
-      "1": "$@c{smile_ehalf}…"
-    }
-  },
-  "rival_6": {
-    "encounter": {
-      "1": "@c{smile_eclosed}Nos encontramos de novo.\n$@c{neutral}Tive um tempo para refletir sobre tudo isso.\nHá uma razão para tudo isso parecer tão estranho.\n$@c{neutral_eclosed}Seu sonho, minha vontade de te vencer…\nTudo faz parte de algo maior.\n$@c{serious}Isso não é sobre mim, nem sobre você… É sobre o mundo, @c{serious_mhalf_fists}e é meu propósito te levar ao limite.\n$@c{neutral_eclosed}Se cumpri esse propósito, não posso dizer, mas fiz tudo ao meu alcance.\n$@c{neutral}Este lugar em que acabamos é assustador… Mas de alguma forma me sinto indiferente, como se já tivesse estado aqui antes.\n$@c{serious_mhalf_fists}Você sente o mesmo, não sente?\n$@c{serious}…é como se algo aqui estivesse falando comigo.\nIsso é tudo o que o mundo conhece há muito tempo.\n$Aqueles momentos que apreciamos juntos que parecem tão recentes não passam de uma memória distante.\n$@c{neutral_eclosed}Quem pode dizer se eles foram realmente reais em primeiro lugar.\n$@c{serious_mopen_fists}Você precisa continuar empurrando, porque se não o fizer, isso nunca vai acabar. Você é a única que pode fazer isso.\n$@c{serious_smile_fists}Eu mal sei o que tudo isso significa, só sei que é verdade.\n$@c{serious_mopen_fists}Se você não pode me derrotar aqui e agora, você não terá chance."
-    },
-    "victory": {
-      "1": "@c{smile_eclosed}Parece que meu trabalho aqui está feito.\n$Quero que você me prometa uma coisa.\n@c{smile}Depois que curar o mundo, por favor, volte para casa."
-    }
-  },
-  "rival_6_female": {
-    "encounter": {
-      "1": "@c{smile_ehalf}Então somos só nós de novo.\n$@c{smile_eclosed}Sabe, continuo pensando nisso…\n$@c{smile_ehalf}Há algo nisso tudo, por que tudo parece tão estranho agora…\n$@c{smile}Você tem seu sonho, e eu tenho essa ambição em mim…\n$Não consigo evitar sentir que há um propósito maior em tudo isso, no que estamos fazendo, você e eu.\n$@c{smile_eclosed}Acho que devo te levar ao limite.\n$@c{smile_ehalf}Não tenho certeza se estou fazendo um bom trabalho nisso, mas tentei meu melhor até agora.\n$Há algo neste lugar estranho e terrível… Tudo parece tão claro…\n$Isso… é tudo o que o mundo conhece há muito tempo.\n$@c{smile_eclosed}É como se eu mal pudesse lembrar das memórias que apreciamos juntos.\n$@c{smile_ehalf}Elas foram reais? Elas parecem tão distantes agora…\n$@c{angry_mopen}Você precisa continuar empurrando, porque se não o fizer, isso nunca vai acabar. Você é o único que pode fazer isso.\n$@c{smile_ehalf}Eu… não sei o que tudo isso significa… mas sinto que é verdade.\n$@c{neutral}Se você não pode me derrotar aqui e agora, você não terá chance."
-    },
-    "victory": {
-      "1": "@c{smile_ehalf}Eu… acho que cumpri meu propósito…\n$@c{smile_eclosed}Prometa-me… Depois que curar o mundo… Por favor… volte para casa.\n$@c{smile_ehalf}…Obrigada."
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/locales/pt_BR/dialogue-final-boss-female.json b/src/locales/pt_BR/dialogue-final-boss-female.json
deleted file mode 100644
index 7f7c04acaff..00000000000
--- a/src/locales/pt_BR/dialogue-final-boss-female.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "encounter": "Parece que a hora finalmente chegou novamente.\nVocê sabe por que veio aqui, não sabe?\n$Você foi atraída para cá, porque já esteve aqui antes.\nInúmeras vezes.\n$Embora talvez isso possa ser contado.\nPara ser preciso, este é de fato o seu {{cycleCount}}º ciclo.\n$A cada ciclo, sua mente retorna ao seu estado anterior.\nMesmo assim, de alguma forma, vestígios de seus antigos \"eus\" permanecem.\n$Até agora, você ainda não conseguiu, mas sinto uma presença diferente em você desta vez.\n\n$Você é a única aqui, embora pareça haver... outro.\n$Você finalmente vai se mostrar um desafio formidável para mim?\nO desafio que anseio há milênios?\n$Vamos começar.",
-  "firstStageWin": "Entendo. A presença que senti era realmente real.\nParece que não preciso mais me segurar.\n$Não me decepcione.",
-  "secondStageWin": "…Magnífico."
-}
\ No newline at end of file
diff --git a/src/locales/pt_BR/dialogue-final-boss-male.json b/src/locales/pt_BR/dialogue-final-boss.json
similarity index 55%
rename from src/locales/pt_BR/dialogue-final-boss-male.json
rename to src/locales/pt_BR/dialogue-final-boss.json
index 0a261ba151e..7009f00db5b 100644
--- a/src/locales/pt_BR/dialogue-final-boss-male.json
+++ b/src/locales/pt_BR/dialogue-final-boss.json
@@ -1,5 +1,6 @@
 {
   "encounter": "Parece que a hora finalmente chegou novamente.\nVocê sabe por que veio aqui, não sabe?\n$Você foi atraído para cá, porque já esteve aqui antes.\nInúmeras vezes.\n$Embora talvez isso possa ser contado.\nPara ser preciso, este é de fato o seu {{cycleCount}}º ciclo.\n$A cada ciclo, sua mente retorna ao seu estado anterior.\nMesmo assim, de alguma forma, vestígios de seus antigos \"eus\" permanecem.\n$Até agora, você ainda não conseguiu, mas sinto uma presença diferente em você desta vez.\n\n$Você é o único aqui, embora pareça haver... outro.\n$Você finalmente vai se mostrar um desafio formidável para mim?\nO desafio que anseio há milênios?\n$Vamos começar.",
+  "encounter_female": "Parece que a hora finalmente chegou novamente.\nVocê sabe por que veio aqui, não sabe?\n$Você foi atraída para cá, porque já esteve aqui antes.\nInúmeras vezes.\n$Embora talvez isso possa ser contado.\nPara ser preciso, este é de fato o seu {{cycleCount}}º ciclo.\n$A cada ciclo, sua mente retorna ao seu estado anterior.\nMesmo assim, de alguma forma, vestígios de seus antigos \"eus\" permanecem.\n$Até agora, você ainda não conseguiu, mas sinto uma presença diferente em você desta vez.\n\n$Você é a única aqui, embora pareça haver... outro.\n$Você finalmente vai se mostrar um desafio formidável para mim?\nO desafio que anseio há milênios?\n$Vamos começar.",
   "firstStageWin": "Entendo. A presença que senti era realmente real.\nParece que não preciso mais me segurar.\n$Não me decepcione.",
   "secondStageWin": "…Magnífico."
 }
\ No newline at end of file
diff --git a/src/locales/pt_BR/dialogue-misc-female.json b/src/locales/pt_BR/dialogue-misc-female.json
deleted file mode 100644
index 761570a7f80..00000000000
--- a/src/locales/pt_BR/dialogue-misc-female.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "ending": "@c{smile}Oh? Você venceu?@d{96} @c{smile_eclosed}Acho que eu deveria saber.\nMas, você está de volta agora.\n$@c{smile}Acabou.@d{64} Você quebrou o ciclo.\n$@c{serious_smile_fists}Você também realizou seu sonho, não é?\nVocê não perdeu nenhuma vez.\n$@c{neutral}Eu sou o único que vai lembrar o que você fez.@d{96}\nAcho que está tudo bem, não é?\n$@c{serious_smile_fists}Sua lenda sempre viverá em nossos corações.\n$@c{smile_eclosed}Enfim, já tive o suficiente deste lugar, não é? Vamos para casa.\n$@c{serious_smile_fists}Talvez quando voltarmos, possamos ter outra batalha?\nSe você estiver disposta.",
-  "ending_female": "@c{shock}Você está de volta?@d{32} Isso significa que…@d{96} você venceu?!\n@c{smile_ehalf}Eu deveria saber que você conseguiria.\n$@c{smile_eclosed}Claro… Eu sempre tive essa sensação.\n@c{smile}Acabou agora, certo? Você quebrou o ciclo.\n$@c{smile_ehalf}Você também realizou seu sonho, não foi?\nVocê não perdeu nenhuma vez.\n$Eu serei a única a lembrar o que você fez.\n@c{angry_mopen}Eu tentarei não esquecer!\n$@c{smile_wave_wink}Brincadeirinha!@d{64} @c{smile}Eu nunca esqueceria.@d{32}\nSua lenda viverá em nossos corações.\n$@c{smile_wave}De qualquer forma,@d{64} está ficando tarde…@d{96} Eu acho?\nÉ difícil dizer neste lugar.\n$Vamos para casa. @c{smile_wave_wink}Talvez amanhã possamos ter outra batalha, pelos velhos tempos?",
-  "ending_endless": "Parabéns por alcançar o final atual!\nMais conteúdo chegará em breve.",
-  "ending_name": "Desenvolvedores"
-}
\ No newline at end of file
diff --git a/src/locales/pt_BR/dialogue-misc-male.json b/src/locales/pt_BR/dialogue-misc.json
similarity index 100%
rename from src/locales/pt_BR/dialogue-misc-male.json
rename to src/locales/pt_BR/dialogue-misc.json
diff --git a/src/locales/pt_BR/dialogue-male.json b/src/locales/pt_BR/dialogue.json
similarity index 82%
rename from src/locales/pt_BR/dialogue-male.json
rename to src/locales/pt_BR/dialogue.json
index 0316dda2524..2f39442ee5a 100644
--- a/src/locales/pt_BR/dialogue-male.json
+++ b/src/locales/pt_BR/dialogue.json
@@ -3,17 +3,21 @@
     "encounter": {
       "1": "Eai, quer batalhar?",
       "2": "Você também é um treinador novo?",
+      "2_female": "Você também é uma treinadora nova?",
       "3": "Eai, nunca te vi antes. Vamos batalhar!",
       "4": "Acabei de perder, então estou tentando encontrar mais Pokémon.\nEspera! Você parece fraco! Vamos batalhar!",
+      "4_female": "Acabei de perder, então estou tentando encontrar mais Pokémon.\nEspera! Você parece fraca! Vamos batalhar!",
       "5": "A gente já se conheceu antes? Não lembro muito bem. Enfim, prazer te conhecer!",
       "6": "Beleza! Vamos nessa!",
       "7": "Beleza! Lá vou eu! Vou te mostrar meu poder!",
       "8": "Hahaha... Vou te mostrar o quão incríveis são meus Pokémon!",
       "9": "Sem perder tempo com cumprimentos. Vamos logo, quando estiver pronto!",
+      "9_female": "Sem perder tempo com cumprimentos. Vamos logo, quando estiver pronta!",
       "10": "Não baixe a guarda, ou você pode acabar chorando quando uma criança te vencer.",
       "11": "Eu criei meus Pokémon com muito cuidado. Você não tem permissão para machucá-los!",
       "12": "Que bom que você chegou! Não vai ser fácil daqui pra frente.",
-      "13": "As batalhas continuam para sempre! Bem-vindo ao mundo sem fim!"
+      "13": "As batalhas continuam para sempre! Bem-vinda ao mundo sem fim!",
+      "13_female": "As batalhas continuam para sempre! Bem-vindo ao mundo sem fim!"
     },
     "victory": {
       "1": "Uau! Você é forte!",
@@ -21,6 +25,7 @@
       "3": "Vou te encontrar de novo quando for mais velho e te vencer!",
       "4": "Ugh. Não tenho mais Pokémon.",
       "5": "Não acredito… NÃO ACREDITO! Como pude perder de novo…",
+      "5_female": "Não acredito… NÃO ACREDITO! Como pude de novo…",
       "6": "Não! Eu perdi!",
       "7": "Uau! Você é incrível! Estou surpreso!",
       "8": "Pode ser… Como… Eu e meus Pokémon somos os mais fortes, porém…",
@@ -35,10 +40,12 @@
     "encounter": {
       "1": "Vamos batalhar, pode ser?",
       "2": "Você parece um treinador novo. Vamos batalhar!",
+      "2_female": "Você parece uma treinadora nova. Vamos batalhar!",
       "3": "Não te reconheço. Que tal uma batalha?",
       "4": "Vamos ter uma batalha Pokémon divertida!",
       "5": "Vou te mostrar como realmente usar Pokémon!",
       "6": "Uma batalha séria começa com um começo sério! Tem certeza que está pronto?",
+      "6_female": "Uma batalha séria começa com um começo sério! Tem certeza que está pronta?",
       "7": "Você só é jovem uma vez. E só tem uma chance em cada batalha. Logo, você será apenas uma memória.",
       "8": "Vai com calma comigo, tá? Mas vou lutar sério!",
       "9": "A escola é chata. Não tenho nada para fazer. Só estou batalhando para passar o tempo."
@@ -52,6 +59,7 @@
       "6": "Sério, eu perdi. Isso é, tipo, seriamente deprimente, mas você foi seriamente legal.",
       "7": "Não preciso de memórias como essa. Deletando memória…",
       "8": "Ei! Eu te disse para pegar leve comigo! Mesmo assim, você é legal quando fica sério.",
+      "8_female": "Ei! Eu te disse para pegar leve comigo! Mesmo assim, você é legal quando fica séria.",
       "9": "Estou realmente cansando de batalhar… Deve haver algo novo para fazer…"
     }
   },
@@ -150,7 +158,9 @@
       "1": "Sim… Você tem bons Pokémon…",
       "2": "O quê?! Mas sou um gênio das batalhas!",
       "3": "Claro, você é o personagem principal!",
-      "4": "OK! OK! Você poderia ser um Treinador Ás!"
+      "3_female": "Claro, você é a personagem principal!",
+      "4": "OK! OK! Você poderia ser um Treinador Ás!",
+      "4_female": "OK! OK! Você poderia ser uma Treinador Ás!"
     },
     "defeat": {
       "1": "Estou dedicando corpo e alma às batalhas de Pokémon!",
@@ -171,7 +181,8 @@
     "encounter": {
       "1": "Prepare-se, porque quando nos unimos, é o dobro do problema!",
       "2": "Dois corações, uma estratégia – vamos ver se você consegue acompanhar nosso poder de gêmeos!",
-      "3": "Espero que esteja pronto para o dobro do problema, porque estamos prestes a causar!"
+      "3": "Espero que esteja pronto para o dobro do problema, porque estamos prestes a causar!",
+      "3_female": "Espero que esteja pronta para o dobro do problema, porque estamos prestes a causar!"
     },
     "victory": {
       "1": "Podemos ter perdido essa rodada, mas nosso vínculo permanece inquebrável!",
@@ -199,7 +210,8 @@
   "black_belt": {
     "encounter": {
       "1": "Elogio sua coragem ao me desafiar! Pois eu sou o que tem o chute mais forte!",
-      "2": "Oh, entendo. Você gostaria de ser cortado em pedaços? Ou prefere o papel de saco de pancadas?"
+      "2": "Oh, entendo. Você gostaria de ser cortado em pedaços? Ou prefere o papel de saco de pancadas?",
+      "2_female": "Oh, entendo. Você gostaria de ser cortada em pedaços? Ou prefere o papel de saco de pancadas?"
     },
     "victory": {
       "1": "Oh. Os Pokémon fizeram a luta. Meu chute forte não ajudou em nada.",
@@ -310,7 +322,8 @@
     },
     "defeat": {
       "1": "New age se refere simplesmente aos compositores clássicos do século XX, certo?",
-      "2": "Não fique preso na tristeza ou frustração. Você pode usar seus rancores para se motivar."
+      "2": "Não fique preso na tristeza ou frustração. Você pode usar seus rancores para se motivar.",
+      "2_female": "Não fique presa na tristeza ou frustração. Você pode usar seus rancores para se motivar."
     }
   },
   "psychic": {
@@ -341,7 +354,8 @@
   },
   "baker": {
     "encounter": {
-      "1": "Espero que esteja pronto para saborear a derrota!"
+      "1": "Espero que esteja pronto para saborear a derrota!",
+      "1_female": "Espero que esteja pronta para saborear a derrota!"
     },
     "victory": {
       "1": "Vou assar uma revanche."
@@ -371,7 +385,8 @@
     "encounter": {
       "1": "Mano, você vai andar na prancha se perder!",
       "2": "Vem com tudo! Sou um marinheiro com orgulho!",
-      "3": "Ahoy marujo! Tá enjoado, é?!"
+      "3": "Ahoy marujo! Tá enjoado, é?!",
+      "3_female": "Ahoy maruja! Tá enjoada, é?!"
     },
     "victory": {
       "1": "Argh! Perdi pra uma criança!",
@@ -399,6 +414,7 @@
     },
     "victory": {
       "1": "Uau, você é forte. Que desperdício. Se você se juntasse à Equipe Rocket, poderia se tornar um Executivo.",
+      "1_female": "Uau, você é forte. Que desperdício. Se você se juntasse à Equipe Rocket, poderia se tornar uma Executiva.",
       "2": "Eu... Eu estou arrasada...",
       "3": "Aaaieeeee! Isso não pode estar acontecendo! Eu lutei muito, mas ainda perdi…"
     }
@@ -436,7 +452,8 @@
     "victory": {
       "1": "Hehehe! Você pode ter me derrotado, mas não tem chance contra o Chefe! Se você se perder agora, não terá que enfrentar uma surra sonora!",
       "2": "Hehehe... Então, eu também perdi...",
-      "3": "Ahya! Como isso pode ser? Para um Admin como eu perder para um treinador qualquer..."
+      "3": "Ahya! Como isso pode ser? Para um Admin como eu perder para um treinador qualquer...",
+      "3_female": "Ahya! Como isso pode ser? Para um Admin como eu perder para uma treinadora qualquer..."
     }
   },
   "courtney": {
@@ -454,13 +471,15 @@
   "shelly": {
     "encounter": {
       "1": "Ahahahaha! Você vai se meter nos assuntos da Equipe Aqua? Você é absolutamente destemido, simplesmente ignorante ou ambos! Você é tão fofo que chega a ser nojento! Vou te derrubar",
+      "1_female": "Ahahahaha! Você vai se meter nos assuntos da Equipe Aqua? Você é absolutamente destemida, simplesmente ignorante ou ambos! Você é tão fofa que chega a ser nojenta! Vou te derrubar",
       "2": "O que é isso? Quem é essa criança mimada?",
       "3": "Relaxe. Seja paciente. Vou te esmagar em breve."
     },
     "victory": {
       "1": "Ahahahaha! Fomos surpreendidos inesperadamente! Estamos sem opções. Teremos que recuar. Mas esta não é a última vez que você verá a Equipe Aqua! Temos outros planos! Não se esqueça disso!",
       "2": "Ahhh?! Fui muito fácil com você?!",
-      "3": "Uh. Você está me dizendo que melhorou seu jogo ainda mais durante a luta? Você é um pirralho com um futuro brilhante… Meu Pokémon e eu não temos mais forças para lutar… Vá em frente… Vá e seja destruído por Archie."
+      "3": "Uh. Você está me dizendo que melhorou seu jogo ainda mais durante a luta? Você é um pirralho com um futuro brilhante… Meu Pokémon e eu não temos mais forças para lutar… Vá em frente… Vá e seja destruído por Archie.",
+      "3_female": "Uh. Você está me dizendo que melhorou seu jogo ainda mais durante a luta? Você é uma pirralha com um futuro brilhante… Meu Pokémon e eu não temos mais forças para lutar… Vá em frente… Vá e seja destruída por Archie."
     }
   },
   "matt": {
@@ -472,14 +491,16 @@
     "victory": {
       "1": "Muito bem, até que o Chefe tenha tempo para você, serei seu oponente!",
       "2": "Posso sentir! Posso sentir, tudo bem! A força saindo de você! Mais! Eu ainda quero mais! Mas parece que estamos sem tempo...",
-      "3": "Isso foi divertido! Eu sabia que você me mostraria um bom tempo! Estou ansioso para enfrentá-lo novamente algum dia!"
+      "3": "Isso foi divertido! Eu sabia que você me mostraria um bom tempo! Estou ansioso para enfrentá-lo novamente algum dia!",
+      "3_female": "Isso foi divertido! Eu sabia que você me mostraria um bom tempo! Estou ansioso para enfrentá-la novamente algum dia!"
     }
   },
   "mars": {
     "encounter": {
       "1": "Sou Mars, uma das principais Comandantes da Equipe Galáctica.",
       "2": "A visão da Equipe Galáctica para o futuro é inabalável. A oposição será esmagada sem piedade!",
-      "3": "Sentindo-se nervoso? Você deveria estar!"
+      "3": "Sentindo-se nervoso? Você deveria estar!",
+      "3_female": "Sentindo-se nervosa? Você deveria estar!"
     },
     "victory": {
       "1": "Isso não pode estar acontecendo! Como eu perdi?!",
@@ -514,36 +535,45 @@
   "zinzolin": {
     "encounter": {
       "1": "Você poderia se tornar uma ameaça para a Equipe Plasma, então vamos eliminá-lo aqui e agora!",
+      "1_female": "Você poderia se tornar uma ameaça para a Equipe Plasma, então vamos eliminá-la aqui e agora!",
       "2": "Oh, pelo amor de Deus... Eu não esperava ter que lutar neste frio congelante!",
-      "3": "Você é um treinador impressionante para ter chegado tão longe. Mas termina aqui."
+      "3": "Você é um treinador impressionante para ter chegado tão longe. Mas termina aqui.",
+      "3_female": "Você é uma treinadora impressionante para ter chegado tão longe. Mas termina aqui."
     },
     "victory": {
       "1": "Ghetsis... Eu falhei com você...",
       "2": "Está amargamente frio. Estou tremendo. Estou sofrendo. Ainda assim, estou vitorioso.",
-      "3": "Hmph. Você é um treinador mais esperto do que eu esperava, mas não esperto o suficiente."
+      "3": "Hmph. Você é um treinador mais esperto do que eu esperava, mas não esperto o suficiente.",
+      "3_female": "Hmph. Você é uma treinadora mais esperta do que eu esperava, mas não esperta o suficiente."
     }
   },
   "rood": {
     "encounter": {
       "1": "Você é uma ameaça para a Equipe Plasma. Não podemos deixá-lo ir embora daqui e agora!",
+      "1_female": "Você é uma ameaça para a Equipe Plasma. Não podemos deixá-la ir embora daqui e agora!",
       "2": "Oh, este vento gelado... Eu nunca pensei que teria que lutar aqui!",
-      "3": "Você é um treinador notável para ter chegado tão longe. Mas é aqui que termina."
+      "3": "Você é um treinador notável para ter chegado tão longe. Mas é aqui que termina.",
+      "3_female": "Você é uma treinadora notável para ter chegado tão longe. Mas é aqui que termina."
     },
     "victory": {
       "1": "Ghetsis... Eu falhei em minha missão...",
       "2": "O frio é penetrante. Estou tremendo. Estou sofrendo. Ainda assim, triunfei.",
-      "3": "Hm. Você é um treinador talentoso, mas infelizmente não talentoso o suficiente."
+      "3": "Hm. Você é um treinador talentoso, mas infelizmente não talentoso o suficiente.",
+      "3_female": "Hm. Você é uma treinadora talentosa, mas infelizmente não talentosa o suficiente."
     }
   },
   "xerosic": {
     "encounter": {
       "1": "Ah ha ha! Será um prazer. Vamos lá, pequeno treinador! Vamos ver o que você tem!",
+      "1_female": "Ah ha ha! Será um prazer. Vamos lá, pequena treinadora! Vamos ver o que você tem!",
       "2": "Hmm... Você é mais poderoso do que parece. Eu me pergunto quanta energia há dentro de você.",
+      "2_female": "Hmm... Você é mais poderosa do que parece. Eu me pergunto quanta energia há dentro de você.",
       "3": "Eu estava esperando por você! Preciso fazer uma pequena pesquisa sobre você! Vamos começar!"
     },
     "victory": {
       "1": "Ah, você é bastante forte. Oh sim—muito forte, de fato.",
       "2": "Ding-ding-ding! Você conseguiu! Ao vencedor, os despojos!",
+      "2_female": "Ding-ding-ding! Você conseguiu! À vencedora, os despojos!",
       "3": "Maravilhoso! Incrível! Você tem uma tremenda habilidade e coragem!"
     }
   },
@@ -551,6 +581,7 @@
     "encounter": {
       "1": "Eu sou Bryony, e será um prazer lutar com você. Mostre-me o que você tem.",
       "2": "Impressionante... Você é mais poderoso do que parece. Vamos ver a verdadeira extensão de sua energia.",
+      "2_female": "Impressionante... Você é mais poderosa do que parece. Vamos ver a verdadeira extensão de sua energia.",
       "3": "Eu antecipei sua chegada. É hora de um pequeno teste. Vamos começar?"
     },
     "victory": {
@@ -563,9 +594,11 @@
     "encounter": {
       "1": "Se prepara pra encrenca!",
       "2": "Estamos realizando um grande trabalho aqui! Cai fora, moleque!",
+      "2_female": "Estamos realizando um grande trabalho aqui! Cai fora, garota!",
       "3": "Entregue seus Pokémon ou enfrente a ira da Equipe Rocket!",
       "4": "Você está prestes a experimentar o verdadeiro terror da Equipe Rocket!",
-      "5": "Ei, moleque! Eu sou um tipo de cara da Equipe Rocket!"
+      "5": "Ei, moleque! Eu sou um tipo de cara da Equipe Rocket!",
+      "5_female": "Ei, garota! Eu sou um tipo de cara da Equipe Rocket!"
     },
     "victory": {
       "1": "Equipe Rocket decolando de novo!",
@@ -613,7 +646,8 @@
       "2": "Presencie o poder da nossa tecnologia e o futuro que vislumbramos!",
       "3": "Em nome da Equipe Galáctica, eliminarei qualquer um que ficar em nosso caminho!",
       "4": "Prepare-se para perder!",
-      "5": "Espero que você esteja pronto para uma surra cósmica!"
+      "5": "Espero que você esteja pronto para uma surra cósmica!",
+      "5_female": "Espero que você esteja pronta para uma surra cósmica!"
     },
     "victory": {
       "1": "Fui amassado...",
@@ -655,6 +689,86 @@
       "5": "Você pode ter me vencido, mas quando eu perco, eu saio com estilo!"
     }
   },
+  "aether_grunt": {
+    "encounter": {
+      "1": "Eu vou lutar com tudo o que tenho para te eliminar!",
+      "2": "Eu não me importo se você é uma criança ou o que. Eu vou te mandar voando se você nos ameaçar!",
+      "3": "Me mandaram afastar Treinadores, não importa quem sejam!",
+      "4": "Eu vou te mostrar o poder do Paraíso Aether!",
+      "5": "Agora que você descobriu a escuridão no coração do Paraíso Aether, precisamos que você desapareça convenientemente!"
+    },
+    "victory": {
+      "1": "Aff! Você parece ter muita habilidade.",
+      "2": "O que isso significa? O que isso significa!",
+      "3": "Ei! Você é tão forte que não há como eu te afastar!",
+      "4": "Hmm... Parece que eu posso ter perdido.",
+      "5": "Aqui está uma resposta para você: Aiyee!"
+    }
+  },
+  "faba": {
+    "encounter": {
+      "1": "Eu, o Chefe de Ramo Faba, vou te mostrar a dureza do mundo real!",
+      "2": "O homem chamado de última linha de defesa do Paraíso Aether vai batalhar com uma mera criança?",
+      "3": "Eu, Faba, sou o Chefe de Ramo do Paraíso Aether. O único no mundo, eu sou insubstituível."
+    },
+    "victory": {
+      "1": "Aiyee!",
+      "2": "C-c-como assim?! Como uma criança...",
+      "3": "Isso é por que... Isso é por que eu não consigo gostar de crianças."
+    }
+  },
+  "skull_grunt": {
+    "encounter": {
+      "1": "Nós não somos maus, somos apenas durões!",
+      "2": "Quer um pouco de nós? É assim que dizemos olá! Prazer em conhecê-los, otários!",
+      "3": "Somos só um bando de caras e minas com um grande interesse nos Pokémon dos outros!",
+      "4": "Por que você está tentando agir durão quando já somos durões como ossos aqui fora, mano?",
+      "5": "Equipe Skull na área! Não podemos pagar o aluguel! Nos divertimos muito, mas nossa juventude foi desperdiçada!"
+    },
+    "victory": {
+      "1": "Ahn? Já acabou?",
+      "2": "Hora de dar o fora, mano! Vamos ter que dizer tchau, mano!",
+      "3": "Nem precisamos dos seus Pokémon fracotes mesmo!",
+      "4": "Que?! Esse muleque é muito forte! Não tem como negar!",
+      "5": "Então, o que? Eu sou pior que um Pokémon?! Eu já tenho problemas de autoestima, cara."
+    }
+  },
+  "plumeria": {
+    "encounter": {
+      "1": " ...Hmph. Você não parece nada especial para mim.",
+      "2": "Esses Capangas gastam muito tempo tentando lidar com crianças como você...",
+      "3": "Mexe com qualquer um da Equipe Skull, e eu vou te mostrar o quão séria eu posso ficar."
+    },
+    "victory": {
+      "1": "Aff! Você é bem forte. Tenho que admitir.",
+      "2": "Aff! Você é bem forte. Agora eu entendi por que meus Capangas gastam tanto tempo batalhando com crianças.",
+      "3": "Aff! Acho que eu só tenho que aceitar essa derrota."
+    }
+  },
+  "macro_grunt": {
+    "encounter": {
+      "1": "Parece que aqui é o fim da linha para você!",
+      "2": "Você é um treinador, não é? Temo que isso não lhe dê o direito de interferir em nosso trabalho.",
+      "3": "Sou da Macro Cosmos Seguros! Já tem um seguro de vida?"
+    },
+    "victory": {
+      "1": "Eu não tenho muita escolha a não ser recuar respeitosamente.",
+      "2": "Ter que desistir do meu dinheiro... Perder significa que estou de volta no vermelho...",
+      "3": "Ninguém pode vencer a Macro Cosmos quando se trata de nossa dedicação ao trabalho!"
+    }
+  },
+  "oleana": {
+    "encounter": {
+      "1": "Eu não vou deixar ninguém interferir no plano do Sr. Rose!",
+      "2": "Então, você passou por todo o pessoal especial que eu ordenei para te parar. Eu não esperaria nada menos.",
+      "3": "Pelo presidente! Eu não vou perder!"
+    },
+    "victory": {
+      "1": "*suspiro* Eu não consegui vencer... Oleana... você realmente é uma mulher sem esperança.",
+      "2": "Aff! Isso é inaceitável... O que eu estava pensando... Qualquer treinador que chega tão longe não seria um fracote...",
+      "3": "*suspiro* Eu sou uma Oleana cansada..."
+    }
+  },
   "rocket_boss_giovanni_1": {
     "encounter": {
       "1": "Tenho que admitir, estou impressionado que tenha chegado até aqui!"
@@ -723,7 +837,8 @@
   },
   "galactic_boss_cyrus_1": {
     "encounter": {
-      "1": "Você foi compelido a vir aqui por tal sentimentalismo vazio\nEu farei você se arrepender de ter ouvido seu coração!"
+      "1": "Você foi compelido a vir aqui por tal sentimentalismo vazio\nEu farei você se arrepender de ter ouvido seu coração!",
+      "1_female": "Você foi compelida a vir aqui por tal sentimentalismo vazio\nEu farei você se arrepender de ter ouvido seu coração!"
     },
     "victory": {
       "1": "Interessante. E bastante curioso."
@@ -787,6 +902,72 @@
       "1": "Tolos sem visão continuarão a poluir este belo mundo."
     }
   },
+  "aether_boss_lusamine_1": {
+    "encounter": {
+      "1": "Você vai assustar minha fera querida! Parece que eu vou precisar te silenciar primeiro."
+    },
+    "victory": {
+      "1": "Como... como você pode ser tão terrível!"
+    },
+    "defeat": {
+      "1": "Aff..."
+    }
+  },
+  "aether_boss_lusamine_2": {
+    "encounter": {
+      "1": "Por que você continua a me incomodar?! Estou cansada de você. Cansada até a alma!\n$Chega de papo furado... Com o poder de Nihilego, vou mostrar o quão errado você estava em vir aqui!"
+    },
+    "victory": {
+      "1": "Aaauuuggghhhhhhhhh!!!"
+    },
+    "defeat": {
+      "1": "Tudo o que eu quero é minha fera preciosa! Eu não me importo com nenhum de vocês!"
+    }
+  },
+  "skull_boss_guzma_1": {
+    "encounter": {
+      "1": "O odiado chefe que te bate e te bate e nunca para...\n$É. O grande e mau Guzma está aqui!"
+    },
+    "victory": {
+      "1": "Tss. Eu vou te bater um dia desses!"
+    },
+    "defeat": {
+      "1": "E você veio até aqui só pra isso, né?"
+    }
+  },
+  "skull_boss_guzma_2": {
+    "encounter": {
+      "1": "Não importa contra quem eu esteja, eu vou derrotá-los!\n$Isso é o que o grande e mau Guzma é!"
+    },
+    "victory": {
+      "1": "Guzma!!! O que há de errado com você?!"
+    },
+    "defeat": {
+      "1": "Vocês são tudo uns idiotas!"
+    }
+  },
+  "macro_boss_rose_1": {
+    "encounter": {
+      "1": "Devo fornecer energia ilimitada para garantir a prosperidade eterna para todos...\n$É meu propósito, meu dever, meu destino!"
+    },
+    "victory": {
+      "1": "Você ainda não entendeu, treinador...\n$Nós... Não, eu vou mudar o rumo da história!"
+    },
+    "defeat": {
+      "1": "Você ainda não entende nada!"
+    }
+  },
+  "macro_boss_rose_2": {
+    "encounter": {
+      "1": "Estou comprometido em resolver o problema de energia na região de Galar e, claro, em todo o mundo.\n$Minha experiência e conquistas que fizeram da Macro Cosmos um sucesso são a prova de que meus métodos funcionam.\n$Não pretendo mudar de ideia, mesmo que eu perca."
+    },
+    "victory": {
+      "1": "Eu esqueci o quão incríveis são as batalhas Pokémon! Faz tanto tempo desde que eu batalhei...\n$Isso foi realmente satisfatório, eu aceito a derrota para esta batalha."
+    },
+    "defeat": {
+      "1": "Eu suponho que deve parecer que estou fazendo algo terrível. Eu não espero que você entenda.\n$Mas eu devo fornecer à região de Galar energia ilimitada para garantir prosperidade eterna."
+    }
+  },
   "brock": {
     "encounter": {
       "1": "Minha especialidade em Pokémon do tipo Pedra vai te derrubar! Vamos lá!",
@@ -812,6 +993,7 @@
     },
     "victory": {
       "1": "Você realmente é forte… Vou admitir que você é habilidoso…",
+      "1_female": "Você realmente é forte… Vou admitir que você é habilidosa…",
       "2": "Hmm… Você sabe que só teve sorte, certo?!",
       "3": "Uau, você é demais! Não acredito que me venceu!"
     },
@@ -829,12 +1011,14 @@
     },
     "victory": {
       "1": "Whoa! Seu time é de verdade, garoto!",
+      "1_female": "Whoa! Seu time é de verdade, garota!",
       "2": "Uau, você é forte! Até meus truques elétricos perderam para você.",
       "3": "Isso foi uma derrota absolutamente chocante!"
     },
     "defeat": {
       "1": "Oh sim! Quando se trata de Pokémon do tipo Elétrico, sou o número um do mundo!",
       "2": "Hahaha! Foi uma batalha eletrizante, garoto!",
+      "2_female": "Hahaha! Foi uma batalha eletrizante, garota!",
       "3": "Uma batalha de Pokémon é guerra, e eu te mostrei combate em primeira mão!"
     }
   },
@@ -913,7 +1097,8 @@
     "encounter": {
       "1": "Eu, o líder da Equipe Rocket, vou te fazer sentir um mundo de dor!",
       "2": "Meu treinamento aqui será vital antes de enfrentar meus antigos associados novamente.",
-      "3": "Não acho que você está preparado para o nível de fracasso que está prestes a experimentar!"
+      "3": "Não acho que você está preparado para o nível de fracasso que está prestes a experimentar!",
+      "3_female": "Não acho que você está preparada para o nível de fracasso que está prestes a experimentar!"
     },
     "victory": {
       "1": "O QUE! Eu, perder?! Não tenho nada a dizer a você!",
@@ -946,6 +1131,7 @@
   "brawly": {
     "encounter": {
       "1": "Oh cara, um desafiante!\nVamos ver o que você pode fazer!",
+      "1_female": "Oh cara, uma desafiante!\nVamos ver o que você pode fazer!",
       "2": "Você parece uma grande onda.\nVamos batalhar!",
       "3": "Hora de criar uma tempestade!\nVamos!"
     },
@@ -973,6 +1159,7 @@
     },
     "defeat": {
       "1": "Você está totalmente carregado agora!\nWahahahaha!",
+      "1_female": "Você está totalmente carregada agora!\nWahahahaha!",
       "2": "Espero ver você faíscando em batalhas futuras!\nWahahahaha!",
       "3": "Wahahahaha! Que batalha eletrizante!"
     }
@@ -1019,6 +1206,7 @@
     },
     "victory": {
       "1": "Você é o primeiro Treinador que vejo com mais graça do que eu.\nJogou excelentemente.",
+      "1_female": "Você é a primeira Treinadora que vejo com mais graça do que eu.\nJogou excelentemente.",
       "2": "Oh, meus Pokémon Voadores despencaram!\nMuito bem.",
       "3": "Embora eu tenha caído, meus Pokémon continuarão a voar!"
     },
@@ -1031,6 +1219,7 @@
   "tate": {
     "encounter": {
       "1": "Hehehe... Ficou surpreso de me ver sem minha irmã?",
+      "1_female": "Hehehe... Ficou surpresa de me ver sem minha irmã?",
       "2": "Posso ver o que você está pensando...\nVocê quer batalhar!",
       "3": "Como você pode derrotar alguém...\nQue sabe todos os seus movimentos?"
     },
@@ -1048,6 +1237,7 @@
   "liza": {
     "encounter": {
       "1": "Fufufu... Ficou surpreso de me ver sem meu irmão?",
+      "1_female": "Fufufu... Ficou surpresa de me ver sem meu irmão?",
       "2": "Posso determinar o que você deseja...\nVocê quer batalhar, não quer?",
       "3": "Como você pode derrotar alguém...\nQue é um com seus Pokémon?"
     },
@@ -1119,8 +1309,10 @@
   "nessa": {
     "encounter": {
       "1": "Não importa que tipo de plano sua mente refinada possa estar tramando, meu parceiro e eu vamos afundá-lo.",
+      "1_female": "Não importa que tipo de plano sua mente refinada possa estar tramando, meu parceiro e eu vamos afundá-la.",
       "2": "Não estou aqui para conversar. Estou aqui para vencer!",
-      "3": "Este é um pequeno presente dos meus Pokémon... Espero que você possa recebê-lo!"
+      "3": "Este é um pequeno presente dos meus Pokémon... Espero que você possa recebê-lo!",
+      "3_female": "Este é um pequeno presente dos meus Pokémon... Espero que você possa recebê-la!"
     },
     "victory": {
       "1": "Você e seus Pokémon são demais...",
@@ -1141,6 +1333,7 @@
     },
     "victory": {
       "1": "Você... Você é muito bom, hein?",
+      "1_female": "Você... Você é muito boa, hein?",
       "2": "Se você encontrar Gordie por aí, certifique-se de dar uma boa surra nele, ok?",
       "3": "Acho que você levou a quebra de gelo um pouco literalmente demais..."
     },
@@ -1154,10 +1347,12 @@
     "encounter": {
       "1": "Você parece forte! Vamos começar!",
       "2": "Sou forte como a amplitude do oceano. Você vai ser varrido, com certeza.",
+      "2_female": "Sou forte como a amplitude do oceano. Você vai ser varrida, com certeza.",
       "3": "Oh ho, então estou enfrentando você! Isso é fora do comum."
     },
     "victory": {
       "1": "Você foi incrível! Está criando alguns Pokémon incríveis. Você dominou a coisa de Treinador!",
+      "1_female": "Você foi incrível! Está criando alguns Pokémon incríveis. Você dominou a coisa de Treinadora!",
       "2": "Você não apenas parece forte, você é forte de verdade! Eh, eu também fui varrido!",
       "3": "Você é forte como uma onda impressionante!"
     },
@@ -1170,6 +1365,7 @@
   "shauntal": {
     "encounter": {
       "1": "Com licença. Você é um desafiante, certo?\nSou a usuária de Pokémon do tipo Fantasma da Elite dos Quatro, Shauntal, e serei sua oponente.",
+      "1_female": "Com licença. Você é uma desafiante, certo?\nSou a usuária de Pokémon do tipo Fantasma da Elite dos Quatro, Shauntal, e serei sua oponente.",
       "2": "Adoro escrever sobre Treinadores que vêm aqui e os Pokémon que treinam.\nPosso usar você e seus Pokémon como tema?",
       "3": "Cada pessoa que trabalha com Pokémon tem uma história para contar.\nQue história está prestes a ser contada?"
     },
@@ -1187,6 +1383,7 @@
   "marshal": {
     "encounter": {
       "1": "Meu mentor, Alder, vê seu potencial como Treinador e está interessado em você.\nMeu objetivo é testá-lo—levar você aos limites da sua força. Kiai!",
+      "1_female": "Meu mentor, Alder, vê seu potencial como Treinadora e está interessado em você.\nMeu objetivo é testá-la—levar você aos limites da sua força. Kiai!",
       "2": "Vitória, vitória decisiva, é meu objetivo! Desafiante, aqui vou eu!",
       "3": "Em mim mesmo, procuro desenvolver a força de um lutador e eliminar qualquer fraqueza em mim!\nPrevalecendo com a força de minhas convicções!"
     },
@@ -1205,7 +1402,8 @@
     "encounter": {
       "1": "Você me lembra um velho amigo. Isso me deixa animado para essa batalha Pokémon!",
       "2": "As batalhas Pokémon não têm sentido se você não pensa por que você batalha.\nOu melhor, isso torna as batalhas junto com Pokémon sem sentido.",
-      "3": "Meu nome é Cheren! Sou um Líder de Ginásio e professor! Prazer em conhecê-lo."
+      "3": "Meu nome é Cheren! Sou um Líder de Ginásio e professor! Prazer em conhecê-lo.",
+      "3_female": "Meu nome é Cheren! Sou um Líder de Ginásio e professor! Prazer em conhecê-la."
     },
     "victory": {
       "1": "Obrigado! Vi o que estava faltando em mim.",
@@ -1221,47 +1419,65 @@
   "chili": {
     "encounter": {
       "1": "Ihuuu! Hora de brincar com FOGO!! Sou o mais forte dos nossos irmãos!",
+      "1_female": "Yeeeeeooow! Hora de brincar com FOGO!! Eu sou o mais forte de nós irmãos!",
       "2": "Ta-da! O incendiário do tipo Fogo Chili—sou eu—será seu oponente!",
-      "3": "Vou mostrar o que eu e meus tipos de Fogo podemos fazer!"
+      "2_female": "Tcharan! O escaldante Chili tipo Fogo (sou eu) será seu oponente!",
+      "3": "Vou mostrar o que eu e meus tipos de Fogo podemos fazer!",
+      "3_female": "Vou te mostrar o que eu e meus ardentes tipo Fogo podemos fazer!"
     },
     "victory": {
       "1": "Você me pegou. Estou... queimado...",
+      "1_female": "Você me pegou. Eu estou… queimado… esgotado…",
       "2": "Uau! Você está pegando fogo!",
+      "2_female": "Uau! Você tá pegando fogo!",
       "3": "Ai! Você me pegou!"
     },
     "defeat": {
       "1": "Estou pegando fogo! Jogue comigo, e você se queimará!",
+      "1_female": "Estou pegando fogo! Brinque comigo e você vai se queimar!",
       "2": "Quando você brinca com fogo, você se queima!",
-      "3": "Quero dizer, vamos lá, seu oponente era eu! Você não tinha chance!"
+      "3": "Quero dizer, vamos lá, seu oponente era eu! Você não tinha chance!",
+      "3_female": "Quero dizer, fala sério, seu oponente era eu! Você não teve chance!"
     }
   },
   "cilan": {
     "encounter": {
       "1": "Nada pessoal... Sem ressentimentos... Eu e meus Pokémon do tipo Grama vamos...\nUm... Vamos batalhar, aconteça o que acontecer.",
+      "1_female": "Nada pessoal... Sem ressentimentos... Eu e meus Pokémon do tipo Grama vamos...\n$Hum... Nós iremos batalhar, aconteça o que acontecer.",
       "2": "Então, hum, se você está bem comigo, vou, hum, colocar tudo o que tenho em ser, er, você sabe, seu oponente.",
-      "3": "OK… Então, hum, eu sou o Cilan, gosto de Pokémon do tipo Grama."
+      "2_female": "Então, hum, se você estiver bem comigo, eu vou, hum, dar tudo o que tenho para ser, hum, você sabe, seu oponente.",
+      "3": "OK… Então, hum, eu sou o Cilan, gosto de Pokémon do tipo Grama.",
+      "3_female": "OK... Então, eu sou Cilan, eu gosto de Pokémon do tipo Grama."
     },
     "victory": {
       "1": "Er... Acabou agora?",
+      "1_female": "Er… Já acabou?",
       "2": "…Que surpresa. Você é muito forte, não é?\nAcho que meus irmãos também não teriam sido capazes de te derrotar...",
+      "2_female": "…Que surpresa. Você é muito forte, não é? \n$Eu acho que meus irmãos também não conseguiriam derrotar você…",
       "3": "…Huh. Parece que meu timing estava, hum, errado?"
     },
     "defeat": {
       "1": "Huh? Ganhei?",
+      "1_female": "Hein? Eu ganhei?",
       "2": "Acho...\nSuponho que ganhei, porque competi com meus irmãos Chili e Cress, e todos conseguimos ficar mais fortes.",
-      "3": "Foi... uma experiência bastante emocionante..."
+      "2_female": "Eu acho... \n$Eu acho que ganhei, porque eu estava competindo com meus irmãos Chili e Cress, e todos nós conseguimos ficar mais fortes.",
+      "3": "Foi... uma experiência bastante emocionante...",
+      "3_female": "Foi… foi uma experiência bastante emocionante…"
     }
   },
   "roark": {
     "encounter": {
       "1": "Preciso ver seu potencial como Treinador. E, vou precisar ver a dureza dos Pokémon que batalham com você!",
+      "1_female": "Preciso ver seu potencial como Treinadora. E, vou precisar ver a dureza dos Pokémon que batalham com você!",
       "2": "Vamos lá! Estes são meus Pokémon de pedra, meu orgulho e alegria!",
       "3": "Pokémon do tipo Pedra são simplesmente os melhores!",
-      "4": "Preciso ver seu potencial como Treinador. E, vou precisar ver a dureza dos Pokémon que batalham com você!"
+      "4": "Preciso ver seu potencial como Treinador. E, vou precisar ver a dureza dos Pokémon que batalham com você!",
+      "4_female": "Preciso ver seu potencial como Treinadora. E, vou precisar ver a dureza dos Pokémon que batalham com você!"
     },
     "victory": {
       "1": "O-o que? Isso não pode ser! Meus Pokémon fortificados!",
       "2": "...Perdemos o controle. Da próxima vez, gostaria de desafiá-lo a uma corrida de escavação de fósseis no subsolo.",
+      "2_female": "...Perdemos o controle. Da próxima vez, gostaria de desafiá-la a uma corrida de escavação de fósseis no subsolo.",
       "3": "Com habilidade como a sua, é natural que você vença.",
       "4": "O-o que?! Não pode ser! Nem isso foi suficiente?",
       "5": "Eu estraguei tudo."
@@ -1284,6 +1500,7 @@
     "victory": {
       "1": "Ainda não sou bom o suficiente...",
       "2": "Eu vejo... Sua jornada o levou a lugares distantes e você testemunhou muito mais do que eu.\nEu invejo você por isso...",
+      "2_female": "Eu vejo... Sua jornada a levou a lugares distantes e você testemunhou muito mais do que eu.\nEu invejo você por isso...",
       "3": "Como isso é possível...",
       "4": "Não acho que nossos potenciais sejam tão diferentes.\nMas você parece ter algo mais do que isso... Que seja.",
       "5": "Acho que preciso de mais treinamento.",
@@ -1342,12 +1559,14 @@
       "1": "Acho que deveria ter esperado por isso!"
     },
     "defeat": {
-      "1": "Heh heh! Não ligue para mim, só pegando uma vitória aqui. Entendo se você estiver chateado, mas não vá dar uma de Kieran comigo, OK?"
+      "1": "Heh heh! Não ligue para mim, só pegando uma vitória aqui. Entendo se você estiver chateado, mas não vá dar uma de Kieran comigo, OK?",
+      "1_female": "Heh heh! Não ligue para mim, só pegando uma vitória aqui. Entendo se você estiver chateada, mas não vá dar uma de Kieran comigo, OK?"
     }
   },
   "ramos": {
     "encounter": {
-      "1": "Você gostou do jardim de diversão que fiz com todas essas plantas resistentes minhas?\n$A força delas é um sinal da minha força como jardineiro e Líder de Ginásio! Você tem certeza de que está pronto para enfrentar tudo isso?"
+      "1": "Você gostou do jardim de diversão que fiz com todas essas plantas resistentes minhas?\n$A força delas é um sinal da minha força como jardineiro e Líder de Ginásio! Você tem certeza de que está pronto para enfrentar tudo isso?",
+      "1_female": "Você gostou do jardim de diversão que fiz com todas essas plantas resistentes minhas?\n$A força delas é um sinal da minha força como jardineiro e Líder de Ginásio! Você tem certeza de que está pronta para enfrentar tudo isso?"
     },
     "victory": {
       "1": "Você acredita nos seus Pokémon... E eles acreditam em você também... Foi uma boa batalha, broto."
@@ -1377,7 +1596,8 @@
     },
     "victory": {
       "1": "Devo dizer, estou aquecida para você! Posso até te admirar um pouco.",
-      "2": "Uau! Você é ótimo! Ganhou meu respeito!\n$Acho que seu foco e vontade nos derrubaram totalmente."
+      "2": "Uau! Você é ótimo! Ganhou meu respeito!\n$Acho que seu foco e vontade nos derrubaram totalmente.",
+      "2_female": "Uau! Você é ótima! Ganhou meu respeito!\n$Acho que seu foco e vontade nos derrubaram totalmente."
     },
     "defeat": {
       "1": "Eu senti sua vontade de vencer, mas eu não perco!",
@@ -1389,7 +1609,8 @@
       "1": "Você tem uma aura vencedora. Então, de qualquer forma, isso vai ser divertido. Vamos ter nossa batalha!"
     },
     "victory": {
-      "1": "Incrível! Você é muito bom, não é?"
+      "1": "Incrível! Você é muito bom, não é?",
+      "1_female": "Incrível! Você é muito boa, não é?"
     },
     "defeat": {
       "1": "Sim! Meus Pokémon e eu somos perfeitamente bons!"
@@ -1430,7 +1651,8 @@
   },
   "clay": {
     "encounter": {
-      "1": "Harrumph! Me deixou esperando, não foi, garoto? Tudo bem, hora de ver o que você pode fazer!"
+      "1": "Harrumph! Me deixou esperando, não foi, garoto? Tudo bem, hora de ver o que você pode fazer!",
+      "1_female": "Harrumph! Me deixou esperando, não foi, garota? Tudo bem, hora de ver o que você pode fazer!"
     },
     "victory": {
       "1": "Cara, como é bom dar tudo de si e ainda assim ser derrotado!"
@@ -1444,7 +1666,8 @@
       "1": "Vou te servir um prato completo de Pokémon do tipo Água! Mas não tente comê-los!"
     },
     "victory": {
-      "1": "Vaultin' Veluza! Você é animado, não é! Um pouco ANIMADO DEMAIS, se me permite dizer!"
+      "1": "Vaultin' Veluza! Você é animado, não é! Um pouco ANIMADO DEMAIS, se me permite dizer!",
+      "1_female": "Vaultin' Veluza! Você é animada, não é! Um pouco ANIMADA DEMAIS, se me permite dizer!"
     },
     "defeat": {
       "1": "Volte para me ver novamente, ouviu?"
@@ -1510,7 +1733,8 @@
       "1": "Há algo em você… Uma diferença na sua postura. \n$Acho que sinto isso em você. Agora, me mostre. Mostre-me o poder que você tem com seus Pokémon. \n$E eu, por minha vez, apresentarei uma performance de ilusões na água com meus Pokémon!"
     },
     "victory": {
-      "1": "Bravo. Agora percebo sua autenticidade e magnificência como Treinador de Pokémon. \n$Tenho muita alegria em ter conhecido você e seus Pokémon. Você se mostrou digno."
+      "1": "Bravo. Agora percebo sua autenticidade e magnificência como Treinador de Pokémon. \n$Tenho muita alegria em ter conhecido você e seus Pokémon. Você se mostrou digno.",
+      "1_female": "Bravo. Agora percebo sua autenticidade e magnificência como Treinadora de Pokémon. \n$Tenho muita alegria em ter conhecido você e seus Pokémon. Você se mostrou digna."
     },
     "defeat": {
       "1": "Uma grande ilusão!"
@@ -1518,13 +1742,15 @@
   },
   "lorelei": {
     "encounter": {
-      "1": "Ninguém me supera quando se trata de Pokémon gelados! Movimentos congelantes são poderosos!\n$Seus Pokémon estarão à minha mercê quando estiverem congelados! Hahaha! Está pronto?"
+      "1": "Ninguém me supera quando se trata de Pokémon gelados! Movimentos congelantes são poderosos!\n$Seus Pokémon estarão à minha mercê quando estiverem congelados! Hahaha! Está pronto?",
+      "1_female": "Ninguém me supera quando se trata de Pokémon gelados! Movimentos congelantes são poderosos!\n$Seus Pokémon estarão à minha mercê quando estiverem congelados! Hahaha! Está pronta?"
     },
     "victory": {
       "1": "Como ousa!"
     },
     "defeat": {
-      "1": "Não há nada que você possa fazer quando está congelado."
+      "1": "Não há nada que você possa fazer quando está congelado.",
+      "1_female": "Não há nada que você possa fazer quando está congelada."
     }
   },
   "will": {
@@ -1540,10 +1766,12 @@
   },
   "malva": {
     "encounter": {
-      "1": "Sinto que meu coração pode explodir em chamas. \n$Estou ardendo de ódio por você, pirralho!"
+      "1": "Sinto que meu coração pode explodir em chamas. \n$Estou ardendo de ódio por você, pirralho!",
+      "1_female": "Sinto que meu coração pode explodir em chamas. \n$Estou ardendo de ódio por você, pirralha!"
     },
     "victory": {
-      "1": "Que novidade… Um novo desafiador derrotou Malva!"
+      "1": "Que novidade… Um novo desafiador derrotou Malva!",
+      "1_female": "Que novidade… Uma nova desafiadora derrotou Malva!"
     },
     "defeat": {
       "1": "Estou encantada! Sim, encantada por poder esmagar você sob meu calcanhar."
@@ -1565,7 +1793,8 @@
       "1": "Dei a posição de capitão ao meu primo Sophocles, mas estou confiante na minha habilidade. \n$Minha força é como a de uma supernova!"
     },
     "victory": {
-      "1": "Certamente encontrei um Treinador interessante para enfrentar!"
+      "1": "Certamente encontrei um Treinador interessante para enfrentar!",
+      "1_female": "Certamente encontrei uma Treinadora interessante para enfrentar!"
     },
     "defeat": {
       "1": "Ahaha. Que batalha interessante."
@@ -1576,10 +1805,12 @@
       "1": "Eu diria que vou pegar leve com você, mas… estaria mentindo! Pense rápido!"
     },
     "victory": {
-      "1": "Nada mal, garoto."
+      "1": "Nada mal, garoto.",
+      "1_female": "Nada mal, garota."
     },
     "defeat": {
-      "1": "Nahahaha! Você realmente é algo mais, garoto!"
+      "1": "Nahahaha! Você realmente é algo mais, garoto!",
+      "1_female": "Nahahaha! Você realmente é algo mais, garota!"
     }
   },
   "bruno": {
@@ -1598,7 +1829,8 @@
       "1": "Sou Bugsy! Eu nunca perco quando se trata de Pokémon do tipo Inseto!"
     },
     "victory": {
-      "1": "Uau, incrível! Você é um especialista em Pokémon!\nMinha pesquisa ainda não está completa. OK, você venceu."
+      "1": "Uau, incrível! Você é um especialista em Pokémon!\nMinha pesquisa ainda não está completa. OK, você venceu.",
+      "1_female": "Uau, incrível! Você é uma especialista em Pokémon!\nMinha pesquisa ainda não está completa. OK, você venceu."
     },
     "defeat": {
       "1": "Obrigado! Graças à nossa batalha, eu também pude fazer progressos na minha pesquisa!"
@@ -1628,10 +1860,12 @@
   },
   "lenora": {
     "encounter": {
-      "1": "Bem, desafiador, vou pesquisar como você batalha com os Pokémon que criou com tanto carinho!"
+      "1": "Bem, desafiador, vou pesquisar como você batalha com os Pokémon que criou com tanto carinho!",
+      "1_female": "Bem, desafiadora, vou pesquisar como você batalha com os Pokémon que criou com tanto carinho!"
     },
     "victory": {
-      "1": "Minha teoria sobre você estava correta. Você é mais do que talentoso… Você é motivado! Eu te saúdo!"
+      "1": "Minha teoria sobre você estava correta. Você é mais do que talentoso… Você é motivado! Eu te saúdo!",
+      "1_female": "Minha teoria sobre você estava correta. Você é mais do que talentosa… Você é motivada! Eu te saúdo!"
     },
     "defeat": {
       "1": "Ah ha ha! Se você perder, certifique-se de analisar o porquê e use esse conhecimento na próxima batalha!"
@@ -1656,7 +1890,8 @@
       "1": "Selvagem! Sua razão já é mais tóxica que a minha!"
     },
     "defeat": {
-      "1": "Ei, vamos lá! Seja sério! Você tem que dar mais de si!"
+      "1": "Ei, vamos lá! Seja sério! Você tem que dar mais de si!",
+      "1_female": "Ei, vamos lá! Seja séria! Você tem que dar mais de si!"
     }
   },
   "olivia": {
@@ -1694,7 +1929,8 @@
   },
   "flint": {
     "encounter": {
-      "1": "Espero que você esteja aquecido, porque aqui vem o Big Bang!"
+      "1": "Espero que você esteja aquecido, porque aqui vem o Big Bang!",
+      "1_female": "Espero que você esteja aquecida, porque aqui vem o Big Bang!"
     },
     "victory": {
       "1": "Incrível! Seus movimentos são tão quentes que fazem os meus parecerem mornos!"
@@ -1716,7 +1952,8 @@
   },
   "caitlin": {
     "encounter": {
-      "1": "Sou eu que apareci quando a flor se abriu. Você que estava esperando…\n$Você parece um Treinador de Pokémon com força refinada e bondade profunda. \n$O que eu procuro no meu oponente é uma força soberba… \n$Por favor, libere seu poder ao máximo!"
+      "1": "Sou eu que apareci quando a flor se abriu. Você que estava esperando…\n$Você parece um Treinador de Pokémon com força refinada e bondade profunda. \n$O que eu procuro no meu oponente é uma força soberba… \n$Por favor, libere seu poder ao máximo!",
+      "1_female": "Sou eu que apareci quando a flor se abriu. Você que estava esperando…\n$Você parece uma Treinadora de Pokémon com força refinada e bondade profunda. \n$O que eu procuro no meu oponente é uma força soberba… \n$Por favor, libere seu poder ao máximo!"
     },
     "victory": {
       "1": "Meus Pokémon e eu aprendemos muito! Agradeço a você."
@@ -1738,13 +1975,16 @@
   },
   "wikstrom": {
     "encounter": {
-      "1": "Bem encontrado, jovem desafiador! Verdadeiramente sou a lâmina famosa de aço endurecido, Duque Wikstrom! \n$Que a batalha comece! En garde!"
+      "1": "Bem encontrado, jovem desafiador! Verdadeiramente sou a lâmina famosa de aço endurecido, Duque Wikstrom! \n$Que a batalha comece! En garde!",
+      "1_female": "Bem encontrado, jovem desafiadora! Verdadeiramente sou a lâmina famosa de aço endurecido, Duque Wikstrom! \n$Que a batalha comece! En garde!"
     },
     "victory": {
-      "1": "Glorioso! A confiança que você compartilha com seu honrado Pokémon supera até mesmo a minha!"
+      "1": "Glorioso! A confiança que você compartilha com seu honrado Pokémon supera até mesmo a minha!",
+      "1_female": "Gloriosa! A confiança que você compartilha com seu honrado Pokémon supera até mesmo a minha!"
     },
     "defeat": {
-      "1": "Que tipo de magia é essa? Meu coração bate incessantemente no meu peito! \n$Vencer contra um oponente tão digno dá asas à minha alma--assim eu voo!"
+      "1": "Que tipo de magia é essa? Meu coração bate incessantemente no meu peito! \n$Vencer contra um oponente tão digno dá asas à minha alma--assim eu voo!",
+      "1_female": "Que tipo de magia é essa? Meu coração bate incessantemente no meu peito! \n$Vencer contra uma oponente tão digna dá asas à minha alma--assim eu voo!"
     }
   },
   "acerola": {
@@ -1776,11 +2016,14 @@
     },
     "victory": {
       "1": "Você me pegou. Você é magnífico!",
-      "2": "Nunca esperei que outro Treinador me derrotasse… Estou surpreso."
+      "1_female": "Você me pegou. Você é magnífica!",
+      "2": "Nunca esperei que outro Treinador me derrotasse… Estou surpreso.",
+      "2_female": "Nunca esperei que outra Treinadora me derrotasse… Estou surpreso."
     },
     "defeat": {
       "1": "Isso foi por pouco. Quer tentar de novo?",
-      "2": "Não é que você seja fraco. Não se incomode com isso."
+      "2": "Não é que você seja fraco. Não se incomode com isso.",
+      "2_female": "Não é que você seja fraca. Não se incomode com isso."
     }
   },
   "karen": {
@@ -1805,7 +2048,8 @@
       "1": "Parece que você entende bem os Pokémon. \n$Isso vai ser uma batalha e tanto! \n$Vou ter que usar a Dynamax no meu Pokémon se eu quiser vencer!"
     },
     "victory": {
-      "1": "O poder da Grama murchou… Que desafiador incrível!"
+      "1": "O poder da Grama murchou… Que desafiador incrível!",
+      "1_female": "O poder da Grama murchou… Que desafiadora incrível!"
     },
     "defeat": {
       "1": "Isso realmente vai te deixar em choque e admiração."
@@ -1824,7 +2068,8 @@
   },
   "drasna": {
     "encounter": {
-      "1": "Você deve ser um Treinador forte. Sim, bastante forte…\n$Isso é uma notícia maravilhosa! Enfrentar oponentes como você e sua equipe fará meus Pokémon crescerem como ervas daninhas!"
+      "1": "Você deve ser um Treinador forte. Sim, bastante forte…\n$Isso é uma notícia maravilhosa! Enfrentar oponentes como você e sua equipe fará meus Pokémon crescerem como ervas daninhas!",
+      "1_female": "Você deve ser uma Treinadora forte. Sim, bastante forte…\n$Isso é uma notícia maravilhosa! Enfrentar oponentes como você e sua equipe fará meus Pokémon crescerem como ervas daninhas!"
     },
     "victory": {
       "1": "Oh, meu Deus. Isso foi uma batalha rápida… Espero que você volte novamente algum dia!"
@@ -1857,7 +2102,8 @@
   },
   "blue": {
     "encounter": {
-      "1": "Você deve ser muito bom para chegar tão longe."
+      "1": "Você deve ser muito bom para chegar tão longe.",
+      "1_female": "Você deve ser muito boa para chegar tão longe."
     },
     "victory": {
       "1": "Só perdi para ele e agora para você… Ele? Hee, hee…"
@@ -1904,7 +2150,8 @@
       "1": "Ainda sou o Campeão. Não vou segurar nada."
     },
     "victory": {
-      "1": "Esta é a emergência de um novo Campeão."
+      "1": "Esta é a emergência de um novo Campeão.",
+      "1_female": "Esta é a emergência de uma nova Campeã."
     },
     "defeat": {
       "1": "Defendi com sucesso meu Campeonato."
@@ -1992,7 +2239,8 @@
       "1": "Eai! Você não acha que os Pokémon são, tipo, super fofos?"
     },
     "victory": {
-      "1": "Waaah! Waaah! Você é tão mau!"
+      "1": "Waaah! Waaah! Você é tão mau!",
+      "1_female": "Waaah! Waaah! Você é tão má!"
     },
     "defeat": {
       "1": "E é isso!"
@@ -2000,7 +2248,8 @@
   },
   "chuck": {
     "encounter": {
-      "1": "Hah! Você quer me desafiar? É corajoso ou apenas ignorante?"
+      "1": "Hah! Você quer me desafiar? É corajoso ou apenas ignorante?",
+      "1_female": "Hah! Você quer me desafiar? É corajosa ou apenas ignorante?"
     },
     "victory": {
       "1": "Você é forte! Por favor, me faça seu aprendiz?"
@@ -2011,7 +2260,8 @@
   },
   "katy": {
     "encounter": {
-      "1": "Não baixe a guarda, a menos que queira se ver jogado no chão!"
+      "1": "Não baixe a guarda, a menos que queira se ver jogado no chão!",
+      "1_female": "Não baixe a guarda, a menos que queira se ver jogada no chão!"
     },
     "victory": {
       "1": "Todos os meus adoráveis Pokémon caíram como moscas!"
@@ -2044,7 +2294,8 @@
   },
   "maylene": {
     "encounter": {
-      "1": "Vim desafiá-lo agora e não vou segurar nada. \n$Por favor, prepare-se para a batalha!"
+      "1": "Vim desafiá-lo agora e não vou segurar nada. \n$Por favor, prepare-se para a batalha!",
+      "1_female": "Vim desafiá-la agora e não vou segurar nada. \n$Por favor, prepare-se para a batalha!"
     },
     "victory": {
       "1": "Eu admito a derrota…"
@@ -2066,7 +2317,8 @@
   },
   "byron": {
     "encounter": {
-      "1": "Treinador! Você é jovem, assim como meu filho, Roark. \n$Com mais Treinadores jovens assumindo o comando, o futuro dos Pokémon é brilhante! \n$Então, como uma parede para os jovens, aceitarei seu desafio!"
+      "1": "Treinador! Você é jovem, assim como meu filho, Roark. \n$Com mais Treinadores jovens assumindo o comando, o futuro dos Pokémon é brilhante! \n$Então, como uma parede para os jovens, aceitarei seu desafio!",
+      "1_female": "Treinadora! Você é jovem, assim como meu filho, Roark. \n$Com mais Treinadores jovens assumindo o comando, o futuro dos Pokémon é brilhante! \n$Então, como uma parede para os jovens, aceitarei seu desafio!"
     },
     "victory": {
       "1": "Hmm! Meus Pokémon robustos--derrotados!"
@@ -2088,7 +2340,8 @@
   },
   "volkner": {
     "encounter": {
-      "1": "Já que você chegou tão longe, deve ser bastante forte…\n$Espero que você seja o Treinador que me faça lembrar como é divertido batalhar!"
+      "1": "Já que você chegou tão longe, deve ser bastante forte…\n$Espero que você seja o Treinador que me faça lembrar como é divertido batalhar!",
+      "1_female": "Já que você chegou tão longe, deve ser bastante forte…\n$Espero que você seja a Treinadora que me faça lembrar como é divertido batalhar!"
     },
     "victory": {
       "1": "Você me venceu…\n$Seu desejo e a maneira nobre como seus Pokémon batalharam por você… \n$Eu até me senti emocionado durante nossa luta. Foi uma batalha muito boa."
@@ -2190,7 +2443,8 @@
   },
   "valerie": {
     "encounter": {
-      "1": "Oh, se não é um jovem Treinador… É adorável conhecê-lo assim. \n$Então, suponho que você ganhou o direito a uma batalha, como recompensa por seus esforços. \n$Uma elusiva Fada pode parecer frágil como a brisa e delicado como uma flor, mas é forte."
+      "1": "Oh, se não é um jovem Treinador… É adorável conhecê-lo assim. \n$Então, suponho que você ganhou o direito a uma batalha, como recompensa por seus esforços. \n$Uma elusiva Fada pode parecer frágil como a brisa e delicado como uma flor, mas é forte.",
+      "1_female": "Oh, se não é uma jovem Treinadora… É adorável conhecê-la assim. \n$Então, suponho que você ganhou o direito a uma batalha, como recompensa por seus esforços. \n$Uma elusiva Fada pode parecer frágil como a brisa e delicado como uma flor, mas é forte."
     },
     "victory": {
       "1": "Espero que você encontre coisas para sorrir amanhã…"
@@ -2237,7 +2491,8 @@
       "1": "Deixe-me ver como você e seu Pokémon parceiro se comportam!"
     },
     "victory": {
-      "1": "Seu rosa ainda está faltando, mas você é um Treinador excelente com Pokémon excelentes."
+      "1": "Seu rosa ainda está faltando, mas você é um Treinador excelente com Pokémon excelentes.",
+      "1_female": "Seu rosa ainda está faltando, mas você é uma Treinadora excelente com Pokémon excelentes."
     },
     "defeat": {
       "1": "Muito ruim para você, eu acho."
@@ -2245,7 +2500,8 @@
   },
   "bede": {
     "encounter": {
-      "1": "Suponho que devo provar além de qualquer dúvida o quão patético você é e quão forte eu sou."
+      "1": "Suponho que devo provar além de qualquer dúvida o quão patético você é e quão forte eu sou.",
+      "1_female": "Suponho que devo provar além de qualquer dúvida o quão patética você é e quão forte eu sou."
     },
     "victory": {
       "1": "Eu vejo… Bem, tudo bem. Eu não estava me esforçando muito de qualquer maneira."
@@ -2289,7 +2545,8 @@
   },
   "brassius": {
     "encounter": {
-      "1": "Pressuponho que você está pronto? Que nossa obra de arte colaborativa comece!"
+      "1": "Pressuponho que você está pronto? Que nossa obra de arte colaborativa comece!",
+      "1_female": "Pressuponho que você está pronta? Que nossa obra de arte colaborativa comece!"
     },
     "victory": {
       "1": "Ahhh…avant-garde!"
@@ -2300,10 +2557,12 @@
   },
   "iono": {
     "encounter": {
-      "1": "Como você está se sentindo sobre esta batalha?\n$...\n$Vamos começar o show! Quão forte é o nosso desafiador? \n$Eu não sei! Vamos descobrir juntos!"
+      "1": "Como você está se sentindo sobre esta batalha?\n$...\n$Vamos começar o show! Quão forte é o nosso desafiador? \n$Eu não sei! Vamos descobrir juntos!",
+      "1_female": "Como você está se sentindo sobre esta batalha?\n$...\n$Vamos começar o show! Quão forte é o nossa desafiadora? \n$Eu não sei! Vamos descobrir juntos!"
     },
     "victory": {
-      "1": "Você é tão chamativo e brilhante quanto um Raio do Trovão de 10.000.000 volts, amigo!"
+      "1": "Você é tão chamativo e brilhante quanto um Raio do Trovão de 10.000.000 volts, amigo!",
+      "1_female": "Você é tão chamativa e brilhante quanto um Raio do Trovão de 10.000.000 volts, amiga!"
     },
     "defeat": {
       "1": "Seus olhos são MEUS!"
@@ -2325,7 +2584,8 @@
       "1": "Vamos lá, baby! Me agite até os ossos!"
     },
     "victory": {
-      "1": "Você é legal, meu amigo, você move minha ALMA!"
+      "1": "Você é legal, meu amigo, você move minha ALMA!",
+      "1_female": "Você é legal, minha amiga, você move minha ALMA!"
     },
     "defeat": {
       "1": "Até mais, baby!"
@@ -2359,7 +2619,9 @@
   "nessa_elite": {
     "encounter": {
       "1": "As marés estão mudando a meu favor. Pronto para ser levado pela corrente?",
-      "2": "Vamos fazer ondas com esta batalha! Espero que esteja preparado!"
+      "1_female": "As marés estão mudando a meu favor. Pronta para ser levada pela corrente?",
+      "2": "Vamos fazer ondas com esta batalha! Espero que esteja preparado!",
+      "2_female": "Vamos fazer ondas com esta batalha! Espero que esteja preparada!"
     },
     "victory": {
       "1": "Você navegou nessas águas perfeitamente... Bem feito!",
@@ -2387,6 +2649,7 @@
   "allister_elite": {
     "encounter": {
       "1": "As sombras caem... Você está pronto para enfrentar seus medos?",
+      "1_female": "As sombras caem... Você está pronta para enfrentar seus medos?",
       "2": "Vamos ver se você pode lidar com a escuridão que eu comando."
     },
     "victory": {
@@ -2409,7 +2672,8 @@
     },
     "defeat": {
       "1": "Outra tempestade enfrentada, outra vitória conquistada! Bem lutado!",
-      "2": "Você foi pego na minha tempestade! Melhor sorte na próxima vez!"
+      "2": "Você foi pego na minha tempestade! Melhor sorte na próxima vez!",
+      "2_female": "Você foi pega na minha tempestade! Melhor sorte na próxima vez!"
     }
   },
   "alder": {
@@ -2542,4 +2806,4 @@
       "1": "@c{smile_ehalf}Eu… acho que cumpri meu propósito…\n$@c{smile_eclosed}Prometa-me… Depois que curar o mundo… Por favor… volte para casa.\n$@c{smile_ehalf}…Obrigada."
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/pt_BR/menu-ui-handler.json b/src/locales/pt_BR/menu-ui-handler.json
index c59865e41f9..cc087c8335e 100644
--- a/src/locales/pt_BR/menu-ui-handler.json
+++ b/src/locales/pt_BR/menu-ui-handler.json
@@ -3,7 +3,6 @@
   "ACHIEVEMENTS": "Conquistas",
   "STATS": "Estatísticas",
   "RUN_HISTORY": "Histórico de Jogos",
-  "VOUCHERS": "Vouchers",
   "EGG_LIST": "Incubadora",
   "EGG_GACHA": "Gacha de ovos",
   "MANAGE_DATA": "Gerenciar dados",
diff --git a/src/locales/pt_BR/modifier-type.json b/src/locales/pt_BR/modifier-type.json
index 722da8d2dbf..1787360b51e 100644
--- a/src/locales/pt_BR/modifier-type.json
+++ b/src/locales/pt_BR/modifier-type.json
@@ -505,8 +505,8 @@
     "BLASTOISINITE": "Blastoisinita",
     "BLAZIKENITE": "Blazikenita",
     "CAMERUPTITE": "Cameruptita",
-    "CHARIZARDITE X": "Charizardita X",
-    "CHARIZARDITE Y": "Charizardita Y",
+    "CHARIZARDITE_X": "Charizardita X",
+    "CHARIZARDITE_Y": "Charizardita Y",
     "DIANCITE": "Diancita",
     "GALLADITE": "Galladita",
     "GARCHOMPITE": "Garchompita",
@@ -525,12 +525,12 @@
     "MAWILITE": "Mawilita",
     "MEDICHAMITE": "Medichamita",
     "METAGROSSITE": "Metagrossita",
-    "MEWTWONITE X": "Mewtwonita X",
-    "MEWTWONITE Y": "Mewtwonita Y",
+    "MEWTWONITE_X": "Mewtwonita X",
+    "MEWTWONITE_Y": "Mewtwonita Y",
     "PIDGEOTITE": "Pidgeotita",
     "PINSIRITE": "Pinsirita",
-    "SABLENITE": "Sablenita",
     "RAYQUAZITE": "Rayquazita",
+    "SABLENITE": "Sablenita",
     "SALAMENCITE": "Salamencita",
     "SCEPTILITE": "Sceptilita",
     "SCIZORITE": "Scizorita",
@@ -606,4 +606,4 @@
     "FAIRY_MEMORY": "Memória de Fada",
     "BLANK_MEMORY": "Memória Vazia"
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/pt_BR/move.json b/src/locales/pt_BR/move.json
index 043a095159c..c463665f1ad 100644
--- a/src/locales/pt_BR/move.json
+++ b/src/locales/pt_BR/move.json
@@ -39,9 +39,9 @@
     "name": "Scratch",
     "effect": "Garras duras, pontiagudas e afiadas rasgam o alvo para causar dano."
   },
-  "viceGrip": {
-    "name": "Vice Grip",
-    "effect": "O alvo é agarrado pelos lados e espremido."
+  "viseGrip": {
+    "name": "Vise Grip",
+    "effect": "O alvo é agarrado e espremido de ambos os lados para causar dano."
   },
   "guillotine": {
     "name": "Guillotine",
@@ -2913,7 +2913,7 @@
   },
   "zippyZap": {
     "name": "Zippy Zap",
-    "effect": "O usuário ataca o alvo com rajadas de eletricidade em alta velocidade. Esse movimento sempre vai primeiro e aumenta a Evasão do usuário."
+    "effect": "O usuário ataca o alvo com rajadas de eletricidade em alta velocidade. Esse movimento sempre vai primeiro e resulta em um golpe crítico."
   },
   "splishySplash": {
     "name": "Splishy Splash",
@@ -3807,4 +3807,4 @@
     "name": "Malignant Chain",
     "effect": "O usuário derrama toxinas no alvo envolvendo-o em uma corrente tóxica e corrosiva. Isso também pode deixar o alvo seriamente envenenado."
   }
-}
\ 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 83169a44414..aa8f32a5d36 100644
--- a/src/locales/pt_BR/pokemon-form.json
+++ b/src/locales/pt_BR/pokemon-form.json
@@ -64,6 +64,7 @@
   "landorusIncarnate": "Materializado",
   "keldeoOrdinary": "Comum",
   "meloettaAria": "Ária",
+  "meloettaPirouette": "Pirueta",
   "froakieBattleBond": "Vínculo de Batalha",
   "scatterbugMeadow": "Prado",
   "scatterbugIcySnow": "Neve Congelada",
@@ -151,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/run-history-ui-handler.json b/src/locales/pt_BR/run-history.json
similarity index 58%
rename from src/locales/pt_BR/run-history-ui-handler.json
rename to src/locales/pt_BR/run-history.json
index fe02a3e31cb..74cc2c35d28 100644
--- a/src/locales/pt_BR/run-history-ui-handler.json
+++ b/src/locales/pt_BR/run-history.json
@@ -1,15 +1,15 @@
 {
   "victory": "Vitória!",
-  "defeatedWildM": "Derrotado por ",
-  "defeatedTrainerM": "Derrotado por ",
-  "defeatedTrainerDoubleM": "Derrotado por Dupla",
-  "defeatedRivalM": "Derrotado por Rival",
-  "defeatedM": "Derrotado",
-  "defeatedWildF": "Derrotada por ",
-  "defeatedTrainerF": "Derrotada por ",
-  "defeatedTrainerDoubleF": "Derrotada por Dupla",
-  "defeatedRivalF": "Derrotada por Rival",
-  "defeatedF": "Derrotada",
+  "defeatedWild": "Derrotado por ",
+  "defeatedTrainer": "Derrotado por ",
+  "defeatedTrainerDouble": "Derrotado por Dupla",
+  "defeatedRival": "Derrotado por Rival",
+  "defeated": "Derrotado",
+  "defeatedWild_female": "Derrotada por ",
+  "defeatedTrainer_female": "Derrotada por ",
+  "defeatedTrainerDouble_female": "Derrotada por Dupla",
+  "defeatedRival_female": "Derrotada por Rival",
+  "defeated_female": "Derrotada",
   "luck": "Sorte",
   "score": "Pontuação",
   "mode": "Modo",
@@ -30,8 +30,8 @@
   "money": "Dinheiro",
   "runLength": "Duração do Jogo",
   "viewHeldItems": "Itens Segurados",
-  "hallofFameTextM": "Bem-vindo ao Hall da Fama!",
-  "hallofFameTextF": "Bem-vinda ao Hall da Fama!",
+  "hallofFameText": "Bem-vindo ao Hall da Fama!",
+  "hallofFameText_female": "Bem-vinda ao Hall da Fama!",
   "viewHallOfFame": "Veja o Hall da Fama!",
   "viewEndingSplash": "Veja a arte final!"
 }
\ No newline at end of file
diff --git a/src/locales/pt_BR/settings.json b/src/locales/pt_BR/settings.json
index d1b4bd33c76..58ccb45f86d 100644
--- a/src/locales/pt_BR/settings.json
+++ b/src/locales/pt_BR/settings.json
@@ -60,8 +60,10 @@
   "playerGender": "Gênero do Jogador",
   "typeHints": "Dicas de Tipo",
   "masterVolume": "Volume Mestre",
-  "bgmVolume": "Volume de BGM",
-  "seVolume": "Volume de SE",
+  "bgmVolume": "Músicas",
+  "fieldVolume": "Ambiente",
+  "seVolume": "Ef. Sonoros",
+  "uiVolume": "Interface",
   "musicPreference": "Preferência de Música",
   "mixed": "Misto",
   "gamepadPleasePlug": "Conecte um controle ou pressione um botão",
@@ -95,11 +97,11 @@
   "controller": "Controle",
   "gamepadSupport": "Suporte para Controle",
   "showBgmBar": "Exibir Nomes das Músicas",
-  "moveTouchControls": "Move Touch Controls",
+  "moveTouchControls": "Mover Controles de Toque",
   "shopOverlayOpacity": "Opacidade da Loja",
   "shopCursorTarget": "Alvo do Cursor da Loja",
   "items": "Itens",
   "reroll": "Atualizar",
   "shop": "Loja",
   "checkTeam": "Checar Time"
-}
\ 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..482265d00c6 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",
@@ -117,5 +117,15 @@
   "plasma_grunts": "Capangas da Equipe Plasma",
   "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
+  "flare_grunts": "Capangas da Equipe Flare",
+  "aether_grunt": "Funcionário da Fundação Aether",
+  "aether_grunt_female": "Funcionária da Fundação Aether",
+  "aether_grunts": "Funcionários da Fundação Aether",
+  "skull_grunt": "Capanga da Equipe Skull",
+  "skull_grunt_female": "Capanga da Equipe Skull",
+  "skull_grunts": "Capangas da Equipe Skull",
+  "macro_grunt": "Treinador da Macro Cosmos",
+  "macro_grunt_female": "Treinadora da Macro Cosmos",
+  "macro_grunts": "Treinadores da Macro Cosmos"
+
+}
diff --git a/src/locales/pt_BR/trainer-names.json b/src/locales/pt_BR/trainer-names.json
index fc4e48de040..5500e2ddb46 100644
--- a/src/locales/pt_BR/trainer-names.json
+++ b/src/locales/pt_BR/trainer-names.json
@@ -138,11 +138,17 @@
   "rood": "Rood",
   "xerosic": "Xerosic",
   "bryony": "Bryony",
+  "faba": "Faba",
+  "plumeria": "Plumeria",
+  "oleana": "Oleana",
   "maxie": "Maxie",
   "archie": "Archie",
   "cyrus": "Cyrus",
   "ghetsis": "Ghetsis",
   "lysandre": "Lysandre",
+  "lusamine": "Lusamine",
+  "guzma": "Guzma",
+  "rose": "Rose",
   "blue_red_double": "Blue & Red",
   "red_blue_double": "Red & Blue",
   "tate_liza_double": "Tate & Liza",
@@ -153,4 +159,4 @@
   "iris_alder_double": "Iris & Alder",
   "marnie_piers_double": "Marnie & Piers",
   "piers_marnie_double": "Piers & Marnie"
-}
\ No newline at end of file
+}
diff --git a/src/locales/pt_BR/trainer-titles.json b/src/locales/pt_BR/trainer-titles.json
index b38de9439c9..701c2e143fa 100644
--- a/src/locales/pt_BR/trainer-titles.json
+++ b/src/locales/pt_BR/trainer-titles.json
@@ -16,6 +16,10 @@
   "galactic_boss": "Chefe da Equipe Galáctica",
   "plasma_boss": "Chefe da Equipe Plasma",
   "flare_boss": "Chefe da Equipe Flare",
+  "aether_boss": "Presidente Aether",
+  "skull_boss": "Chefe da Equipe Skull",
+  "macro_boss": "Presidente da Macro Cosmos",
+
   "rocket_admin": "Admin da Equipe Rocket",
   "rocket_admin_female": "Admin da Equipe Rocket",
   "magma_admin": "Admin da Equipe Magma",
@@ -27,5 +31,8 @@
   "plasma_sage": "Sábio da Equipe Plasma",
   "plasma_admin": "Admin da Equipe Plasma",
   "flare_admin": "Admin da Equipe Flare",
-  "flare_admin_female": "Admin da Equipe Flare"
-}
\ No newline at end of file
+  "flare_admin_female": "Admin da Equipe Flare",
+  "aether_admin": "Admin da Fundação Aether",
+  "skull_admin": "Admin da Equipe Skull",
+  "macro_admin": "Macro Cosmos"
+}
diff --git a/src/locales/pt_BR/tutorial.json b/src/locales/pt_BR/tutorial.json
index 7184f8538f1..e347ca6fbee 100644
--- a/src/locales/pt_BR/tutorial.json
+++ b/src/locales/pt_BR/tutorial.json
@@ -5,6 +5,6 @@
   "starterSelect": "Aqui você pode escolher seus iniciais apertando a tecla Z ou\na Barra de Espaço.\n$Esses serão os primeiro Pokémon da sua equipe.\n$Cada inicial tem seu custo. Sua equipe pode ter até 6\nmembros, desde que a soma dos custos não ultrapasse 10. \n$Você pode escolher o gênero, a habilidade\ne até a forma do seu inicial.\n$Essas opções dependem das variantes dessa\nespécie que você já capturou ou chocou. \n$Os IVs de cada inicial são os melhores de todos os Pokémon\ndaquela espécie que você já capturou ou chocou.\n$Sempre capture vários Pokémon de várias espécies!",
   "pokerus": "Todo dia, 3 Pokémon iniciais ficam com uma borda roxa.\n$Caso veja um inicial que você possui com uma dessa, tente\nadicioná-lo a sua equipe. Lembre-se de olhar seu sumário!",
   "statChange": "As mudanças de atributos se mantém após a batalha desde que o Pokémon não seja trocado.\n$Seus Pokémon voltam a suas Poké Bolas antes de batalhas contra treinadores e de entrar em um novo bioma.\n$Para ver as mudanças de atributos dos Pokémon em campo, mantena C ou Shift pressionado durante a batalha.",
-  "selectItem": "Após cada batalha, você pode escolher entre 3 itens aleatórios.\n$Você pode escolher apenas um deles.\n$Esses itens variam entre consumíveis, itens de segurar e itens passivos permanentes.\n$A maioria dos efeitos de itens não consumíveis podem ser acumulados.\n$Alguns itens só aparecerão se puderem ser usados, como os itens de evolução.\n$Você também pode transferir itens de segurar entre os Pokémon utilizando a opção \"Transfer\".\n$A opção de transferir irá aparecer no canto inferior direito assim que você obter um item de segurar.\n$Você pode comprar itens consumíveis com dinheiro, e sua variedade aumentará conforme você for mais longe.\n$Certifique-se de comprá-los antes de escolher seu item aleatório. Ao escolhê-lo, a próxima batalha começará.",
+  "selectItem": "Após cada batalha, você pode escolher entre 3 itens aleatórios.\n$Você pode escolher apenas um deles.\n$Esses itens variam entre consumíveis, itens de segurar e itens passivos permanentes.\n$A maioria dos efeitos de itens não consumíveis podem ser acumulados.\n$Alguns itens só aparecerão se puderem ser usados, como os itens de evolução.\n$Você também pode transferir itens de segurar entre os Pokémon utilizando a opção \"Alterar\".\n$A opção de transferir irá aparecer no canto inferior direito assim que você obter um item de segurar.\n$Você pode comprar itens consumíveis com dinheiro, e sua variedade aumentará conforme você for mais longe.\n$Certifique-se de comprá-los antes de escolher seu item aleatório. Ao escolhê-lo, a próxima batalha começará.",
   "eggGacha": "Aqui você pode trocar seus vouchers\npor ovos de Pokémon.\n$Ovos ficam mais próximos de chocar após cada batalha.\nOvos mais raros demoram mais para chocar.\n$Pokémon chocados não serão adicionados a sua equipe,\nmas sim aos seus iniciais.\n$Pokémon chocados geralmente possuem IVs melhores\nque Pokémon selvagens.\n$Alguns Pokémon só podem ser obtidos através de seus ovos.\n$Temos 3 máquinas, cada uma com seu bônus específico,\nentão escolha a que mais lhe convém!"
-}
\ No newline at end of file
+}
diff --git a/src/locales/zh_CN/achv-female.json b/src/locales/zh_CN/achv-female.json
deleted file mode 100644
index 103a9bb41b5..00000000000
--- a/src/locales/zh_CN/achv-female.json
+++ /dev/null
@@ -1,272 +0,0 @@
-{
-  "Achievements": {
-    "name": "成就"
-  },
-  "Locked": {
-    "name": "未解锁"
-  },
-
-  "MoneyAchv": {
-    "description": "累计获得 ₽{{moneyAmount}}"
-  },
-  "10K_MONEY": {
-    "name": "小有积蓄"
-  },
-  "100K_MONEY": {
-    "name": "大户人家"
-  },
-  "1M_MONEY": {
-    "name": "百万富翁"
-  },
-  "10M_MONEY": {
-    "name": "暴发户"
-  },
-
-  "DamageAchv": {
-    "description": "在单次攻击中造成 {{damageAmount}} 点伤害"
-  },
-  "250_DMG": {
-    "name": "重拳出击"
-  },
-  "1000_DMG": {
-    "name": "神拳猛击"
-  },
-  "2500_DMG": {
-    "name": "夺少？"
-  },
-  "10000_DMG": {
-    "name": "一拳超人"
-  },
-
-  "HealAchv": {
-    "description": "通过技能、能力或携带的道具一次性治疗 {{healAmount}} {{HP}}点"
-  },
-  "250_HEAL": {
-    "name": "新手奶妈"
-  },
-  "1000_HEAL": {
-    "name": "治疗担当"
-  },
-  "2500_HEAL": {
-    "name": "牧师"
-  },
-  "10000_HEAL": {
-    "name": "泉水"
-  },
-
-  "LevelAchv": {
-    "description": "将一只宝可梦提升到 Lv{{level}}"
-  },
-  "LV_100": {
-    "name": "别急，后面还有"
-  },
-  "LV_250": {
-    "name": "精英"
-  },
-  "LV_1000": {
-    "name": "天外有天"
-  },
-
-  "RibbonAchv": {
-    "description": "累计获得 {{ribbonAmount}} 个勋章"
-  },
-  "10_RIBBONS": {
-    "name": "宝可梦联盟冠军"
-  },
-  "25_RIBBONS": {
-    "name": "超级球联盟冠军"
-  },
-  "50_RIBBONS": {
-    "name": "高级球联盟冠军"
-  },
-  "75_RIBBONS": {
-    "name": "肉鸽球联盟冠军"
-  },
-  "100_RIBBONS": {
-    "name": "大师球联盟冠军"
-  },
-
-  "TRANSFER_MAX_BATTLE_STAT": {
-    "name": "团队协作",
-    "description": "在一项属性强化至最大时用接力棒传递给其他宝可梦"
-  },
-  "MAX_FRIENDSHIP": {
-    "name": "亲密无间",
-    "description": "使一只宝可梦的亲密度达到最大值"
-  },
-  "MEGA_EVOLVE": {
-    "name": "大变身",
-    "description": "超级进化一只宝可梦"
-  },
-  "GIGANTAMAX": {
-    "name": "这位更是重量级",
-    "description": "极巨化一只宝可梦"
-  },
-  "TERASTALLIZE": {
-    "name": "本系爱好者",
-    "description": "太晶化一只宝可梦"
-  },
-  "STELLAR_TERASTALLIZE": {
-    "name": "隐藏属性",
-    "description": "星晶化一只宝可梦"
-  },
-  "SPLICE": {
-    "name": "无限融合",
-    "description": "使用基因之楔将两只宝可梦融合在一起"
-  },
-  "MINI_BLACK_HOLE": {
-    "name": "一大洞的道具",
-    "description": "获得一个迷你黑洞"
-  },
-  "CATCH_MYTHICAL": {
-    "name": "神秘礼物",
-    "description": "捕捉一只幻之宝可梦"
-  },
-  "CATCH_SUB_LEGENDARY": {
-    "name": "二级传说",
-    "description": "捕捉一只二级传说宝可梦"
-  },
-  "CATCH_LEGENDARY": {
-    "name": "传说",
-    "description": "捕捉一只传说宝可梦"
-  },
-  "SEE_SHINY": {
-    "name": "闪耀夺目",
-    "description": "在野外找到一只闪光宝可梦"
-  },
-  "SHINY_PARTY": {
-    "name": "呕心沥血",
-    "description": "拥有一支由闪光宝可梦组成的满员队伍"
-  },
-  "HATCH_MYTHICAL": {
-    "name": "幻兽蛋",
-    "description": "从蛋中孵化出一只幻之宝可梦"
-  },
-  "HATCH_SUB_LEGENDARY": {
-    "name": "二级传说蛋",
-    "description": "从蛋中孵化出一只二级传说宝可梦"
-  },
-  "HATCH_LEGENDARY": {
-    "name": "传说蛋",
-    "description": "从蛋中孵化出一只传说宝可梦"
-  },
-  "HATCH_SHINY": {
-    "name": "金色传说！",
-    "description": "从蛋中孵化出一只闪光宝可梦"
-  },
-  "HIDDEN_ABILITY": {
-    "name": "隐藏实力",
-    "description": "捕捉一只拥有隐藏特性的宝可梦"
-  },
-  "PERFECT_IVS": {
-    "name": "合格证",
-    "description": "获得一只拥有完美个体值的宝可梦"
-  },
-  "CLASSIC_VICTORY": {
-    "name": "战无不胜",
-    "description": "在经典模式中通关游戏"
-  },
-  "UNEVOLVED_CLASSIC_VICTORY": {
-    "name": "带孩子来上班",
-    "description": "通关经典模式时队伍中至少有一名未进化的宝可梦"
-  },
-
-  "MONO_GEN_ONE": {
-    "name": "最初的劲敌",
-    "description": "完成仅限第一世代的挑战"
-  },
-  "MONO_GEN_TWO": {
-    "name": "1.5世代",
-    "description": "完成仅限第二世代的挑战"
-  },
-  "MONO_GEN_THREE": {
-    "name": "“水太多了”",
-    "description": "完成仅限第三世代的挑战"
-  },
-  "MONO_GEN_FOUR": {
-    "name": "她真是最强冠军吗？",
-    "description": "完成仅限第四世代的挑战"
-  },
-  "MONO_GEN_FIVE": {
-    "name": "完全原创",
-    "description": "完成仅限第五世代的挑战"
-  },
-  "MONO_GEN_SIX": {
-    "name": "女大公",
-    "description": "完成仅限第六世代的挑战"
-  },
-  "MONO_GEN_SEVEN": {
-    "name": "首届冠军",
-    "description": "完成仅限第七世代的挑战"
-  },
-  "MONO_GEN_EIGHT": {
-    "name": "冠军时刻！",
-    "description": "完成仅限第八世代的挑战"
-  },
-  "MONO_GEN_NINE": {
-    "name": "她又放水了",
-    "description": "完成仅限第九世代的挑战"
-  },
-
-  "MonoType": {
-    "description": "完成 {{type}} 单属性挑战"
-  },
-  "MONO_NORMAL": {
-    "name": "异乎寻常的寻常"
-  },
-  "MONO_FIGHTING": {
-    "name": "我有真功夫"
-  },
-  "MONO_FLYING": {
-    "name": "愤怒的小鸟"
-  },
-  "MONO_POISON": {
-    "name": "关都地区特色"
-  },
-  "MONO_GROUND": {
-    "name": "地震预报"
-  },
-  "MONO_ROCK": {
-    "name": "坚如磐石"
-  },
-  "MONO_BUG": {
-    "name": "音箱蟀侠"
-  },
-  "MONO_GHOST": {
-    "name": "捉鬼敢死队"
-  },
-  "MONO_STEEL": {
-    "name": "铁巨人"
-  },
-  "MONO_FIRE": {
-    "name": "搓火球解决一切"
-  },
-  "MONO_WATER": {
-    "name": "当雨来临，倾盆而下"
-  },
-  "MONO_GRASS": {
-    "name": "别踏这个青"
-  },
-  "MONO_ELECTRIC": {
-    "name": "瞄准大岩蛇的角！"
-  },
-  "MONO_PSYCHIC": {
-    "name": "脑洞大开"
-  },
-  "MONO_ICE": {
-    "name": "如履薄冰"
-  },
-  "MONO_DRAGON": {
-    "name": "准神俱乐部"
-  },
-  "MONO_DARK": {
-    "name": "总有叛逆期"
-  },
-  "MONO_FAIRY": {
-    "name": "林克，醒醒！"
-  },
-  "FRESH_START": {
-    "name": "初次尝试！",
-    "description": "完成初次尝试挑战"
-  }
-}
diff --git a/src/locales/zh_CN/achv-male.json b/src/locales/zh_CN/achv.json
similarity index 97%
rename from src/locales/zh_CN/achv-male.json
rename to src/locales/zh_CN/achv.json
index 103a9bb41b5..8de0c48a2c3 100644
--- a/src/locales/zh_CN/achv-male.json
+++ b/src/locales/zh_CN/achv.json
@@ -268,5 +268,9 @@
   "FRESH_START": {
     "name": "初次尝试！",
     "description": "完成初次尝试挑战"
+  },
+  "INVERSE_BATTLE": {
+    "name": "镜子子镜",
+    "description": "完成逆转之战挑战\n战挑战之转逆成完"
   }
 }
diff --git a/src/locales/zh_CN/battle.json b/src/locales/zh_CN/battle.json
index f16b6fac77c..84f468a4a4b 100644
--- a/src/locales/zh_CN/battle.json
+++ b/src/locales/zh_CN/battle.json
@@ -38,7 +38,7 @@
   "learnMoveNotLearned": "{{pokemonName}}没有学会{{moveName}}。",
   "learnMoveForgetQuestion": "要忘记哪个技能？",
   "learnMoveForgetSuccess": "{{pokemonName}}忘记了\n如何使用{{moveName}}。",
-  "countdownPoof": "@d{32}1, @d{15}2 @d{15}… @d{15}… @d{15}@s{pb_bounce_1}空！",
+  "countdownPoof": "@d{32}1, @d{15}2 @d{15}… @d{15}… @d{15}@s{se/pb_bounce_1}空！",
   "learnMoveAnd": "然后……",
   "levelCapUp": "等级上限提升到{{levelCap}}！",
   "moveNotImplemented": "{{moveName}}尚未实装，无法选择。",
diff --git a/src/locales/zh_CN/bgm-name.json b/src/locales/zh_CN/bgm-name.json
index 34ce16db00f..d0508a49661 100644
--- a/src/locales/zh_CN/bgm-name.json
+++ b/src/locales/zh_CN/bgm-name.json
@@ -78,11 +78,21 @@
   "battle_galactic_grunt": "晶灿钻石·明亮珍珠「战斗！银河队」",
   "battle_plasma_grunt": "黑白「战斗！等离子团」",
   "battle_flare_grunt": "XY「战斗！闪焰队」",
+  "battle_aether_grunt": "日月「战斗！以太基金会」",
+  "battle_skull_grunt": "日月「战斗！骷髅队」",
+  "battle_macro_grunt": "剑盾「战斗！马洛科蒙集团」",
+  "battle_galactic_admin": "晶灿钻石·明亮珍珠「战斗！银河队干部」",
+  "battle_skull_admin": "日月「战斗！骷髅队干部」",
+  "battle_oleana": "剑盾「战斗！奥利薇」",
   "battle_rocket_boss": "究极日月「战斗！坂木」",
   "battle_aqua_magma_boss": "Ω红宝石α蓝宝石「战斗！水梧桐・赤焰松」",
   "battle_galactic_boss": "晶灿钻石·明亮珍珠「战斗！赤日」",
   "battle_plasma_boss": "黑2白2「战斗！魁奇思」",
   "battle_flare_boss": "XY「战斗！弗拉达利」",
+  "battle_aether_boss":  "日月「战斗！露莎米奈」",
+  "battle_skull_boss": "日月「战斗！古兹马」",
+  "battle_macro_boss": "剑盾「战斗！洛兹」",
+
   "abyss": "空之探险队「黑暗小丘」",
   "badlands": "空之探险队「枯竭之谷」",
   "beach": "空之探险队「潮湿岩地」",
@@ -135,4 +145,4 @@
   "heal": "黑白「宝可梦回复」",
   "menu": "空之探险队「欢迎来到宝可梦的世界」",
   "title": "空之探险队「主题曲」"
-}
\ No newline at end of file
+}
diff --git a/src/locales/zh_CN/challenges.json b/src/locales/zh_CN/challenges.json
index 0b454d759fb..9351ec96285 100644
--- a/src/locales/zh_CN/challenges.json
+++ b/src/locales/zh_CN/challenges.json
@@ -25,5 +25,12 @@
     "desc": "你只能使用御三家，就像是你第一次玩宝可梦肉鸽一样。",
     "value.0": "关闭",
     "value.1": "开启"
+  },
+  "inverseBattle": {
+    "name": "逆转之战",
+    "shortName": "逆转之战",
+    "desc": "属性相克关系被反转，且没有任何属性对其他属性免疫。\n禁用其他挑战的成就。",
+    "value.0": "关闭",
+    "value.1": "开启"
   }
 }
\ No newline at end of file
diff --git a/src/locales/zh_CN/config.ts b/src/locales/zh_CN/config.ts
index 63e3f46f7b3..44a190d8c11 100644
--- a/src/locales/zh_CN/config.ts
+++ b/src/locales/zh_CN/config.ts
@@ -4,8 +4,7 @@ import ability from "./ability.json";
 import abilityTriggers from "./ability-trigger.json";
 import arenaFlyout from "./arena-flyout.json";
 import arenaTag from "./arena-tag.json";
-import achvMale from "./achv-male.json";
-import achvFemale from "./achv-female.json";
+import achv from "./achv.json";
 import battle from "./battle.json";
 import battleScene from "./battle-scene.json";
 import battleInfo from "./battle-info.json";
@@ -16,14 +15,10 @@ import bgmName from "./bgm-name.json";
 import biome from "./biome.json";
 import challenges from "./challenges.json";
 import commandUiHandler from "./command-ui-handler.json";
-import dialogueMale from "./dialogue-male.json";
-import dialogueFemale from "./dialogue-female.json";
-import dialogueEndbossMale from "./dialogue-final-boss-male.json";
-import dialogueEndbossFemale from "./dialogue-final-boss-female.json";
-import dialogueMiscMale from "./dialogue-misc-male.json";
-import dialogueMiscFemale from "./dialogue-misc-female.json";
-import dialogueDoubleBattleMale from "./dialogue-double-battle-male.json";
-import dialogueDoubleBattleFemale from "./dialogue-double-battle-female.json";
+import dialogue from "./dialogue.json";
+import battleSpecDialogue from "./dialogue-final-boss.json";
+import miscDialogue from "./dialogue-misc.json";
+import doubleBattleDialogue from "./dialogue-double-battle.json";
 import egg from "./egg.json";
 import fightUiHandler from "./fight-ui-handler.json";
 import filterBar from "./filter-bar.json";
@@ -57,7 +52,7 @@ import weather from "./weather.json";
 import terrain from "./terrain.json";
 import modifierSelectUiHandler from "./modifier-select-ui-handler.json";
 import moveTriggers from "./move-trigger.json";
-import runHistory from "./run-history-ui-handler.json";
+import runHistory from "./run-history.json";
 
 export const zhCnConfig = {
   ability,
@@ -76,16 +71,11 @@ export const zhCnConfig = {
   challenges,
   commandUiHandler,
   common,
-  PGMachv: achvMale,
-  PGFachv: achvFemale,
-  PGMdialogue: dialogueMale,
-  PGFdialogue: dialogueFemale,
-  PGMbattleSpecDialogue: dialogueEndbossMale,
-  PGFbattleSpecDialogue: dialogueEndbossFemale,
-  PGMmiscDialogue: dialogueMiscMale,
-  PGFmiscDialogue: dialogueMiscFemale,
-  PGMdoubleBattleDialogue: dialogueDoubleBattleMale,
-  PGFdoubleBattleDialogue: dialogueDoubleBattleFemale,
+  achv,
+  dialogue,
+  battleSpecDialogue,
+  miscDialogue,
+  doubleBattleDialogue,
   egg,
   fightUiHandler,
   filterBar,
diff --git a/src/locales/zh_CN/dialogue-double-battle-male.json b/src/locales/zh_CN/dialogue-double-battle-male.json
deleted file mode 100644
index 5ab6bf49890..00000000000
--- a/src/locales/zh_CN/dialogue-double-battle-male.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "blue_red_double": {
-    "encounter": {
-      "1": "青绿：嘿，赤红，\n让这家伙看看我们是什么来头！$赤红: ...$青绿: 见识下真新镇的实力！"
-    },
-    "victory": {
-      "1": "青绿：打得真不错$赤红: ..."
-    }
-  },
-  "red_blue_double": {
-    "encounter": {
-      "1": "赤红: ...!$青绿： 他人狠话不多。$青绿： 但别被他耍了，\n毕竟他可是个冠军！"
-    },
-    "victory": {
-      "1": "赤红: ...!$青绿: 下次我们一定会赢你！"
-    }
-  },
-  "tate_liza_double": {
-    "encounter": {
-      "1": "小枫:嘿嘿嘿……你惊讶吗？$小南: 这里有两个道馆馆主？$小枫: 我们是双胞胎！$小南: 我们无需交谈，因为……$我们可以通晓彼此的想法$小枫: 我们的组合……$小南: 你能打败吗？"
-    },
-    "victory": {
-      "1": "小枫：什么？我们的组合……$小南：被瓦解了！"
-    }
-  },
-  "liza_tate_double": {
-    "encounter": {
-      "1": "小南：呵呵呵……你惊讶吧？$小枫：这里有两个道馆馆主？$小南：我们可以通晓……$小枫：彼此的想法……$小南：全在我们脑中！$小枫：我们的组合……$小南：你能打败吗？"
-    },
-    "victory": {
-      "1": "小枫：你和你的宝可梦……$小南：简直像亲兄弟姐妹！"
-    }
-  },
-  "wallace_steven_double": {
-    "encounter": {
-      "1": "大吾：米可利, 展现冠军的实力吧！$米可利：我们将展示丰缘的实力！$大吾：要上了！"
-    },
-    "victory": {
-      "1": "大吾：打得真不错！$米可利：我们下次会赢的！"
-    }
-  },
-  "steven_wallace_double": {
-    "encounter": {
-      "1": "大吾：你有什么稀有的宝可梦吗？$米可利：大吾……我们是来对战的，\n不是来炫耀宝可梦的。$大吾：哦……知道了… 那么要上了！"
-    },
-    "victory": {
-      "1": "大吾：战斗结束了，\n来看看我的稀有宝可梦！$米可利：大吾……"
-    }
-  },
-  "alder_iris_double": {
-    "encounter": {
-      "1": "阿戴克：我们俩是合众最强的训练家！$艾莉丝：与最强来一场最激烈的战斗吧！"
-    },
-    "victory": {
-      "1": "阿戴克：哇哦！你真是超级厉害！$艾莉丝：我们下次会赢的啦！"
-    }
-  },
-  "iris_alder_double": {
-    "encounter": {
-      "1": "艾莉丝：欢迎！挑战者，\n合众地区最强的冠军大驾光临！$阿戴克：艾莉丝，你是不是有点太兴奋了…"
-    },
-    "victory": {
-      "1": "艾莉丝：这样的失败可不好受啊…$阿戴克：但是只有失败才能让我们变强！"
-    }
-  },
-  "piers_marnie_double": {
-    "encounter": {
-      "1": "玛俐：哥哥，给他们展现尖钉镇的实力！$聂梓：我们带来黑暗！"
-    },
-    "victory": {
-      "1": "玛俐：你的强光亮瞎我们的黑暗了啦……$聂梓：实在太亮了…"
-    }
-  },
-  "marnie_piers_double": {
-    "encounter": {
-      "1": "聂梓: 台下准备好了吗！$玛俐: 哥哥，我们是来对战的，\n不是来唱歌的……"
-    },
-    "victory": {
-      "1": "聂梓：这首歌献给大家！$玛俐：哥哥……"
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/locales/zh_CN/dialogue-double-battle-female.json b/src/locales/zh_CN/dialogue-double-battle.json
similarity index 100%
rename from src/locales/zh_CN/dialogue-double-battle-female.json
rename to src/locales/zh_CN/dialogue-double-battle.json
diff --git a/src/locales/zh_CN/dialogue-final-boss-male.json b/src/locales/zh_CN/dialogue-final-boss-male.json
deleted file mode 100644
index edbc302dcd4..00000000000
--- a/src/locales/zh_CN/dialogue-final-boss-male.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "encounter": "看来终于又到了那个时候。\n你知道自己为何会来到这里，不是吗？\n$你被吸引到这里，因为你以前就来过这里。\n无数次。\n$尽管，或许可以数一数。\n准确地说，这实际上是你的第{{cycleCount}}次循环。\n$每一次循环，你的思想都会恢复到之前的状态。\n即便如此，不知何故，你之前自我的残留仍然存在。\n$直到现在，你仍未成功，\n但我感觉这次你身上有一种异样的气息。\n$你是这里唯一的人，尽管感觉上还有……另一个人。\n$你最终会成为对我来的一个硬茬吗？\n我渴望了数千年的挑战？\n$我们，开始。",
-  "firstStageWin": "我明白了。我所感觉到的气息确实是真实的。\n看来我不再需要保留实力了。\n$别让我失望。",
-  "secondStageWin": "…漂亮。"
-}
\ No newline at end of file
diff --git a/src/locales/zh_CN/dialogue-final-boss-female.json b/src/locales/zh_CN/dialogue-final-boss.json
similarity index 100%
rename from src/locales/zh_CN/dialogue-final-boss-female.json
rename to src/locales/zh_CN/dialogue-final-boss.json
diff --git a/src/locales/zh_CN/dialogue-male.json b/src/locales/zh_CN/dialogue-male.json
deleted file mode 100644
index 09090f36d94..00000000000
--- a/src/locales/zh_CN/dialogue-male.json
+++ /dev/null
@@ -1,2545 +0,0 @@
-{
-  "youngster": {
-    "encounter": {
-      "1": "嘿，想来对战吗？",
-      "2": "你也是新人训练师吗？",
-      "3": "嘿，我之前没见过你。我们来对战吧！",
-      "4": "我刚输了，所以我正在寻找更多的宝可梦。$等等！你看起来很弱！\n来吧，我们对战吧！",
-      "5": "我们见过面吗？我记不太清了。$嗯，不管怎样，很高兴见到你！",
-      "6": "好的！我们上吧！",
-      "7": "好的！我来啦！我会向你展示我的实力！",
-      "8": "嚯嚯嚯...我会向你展示我的宝可梦有多厉害！",
-      "9": "不要浪费时间打招呼。你准备好了就放马过来！",
-      "10": "别掉以轻心，$否则你可能会被小朋友打到哭鼻子哦。",
-      "11": "我精心培养了我的宝可梦。不许你伤害它们！",
-      "12": "恭喜你成功了！从这以后可不轻松哦。",
-      "13": "战斗永无止境！欢迎来到没有尽头的世界！"
-    },
-    "victory": {
-      "1": "哇！你很强！",
-      "2": "我根本没机会赢，对吧？",
-      "3": "我会等长大了再来打败你！",
-      "4": "呃。我没有更多宝可梦了。",
-      "5": "不可能…不可能！我怎么可能又输了…",
-      "6": "不！我输了！",
-      "7": "哇！你真是太不可思议了！我既惊讶又钦佩！",
-      "8": "这怎么…怎么可能…$明明我和我的宝可梦是最强大的…",
-      "9": "下次我不会输了！我们找时间再对战吧！",
-      "10": "天哪！你看不出我还只是个小孩子吗！$你那样全力以赴太赖了！",
-      "11": "你的宝可梦更棒啊！和我交换吧！",
-      "12": "我之前有点上头，我说了什么来着？",
-      "13": "啊哈哈！就是这样！$对！你已经熟悉这个世界了！"
-    }
-  },
-  "lass": {
-    "encounter": {
-      "1": "我们来对战吧，好吗？",
-      "2": "你看起来像是个新人训练师。我们来战斗吧！",
-      "3": "我不认识你。来对战怎么样？",
-      "4": "让我们来进行一场有趣的宝可梦对战吧！",
-      "5": "我会向你展示如何真正使用宝可梦！",
-      "6": "一场认真的对战从始于认真的开场白！$你确定你准备好了吗？",
-      "7": "花无重开日，人无再少年。$你在对战中只有一次机会。$很快，你就只能活在回忆中了。",
-      "8": "你最好对我手下留情，好吗？$当然我会认真对战的！",
-      "9": "学校很无聊，我无事可做。$*哈欠*…我只是来对战打发时间。"
-    },
-    "victory": {
-      "1": "那真是令人印象深刻！我还有很多要学习。",
-      "2": "我没想到你会这么轻易地打败我…",
-      "3": "我希望有一天，我们能再进行一场对战。",
-      "4": "那真是场非常有趣的对战！$你让我精疲力尽了…",
-      "5": "你给我上了一课！你真是太棒了！",
-      "6": "说真的，我输了。$这，怎么说，真的好难过，但你也真的很厉害。",
-      "7": "我不需要像这样的记忆。删除记忆中…",
-      "8": "嘿！我告诉过你要对我手下留情！$不过，当你认真的时候，你真的很酷。",
-      "9": "实际上，我开始厌倦对战了…$一定有新的事情可以做…"
-    }
-  },
-  "breeder": {
-    "encounter": {
-      "1": "听话的宝可梦，自私的宝可梦…$宝可梦有独特的性格呢。",
-      "2": "尽管我出生贫寒，但我的宝可梦培养的很好。",
-      "3": "嗯，你有没有管教你的宝可梦？$过度溺爱是不好的。"
-    },
-    "victory": {
-      "1": "对每个宝可梦因材施教是很重要的。",
-      "2": "不像一无是处的我…这些宝可梦都很优秀。",
-      "3": "过度的赞美会宠坏宝可梦和人。"
-    },
-    "defeat": {
-      "1": "即使输了，也不应该对你的宝可梦发火。",
-      "2": "相当好的宝可梦，对吧？我很会养东西。",
-      "3": "无论你多么爱你的宝可梦，$你仍要在它没做好时管教它们。"
-    }
-  },
-  "breeder_female": {
-    "encounter": {
-      "1": "宝可梦永远不会背叛你。$它们会回报你对它们的爱。",
-      "2": "要我教教你训练优秀宝可梦的技巧吗？",
-      "3": "特别的宝可梦有特别的培育技巧。"
-    },
-    "victory": {
-      "1": "呃…事情不应该是这样的。$我是不是用错了能量方块？",
-      "2": "这怎么会发生在我的宝可梦身上…$你给你的宝可梦喂了什么？",
-      "3": "如果我输了，我告诉你我只是在消磨时间。$你根本不会伤害到我的自尊心。"
-    },
-    "defeat": {
-      "1": "这证明了我的宝可梦已经接受了我的爱。",
-      "2": "训出好宝可梦的真正技巧是捉到好的宝可梦。",
-      "3": "宝可梦的强弱取决于你的饲养方式。"
-    }
-  },
-  "fisherman": {
-    "encounter": {
-      "1": "啊！你让我错过了一次咬钩！$你打算怎么办？",
-      "2": "走开！你吓跑了宝可梦！",
-      "3": "让我看看你能否赢得胜利！"
-    },
-    "victory": {
-      "1": "算了吧。",
-      "2": "下一次，我将卷土重来，凯旋而归！",
-      "3": "我想这次我低估了海流。"
-    }
-  },
-  "fisherman_female": {
-    "encounter": {
-      "1": "哇！我钓到了一条大鱼！",
-      "2": "线已收好，准备提竿！",
-      "3": "准备制造波浪！"
-    },
-    "victory": {
-      "1": "我会带着更强大的鱼钩回来。",
-      "2": "下次我会赢得胜利。",
-      "3": "我只是在为回归磨利我的鱼钩！"
-    }
-  },
-  "swimmer": {
-    "encounter": {
-      "1": "是时候潜水了！",
-      "2": "让我们一起乘风破浪，赢得胜利！",
-      "3": "该一鸣惊人了！"
-    },
-    "victory": {
-      "1": "沉浸在失败中！",
-      "2": "失败的波浪！",
-      "3": "后浪死在沙滩上，我猜。"
-    }
-  },
-  "backpacker": {
-    "encounter": {
-      "1": "收拾行李，开始游戏！",
-      "2": "让我看看你是否能跟上！",
-      "3": "全副武装，挑战者！",
-      "4": "我花了20年时间试图找到自己……但我在哪里？"
-    },
-    "victory": {
-      "1": "这次绊倒了！",
-      "2": "哦，我觉得我迷路了。",
-      "3": "死路！",
-      "4": "等一下！嘿！你不知道我是谁吗？"
-    }
-  },
-  "ace_trainer": {
-    "encounter": {
-      "1": "你看起来挺自信的。",
-      "2": "你的宝可梦…… 让我看看……",
-      "3": "因为我是王牌训练师，人们认为我很强。",
-      "4": "你知道成为王牌训练师需要什么吗？"
-    },
-    "victory": {
-      "1": "是的…… 你的宝可梦很棒……",
-      "2": "什么？！我是战斗天才啊！",
-      "3": "理所应当，你才是主角！",
-      "4": "好好好！你可以成为王牌训练师！"
-    },
-    "defeat": {
-      "1": "我将把我的身体和灵魂全都奉献给宝可梦对战！",
-      "2": "一切都在我的预料之中… \n没有什么好惊讶的…",
-      "3": "我觉得我长大后有点玻璃心，$你太压力我我会跨的……",
-      "4": "我当然很强大，不会输。$而且重要的是我要优雅地赢。"
-    }
-  },
-  "parasol_lady": {
-    "encounter": {
-      "1": "是时候用优雅和从容来为战斗添彩了！"
-    },
-    "victory": {
-      "1": "我的优雅依然完好无损！"
-    }
-  },
-  "twins": {
-    "encounter": {
-      "1": "准备好咯，因为我们联手，\n麻烦双倍！",
-      "2": "两颗心，一条绳$让我们看看你能否跟上我们双胞胎的力量！",
-      "3": "希望你准备好了面对双倍的麻烦，$因为我们即将燃起来啦！"
-    },
-    "victory": {
-      "1": "虽然我们在这一轮输了，$但我们的羁绊依然坚不可摧！",
-      "2": "我们的双胞胎精神，才不会就此熄灭。",
-      "3": "我们会作为充满活力的二人组，$卷土重来，变得更强！"
-    },
-    "defeat": {
-      "1": "双胞胎的力量至高无上！",
-      "2": "两颗心，一起赢！",
-      "3": "笑容成双，共舞成双！"
-    }
-  },
-  "cyclist": {
-    "encounter": {
-      "1": "准备好在我后面吃土吧！",
-      "2": "挑战者，准备好！我要把你打的落花流水！",
-      "3": "全速前进，让我看看你能不能跟的上！"
-    },
-    "victory": {
-      "1": "轮子可能不转了，但我的决心没有停下。",
-      "2": "被超越了！",
-      "3": "通往胜利的道路还有许多曲折等待探索。"
-    }
-  },
-  "black_belt": {
-    "encounter": {
-      "1": "我赞扬你挑战我的勇气！$因为我是踢力最强的人！",
-      "2": "哦，我明白了。你想被切成碎片吗？$或者你更喜欢当个沙袋？"
-    },
-    "victory": {
-      "1": "哦。是宝可梦在战斗。$我强大的踢击一点忙都没帮上。",
-      "2": "嗯…如果我无论如何都会输，我希望能被彻底打败。"
-    }
-  },
-  "battle_girl": {
-    "encounter": {
-      "1": "你不必试图勾引我。你可以输给我。"
-    },
-    "victory": {
-      "1": "很难说再见，但我们快没时间了……"
-    }
-  },
-  "hiker": {
-    "encounter": {
-      "1": "人到中年后，我的身体和我爬过的山一样强壮！",
-      "2": "我从父母那里遗传了这副魁梧的身材…$就像一座活生生的山脉…"
-    },
-    "victory": {
-      "1": "至少在BMI方面我不能输！",
-      "2": "这还不够……永远不够。$我的坏胆固醇还不够高……"
-    }
-  },
-  "ranger": {
-    "encounter": {
-      "1": "当我身处大自然中，其他事情都不重要了。",
-      "2": "如果我生活中没有大自然，有时就会突然感到焦虑。"
-    },
-    "victory": {
-      "1": "无论我是赢是输，\n对广阔的大自然来说并不重要……",
-      "2": "与城市生活的窒息感相比，\n这种事情微不足道。"
-    },
-    "defeat": {
-      "1": "我赢了。但与浩瀚的大自然相比，\n胜利算不了什么…",
-      "2": "与我的焦虑症相比，我觉得你也不会怎样…"
-    }
-  },
-  "scientist": {
-    "encounter": {
-      "1": "我的研究将引导这个世界走向和平与欢乐。"
-    },
-    "victory": {
-      "1": "我是个天才…我不应该输给你这样的人…"
-    }
-  },
-  "school_kid": {
-    "encounter": {
-      "1": "……嘿嘿。我对计算和分析很有信心。",
-      "2": "我正在尽可能地积累经验，$因为我希望有一天能成为道馆馆主。"
-    },
-    "victory": {
-      "1": "哦…计算和分析也许和个例不太匹配呀…",
-      "2": "我想，即使是艰难困苦的经历，也有存在的意义。"
-    }
-  },
-  "artist": {
-    "encounter": {
-      "1": "我以前很受欢迎，但现在已经彻底过气了。"
-    },
-    "victory": {
-      "1": "随着时代的变迁，价值观也在变化。$我意识到这一点已经太晚了。"
-    }
-  },
-  "guitarist": {
-    "encounter": {
-      "1": "当我弹奏着走向胜利的旋律时，$准备好感受失败的节奏吧！"
-    },
-    "victory": {
-      "1": "暂时沉默了，但我不屈的旋律将继续演奏。"
-    }
-  },
-  "worker": {
-    "encounter": {
-      "1": "人们总误解我，这让我很烦。$我比大家想象的要干净得多。"
-    },
-    "victory": {
-      "1": "我真的不想晒伤皮肤，所以我想在阴凉处工作。"
-    }
-  },
-  "worker_female": {
-    "encounter": {
-      "1": "人们总是误解我，这让我很烦。 $我比大家想象的要干净得多。"
-    },
-    "victory": {
-      "1": "我真的不想晒伤皮肤，\n所以我想在阴凉处工作。"
-    },
-    "defeat": {
-      "1": "我的身体和心灵并不总同步。"
-    }
-  },
-  "worker_double": {
-    "encounter": {
-      "1": "你会知道我们怎么击败你的。我们在工地训练过！"
-    },
-    "victory": {
-      "1": "真奇怪…怎么会这样…我不应该被打败的。"
-    }
-  },
-  "hex_maniac": {
-    "encounter": {
-      "1": "我通常只听古典音乐，但如果我输了，$我想我应该试试新时代的音乐！",
-      "2": "我的每一滴眼泪都让我变得更加坚强。"
-    },
-    "victory": {
-      "1": "乐坛新时代的曙光就此出现了吗？",
-      "2": "现在我变得更强了。我随着他人怨恨而成长。"
-    },
-    "defeat": {
-      "1": "“新时代”指的是二十世纪的古典作曲家，对吧？",
-      "2": "不要纠结于悲伤或沮丧。$你可以用悲愤来激励自己。"
-    }
-  },
-  "psychic": {
-    "encounter": {
-      "1": "嘿！集中！"
-    },
-    "victory": {
-      "1": "呃呃呃！"
-    }
-  },
-  "officer": {
-    "encounter": {
-      "1": "准备好，因为正义即将得到伸张！",
-      "2": "准备好维护法律，在战场上伸张正义！"
-    },
-    "victory": {
-      "1": "正义的分量比以往还要沉重……",
-      "2": "失败的阴影，在警局中徘徊。"
-    }
-  },
-  "beauty": {
-    "encounter": {
-      "1": "我最后的战斗…我就是这么看待这场对战的…"
-    },
-    "victory": {
-      "1": "很有趣…有时间再来一场最后的战斗…"
-    }
-  },
-  "baker": {
-    "encounter": {
-      "1": "希望你准备好品尝失败的滋味！"
-    },
-    "victory": {
-      "1": "我会卷土重来的。"
-    }
-  },
-  "biker": {
-    "encounter": {
-      "1": "是时候加速，把你甩在后面了！"
-    },
-    "victory": {
-      "1": "我会为下一场比赛调整状态。"
-    }
-  },
-  "firebreather": {
-    "encounter": {
-      "1": "我的火焰会吞噬你！",
-      "2": "我的灵魂在燃烧，我要让你看看它有多滚烫！",
-      "3": "快来看看吧！"
-    },
-    "victory": {
-      "1": "我燃成灰了…",
-      "2": "哟！ 好烫！",
-      "3": "嗷！ 我的鼻尖烧焦了！"
-    }
-  },
-  "sailor": {
-    "encounter": {
-      "1": "伙计，如果你输了，你就得挨板子！",
-      "2": "来吧！这关系到我作为水手的尊严！",
-      "3": "你好啊！你晕船么？"
-    },
-    "victory": {
-      "1": "啊，被孩子打败了。",
-      "2": "你的精神让我沉沦！",
-      "3": "好像是我晕船了…"
-    }
-  },
-  "archer": {
-    "encounter": {
-      "1": "在你继续前进之前，\n让我看看你要如何和对付火箭队。",
-      "2": "我收到报告说你的实力与众不同，\n就让我来看看这是否属实吧。",
-      "3": "我是阿波罗，火箭对的干部。\n我不会对组织的敌人手软。"
-    },
-    "victory": {
-      "1": "大失误……",
-      "2": "以我现在的实力，无法胜任我的任务……",
-      "3": "原……谅我，坂木。\n我竟被一名训练师打败了。."
-    }
-  },
-  "ariana": {
-    "encounter": {
-      "1": "站住！我们可不能放过你！\n$这会损伤火箭对的名誉，明白吗？",
-      "2": "我不知道也不想知道我的所作所为正确与否…\n$我只要遵从坂木老大的指令就可以了！",
-      "3": "你的旅途到此为止了，我会把你狠狠扳倒！"
-    },
-    "victory": {
-      "1": "切，你好强，可恶。\n$如果你加入火箭队，肯定能成为干部。",
-      "2": "好……好崩溃……",
-      "3": "嗯啊啊！这不可能！我使出全力还是输了！"
-    }
-  },
-  "proton": {
-    "encounter": {
-      "1": "你想干什么？如果你要妨碍我们的事业，我可不会手下留情。",
-      "2": "你在这干什么？别人总说我是火箭队里最残忍和恐怖的人…\n$我强烈推荐你别来碍我们的事！",
-      "3": "我是兰斯，火箭队的干部。就让来扫除你对我们的阻挠。"
-    },
-    "victory": {
-      "1": "我的防线崩溃了……",
-      "2": "你虽然这次赢了，但是这只是让火箭队的怒火继续燃烧！",
-      "3": "我输了…但是我不会忘记的。"
-    }
-  },
-  "petrel": {
-    "encounter": {
-      "1": "哇哈哈哈，我们一直在等你。我？你不知道我是谁？是我，坂木啊。\n$伟大的坂木大人本人！哇哈哈哈！…啊？我听起来不像坂木吗？\n$我连看起来都不像？怎么会呢，我可认真的变装了！",
-      "2": "我是拉姆达，火箭队的干部。我不会允许你干涉我们的计划！",
-      "3": "火箭队干部拉姆达来会会这个入侵者！"
-    },
-    "victory": {
-      "1": "好好好，我会说他在哪的",
-      "2": "我……我什么也做不了……坂木，请原谅我……",
-      "3": "不，我不能慌了神，必须通知其他人…"
-    }
-  },
-  "tabitha": {
-    "encounter": {
-      "1": "呵呵呵！原来你都一路来到这里了！但你来晚了！",
-      "2": "呵呵呵……你终于来了？我们小瞧你了，没不过事！ \n$我比你见过的所有队员都要厉害，我可不会拖延时间。\n$我会把你碾碎！",
-      "3": "我要让你尝尝痛苦的滋味！认命吧！"
-    },
-    "victory": {
-      "1": "呵呵呵！虽然你打败了我，但你根本没机会打败老大！\n$如果你现在输了，你就不用面对那样严厉的鞭笞了！",
-      "2": "呵呵呵……所以，我也输了……",
-      "3": "啊哈！怎么会这样？像我这样的干部\n竟然输给了一个随处可见的训练师……"
-    }
-  },
-  "courtney": {
-    "encounter": {
-      "1": "那个东西……你所拥有的那个东西……\n那就是……那就是我们熔岩队所寻找的东西……",
-      "2": "……那么……删除记忆……",
-      "3": "……哈……分析中……啊哈♪"
-    },
-    "victory": {
-      "1": "……改变……世界。",
-      "2": "如预期。出乎意料。目标锁定…锁定你……完成。\n$开始……实验。材料是你…永远…啊哈……♪",
-      "3": "……又来了？出乎意料……我就知道。你……很有趣！……啊哈哈！♪"
-    }
-  },
-  "shelly": {
-    "encounter": {
-      "1": "啊哈哈哈哈！你要插手海洋队的事？\n$你要么是绝对无畏，要么就是无知，或者两者兼有！\n$你太可爱了，太恶心了！我要把你打倒！",
-      "2": "怎么回事？这个小鬼头是谁？",
-      "3": "冷静点，耐心点。我很快就会把你击溃。"
-    },
-    "victory": {
-      "1": "啊哈哈哈哈！我们意外地被人干扰了！我们别无选择。\n$不得不撤退了，但这会不是你最后一次面对海洋队！\n$我们还有其他计划！别忘了！",
-      "2": "啊？！我是不是对你太温柔了？！",
-      "3": "呃…难道在对战中你也一刻不停地在变强吗？\n$你真是个前途光明的小鬼……\n我和我的宝可梦已经没有任何力量去战斗了……\n$继续吧……准备去被水梧桐摧毁吧。"
-    }
-  },
-  "matt": {
-    "encounter": {
-      "1": "嚯！哈哈哈！怎么，你是不是脑子不正常了？\n看看你，像个幕下力士！",
-      "2": "“哦吼！你！你真是个有趣的孩子！",
-      "3": "你在这里干什么？你跟踪我们了吗？"
-    },
-    "victory": {
-      "1": "好吧，在老大有时间对付你之前，我来成为你的对手！",
-      "2": "我能感觉到！我感觉到了，没错！你身上散发出的力量！\n$更多！还想要更多！但看起来我们没时间了……",
-      "3": "真有趣！我就知道你会让我尽兴的！\n我期待有一天再次面对你！"
-    }
-  },
-  "mars": {
-    "encounter": {
-      "1": "我是伙星，银河队的顶级干部之一。",
-      "2": "银河队对未来的愿景坚定不移。\n反对者将被无情地粉碎！",
-      "3": "“紧张吗？你是该感到紧张了！"
-    },
-    "victory": {
-      "1": "这不可能！我怎么会输？！",
-      "2": "你很有本事，我承认。",
-      "3": "输了……犯了一个代价高昂的大错。"
-    }
-  },
-  "jupiter": {
-    "encounter": {
-      "1": "岁星，银河队干部，为您效劳。",
-      "2": "抵抗是徒劳的。银河队必将获胜！",
-      "3": "你在发抖啊……已经害怕了吗？"
-    },
-    "victory": {
-      "1": "不会吧……我输了？！",
-      "2": "厉害，你胆子真大！",
-      "3": "输成这样……真丢人。"
-    }
-  },
-  "saturn": {
-    "encounter": {
-      "1": "我是镇星，银河队的干部。",
-      "2": "我们的使命是绝对的，任何阻碍都将被消灭！",
-      "3": "我从你的眼中看到的是恐惧吗？"
-    },
-    "victory": {
-      "1": "不可能……被你打败了？！",
-      "2": "你证明了自己是一个值得尊敬的对手。",
-      "3": "失败的苦涩……难以接受……。"
-    }
-  },
-  "zinzolin": {
-    "encounter": {
-      "1": "你可能会对等离子队构成威胁，所以我们现在就消灭你！",
-      "2": "哦，天哪……我没想到要在这么冷的天气里战斗！",
-      "3": "能走到今天这一步，你真是个了不起的训练师。\n但一切到此结束。"
-    },
-    "victory": {
-      "1": "魁奇思大人……我让你失望了……",
-      "2": "好冷，我不仅发抖，还要遭罪。",
-      "3": "哼。你比我想象的要聪明，但还不够。"
-    }
-  },
-  "rood": {
-    "encounter": {
-      "1": "你对等离子队是个威胁。我们现在不能让你离开这里！",
-      "2": "哦，这寒风……我从没想过我必须在这里战斗！",
-      "3": "能走到今天这一步，你是一位了不起的训练师，但这就是你的结局了。"
-    },
-    "victory": {
-      "1": "魁奇思大人……我的任务失败了",
-      "2": "寒风刺骨。我瑟瑟发抖。我痛苦不堪。",
-      "3": "嗯，你是很有才。但是要打败等离子队还不够……！"
-    }
-  },
-  "xerosic": {
-    "encounter": {
-      "1": "啊哈哈！我很乐意。\n来吧，小训练师！让我们看看你有什么本事！",
-      "2": "嗯……你比看上去更强大。\n我想知道你体内有多少能量。",
-      "3": "我一直在等你！我需要对你做一点研究！\n来吧，我们开始吧！"
-    },
-    "victory": {
-      "1": "啊，你好强大啊……嗯……确实非常强大。",
-      "2": "叮叮叮！你成功了！\n战利品归胜利者！",
-      "3": "太棒了！太神奇了！\n你的技巧和勇气都无与伦比！"
-    }
-  },
-  "bryony": {
-    "encounter": {
-      "1": "我是芭菈，能与你一战是我的荣幸。\n让我看看你的实力。",
-      "2": "令人印象深刻……你比你看上去的还要强大。\n让我们看看你真正的实力。",
-      "3": "我预料到了你的到来。\n是时候进行一个小实验了，我们开始吧？"
-    },
-    "victory": {
-      "1": "你很强大。哦，嗯嗯！确实非常强大",
-      "2": "叮叮叮！你做得很好。胜利属于你。",
-      "3": "太棒了！了不起！你的技巧和勇气值得称赞。"
-    }
-  },
-  "rocket_grunt": {
-    "encounter": {
-      "1": "你要有麻烦了！",
-      "2": "我们要干大事了！\n闪一边去，小子！",
-      "3": "把你的宝可梦交过来，\n不然就尝尝火箭队的厉害！",
-      "4": "你准备好感受火箭队真正的恐怖了吗！",
-      "5": "喂，小子！俺可是火箭队滴！"
-    },
-    "victory": {
-      "1": "好讨厌的感觉啊！",
-      "2": "哎呀！不小心丢掉电梯钥匙啦！",
-      "3": "我搞砸了。",
-      "4": "我的伙计们不会放过你……！",
-      "5": "你说啥？俺们火箭队要玩完了？"
-    }
-  },
-  "magma_grunt": {
-    "encounter": {
-      "1": "如果你挡在熔岩队路上，那就别指望我们手下留情！",
-      "2": "你最好别妨碍我们的计划！\n我们会让世界变得更美好！",
-      "3": "少碍事！熔岩队没时间理你这样的小孩！",
-      "4": "你有棉花糖没？我来给你好好烤烤！",
-      "5": "我们会利用火山的力量！\n它马上要…爆发了！懂吗？嘿嘿嘿……"
-    },
-    "victory": {
-      "1": "哈？我输了？！",
-      "2": "我怎么会输！我为了训练饭都不吃了！",
-      "3": "不会吧，不就是一个小孩！",
-      "4": "呃啊…我得赶快逃回基地…",
-      "5": "你打败我了…你觉得老大会扣我工资吗？"
-    }
-  },
-  "aqua_grunt": {
-    "encounter": {
-      "1": "即使是小孩，如果要和海洋队作对，也别指望我们手下留情！",
-      "2": "嚯…你好大的胆子，敢惹我们海洋队！",
-      "3": "不仅是我的水系宝可梦，整片大海即将淹没你！",
-      "4": "我们海洋队，是为了大义！",
-      "5": "准备好被我的…呃…我宝可梦的海流冲走吧！"
-    },
-    "victory": {
-      "1": "你在开玩笑吧？",
-      "2": "害，没想到这种小屁孩也要管我的闲事！",
-      "3": "我输了？看来我得自己游回基地了。",
-      "4": "不是吧，怎么会，老大要生气了……",
-      "5": "你打败了我…老大不会要让我上跳板吧……"
-    }
-  },
-  "galactic_grunt": {
-    "encounter": {
-      "1": "别惹银河队！",
-      "2": "见识下我们的科技，和我们所设想的未来！",
-      "3": "以银河队之名，我会扫清一切挡路的人！",
-      "4": "准备输的一败涂地吧！",
-      "5": "希望你做好被宇宙力量碾压的准备。"
-    },
-    "victory": {
-      "1": "停机了…",
-      "2": "从长远来看，这次的挫折不用在意。",
-      "3": "小失败不会影响我们的宏图伟业！",
-      "4": "咋回事！？",
-      "5": "个人记录：提升对战水平，优先级，高……"
-    }
-  },
-  "plasma_grunt": {
-    "encounter": {
-      "1": "异端不共戴天！",
-      "2": "要是我赢了你！就把你的宝可梦放生！",
-      "3": "要是敢和等离子队作对，我来好好关照你！",
-      "4": "等离子队会从你们这种自私的人手里解放宝可梦！",
-      "5": "我们的发型帅的一批，而我们的战斗水平呢，\n马上让你见识一下。"
-    },
-    "victory": {
-      "1": "等离子子子子子子！",
-      "2": "我怎么会输……",
-      "3": "…没用的家伙！我得去偷个厉害点的宝可梦！",
-      "4": "伟大的事业总会被人阻挠…",
-      "5": "烂完了…烂烂烂烂烂！等离子队烂了！\n说短点就是，等烂子队！"
-    }
-  },
-  "flare_grunt": {
-    "encounter": {
-      "1": "你的宝可梦无法与闪焰队的优雅相提并论",
-      "2": "带个墨镜吧，别被我闪瞎狗眼了！",
-      "3": "闪焰队将净化这个不完美的世界！",
-      "4": "准备面对闪焰队的美！",
-      "5": "时尚对我们来说最重要！"
-    },
-    "victory": {
-      "1": "我的未来看起来并不明亮…",
-      "2": "这战斗比我想的更难搞，我得重头训练了。",
-      "3": "啊啊？我输了？！",
-      "4": "就算是在失败当中，闪焰队依旧优雅动人！",
-      "5": "你虽然打败了我，但是我输的也这么潇洒！"
-    }
-  },
-  "rocket_boss_giovanni_1": {
-    "encounter": {
-      "1": "我不得不说，能来到这里，你的确很不简单！"
-    },
-    "victory": {
-      "1": "什么！这不可能！"
-    },
-    "defeat": {
-      "1": "记住我的话。无法衡量自己的力量，说明你还是个孩子。"
-    }
-  },
-  "rocket_boss_giovanni_2": {
-    "encounter": {
-      "1": "我的老伙计还需要我…你要挡我的路吗？"
-    },
-    "victory": {
-      "1": "这怎么可能…？\n火箭队的梦想…就这么成为泡影了…"
-    },
-    "defeat": {
-      "1": "火箭队会重生，而我会统治世界！"
-    }
-  },
-  "magma_boss_maxie_1": {
-    "encounter": {
-      "1": "我会亲手埋葬你，希望你能喜欢！"
-    },
-    "victory": {
-      "1": "啊！你…很厉害…我落后了…一点…"
-    },
-    "defeat": {
-      "1": "熔岩队必胜！"
-    }
-  },
-  "magma_boss_maxie_2": {
-    "encounter": {
-      "1": "你是我实现目标最后的障碍。\n准备好迎接我最强的一击吧！哈哈哈哈！"
-    },
-    "victory": {
-      "1": "这…这不…呃"
-    },
-    "defeat": {
-      "1": "现在…我要把这个星球变成人类的理想国度！"
-    }
-  },
-  "aqua_boss_archie_1": {
-    "encounter": {
-      "1": "我是海洋队的老大，所以，你的路大概走到头了。"
-    },
-    "victory": {
-      "1": "下次再见吧。我会记住你的脸的。"
-    },
-    "defeat": {
-      "1": "天才！我的队伍不会再退缩了！"
-    }
-  },
-  "aqua_boss_archie_2": {
-    "encounter": {
-      "1": "我等这一天很久了。\n这就是我的真实力量！"
-    },
-    "victory": {
-      "1": "果然很强……啊！"
-    },
-    "defeat": {
-      "1": "我会让这世界上的一切回归到最初的纯净状态！！"
-    }
-  },
-  "galactic_boss_cyrus_1": {
-    "encounter": {
-      "1": "但在这之前，让我见识见识你那敢向银河队叫板的实力吧。"
-    },
-    "victory": {
-      "1": "有意思，简直太有意思了。"
-    },
-    "defeat": {
-      "1": "我要创造我的新世界…"
-    }
-  },
-  "galactic_boss_cyrus_2": {
-    "encounter": {
-      "1": "是啊，我和你还真是有缘呢。\n不过，这段孽缘…就让我在此斩断吧！"
-    },
-    "victory": {
-      "1": "怎么可能！怎么可能！怎么可能！"
-    },
-    "defeat": {
-      "1": "永别了。"
-    }
-  },
-  "plasma_boss_ghetsis_1": {
-    "encounter": {
-      "1": "无论是谁做了什么！都无法阻止我！"
-    },
-    "victory": {
-      "1": "怎么回事？我可是建立了等离子队的完美的人啊！\n是要改变世界的完美的统治者！"
-    },
-    "defeat": {
-      "1": "我是坐拥世界的完美统治者！哇哈哈哈！"
-    }
-  },
-  "plasma_boss_ghetsis_2": {
-    "encounter": {
-      "1": "来吧！让我看看你彻底绝望时的那张脸！"
-    },
-    "victory": {
-      "1": "不！我的伟大目标！我要完全支配世界啊！"
-    },
-    "defeat": {
-      "1": "酋雷姆！融合吧！"
-    }
-  },
-  "flare_boss_lysandre_1": {
-    "encounter": {
-      "1": "你想要阻止我？在对战中展示给我看吧！"
-    },
-    "victory": {
-      "1": "看来你的确是想要阻止我。但是，先等一下。"
-    },
-    "defeat": {
-      "1": "宝可梦…不该存在。"
-    }
-  },
-  "flare_boss_lysandre_2": {
-    "encounter": {
-      "1": "你我的未来…究竟哪个才正确，\n就让我们来问问各自的宝可梦吧！"
-    },
-    "victory": {
-      "1": "哇啊啊啊！"
-    },
-    "defeat": {
-      "1": "没有远见的蠢货会继续玷污这个美丽的世界。"
-    }
-  },
-  "brock": {
-    "encounter": {
-      "1": "我对岩石属性宝可梦的专精会击败你！来吧！",
-      "2": "我磐石般的意志将压倒你！",
-      "3": "让我展示给你看看，我宝可梦真正的力量！"
-    },
-    "victory": {
-      "1": "你宝可梦的力量战胜了我坚如磐石的防御！",
-      "2": "世界很大！很高兴有机会和你战斗。",
-      "3": "也许我应该回去追寻我成为宝可梦饲养员的梦想……"
-    },
-    "defeat": {
-      "1": "最好的进攻就是坚固的防守！$那是我做事的方式！",
-      "2": "下次来和我一起研究岩石属性，$更好地了解如何与它们对战！",
-      "3": "哈哈，我在各地的旅行有所回报了！"
-    }
-  },
-  "misty": {
-    "encounter": {
-      "1": "我的战策就是使用水属性宝可梦全面进攻！",
-      "2": "嗨，我会让你见识我的水属性宝可梦的力量！",
-      "3": "我的梦想是踏上旅程，与强大的训练师战斗……$你能满足我吗？"
-    },
-    "victory": {
-      "1": "你真的很强……我承认，你有技术的……",
-      "2": "哼……你知道你只是运气好，对吧？！",
-      "3": "哇，你太过分了！不敢相信你打败我了！"
-    },
-    "defeat": {
-      "1": "强大的小霞对你来说，太过分了吗？",
-      "2": "我希望你看到了我宝可梦优雅的游泳技巧！",
-      "3": "你的宝可梦无法匹敌我的心腹和骄傲！"
-    }
-  },
-  "lt_surge": {
-    "encounter": {
-      "1": "我的电属性宝可梦在战争中救了我！$我来给你展示一下！",
-      "2": "立正！我要电到你投降！",
-      "3": "我会像对待敌军一样，狠狠电你！"
-    },
-    "victory": {
-      "1": "哇！你的队伍有真家伙，小子！",
-      "2": "啊啊，你很强！连我的电击技巧都输给了你。",
-      "3": "这失败真是把我给电麻了！"
-    },
-    "defeat": {
-      "1": "哦耶！我的电属性宝可梦是世界第一！",
-      "2": "哈哈哈！真是一场电动人心的战斗，小子！",
-      "3": "宝可梦对战等于战争，$我向你展示了军队中的格斗技巧！"
-    }
-  },
-  "erika": {
-    "encounter": {
-      "1": "啊，这里天气真好…$哦，对战？那好吧。",
-      "2": "我在宝可梦对战上的造诣，$可以与我的插花技巧相媲美。",
-      "3": "哦，希望我宝可梦的宜人香气\n不会再让我睡着…",
-      "4": "看看花园里的花朵，如此令人心旷神怡。"
-    },
-    "victory": {
-      "1": "哦！我认输啦~",
-      "2": "这场比赛非常愉快。",
-      "3": "啊，看来我输了…",
-      "4": "哦，我的天哪。"
-    },
-    "defeat": {
-      "1": "我怕我会打瞌睡…",
-      "2": "哦，我天。看来我的草属性宝可梦击败了你。",
-      "3": "那场战斗是如此令人心旷神怡。",
-      "4": "哦…这就完啦？"
-    }
-  },
-  "janine": {
-    "encounter": {
-      "1": "我正在掌握毒属性攻击的艺术。$今天我来和你过过招！",
-      "2": "父亲相信我能独当一面。$我来证明他说的对！",
-      "3": "我的忍术，仅次于我的父亲！$你能跟的上吗？"
-    },
-    "victory": {
-      "1": "就算现在，我仍然需要继续训练…我明白了。",
-      "2": "你的战斗技巧，超过了我。",
-      "3": "我要好好努力提高我的技术。"
-    },
-    "defeat": {
-      "1": "呵呵…毒液耗尽了你所有的力量。",
-      "2": "哈！你根本无法抵挡我卓越的忍技！",
-      "3": "我没有辜负父亲对我的信任。"
-    }
-  },
-  "sabrina": {
-    "encounter": {
-      "1": "我的超能力预见了你的到来！",
-      "2": "我不喜欢战斗，但如果你想，$我会展示我的实力！",
-      "3": "我能感觉到你的雄心壮志。$我倒要看看你是不是虚有其表。"
-    },
-    "victory": {
-      "1": "你的力量……远远超出了我的预知……",
-      "2": "我没有准确预测到你的实力。",
-      "3": "即使我强大的超能力也无法感知到你这样强大的人。"
-    },
-    "defeat": {
-      "1": "这场胜利……和我看到的未来一样啊！",
-      "2": "也许我预感到有强大实力的人，是另一个……",
-      "3": "在你奋不顾身投入战斗之前，\n磨练你的能力。$如果你这样做，你才未来可期……"
-    }
-  },
-  "blaine": {
-    "encounter": {
-      "1": "哈！希望你带了烧伤治疗药！",
-      "2": "我火热的宝可梦将所有挑战者都焚烧殆尽！",
-      "3": "准备好玩火吧！"
-    },
-    "victory": {
-      "1": "我已经焚烧殆尽了！甚至连灰烬都没有留下！",
-      "2": "我没有把火焰煽得足够高吗？",
-      "3": "我燃尽了……但这让我进步的动力燃烧得更旺了！"
-    },
-    "defeat": {
-      "1": "我的熊熊烈火无法被扑灭！",
-      "2": "我的宝可梦因这次胜利而变得更加强大！",
-      "3": "哈！我的激情燃得比你的更热烈！"
-    }
-  },
-  "giovanni": {
-    "encounter": {
-      "1": "我，火箭队的领袖，\n会让你的世界感受到痛苦！",
-      "2": "我在这里的训练在我再次面对老朋友之前至关重要。",
-      "3": "我认为你还没有准备好迎接你即将经历的失败！"
-    },
-    "victory": {
-      "1": "什么！我输了？！ 我没什么可和你说的！",
-      "2": "哼……你永远无法理解我希望实现的目标。",
-      "3": "这次失败只是暂时的。$我将找准时机，让火箭队浴火重生。"
-    },
-    "defeat": {
-      "1": "不知自己几斤几两，\n说明你仍然只是一个孩子。",
-      "2": "不要再试图干涉我。",
-      "3": "我希望你明白挑战我是多么愚蠢。"
-    }
-  },
-  "roxanne": {
-    "encounter": {
-      "1": "您能否展示一下您是如何战斗的么？",
-      "2": "你可以和更多训练师战斗来学到很多东西。",
-      "3": "哦，被你抓到我正在用功了~$你想战斗吗？"
-    },
-    "victory": {
-      "1": "哦，看来我输了。$我明白了。",
-      "2": "看来我在战斗方面还有更多东西要学。",
-      "3": "我会把今天在这里学到的东西铭记于心。"
-    },
-    "defeat": {
-      "1": "从我们的对战中，我学到了很多。$希望你也是。",
-      "2": "我期待再次与你战斗。$希望你能运用在此学到的东西。",
-      "3": "我凭借我所学到的一切赢得了胜利。"
-    }
-  },
-  "brawly": {
-    "encounter": {
-      "1": "哦，伙计，挑战者！$让我看看你的能耐！",
-      "2": "你看起来很厉害嘛。$来对战吧！",
-      "3": "是时候掀起风暴了！$我们上吧！"
-    },
-    "victory": {
-      "1": "哦哇，你把我冲走了！",
-      "2": "你驾驭了我的海浪，把我打败了！",
-      "3": "我觉得我就像是在武斗洞窟里迷路了！"
-    },
-    "defeat": {
-      "1": "哈哈，我驾驭了大浪！$有时间再挑战我吧。",
-      "2": "再和我一起冲浪吧！",
-      "3": "就像潮水的涨落，\n我希望你也能再来挑战我。"
-    }
-  },
-  "wattson": {
-    "encounter": {
-      "1": "是时候被电击了！$哈哈哈！",
-      "2": "我要让火星子飞蹦！$哈哈哈！",
-      "3": "我希望你带了麻痹药！$哇哈哈哈！"
-    },
-    "victory": {
-      "1": "看来我的电量用完了！$哇哈哈哈！",
-      "2": "你完全接地了是吧！$哇哈哈哈！",
-      "3": "谢谢你给我电了一下！$哇哈哈哈！"
-    },
-    "defeat": {
-      "1": "电充充满，有时间再挑战我吧！$哇哈哈哈！",
-      "2": "我希望你觉得我们的战斗激情似电！$哇哈哈哈！",
-      "3": "你没想到我赢了吧？$哇哈哈哈！"
-    }
-  },
-  "flannery": {
-    "encounter": {
-      "1": "很高兴见到你！等等，不对……$我要粉碎你！",
-      "2": "我才当道馆主没多久，\n但我会让你灰飞烟灭！",
-      "3": "是时候展示爷爷教给我的招式了！来对战吧！"
-    },
-    "victory": {
-      "1": "你让我想起了我的爷爷……$难怪我输了。",
-      "2": "我是不是太努力了？$我应该放松，不能太上头了。",
-      "3": "失败才不会呛到我。$是时候重新点燃训练了！"
-    },
-    "defeat": {
-      "1": "我希望我让祖父感到骄傲了……$有时间我们再战斗吧。",
-      "2": "我……我简直不敢相信我赢了！$按照自己的方式做事奏效了！",
-      "3": "早点用炽热的招式再来交手吧！"
-    }
-  },
-  "norman": {
-    "encounter": {
-      "1": "我没想到你能一路来到这里。$我们来对战吧。",
-      "2": "作为道馆主，我会尽一切努力赢得胜利。$我们开始吧！",
-      "3": "你最好全力以赴。$对战的时候到了！"
-    },
-    "victory": {
-      "1": "我输给了你……？$但规则就是规则。",
-      "2": "难道我不该从城都搬家吗……？",
-      "3": "我不敢相信。$这是一场好对战。"
-    },
-    "defeat": {
-      "1": "我们都尽力了。$希望我们不久之后能再对战。",
-      "2": "你应该尝试挑战我的孩子。$可能会有一些收获！",
-      "3": "谢谢你精彩的战斗。$下次好运。"
-    }
-  },
-  "winona": {
-    "encounter": {
-      "1": "我一直在天空中翱翔寻找猎物…$而你就是我的目标！",
-      "2": "不管战况如何，我都会和我的飞行宝可梦$以优雅的姿态获胜。来战斗吧！",
-      "3": "我希望你不怕高。$我们一起升上高空吧！"
-    },
-    "victory": {
-      "1": "你是我见过的第一位比我更有风度的训练师。$打的非常出色。",
-      "2": "哦，我的飞行系宝可梦都已经坠落了！$好吧。",
-      "3": "尽管我倒下了，我的宝可梦将继续翱翔！"
-    },
-    "defeat": {
-      "1": "我与我的飞行系宝可梦，\n将永远优雅地起舞！",
-      "2": "我希望你喜欢我们的演出。$我们优雅的舞蹈已经落幕。",
-      "3": "你愿意再来观看我们优雅的编舞吗？"
-    }
-  },
-  "tate": {
-    "encounter": {
-      "1": "嘿嘿嘿…$看到我没和妹妹在一起，很惊讶么？",
-      "2": "我可以读懂你在想什么…$你想要战斗！",
-      "3": "你如何击败一个…$读懂你一举一动的人？"
-    },
-    "victory": {
-      "1": "赢不了啊…$我想小南了…",
-      "2": "你和宝可梦之间的联系比我们更强。",
-      "3": "如果我和小南联手，我们会赢的。$我们可以了解彼此的想法！"
-    },
-    "defeat": {
-      "1": "我和我的宝可梦无与伦比！",
-      "2": "如果你连我都打不过，\n你肯定也打不过小南。",
-      "3": "这多亏了我和小南的严格训练。$我可以与宝可梦一心同体。"
-    }
-  },
-  "liza": {
-    "encounter": {
-      "1": "呵呵呵…$看到我没和哥哥一起，很惊讶吗？",
-      "2": "我可以读懂你渴望什么…$你想战斗，不是吗？",
-      "3": "你如何击败一个…$与宝可梦们一心同体的人？"
-    },
-    "victory": {
-      "1": "赢不了啊…$我想小枫了…",
-      "2": "你和宝可梦之间的联系…$比我强。",
-      "3": "如果我和小枫在一起，我们会赢的。$我们甚至可以接上彼此的话！"
-    },
-    "defeat": {
-      "1": "我和我的宝可梦势不可挡。",
-      "2": "如果你连我都打不过，\n你肯定也打不过小枫。",
-      "3": "这多亏了我和小枫的严格训练。$我可以与我的宝可梦一心同体。"
-    }
-  },
-  "juan": {
-    "encounter": {
-      "1": "别害羞啊。$我们来战斗吧！",
-      "2": "啊哈哈哈，敬请期待\n我和水属性宝可梦的盛大演出！",
-      "3": "我就是正在逼近的风暴！$你能经受住考验吗？",
-      "4": "请你见证我们的表演。$由我和宝可梦共同创造的宏伟水之幻境！"
-    },
-    "victory": {
-      "1": "你可能是一个能挑战米可利的天才！",
-      "2": "我专注于优雅，而你刻苦锻炼。$你能击败我是很正常的。",
-      "3": "啊哈哈哈！$好吧，这次你赢了。",
-      "4": "从你身上，我感受到了技巧的光辉，\n它将战胜一切。"
-    },
-    "defeat": {
-      "1": "宝可梦和我创造的水之幻境，让我取得了胜利。",
-      "2": "啊哈哈哈，我赢了，你输了。",
-      "3": "要我把我的服装借给你吗？\n可能能帮到你对战啊！$啊哈哈哈，我开玩笑的！",
-      "4": "我是赢家！也就是说，你输了。"
-    }
-  },
-  "crasher_wake": {
-    "encounter": {
-      "1": "极限! 极限! 看好了!$极限假面…就此…登场!",
-      "2": "极限! 极限! 极限假面!",
-      "3": "我是滔滔巨浪，将你冲走！"
-    },
-    "victory": {
-      "1": "我真是笑得合不拢嘴啊！$哈哈哈！那真是太有趣了！",
-      "2": "呼哇！结束收尾了！$我该怎么说呢……$我还想再对战！我还想再继续战斗！",
-      "3": "啊啊啊啊啊!?"
-    },
-    "defeat": {
-      "1": "耶！就是这样！",
-      "2": "我赢了，但我还想要更多！\n我还想再更多地战斗！",
-      "3": "再见！"
-    }
-  },
-  "falkner": {
-    "encounter": {
-      "1": "我将向你展示华丽的飞行宝可梦真正的力量！",
-      "2": "风啊，伴我同行！",
-      "3": "爸爸！我希望你能在空中注视着我的战斗！"
-    },
-    "victory": {
-      "1": "明白了……我会礼貌地退场。",
-      "2": "输了就是输了。你确实很强大。",
-      "3": "…行吧! 嗯, 我输了。"
-    },
-    "defeat": {
-      "1": "爸爸！我用你珍爱的飞行宝可梦赢了……",
-      "2": "飞行系宝可梦才是最强的！",
-      "3": "感觉我正在追赶上我的父亲！"
-    }
-  },
-  "nessa": {
-    "encounter": {
-      "1": "无论你的小脑瓜子在搞什么阴谋诡计，$我和我的搭档都会确保它石沉大海。",
-      "2": "我来这里可不是为了闲聊，\n而是为了赢！",
-      "3": "这是我的宝可梦给你的一点小礼物……\n我希望你能接受！"
-    },
-    "victory": {
-      "1": "你和你的宝可梦太过分了……",
-      "2": "怎么……？这怎么可能？！",
-      "3": "我完全被冲走了！"
-    },
-    "defeat": {
-      "1": "汹涌的海浪再次袭来！",
-      "2": "是时候乘风破浪，取得胜利了！",
-      "3": "诶嘿嘿！"
-    }
-  },
-  "melony": {
-    "encounter": {
-      "1": "我不会手下留情！",
-      "2": "好吧，我想我们应该开始了。",
-      "3": "我会把你冻得结结实实的！"
-    },
-    "victory": {
-      "1": "你……你可厉害了，是不是？",
-      "2": "如果你找到玛瓜，一定要好好教训他，好吗？",
-      "3": "你的破冰方式有点过于直接了呢……"
-    },
-    "defeat": {
-      "1": "现在你知道战斗有多残酷了吧？",
-      "2": "嘿！看来我又赢了！",
-      "3": "你是在保留实力吗？"
-    }
-  },
-  "marlon": {
-    "encounter": {
-      "1": "你看起来很强！来吧！让我们开始吧！",
-      "2": "我的强大像大海一样无边无际。$你会被我冲走，绝对的。",
-      "3": "哦豁，由我来面对你！这可不得了咯！"
-    },
-    "victory": {
-      "1": "你太厉害了！\n你培养了一些非常强大的宝可梦啊，$你已经掌握了训练师的精髓！",
-      "2": "你不仅仅是看起来，\n你是真的强，真的！$呃，我也被冲走了！",
-      "3": "你像凶猛的波浪一样强壮！"
-    },
-    "defeat": {
-      "1": "你很强，但这还不足以动摇大海，懂？",
-      "2": "嘻！看来我又赢了！",
-      "3": "甜蜜的胜利！"
-    }
-  },
-  "shauntal": {
-    "encounter": {
-      "1": "打扰了。你是挑战者，对吗？$我是四天王的幽灵系宝可梦使用者，$婉龙，我将是你的对手。",
-      "2": "我非常喜欢描写来到这里的训练师，\n以及他们训练的宝可梦。$我可以用你和你的宝可梦作为主题吗？",
-      "3": "每个与宝可梦相处的人都有故事要讲。$接下来要讲的故事是怎样的呢？"
-    },
-    "victory": {
-      "1": "哇。我惊呆了！",
-      "2": "对…对不起！我必须先向我的宝可梦道歉……$都是因为我让你们有了不好的经历，真的很抱歉！",
-      "3": "你要知道，我仍然是四天王之一！"
-    },
-    "defeat": {
-      "1": "额呵呵。",
-      "2": "给了我下一部小说的绝佳素材！",
-      "3": "就这样，又一篇故事来到尾声……"
-    }
-  },
-  "marshal": {
-    "encounter": {
-      "1": "我的师傅，阿戴克，\n看到了你作为训练师的潜力，$对你很有兴趣。$我要来考验你——挖掘你力量的极限。\n丹田发力！",
-      "2": "胜利，决定性的胜利，\n正是我所求！挑战者，我来了！",
-      "3": "在我的心中，我寻求着成为战士的力量，\n克服自身的所有弱点！$以我的信念，取胜！"
-    },
-    "victory": {
-      "1": "呼！干得好！",
-      "2": "不要停止战斗，追求更高的目标！",
-      "3": "你和你宝可梦展现的力量\n给我留下了深刻的印象……"
-    },
-    "defeat": {
-      "1": "嗯…",
-      "2": "这真是场好战斗。",
-      "3": "哈啊！哈啊！嗨呀啊！"
-    }
-  },
-  "cheren": {
-    "encounter": {
-      "1": "你让我想起了一位老朋友。$这让我对这场宝可梦战斗感到兴奋！",
-      "2": "不考虑清楚这一点，\n宝可梦对战就没有了意义。$这就是失去了和宝可梦一同战斗的意义。",
-      "3": "我的名字是黑连！我是道馆馆主，\n也是老师！$很高兴认识你。"
-    },
-    "victory": {
-      "1": "谢谢……我又能发现自己的不足了。",
-      "2": "谢谢…接近理想的道路…我好像隐约看到了。",
-      "3": "嗯……这值得思考。"
-    },
-    "defeat": {
-      "1": "作为道馆馆主，我要成为你要跨越的壁垒！",
-      "2": "好吧！",
-      "3": "正因为有宝可梦，我们才能走到这里。$为什么宝可梦会帮助我们，\n这个恐怕不仅是宝可梦与训练家…$而是生命与生命之间的问题。"
-    }
-  },
-  "chili": {
-    "encounter": {
-      "1": "咿呀！是时候玩火了！！我是三兄弟中最强的！",
-      "2": "嗒哒！如火似焰的伯特——就是我\n——你接下来的对手！",
-      "3": "我将向你展示，\n我和我炽热的火系宝可梦的能耐！"
-    },
-    "victory": {
-      "1": "被你干掉了。我……燃尽了……",
-      "2": "哇吼！你燃起来了！",
-      "3": "啊！被你干碎了！"
-    },
-    "defeat": {
-      "1": "我燃起来啦！和我玩儿，你就会被烫伤！",
-      "2": "你要是玩儿火，就会被烫伤！",
-      "3": "我说，拜托，\n你的对手是我，没机会赢的！"
-    }
-  },
-  "cilan": {
-    "encounter": {
-      "1": "无关个人情感…也不会有艰难的感受…$我和我的草属性宝可梦会…$呃…不管什么样的对手我们都会应战的。",
-      "2": "所以，呃，如果你愿意的话，我会，\n呃，尽我所能做好，呃，你知道的，你的对手。",
-      "3": "好吧……所以，我是天桐，\n我喜欢草属性宝可梦。"
-    },
-    "victory": {
-      "1": "呃……已经结束了吗？",
-      "2": "…真是太意外了。你真…强。$看起来就算是伯特或寇恩都赢不了你…",
-      "3": "…嗯。看起来我来的…不是时候？"
-    },
-    "defeat": {
-      "1": "哈？我赢了？",
-      "2": "我想…$我想我赢了，因为我一直在和我的兄弟伯特和寇恩竞争，\n我们都变得更强了。",
-      "3": "…这…这是一次非常吓人的经历呢…"
-    }
-  },
-  "roark": {
-    "encounter": {
-      "1": "我需要看看你作为训练师的潜力。$还有，我要看看与你并肩作战的宝可梦的坚韧！",
-      "2": "来吧！这些是我的岩石系宝可梦，我的骄傲！",
-      "3": "岩石属性宝可梦就是最强的！",
-      "4": "我要看看你作为训练师的潜力。$还要看看与你并肩作战的宝可梦的坚韧！"
-    },
-    "victory": {
-      "1": "什么？不可能！我强化的宝可梦们！",
-      "2": "……我大脑过载了。$下次邀请你参加地下的化石挖掘比赛。",
-      "3": "有你这种技术，赢得胜利是很正常的。",
-      "4": "什么？！连这也不够？",
-      "5": "我搞砸了。"
-    },
-    "defeat": {
-      "1": "看？我为我的摇滚战斗风格感到骄傲！",
-      "2": "谢谢！这场战斗给了我自信，$我感觉能够打败我父亲了！",
-      "3": "我感觉就像我砸穿了一块顽石！"
-    }
-  },
-  "morty": {
-    "encounter": {
-      "1": "只要我再多努力一点，我就能看到我遇到传说中的宝可梦的未来！$你会帮助我达到那个水平！",
-      "2": "据说，彩虹色的宝可梦会\n出现在真正强大的训练师面前。 $我一直相信着这个美丽的传说，\n所以，从出生开始，\n就在这里进行着秘密的修行。$因为这样，其他人看不到的东西\n我也能够看得到…$我看到的，是那个将传说中的宝可梦\n召唤到这片大地上的人的影子。$我一直相信，那就是我自己！\n希望你也能助我一臂之力！",
-      "3": "无论你相信还是不相信，神秘的力量确实存在。",
-      "4": "你可以见证我训练的成果。",
-      "5": "你必须让你与宝可梦的灵魂合二为一。你能做到吗？",
-      "6": "嘿，你想成为我训练的一部分吗？"
-    },
-    "victory": {
-      "1": "我还不够好……",
-      "2": "我明白了…你的旅程…去了遥远的地方，你见过的比我多得多。$我羡慕你…",
-      "3": "这怎么可能……",
-      "4": "我认为我们的潜力没什么不同。$但是，我觉得你并不简单，似乎还有什么……",
-      "5": "我想我需要更多的训练。",
-      "6": "那太遗憾了"
-    },
-    "defeat": {
-      "1": "我又向前迈进了一步。",
-      "2": "呵呵呵……",
-      "3": "什…么？！那还不够？",
-      "4": "我感觉就像我砸穿了一块顽石！",
-      "5": "哈哈哈啊！",
-      "6": "我知道我会赢！"
-    }
-  },
-  "crispin": {
-    "encounter": {
-      "1": "我想赢，所以接下来我正要赢！",
-      "2": "我想对战就对战！懂吗！就应该这样！"
-    },
-    "victory": {
-      "1": "我想赢……但我还是输了！",
-      "2": "我输了……因为我赢不了！"
-    },
-    "defeat": {
-      "1": "嘿，等一下。我是不是赢了？$我觉得我赢了！太满足了！",
-      "2": "哇哦！那太棒了！"
-    }
-  },
-  "amarys": {
-    "encounter": {
-      "1": "我想帮助某个人。因此，我不能输。$…我们的战斗现在开始。"
-    },
-    "victory": {
-      "1": "我还不够，我明白了。"
-    },
-    "defeat": {
-      "1": "胜利属于我。打得好。"
-    }
-  },
-  "lacey": {
-    "encounter": {
-      "1": "我将用我平时的队伍\n作为四天王的一员面对你。"
-    },
-    "victory": {
-      "1": "打得真好呀~"
-    },
-    "defeat": {
-      "1": "让我们为你宝可梦的努力给予热烈的掌声！"
-    }
-  },
-  "drayton": {
-    "encounter": {
-      "1": "哥们，我喜欢椅子。\n你喜欢椅子吗？简直是救星。$我不明白为什么大家不一直坐着。\n站着多累人！"
-    },
-    "victory": {
-      "1": "我早该想到的！"
-    },
-    "defeat": {
-      "1": "嘿嘿嘿！别介意我，\n我只是在这里小赢一下。$如果你不开心，我懂，\n但别因为我对乌栗发火，OK？"
-    }
-  },
-  "ramos": {
-    "encounter": {
-      "1": "我用那些强壮的植物\n盖出来的游乐场精彩吗？$它们的力量象征着我这个园丁兼道馆馆主的实力，\n你真的确定能够与之抗衡吗？"
-    },
-    "victory": {
-      "1": "你信任你的宝可梦，\n它们也信任你…不错的战斗，小豆芽。"
-    },
-    "defeat": {
-      "1": "呵呵呵…确实，\n脆弱的小草甚至能穿透混凝土。"
-    }
-  },
-  "viola": {
-    "encounter": {
-      "1": "败阵时的后悔，胜利的瞬间…$都是最棒的影象！很好呀，很好呀！$那么来吧！",
-      "2": "我的镜头总会聚焦在胜利上，\n我不会让任何事情破坏这个画面！"
-    },
-    "victory": {
-      "1": "你和你的宝可梦向我展示了一个全新的镜头机位！\n很好呀，很好呀！",
-      "2": "你通过镜头看到的世界，\n和你与宝可梦并肩作战时看到的世界…$视角不同，即使是同一个世界看起来也完全不同。"
-    },
-    "defeat": {
-      "1": "我胜利那一刻的照片，\n将是一个真正的赢家，对吧！",
-      "2": "是的！我拍了些很棒的照片！"
-    }
-  },
-  "candice": {
-    "encounter": {
-      "1": "向小菘我挑战吗？好啊！\n我就是在等待强者$但是我也气势高昂，很强哦？",
-      "2": "宝可梦也好，时尚也好，恋爱也好，\n无论做什么都气势高昂！$就说到这儿吧，让你见识一下我的气势，\n要做好觉悟哦！"
-    },
-    "victory": {
-      "1": "好厉害！我有点尊敬你了。",
-      "2": "好厉害！我有点尊敬你了！$嗯，感觉是被你的气势给压倒了。"
-    },
-    "defeat": {
-      "1": "你的气势我看到了，但我还是不会输的！",
-      "2": "怎么样？小菘我的气势！\n宝可梦们的气势满满哦！"
-    }
-  },
-  "gardenia": {
-    "encounter": {
-      "1": "你身上有一种胜利的气息。\n那么不管怎样，$这应该会是场有趣的战斗。\n让我们对战吧！"
-    },
-    "victory": {
-      "1": "太棒了！你可擅长对战了，不是吗？"
-    },
-    "defeat": {
-      "1": "太好了！我的宝可梦和我都很棒！"
-    }
-  },
-  "aaron": {
-    "encounter": {
-      "1": "好的！让我来接受你的挑战！"
-    },
-    "victory": {
-      "1": "战斗是一件深刻而复杂的事情……"
-    },
-    "defeat": {
-      "1": "战胜一位四天王并不容易。"
-    }
-  },
-  "cress": {
-    "encounter": {
-      "1": "没！错！你必须面对\n与我和我高贵的水属性的战斗！"
-    },
-    "victory": {
-      "1": "输了？我？我不敢相信。"
-    },
-    "defeat": {
-      "1": "当你的对手是我时，这是必然的结果。"
-    }
-  },
-  "allister": {
-    "encounter": {
-      "1": "我是欧尼奥。$我…我来了……"
-    },
-    "victory": {
-      "1": "我差点被吓得丢了面具…那真是…$哇。我可以看清你真正的实力。"
-    },
-    "defeat": {
-      "1": "这真是太棒了！"
-    }
-  },
-  "clay": {
-    "encounter": {
-      "1": "咳咳! 让我好等，不是吗，孩子？$好吧，是时候看看你能做到什么了！"
-    },
-    "victory": {
-      "1": "真是的……我先说好，\n我可没有手下留情。"
-    },
-    "defeat": {
-      "1": "最重要的是输掉的时候该怎么办。$只要你能在失败中找到教训，\n就能够不断地成长！"
-    }
-  },
-  "kofu": {
-    "encounter": {
-      "1": "我会给你上一整道水系宝可梦大餐！\n但别真吃了它们！"
-    },
-    "victory": {
-      "1": "吃了吗！你真是活力又新鲜啊，\n不是吗！$就是有点太鲜活了！"
-    },
-    "defeat": {
-      "1": "你要再来找我，听见了吗？"
-    }
-  },
-  "tulip": {
-    "encounter": {
-      "1": "请让我运用我的化妆技巧，$让你可爱的小宝可梦变得更美丽！"
-    },
-    "victory": {
-      "1": "你妆点的力量宛如魔法加固，\n完全冲洗不掉啊。"
-    },
-    "defeat": {
-      "1": "你知道吗，在我这行，\n那些没天赋的人往往会很快消失，$再也不会被提起。"
-    }
-  },
-  "sidney": {
-    "encounter": {
-      "1": "你给我的印象不错，\n我猜这会是一场精彩的对战。$很棒！看起来真的很棒！$你和我，让我们享受一场\n只能在这里上演的战斗吧！"
-    },
-    "victory": {
-      "1": "嗯，你觉得怎样？我输了！\n嗯，不过这很有趣，所以无所谓啊。"
-    },
-    "defeat": {
-      "1": "别介意，OK？"
-    }
-  },
-  "phoebe": {
-    "encounter": {
-      "1": "过去我在修行时得到了\n能与幽灵宝可梦亲密交流的能力。$没错，我和宝可梦之间\n有著强烈的羁绊。$那么，来试试看你有没有能力\n伤到我的宝可梦吧！"
-    },
-    "victory": {
-      "1": "哦，天呀。我输了。"
-    },
-    "defeat": {
-      "1": "我期待着下次再和你战斗！"
-    }
-  },
-  "glacia": {
-    "encounter": {
-      "1": "我在这儿见到的尽是些\n弱不禁风的训练家和宝可梦。$你又如何呢？如果你能让我不得不用\n上全力的话就再好不过了！"
-    },
-    "victory": {
-      "1": "你和你的宝可梦…\n你们的灵魂燃烧得多么热烈啊！$这股激烈的热能仿佛能征服一切。\n$难怪我的冰属性技巧也奈何不了你了。"
-    },
-    "defeat": {
-      "1": "一场充满激情的战斗，确实。"
-    }
-  },
-  "drake": {
-    "encounter": {
-      "1": "对于我们这些将宝可梦视为\n同伴一同战斗的训练家来说，$你知道怎样才能赢得胜利吗？\n你知道获得胜利的条件吗？$如果你不知道，\n那么你永远也无法战胜我！"
-    },
-    "victory": {
-      "1": "干得漂亮，就是这样。"
-    },
-    "defeat": {
-      "1": "我在这场战斗中全力以赴了！"
-    }
-  },
-  "wallace": {
-    "encounter": {
-      "1": "你的气质变了，\n我能感觉到这一点。$现在，把你和你的宝可梦\n的力量展现给我看吧。$作为回礼，就由我和我的宝可梦\n演出一场水之幻影吧！"
-    },
-    "victory": {
-      "1": "精彩。此刻，我能从你身上感觉到\n身为宝可梦训练家的可靠与高贵。$我真荣幸能遇到你和你的宝可梦。"
-    },
-    "defeat": {
-      "1": "伟大的幻影！"
-    }
-  },
-  "lorelei": {
-    "encounter": {
-      "1": "只要能让我用冰属性宝可梦，\n就绝对没人能赢得过我！\n能冻住对方可是很厉害的哦！$因为如果被冻住，你的宝可梦就无法动弹了！\n啊哈哈！你做好觉悟了吧！"
-    },
-    "victory": {
-      "1": "你怎么敢！"
-    },
-    "defeat": {
-      "1": "一旦你被冻结，你就什么都做不了。"
-    }
-  },
-  "will": {
-    "encounter": {
-      "1": "我曾经环游世界，\n日以继夜地做着超能力宝可梦的修行之旅。$我会不断变强！没理由会在这里输掉！"
-    },
-    "victory": {
-      "1": "……不会吧……"
-    },
-    "defeat": {
-      "1": "就差一点。\n我想知道你缺少了什么。"
-    }
-  },
-  "malva": {
-    "encounter": {
-      "1": "我的内心可是一直燃烧着呢。$燃烧着对你的怒火！"
-    },
-    "victory": {
-      "1": "挑战者出色地击败了四天王之一，帕琦拉。"
-    },
-    "defeat": {
-      "1": "真开心啊，能将你彻底粉碎！"
-    }
-  },
-  "hala": {
-    "encounter": {
-      "1": "老哈拉让你放开嗓子！"
-    },
-    "victory": {
-      "1": "我能感受到你在旅途中获得的力量。"
-    },
-    "defeat": {
-      "1": "啊哈哈。多么有趣的战斗。"
-    }
-  },
-  "rika": {
-    "encounter": {
-      "1": "我要对你手下留情，但……骗你的啦！$好好动脑！"
-    },
-    "victory": {
-      "1": "不错，小子。"
-    },
-    "defeat": {
-      "1": "啊哈哈哈哈！你真的很特别，小子！"
-    }
-  },
-  "molayne": {
-    "encounter": {
-      "1": "我将队长的位置让给了我的表弟马玛内,\n但我对自己的能力很有信心。 $我的力量就像超新星一样！"
-    },
-    "victory": {
-      "1": "我发现了一个有趣的训练师对手！"
-    },
-    "defeat": {
-      "1": "啊哈哈。多么有趣的战斗。"
-    }
-  },
-  "bruno": {
-    "encounter": {
-      "1": "我们将用势不可挡的力量磨灭你！呼哈！"
-    },
-    "victory": {
-      "1": "为什么？我怎么会输？"
-    },
-    "defeat": {
-      "1": "你可以随意挑战我，\n但结果永远不会改变！"
-    }
-  },
-  "bugsy": {
-    "encounter": {
-      "1": "我是阿笔！\n对虫系宝可梦的熟悉不会输给任何人的！"
-    },
-    "victory": {
-      "1": "哇，太棒了！\n你是个宝可梦专家！$我的研究还没有完成。\n好吧，你赢了。"
-    },
-    "defeat": {
-      "1": "谢谢！多亏了我们的战斗，\n我的研究也取得了进展！"
-    }
-  },
-  "koga": {
-    "encounter": {
-      "1": "哇哈哈哈哈！$宝可梦不仅仅是关于蛮力，拭目以待吧！"
-    },
-    "victory": {
-      "1": "啊！你证明了自己！"
-    },
-    "defeat": {
-      "1": "懂不懂要对忍者的技巧心神畏惧？"
-    }
-  },
-  "bertha": {
-    "encounter": {
-      "1": "啊，让老婆婆看看你学到了什么？"
-    },
-    "victory": {
-      "1": "好吧，亲爱的孩子，\n不得不说，那令人印象深刻。$你的宝可梦相信你并尽最大努力为你赢得胜利。$尽管我输了，\n我也止不住笑呢！"
-    },
-    "defeat": {
-      "1": "哈哈哈！看来老婆婆我赢了！"
-    }
-  },
-  "lenora": {
-    "encounter": {
-      "1": "那么，挑战者，让我来研究$你与你精心养育的宝可梦要如何战斗！"
-    },
-    "victory": {
-      "1": "我关于你的理论是正确的。$你不仅仅是有天赋……你很努力！\n我向你致敬！"
-    },
-    "defeat": {
-      "1": "啊哈哈！如果你输了，\n一定要分析原因，$并在下一场战斗中运用那些知识！"
-    }
-  },
-  "siebold": {
-    "encounter": {
-      "1": "只要我活着，我将不断努力寻求终极美食…$以及和最强的对手战斗！"
-    },
-    "victory": {
-      "1": "您的事迹，我志米铭记在心。"
-    },
-    "defeat": {
-      "1": "我们的宝可梦战斗就像我灵魂的养料。\n它将让我继续前进。$这就是我将向你表示敬意的方式，\n感谢你在战斗中全力以赴！"
-    }
-  },
-  "roxie": {
-    "encounter": {
-      "1": "准备好了吗！我要给你上一课！"
-    },
-    "victory": {
-      "1": "够野的！你的想法比我的还要毒！"
-    },
-    "defeat": {
-      "1": "嘿，拜托！认真点！\n你要加把劲啊!"
-    }
-  },
-  "olivia": {
-    "encounter": {
-      "1": "没什么开场白。\n是时候和我丽姿，战斗了！"
-    },
-    "victory": {
-      "1": "真的很可爱……你和你的宝可梦……"
-    },
-    "defeat": {
-      "1": "嗯哼。"
-    }
-  },
-  "poppy": {
-    "encounter": {
-      "1": "哦！你想和我进行宝可梦对战么？"
-    },
-    "victory": {
-      "1": "呜哇？！嘛……"
-    },
-    "defeat": {
-      "1": "耶！我做到了！我击~败~了~你！\n你可以来…打…复仇之战？$只要你想，随时来打复仇之战吧！"
-    }
-  },
-  "agatha": {
-    "encounter": {
-      "1": "宝可梦是为战斗而生的！ \n让我来告诉你什么是真正的战斗吧！"
-    },
-    "victory": {
-      "1": "呵呵！你可真是了不起！"
-    },
-    "defeat": {
-      "1": "额哈哈哈，真正的战斗就是该这样。"
-    }
-  },
-  "flint": {
-    "encounter": {
-      "1": "希望你已经热身完毕，\n因为这里即将大爆炸！"
-    },
-    "victory": {
-      "1": "不可思议！$你的动作如此火热，让我看起来温吞吞的！"
-    },
-    "defeat": {
-      "1": "嗯？就这吗？\n我觉得你得再激情点。"
-    }
-  },
-  "grimsley": {
-    "encounter": {
-      "1": "一无所有，\n或者，赢下所有！"
-    },
-    "victory": {
-      "1": "一旦失败，\n就意味着失去一切……$下一次我要追寻胜利！"
-    },
-    "defeat": {
-      "1": "如果有人赢了，\n和他对战的人就会输。"
-    }
-  },
-  "caitlin": {
-    "encounter": {
-      "1": "当花儿绽开时、我便出现。\n成为你在等待的人…$你似乎同时具备实力和善意$我所寻找的是拥有卓越力量的对手…$请用出你的全力吧！"
-    },
-    "victory": {
-      "1": "我和我的宝可梦学到了很多！非常感谢。"
-    },
-    "defeat": {
-      "1": "我渴望以优雅的姿态取得胜利。"
-    }
-  },
-  "diantha": {
-    "encounter": {
-      "1": "与你的宝可梦对战\n让你充满了未来的希望…$说真的，这让我更有活力地面对新的一天，确实如此！"
-    },
-    "victory": {
-      "1": "拥有高尚灵魂的训练家和宝可梦的身姿，\n让我的心激烈地震颤…"
-    },
-    "defeat": {
-      "1": "哦，太棒了！你觉得怎么样？\n我的队伍很酷吧~对吧？"
-    }
-  },
-  "wikstrom": {
-    "encounter": {
-      "1": "年轻的挑战者，幸会！\n我乃是著名的钢铁之刃，公爵雁铠! $让我们开始战斗吧！预备！"
-    },
-    "victory": {
-      "1": "辉煌！你与你尊贵的\n宝可梦之间的信任居然胜过了我！"
-    },
-    "defeat": {
-      "1": "哦哦哦！这是怎么回事，\n我的心止不住地在震颤！ $与如此有价值的对手的胜利\n让我的灵魂飞翔——我心翱翔！"
-    }
-  },
-  "acerola": {
-    "encounter": {
-      "1": "对战只是找个乐子！来吧，我来会会你！"
-    },
-    "victory": {
-      "1": "我……我说不出话！你是怎么做到的？！"
-    },
-    "defeat": {
-      "1": "哈哈！真是吓人倒怪的胜利呀！"
-    }
-  },
-  "larry_elite": {
-    "encounter": {
-      "1": "……你好，我是青木。$麻烦的是我还要兼任四天王。"
-    },
-    "victory": {
-      "1": "好吧，我们翅膀下的疾风止于你这了啊…"
-    },
-    "defeat": {
-      "1": "是时候和老板开会了。"
-    }
-  },
-  "lance": {
-    "encounter": {
-      "1": "我一直在等你。让我来试试你有几斤几两。",
-      "2": "我知道你能走这么远。让我们开始吧。"
-    },
-    "victory": {
-      "1": "被你拿下了啊。你太出色了!",
-      "2": "我从没想到会有另一个训练师打败我……$我很惊讶。"
-    },
-    "defeat": {
-      "1": "就差一点。想再试一次吗？",
-      "2": "我没觉得你弱，别因此困扰。"
-    }
-  },
-  "karen": {
-    "encounter": {
-      "1": "我是梨花，你想和我的恶属性宝可梦$来一场对决吗？",
-      "2": "我和你见过的那些人不一样。",
-      "3": "你组建了一支迷人的队伍。$我们的战斗应该会是场精彩的比赛。"
-    },
-    "victory": {
-      "1": "不！我赢不了。你是怎么做到变得这么强的？",
-      "2": "我不会偏离我所选择的道路。",
-      "3": "冠军正期待与你见面。"
-    },
-    "defeat": {
-      "1": "意料之中。",
-      "2": "嗯，还算有点意思。",
-      "3": "随时欢迎你来找我。"
-    }
-  },
-  "milo": {
-    "encounter": {
-      "1": "看起来你显然很了解宝可梦。$这会是一场激烈的战斗！$如果我想赢，我得让我的宝可梦极巨化！"
-    },
-    "victory": {
-      "1": "草的力量凋谢了…多么不可思议的挑战者！"
-    },
-    "defeat": {
-      "1": "这必将让你大吃一惊。"
-    }
-  },
-  "lucian": {
-    "encounter": {
-      "1": "请稍等，我正在读的书\n正要进入最精彩的部分…$英雄获得了一把神秘之剑，\n即将面临最后的考验…啊，算了。$既然你能走到这一步，\n我就不说这些了，和你战斗吧。$让我看看你是否\n能像我书中的主角一样荣耀！"
-    },
-    "victory": {
-      "1": "我明白了…看来你把我逼入了绝境。"
-    },
-    "defeat": {
-      "1": "我得维护我的名誉。"
-    }
-  },
-  "drasna": {
-    "encounter": {
-      "1": "你很厉害吧，\n而且相当相当地厉害呢。$我很高兴，能和这样的对手交手，\n就能更好地培养宝可梦们了。"
-    },
-    "victory": {
-      "1": "哎呀，就这么结束了，\n不好意思，可以的话欢迎再来。"
-    },
-    "defeat": {
-      "1": "怎么会这样？"
-    }
-  },
-  "kahili": {
-    "encounter": {
-      "1": "那么，既然来了……\n要不来看看今天的风更青睐谁？$是你……还是我？"
-    },
-    "victory": {
-      "1": "让我这个四天王都感到沮丧，$看来你的力量货真价实。"
-    },
-    "defeat": {
-      "1": "那真是一记好球！"
-    }
-  },
-  "hassel": {
-    "encounter": {
-      "1": "让你亲身感受一下什么叫做猛烈的对战气息吧！"
-    },
-    "victory": {
-      "1": "这次幸运之神对你微笑了，但是……$谁知道你下次还会不会这么幸运。"
-    },
-    "defeat": {
-      "1": "那挺厉害的吧！"
-    }
-  },
-  "blue": {
-    "encounter": {
-      "1": "能走到这里，你一定非常优秀。"
-    },
-    "victory": {
-      "1": "我只输给过他，现在又是你……？$你问他是谁？哈哈哈……"
-    },
-    "defeat": {
-      "1": "看吧？我的实力就是我来到这里的原因。"
-    }
-  },
-  "piers": {
-    "encounter": {
-      "1": "准备好和我的队伍来个大狂欢吧！$尖钉镇，是时候嗨起来了！"
-    },
-    "victory": {
-      "1": "我和我的队伍已经尽力了。$找个时间再来对战吧……"
-    },
-    "defeat": {
-      "1": "我的喉咙因为呼喊而变得沙哑……$但这是一场激动人心的战斗！"
-    }
-  },
-  "red": {
-    "encounter": {
-      "1": "…!"
-    },
-    "victory": {
-      "1": "…?"
-    },
-    "defeat": {
-      "1": "…!"
-    }
-  },
-  "jasmine": {
-    "encounter": {
-      "1": "哦……你的宝可梦给人印象深刻。$我想我会享受这场战斗的。"
-    },
-    "victory": {
-      "1": "你真的很强。我也得加把劲了。"
-    },
-    "defeat": {
-      "1": "我从没想到会赢。"
-    }
-  },
-  "lance_champion": {
-    "encounter": {
-      "1": "我依旧是冠军，所以我不会留情的。"
-    },
-    "victory": {
-      "1": "这就是新冠军的崛起。"
-    },
-    "defeat": {
-      "1": "我成功捍卫了冠军的头衔。"
-    }
-  },
-  "steven": {
-    "encounter": {
-      "1": "告诉我…你在和宝可梦的旅途过程中看到了什么？$邂逅了那么多的训练师，\n你都会有什么样的感受呢？$在这丰饶的大地上旅行…\n有没有唤醒你内在的某种东西？$你不如就用一场对战来告诉我你心中的答案吧。$我也会和我的宝可梦用这种方式\n将我们所知道的告诉你的！"
-    },
-    "victory": {
-      "1": "没想到连我这个联盟冠军\n都败在你的手上了呢…"
-    },
-    "defeat": {
-      "1": "正如我所期待的。谢谢！"
-    }
-  },
-  "cynthia": {
-    "encounter": {
-      "1": "我，竹兰，接受你的挑战！\n我是不会手软的！"
-    },
-    "victory": {
-      "1": "无论对战多么有趣，\n它总会有结束的时候……"
-    },
-    "defeat": {
-      "1": "即使你输了，\n也永远不要失去你对宝可梦的热爱。"
-    }
-  },
-  "iris": {
-    "encounter": {
-      "1": "你知道吗？\n我真的很期待和强大的训练师进行认真的战斗！$我的意思是，来吧！\n到达这里的是那些渴望胜利的训练师，$他们与经历过无数艰难\n战斗的宝可梦一起战斗！$如果我和那样的人战斗，\n不仅我会变得更强，我的宝可梦也会！$我们也会更好地了解彼此！\n好！做好准备吧！$我是艾莉丝，宝可梦联盟冠军，\n我，将打败你！"
-    },
-    "victory": {
-      "1": "啊……我尽力了，但我们输了……"
-    },
-    "defeat": {
-      "1": "耶！我们赢了！"
-    }
-  },
-  "hau": {
-    "encounter": {
-      "1": "我想知道，训练师是否会根据他们是\n来自温暖地区还是寒冷地区而以不同的方式战斗。$让我们来测试一下！"
-    },
-    "victory": {
-      "1": "那太棒了！我觉得我现在有点了解你的感觉了！"
-    },
-    "defeat": {
-      "1": "老铁，这才叫战斗！"
-    }
-  },
-  "geeta": {
-    "encounter": {
-      "1": "我决定再试一次。$来吧…让我看看你的训练成果。"
-    },
-    "victory": {
-      "1": "我期待着你的成就！"
-    },
-    "defeat": {
-      "1": "怎么，这就结束了？"
-    }
-  },
-  "nemona": {
-    "encounter": {
-      "1": "耶！我太兴奋了！让我们稍微放轻松！"
-    },
-    "victory": {
-      "1": "好吧，太糟了，但我还是玩得很开心！$下次我一定会赢你！"
-    },
-    "defeat": {
-      "1": "好吧，那是一场很棒的战斗！$肯定是会有收获的啦。"
-    }
-  },
-  "leon": {
-    "encounter": {
-      "1": "来享受一段冠军时刻吧！"
-    },
-    "victory": {
-      "1": "我的冠军生涯结束了……$但这是多么美好的冠军时刻啊！$谢谢你给了我最精彩的一战！"
-    },
-    "defeat": {
-      "1": "名副其实的冠军时刻！"
-    }
-  },
-  "whitney": {
-    "encounter": {
-      "1": "嘿！你不认为宝可梦超级可爱吗？"
-    },
-    "victory": {
-      "1": "哇啊！哇啊！你太坏了！"
-    },
-    "defeat": {
-      "1": "就是这样！"
-    }
-  },
-  "chuck": {
-    "encounter": {
-      "1": "哈！你想挑战我？你是勇敢还是无知？"
-    },
-    "victory": {
-      "1": "你很强！能不能收我为徒？"
-    },
-    "defeat": {
-      "1": "搞定。你明白我比你强得多了吗？"
-    }
-  },
-  "katy": {
-    "encounter": {
-      "1": "不要放松警惕，除非你想被虫丝绊倒哦！"
-    },
-    "victory": {
-      "1": "我可爱的宝可梦们都像苍蝇一样坠落了！"
-    },
-    "defeat": {
-      "1": "开饭啦，我可爱的彩粉蝶！"
-    }
-  },
-  "pryce": {
-    "encounter": {
-      "1": "年轻不代表能获得胜利！经验才是关键。"
-    },
-    "victory": {
-      "1": "无与伦比！赢得完美，试着不要忘记你现在的感受。"
-    },
-    "defeat": {
-      "1": "正如我所料。"
-    }
-  },
-  "clair": {
-    "encounter": {
-      "1": "你知道我是谁吗？知道还敢挑战我？"
-    },
-    "victory": {
-      "1": "我想知道以你现在的水平能走多远，有趣。"
-    },
-    "defeat": {
-      "1": "就是这样。"
-    }
-  },
-  "maylene": {
-    "encounter": {
-      "1": "我现在要挑战你，我不会保留任何实力。$请准备好战斗！"
-    },
-    "victory": {
-      "1": "是我输了…"
-    },
-    "defeat": {
-      "1": "太棒了。"
-    }
-  },
-  "fantina": {
-    "encounter": {
-      "1": "你来挑战吧。我会胜利。$这就是家缘市的道馆馆主。"
-    },
-    "victory": {
-      "1": "你是最强的，我认输了。"
-    },
-    "defeat": {
-      "1": "我非常，非常高兴！"
-    }
-  },
-  "byron": {
-    "encounter": {
-      "1": "和我儿子瓢太一样的年轻人啊！$我相信培养年轻人\n关系到宝可梦光明的未来！$为此就让我来成为\n年轻人必须跨越的堡垒吧！"
-    },
-    "victory": {
-      "1": "唔！我千锤百炼的宝可梦！"
-    },
-    "defeat": {
-      "1": "哈哈哈哈！怎么样！我千锤百炼的宝可梦！"
-    }
-  },
-  "olympia": {
-    "encounter": {
-      "1": "战斗是决定命运的古老传统。让我们开始吧！"
-    },
-    "victory": {
-      "1": "创造你自己的道路。$不要让任何东西阻挡你的路、你的命运、你的未来。"
-    },
-    "defeat": {
-      "1": "我们的道路现在已经清晰了。"
-    }
-  },
-  "volkner": {
-    "encounter": {
-      "1": "能留到最后的训练家想必肯定是很强的…$希望你会是能让我回忆起\n宝可梦对战乐趣的训练家！"
-    },
-    "victory": {
-      "1": "我输了…$你的心意，宝可梦的不顾一切。$战斗的时候就让我热血沸腾。"
-    },
-    "defeat": {
-      "1": "完全没感觉…$和我希望的完全不一样！"
-    }
-  },
-  "burgh": {
-    "encounter": {
-      "1": "唔…我有预感，\n只要赢了这场战斗就能画出更好的画来…$嗯！战斗充满了幻象！那么，马上开始吧。",
-      "2": "当然，我对我所有的宝可梦都相当骄傲！ $现在…让我们马上开始吧！"
-    },
-    "victory": {
-      "1": "结束了吗？我的女神抛弃我了吗？",
-      "2": "啊唔，输了……你还真是很强啊。"
-    },
-    "defeat": {
-      "1": "唔啊……好……好美啊！",
-      "2": "偶尔也有一些不是很好看的胜利，$但只要努力了，\n不管怎么样的战斗，都是很美丽的。"
-    }
-  },
-  "elesa": {
-    "encounter": {
-      "1": "最后一击！\n在确信这一点的时候全身会流淌过电流！$为追求这个快感，\n我要用可爱的宝可梦们让你头晕眼花。"
-    },
-    "victory": {
-      "1": "本想让你头晕的，\n结果我倒反被你电到了。"
-    },
-    "defeat": {
-      "1": "感觉还不够啊……下次能使出全力来吗？"
-    }
-  },
-  "skyla": {
-    "encounter": {
-      "1": "终于到决战了！\n这是决定顶点的宝可梦对战吧？$我最喜欢顶点了！\n在高的地方能看到很远很远！$好了！就让我和你好好地玩一场吧！"
-    },
-    "victory": {
-      "1": "和你的战斗让我更强了……谢谢。"
-    },
-    "defeat": {
-      "1": "不管是赢了还是输了，战斗都能得到一些东西。"
-    }
-  },
-  "brycen": {
-    "encounter": {
-      "1": "有其他的人和宝可梦在一起，$这份支持会让自己更强…\n让我来给你展示一下这样的强大吧！"
-    },
-    "victory": {
-      "1": "你和你的宝可梦！配合得天衣无缝！\n华丽的友情！"
-    },
-    "defeat": {
-      "1": "尝试极限！锻炼！"
-    }
-  },
-  "drayden": {
-    "encounter": {
-      "1": "现在我寻求的是\n能让我看到光明未来的年轻训练家。$你有多少实力，就让我用我的经验，\n我对宝可梦倾注的爱来验证吧！"
-    },
-    "victory": {
-      "1": "失败后涌现的这灼热的意志…\n该怎么说呢…"
-    },
-    "defeat": {
-      "1": "啊啊啊！你的实力就这种程度吗！"
-    }
-  },
-  "grant": {
-    "encounter": {
-      "1": "我只期待一件事。. $通过超越彼此，\n我们找到通往更高境界的道路。"
-    },
-    "victory": {
-      "1": "你是一堵我无法逾越的墙！"
-    },
-    "defeat": {
-      "1": "不要放弃。\n这就是人生的真谛。$大道至简。"
-    }
-  },
-  "korrina": {
-    "encounter": {
-      "1": "小女子科尔尼来大显身手啦！"
-    },
-    "victory": {
-      "1": "正因为有你，\n才能让你的宝可梦进化！"
-    },
-    "defeat": {
-      "1": "好劲爆的战斗呀！"
-    }
-  },
-  "clemont": {
-    "encounter": {
-      "1": "哦！我很高兴我们能见面！"
-    },
-    "victory": {
-      "1": "你对战斗的热情激励了我！"
-    },
-    "defeat": {
-      "1": "看来我的训练师成长强化机-马克2号，\n真的起作用了！"
-    }
-  },
-  "valerie": {
-    "encounter": {
-      "1": "哦，这不是一个年轻的训练师吗……\n能这样遇见你真是太好了。 $我想你已经获得了这场战斗的资格，\n作为对你努力的奖励。 $难以捉摸的妖精可能看起来像微风一样脆弱，\n像花朵一样精致，但很坚强。"
-    },
-    "victory": {
-      "1": "我希望明天你也能找到一些值得会心微笑的事物……"
-    },
-    "defeat": {
-      "1": "哦，天哪，这太遗憾了……"
-    }
-  },
-  "wulfric": {
-    "encounter": {
-      "1": "你知道吗？\n我们都说战斗能学到东西，羁绊之类的，$但实际上，我这么做只是因为有趣。 $谁在乎那些华而不实的东西？\n我们来战斗吧！"
-    },
-    "victory": {
-      "1": "杰出！我像冰山一样坚硬，但你彻底击溃了我！"
-    },
-    "defeat": {
-      "1": "和我干的结果就是这样！"
-    }
-  },
-  "kabu": {
-    "encounter": {
-      "1": "每个训练师和宝可梦都在努力追求胜利。$但这意味着你的对手也在努力赢得胜利。$最终，比赛是由哪一方\n能够发挥出他们真正的潜力来决定的。"
-    },
-    "victory": {
-      "1": "我很高兴今天能和你战斗！"
-    },
-    "defeat": {
-      "1": "这是我感觉自己的成长的好方式！"
-    }
-  },
-  "bea": {
-    "encounter": {
-      "1": "你有没有一种不可动摇的精神，\n受到什么攻击都安如磐石？ $就让我来试试吧？"
-    },
-    "victory": {
-      "1": "我感受到了你的宝可梦\n在战斗中被你指挥时的战斗之魂。"
-    },
-    "defeat": {
-      "1": "每个人都希望能有一场这样的好比赛。"
-    }
-  },
-  "opal": {
-    "encounter": {
-      "1": "让我看看你和你的宝可梦的表现如何！"
-    },
-    "victory": {
-      "1": "你不够粉嫩呀，\n但你是一个优秀的训练师，$还拥有着优秀的宝可梦。"
-    },
-    "defeat": {
-      "1": "对你来说太惨了，我觉得。"
-    }
-  },
-  "bede": {
-    "encounter": {
-      "1": "就让我来证明你有多可怜，我有多强大。"
-    },
-    "victory": {
-      "1": "我懂了……好吧。其实我还没拿出全力呢。"
-    },
-    "defeat": {
-      "1": "我觉得我打的不错。"
-    }
-  },
-  "gordie": {
-    "encounter": {
-      "1": "好了，我们来做个了结吧！"
-    },
-    "victory": {
-      "1": "我只想要挖一个洞爬进去……$好吧，现在更像是掉了进去。"
-    },
-    "defeat": {
-      "1": "像往常一样战斗，胜利就会随之而来！"
-    }
-  },
-  "marnie": {
-    "encounter": {
-      "1": "事实上，言而总之… \n人家自己也想当冠军呀! $所以别认为我在针对你！"
-    },
-    "victory": {
-      "1": "好吧，我还是输了……\n但是我看到了很多你和你宝可梦的优点哦"
-    },
-    "defeat": {
-      "1": "希望你喜欢我们的战斗策略。"
-    }
-  },
-  "raihan": {
-    "encounter": {
-      "1": "我打算击败冠军，赢得锦标赛，\n并向世界证明奇巴纳大人有多强！"
-    },
-    "victory": {
-      "1": "就算输了我也好帅。$真是罪孽深重啊。$看来得再来张自拍了！"
-    },
-    "defeat": {
-      "1": "为了纪念此刻，来张自拍吧！"
-    }
-  },
-  "brassius": {
-    "encounter": {
-      "1": "你应该准备好了吧，\n一起完成这美丽的艺术作品吧！"
-    },
-    "victory": {
-      "1": "啊……前卫！"
-    },
-    "defeat": {
-      "1": "我将立即开始新的创作！"
-    }
-  },
-  "iono": {
-    "encounter": {
-      "1": "谁在奇述！是我奇树！\n做好准备了吗！$...$直播开始！\n今天的小挑战者有多强？$奇树不知道哦~\n让我们一起来看看吧！"
-    },
-    "victory": {
-      "1": "你的闪耀如1000万伏特！朋友！"
-    },
-    "defeat": {
-      "1": "奇树奇树捕获你的眼球！"
-    }
-  },
-  "larry": {
-    "encounter": {
-      "1": "归根结底，普普通通就是最强。"
-    },
-    "victory": {
-      "1": "哼，给我上了一道“战败”。"
-    },
-    "defeat": {
-      "1": "下班打卡，走了"
-    }
-  },
-  "ryme": {
-    "encounter": {
-      "1": "宝贝, 一起! \n摇滚摇到骨子里!"
-    },
-    "victory": {
-      "1": "你好酷！我佩服！\n我的灵魂为你哭！"
-    },
-    "defeat": {
-      "1": "再会, 宝贝!"
-    }
-  },
-  "grusha": {
-    "encounter": {
-      "1": "我保证我宝可梦的力量\n会让你感到寒冷彻骨！"
-    },
-    "victory": {
-      "1": "你燃烧的热情……老实说，我有点喜欢。"
-    },
-    "defeat": {
-      "1": "你没有升温。"
-    }
-  },
-  "marnie_elite": {
-    "encounter": {
-      "1": "你已经走到这一步了？$哼~ 看看你能不能对付我的宝可梦！",
-      "2": "我将全力以赴, 别觉得我会手下留情哦~"
-    },
-    "victory": {
-      "1": "不敢相信…我输掉了… $但是你确实赢得好，干得漂亮捏~",
-      "2": "看来我还要多多学习呀，\n不过你打的很不错哦~"
-    },
-    "defeat": {
-      "1": "你打得不错，但是我更胜一筹！$祝你下次好运啦~",
-      "2": "看来我的练习有所回报了。\n感谢一战！"
-    }
-  },
-  "nessa_elite": {
-    "encounter": {
-      "1": "海流正在朝着对我有利的方向转变。$准备好被卷走了吗？",
-      "2": "让我们在这场战斗中掀起波澜！$我希望你做好准备！"
-    },
-    "victory": {
-      "1": "你完美地渡过了这片水域......干得好！",
-      "2": "看来我现在无法与你匹敌。干得好！"
-    },
-    "defeat": {
-      "1": "水总能找到出路。\n真是爽快的一战！",
-      "2": "你打得很好，\n但海洋的力量是不可阻挡的！"
-    }
-  },
-  "bea_elite": {
-    "encounter": {
-      "1": "做好准备！我的斗志熊熊燃烧！",
-      "2": "让我们看看你是否能跟上我永不停歇的节奏！"
-    },
-    "victory": {
-      "1": "你的实力......令人印象深刻。\n你真的值得这场胜利。",
-      "2": "我以前从未感受过这种强度。\n太棒了！"
-    },
-    "defeat": {
-      "1": "我的高强度训练又带来胜利了！\n干得好！",
-      "2": "你有实力，但我的训练更努力。\n精彩的战斗！"
-    }
-  },
-  "allister_elite": {
-    "encounter": {
-      "1": "黑暗降临...你准备好面对你的恐惧了吗？",
-      "2": "让我们看看你能否应对我所操控的黑暗。"
-    },
-    "victory": {
-      "1": "你已经驱散了阴影......\n暂时。干得很好。",
-      "2": "你的光芒刺穿了我的黑暗。干得好。"
-    },
-    "defeat": {
-      "1": "黑影在轻语...\n你的力量还不够。",
-      "2": "黑暗获胜了......\n也许下次你会看到光明。"
-    }
-  },
-  "raihan_elite": {
-    "encounter": {
-      "1": "虽然没法打败丹帝夺冠，\n让我觉得很遗憾……$但是有你这家伙当对手，\b倒是也还不赖啊！",
-      "2": "准备好面对龙之风暴！"
-    },
-    "victory": {
-      "1": "你的气势就像暴风一样，\n连我都甘拜下风了！",
-      "2": "你完美地驾驭了我的风暴……打得好！"
-    },
-    "defeat": {
-      "1": "又一场龙之风暴袭来，又一场胜利！打得好！",
-      "2": "你被我的龙之风暴卷入了！祝你下次好运！"
-    }
-  },
-  "alder": {
-    "encounter": {
-      "1": "准备好和合众最强的训练家交手吧！"
-    },
-    "victory": {
-      "1": "精彩！简直就是天下无双！"
-    },
-    "defeat": {
-      "1": "战斗结束后，我的心像是吹过了温和的风……\n$真是厉害！"
-    }
-  },
-  "kieran": {
-    "encounter": {
-      "1": "我的努力让我越来越强！\n$所以我不会输。"
-    },
-    "victory": {
-      "1": "不可能……\n$真是一场有趣又激动人心的战斗啊！"
-    },
-    "defeat": {
-      "1": "哇塞，好一场战斗！\n$你得多练练了。"
-    }
-  },
-  "rival": {
-    "encounter": {
-      "1": "@c{smile}嘿，我在找你呢！我知道你急着上路，\n但至少说个再见吧…$@c{smile_eclosed}所以你终于要开始追逐梦想了？\n我几乎不敢相信。$@c{serious_smile_fists}来都来了，来一场对战怎么样？\n毕竟，我想看看你是不是准备周全了。$@c{serious_mopen_fists}不要手下留情，我想让你全力以赴！"
-    },
-    "victory": {
-      "1": "@c{shock}哇…你彻底击败了我。\n你是真初学者吗？$@c{smile}也许是靠点运气，但是…\n谁知道，你可能真的能一路走下去。$顺便说一下，博士让我给你这些东西。它们看起来可牛了。$@c{serious_smile_fists}祝你好运！"
-    }
-  },
-  "rival_female": {
-    "encounter": {
-      "1": "@c{smile_wave}你在这儿啊！我到处找你呢！$@c{angry_mopen}你忘了和你最好的朋友说再见了吗？$@c{smile_ehalf}你要去追逐梦想了，对吧？\n从今天开始，是不是…$@c{smile}不管怎样，忘了我的事就原谅你吧，\n但有个条件。@c{smile_wave_wink}你必须和我对战！$@c{angry_mopen}全力以赴！\n你也不想让你的冒险在开始之前就结束了，对吧？"
-    },
-    "victory": {
-      "1": "@c{shock}你刚开始就已经这么强了？！@d{96}$@c{angry}你是不是开了？$@c{smile_wave_wink}只是开个玩笑啦！@d{64} @c{smile_eclosed}我输地心服口服了…\n我感觉你出去挺有天赋的。$@c{smile}顺便说一下，博士想让我给你一些东西。\n希望它们能帮上忙！$@c{smile_wave}像往常一样尽力而为！\n我相信你！"
-    }
-  },
-  "rival_2": {
-    "encounter": {
-      "1": "@c{smile}嘿，你也在这里吗？$@c{smile_eclosed}一路过关斩将，是吧？$@c{serious_mopen_fists}我知道看起来好像我尾随着你来到这里，\n怎么可能啦。$@c{serious_smile_fists}说真的，自从你在老家打败我后，\n我就一直很渴望再比一场。$我自己也进行了很多训练，\n所以这次我肯定会好好打一场。$@c{serious_mopen_fists}不要手下留情，就像以前一样！$让我们开始吧！"
-    },
-    "victory": {
-      "1": "@c{neutral_eclosed}哦。我过于自信了。$@c{smile}不过没关系。我猜到可能会这样。$@c{serious_mopen_fists}这只意味着我下次需要更努力！$$@c{smile}呃，不是特意帮你，我正好有多余的这个，\n我觉得你可能想要。$$@c{serious_smile_fists}不过这次之后别指望再有了！$我不能一直给我的对手优势。$@c{smile}反正，保重！"
-    }
-  },
-  "rival_2_female": {
-    "encounter": {
-      "1": "@c{smile_wave}哦，真巧，在这里遇见你。\n看来你还没输过嘛。@c{angry_mopen}哈……好家伙！$@c{angry_mopen}我知道你在想什么，\n不，我才不会跟踪你什么呢。 @c{smile_eclosed}我只是碰巧在附近。$@c{smile_ehalf}我为你感到高兴，但我只想让你知道\n有时输了是可以接受的。$@c{smile}我们从错误中学到的东西\n往往比我们一直成功时学到的还要多。$@c{angry_mopen}无论如何，我为了我们的复赛已经努力训练了\n所以你最好全力以赴！"
-    },
-    "victory": {
-      "1": "@c{neutral}我……没打算会输来着……$@c{smile}嗷……好吧。看来我要再更加努力训练了！$@c{smile_wave}我还给你带了个这个$@c{smile_wave_wink}不用谢我哦~.$@c{angry_mopen}不过，这是最后一个啦！\n你可别想再从我这赚小便宜了~$@c{smile_wave}要保重哦！"
-    },
-    "defeat": {
-      "1": "输了有时候也不要紧的…"
-    }
-  },
-  "rival_3": {
-    "encounter": {
-      "1": "@c{smile}嘿，看看这是谁！好久不见啊。$@c{neutral}你……还是没输过？哈…$@c{neutral_eclosed}这有点……不太对劲。$没有你一起，回家的感觉有很不一样。$@c{serious}虽然我知道这挺别扭的，但我就直说了。$@c{neutral_eclosed}我觉得你有点儿难以理喻。$@c{serious}没有人能够战无不胜。$失败乃成功之母。$@c{neutral_eclosed}你已经赢得了够好的成绩，\n但前面道阻且长，只会愈发艰难。 @c{neutral}你做好准备了没？$@c{serious_mopen_fists}如果做好了，证明给我看吧。"
-    },
-    "victory": {
-      "1": "@c{angry_mhalf}这太离谱了……我几乎从没停下训练……$我们之间的差距怎么还是这么大？"
-    }
-  },
-  "rival_3_female": {
-    "encounter": {
-      "1": "@c{smile_wave}好久不见！还没输过，对吧。$@c{angry}我觉得你点烦了。@c{smile_wave_wink}开玩笑啦！$@c{smile_ehalf}但说真的，你现在不想家吗？\n不想…我吗?$我……我的意思是，我们真的很想你。$@c{smile_eclosed}我支持你的一切，包括你的梦想。\n但现实就是你早晚会经历失败。$@c{smile}当你失败的时候，我想像往常一样陪在你身边。$@c{angry_mopen}现在，给你看看我变得多强了吧！"
-    },
-    "victory": {
-      "1": "@c{shock}都这样了……还是不够吗？$这样下去，你就永远不会回来了……"
-    },
-    "defeat": {
-      "1": "你尽力了，现在让我们回家吧。"
-    }
-  },
-  "rival_4": {
-    "encounter": {
-      "1": "@c{neutral}嘿。$我不会对你说什么拐弯抹角的客套话。$@c{neutral_eclosed}我来，就是为了赢，简单明了。$@c{serious_mhalf_fists}我将所有时间都投入到训练中，\n掌握了如何发挥我的潜力。$@c{smile}当你削减掉不必要的睡眠和社交后，\n你会得到很多额外的时间。$@c{serious_mopen_fists}但在我获胜之前，这些都不重要了。$@c{neutral_eclosed}我甚至已经到达了战无不败的境地。$@c{smile_eclosed}我觉得你的思路倒是也没毛病。$@c{angry_mhalf}失败是属于弱者的，\n我已经不再软弱了。$@c{serious_mopen_fists}准备好吧。"
-    },
-    "victory": {
-      "1": "@c{neutral}你…@d{64} 你是人吗？"
-    }
-  },
-  "rival_4_female": {
-    "encounter": {
-      "1": "@c{neutral}是我哦！没又把我忘了吧……是吗？$@c{smile}你应该为自己走了这么远感到骄傲。恭喜你！$但看来你的旅程到此为止了。$@c{smile_eclosed}你唤醒了我体内一些我从未有过的东西。\n就像我现在满脑子除了训练还是训练。$@c{smile_ehalf}我几乎已经没空吃饭睡觉了，\n我没日没夜训练我的宝可梦，每次都能变得更强。$@c{neutral}事实上，我……几乎不认识自己了。$现在，我终于达到了巅峰。\n我感觉我已经战无不胜了。$而且你知道吗？这一切都是因为你。$@c{smile_ehalf}我不知道到底是该感谢你还是恨你。$@c{angry_mopen}做好准备…"
-    },
-    "victory": {
-      "1": "@c{neutral}你…@d{64} 你是人吗？"
-    },
-    "defeat": {
-      "1": "@c{smile}你应该为自己走了这么远感到骄傲。"
-    }
-  },
-  "rival_5": {
-    "encounter": {
-      "1": "@c{neutral}…"
-    },
-    "victory": {
-      "1": "@c{neutral}…"
-    }
-  },
-  "rival_5_female": {
-    "encounter": {
-      "1": "@c{neutral}…"
-    },
-    "victory": {
-      "1": "@c{neutral}…"
-    },
-    "defeat": {
-      "1": "$@c{smile_ehalf}…"
-    }
-  },
-  "rival_6": {
-    "encounter": {
-      "1": "@c{smile_eclosed}又见面了。$@c{neutral}我花了点时间思考反思\n有理由说明为什么这一切都显得如此奇妙。$@c{neutral_eclosed}你所追逐的梦想，我想击败你的决心…$这都是某种庞大使命的一部分。$@c{serious}这不仅仅是关于我和你… 而是关于这个世界， @c{serious_mhalf_fists}我的使命就是将你推向极限。$@c{neutral_eclosed}我是否达成了那个使命，我说不上来，但我已尽我所能。$@c{neutral}我们最终到达的这个地方看起来很可怕\n 然而不知何故，我心中毫无畏惧，好像我早就来过这里。$@c{serious_mhalf_fists}你也有同样的感觉，对吧？$@c{serious}……这里好像有什么东西在呼唤我。\n这是世界早已记录的一切。$那些我们经历过的时光，那些记忆犹新的过去，\n其实只是遥远的回忆。$@c{neutral_eclosed}谁能保证它们是否真的发生过。$@c{serious_mopen_fists}你必须继续前进，不然的话，这一切将永无止境。\n这件事而只有你能办成。$@c{serious_smile_fists}我不清楚这一切意味着什么，但我知道……$@c{serious_mopen_fists}如果现在你不能就此击败我，\n你将毫无机会可言。"
-    },
-    "victory": {
-      "1": "@c{smile_eclosed}看来我的使命在这里已经完成了。\n我想让你答应我一件事。$@c{smile}在你拯救世界之后，要回家。"
-    }
-  },
-  "rival_6_female": {
-    "encounter": {
-      "1": "@c{smile_ehalf}又只有我们两个人了。$@c{smile_eclosed}你知道吗，我在心里想啊想，\n想了好久……$@c{smile_ehalf}这一切背后是有什么原因吗，\n为什么一切现在看起来都这么奇怪……$@c{smile}你有你的梦想，而我内心有这个抱负……$我不禁感觉这一切背后有一个更庞大的力量，$掌控者我们所做的一切，你和我之间。$@c{smile_eclosed}我想我注定要推动你……到你的极限。$@c{smile_ehalf}我不清楚我是否一直做得很好，\n但到现在为止，我已经尽力了。$这个奇怪而可怕的地方……\n一切看起来都那么清晰……$这是世界早已记录的一切。$@c{smile_eclosed}我好像记不清我们一起度过的日子了。$@c{smile_ehalf}那些回忆到底是真的吗？\n怎么感觉这么久远……$@c{angry_mopen}你得继续前进，不然的话，这一切将永无止境。\n你是唯一能做到这件事的。$@c{smile_ehalf}我……不知道这一切意味着什么……\n但我明白$@c{neutral}如果你现在不能就此击败我，\n你将毫无机会可言。"
-    },
-    "victory": {
-      "1": "@c{smile_ehalf}我……\n我想我完成了我的使命……$@c{smile_eclosed}答应我……在你拯救世界之后\n……要……平安到家。$@c{smile_ehalf}……谢谢你。"
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/locales/zh_CN/dialogue-misc-male.json b/src/locales/zh_CN/dialogue-misc-male.json
deleted file mode 100644
index e9ac66b7955..00000000000
--- a/src/locales/zh_CN/dialogue-misc-male.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "ending": "@c{smile}哦?你赢了？@d{96} @c{smile_eclosed}我应该早猜到了\n你回来了。\n$@c{smile}结束了。@d{64} 你终结了这个循环。\n$@c{serious_smile_fists}你也完成了自己的梦想，不是吗？\n你甚至一次都没失败。\n$@c{neutral}我是唯一能够记得你所作所为的人@d{96}\n我觉得这应该也还行吧？\n$@c{serious_smile_fists}你的传奇将永远留存于我们心中。\n$@c{smile_eclosed}不管了，我真是受够这个地方了，你也一样吗？我们回家吧。\n$@c{serious_smile_fists}可能等我们回家以后，再打一场？\n要是你想的话",
-  "ending_female": "@c{shock}你回来了？@d{32} 也就是说…@d{96} 你赢了呀！？\n@c{smile_ehalf}我应该早料到了。\n$@c{smile_eclosed}当然…我一直有这种感觉\n@c{smile}一切都结束了，对么？ 你打破了循环。\n$@c{smile_ehalf}你也完成了自己的梦想，不是吗？\n你甚至一次都没失败。\n$我是唯一能够记得你所作所为的人\n@c{angry_mopen}我会努力不忘掉哒！\n$@c{smile_wave_wink}开玩笑啦，@d{64} @c{smile}我才不会忘呢。@d{32}\n你的传奇将永远留存于我们心中。\n$@c{smile_wave}不管了，@d{64} 时候不早了@d{96} ，应该吧？\n在这地方还真搞不清楚。\n$一起回家吧。 @c{smile_wave_wink}可能明天，我们再来打一场，为了重温回忆嘛~"
-}
\ No newline at end of file
diff --git a/src/locales/zh_CN/dialogue-misc-female.json b/src/locales/zh_CN/dialogue-misc.json
similarity index 100%
rename from src/locales/zh_CN/dialogue-misc-female.json
rename to src/locales/zh_CN/dialogue-misc.json
diff --git a/src/locales/zh_CN/dialogue-female.json b/src/locales/zh_CN/dialogue.json
similarity index 94%
rename from src/locales/zh_CN/dialogue-female.json
rename to src/locales/zh_CN/dialogue.json
index 09090f36d94..5a4615fac54 100644
--- a/src/locales/zh_CN/dialogue-female.json
+++ b/src/locales/zh_CN/dialogue.json
@@ -655,6 +655,86 @@
       "5": "你虽然打败了我，但是我输的也这么潇洒！"
     }
   },
+  "aether_grunt": {
+    "encounter": {
+      "1": "我会用尽全力消灭你！",
+      "2": "我才不管你是不是小孩！\n只要和我们作对，我就把你打飞！",
+      "3": "上头要我拦下所有训练师，无论是谁！",
+      "4": "给你展现一下以太乐园的力量！",
+      "5": "既然你已经触达到了以太基金会的黑暗，\n那我要请你就此消失了。"
+    },
+    "victory": {
+      "1": "哼！看来你有点实力。",
+      "2": "这什么情况！什么情况！",
+      "3": "啊！你怎么这么强！我这下可没法阻止你！",
+      "4": "嗯……看来我输了……",
+      "5": "我惊掉大牙了……"
+    }
+  },
+  "faba": {
+    "encounter": {
+      "1": "我，分部长扎奥博， \n给你见识下现实世界的残酷吧！",
+      "2": "堂堂以太乐园的最后防线，\n我扎奥博竟然要跟个毛头小子对战。",
+      "3": "我，扎奥博，以太基金会分部长。\n世上唯一，无可替代！"
+    },
+    "victory": {
+      "1": "哎咿呀！",
+      "2": "怎……怎么可能！这孩子！",
+      "3": "这就是……这就是为啥我讨厌小孩子！"
+    }
+  },
+  "skull_grunt": {
+    "encounter": {
+      "1": "我们并不坏，YO，我们是硬汉！",
+      "2": "YO！咋样！我们就这样打招呼！\n混个脸熟呗，崽子！",
+      "3": "咱们就是一帮对别人的宝可梦\n比较感兴趣的哥们和姐们！",
+      "4": "别装B了，你有我们拽吗，老弟？",
+      "5": "骷髅队在此！没钱住房子！\n天天找乐子！青春混到死！"
+    },
+    "victory": {
+      "1": "哈？这就完了？",
+      "2": "该逃跑了YO！闪一边去YO！",
+      "3": "你这种弱鸡宝可梦反正我们也不要！",
+      "4": "啥！？ 这小屁孩也太牛B了！",
+      "5": "MAN！我能说什么，\n我的人生比宝可梦还烂。"
+    }
+  },
+  "plumeria": {
+    "encounter": {
+      "1": " …哼嗯，你看起来也没啥特别的。",
+      "2": "这帮呆子对付你也花了太长时间了吧……",
+      "3": "要是惹了骷髅队的人！我就不和你开玩笑了！"
+    },
+    "victory": {
+      "1": "哼嗯！你很强，我承认。",
+      "2": "哼，你是挺强的。现在我知道\n为啥那帮手下要花那么久对付一个小孩了。",
+      "3": "哼嗯！看来我得承认我输了。"
+    }
+  },
+  "macro_grunt": {
+    "encounter": {
+      "1": "你的对战生涯到此为止了。",
+      "2": "你是一名训练师吧\n你没有干涉我们工作的权力！",
+      "3": "我是马洛科蒙集团的，要买马洛科蒙人寿保险吗。"
+    },
+    "victory": {
+      "1": "除了礼貌地撤退我似乎别无选择…",
+      "2": "没法留住我的零花钱了，我又要财政赤字了…",
+      "3": "没人能比马洛科蒙集团的我们工作更卷！"
+    }
+  },
+  "oleana": {
+    "encounter": {
+      "1": "我不会让你方案洛兹先生的计划！",
+      "2": "看来你打倒了所有我安排的训练师，本身也没对他们有啥期待…",
+      "3": "为了总裁！我不会输的！"
+    },
+    "victory": {
+      "1": "*叹气*我赢不了。\n奥利薇，你真是个没用的女人",
+      "2": "呃啊！不可饶恕...我在想什么。\n走到这里的训练师果然不会轻易屈服！",
+      "3": "*叹气*奥利薇累累了……"
+    }
+  },
   "rocket_boss_giovanni_1": {
     "encounter": {
       "1": "我不得不说，能来到这里，你的确很不简单！"
@@ -787,6 +867,72 @@
       "1": "没有远见的蠢货会继续玷污这个美丽的世界。"
     }
   },
+  "aether_boss_lusamine_1": {
+    "encounter": {
+      "1": "你吓到我可爱的异兽了！我要让你先闭嘴！"
+    },
+    "victory": {
+      "1": "你…你怎么这么不听话！"
+    },
+    "defeat": {
+      "1": "哼嗯…"
+    }
+  },
+  "aether_boss_lusamine_2": {
+    "encounter": {
+      "1": "为什么你要一直妨碍我！\n我受够你了，完完全全受够了！ \n$不用说废话了…有了虚吾伊德的力量。\n我会让你明白，你来这里是有多么错误！"
+    },
+    "victory": {
+      "1": "呃呃啊啊啊啊呜呜呜啊啊！"
+    },
+    "defeat": {
+      "1": "我只要和我可爱的异兽在一起就好了！你们怎么样都无所谓了！"
+    }
+  },
+  "skull_boss_guzma_1": {
+    "encounter": {
+      "1": "摧毁，摧毁，\n不管摧毁几次也从不手软\n$惹人厌的古兹马大爷在此。"
+    },
+    "victory": {
+      "1": "切，我一定要找时间干掉你！"
+    },
+    "defeat": {
+      "1": "大老远跑来就这，昂？"
+    }
+  },
+  "skull_boss_guzma_2": {
+    "encounter": {
+      "1": "不管谁与我作对，我都会干掉他们！\n$这就是大坏蛋古兹马的全部！"
+    },
+    "victory": {
+      "1": "古兹马！！你在干什么啊！！！"
+    },
+    "defeat": {
+      "1": "你们真够蠢的!"
+    }
+  },
+  "macro_boss_rose_1": {
+    "encounter": {
+      "1": "我必须为所有人提供无限的能源，实现繁荣。$这是我的目的，我的责任，我的使命！"
+    },
+    "victory": {
+      "1": "你还是没有明白，训练师\n$我们…不，我要推动历史的进程啊！"
+    },
+    "defeat": {
+      "1": "你完全不理解！"
+    }
+  },
+  "macro_boss_rose_2": {
+    "encounter": {
+      "1": "我致力于解决伽勒尔的能源问题\n——当然也是全世界的能源问题。\n$我的经验与成果，造就了马洛科蒙集团，证明了我的正确与成功！\n$就算输了，我也不会改变主意的……"
+    },
+    "victory": {
+      "1": "我都忘记宝可梦对战的魅力了！我太久没有着手对战了…\n$这的确让人很满足，我接受我的失败！"
+    },
+    "defeat": {
+      "1": "我承认我做的事情非常渗人，我也不指望你能理解。\n$但我必须为伽勒尔地区提供无限的能源，确保永久的繁荣。"
+    }
+  },
   "brock": {
     "encounter": {
       "1": "我对岩石属性宝可梦的专精会击败你！来吧！",
@@ -2542,4 +2688,4 @@
       "1": "@c{smile_ehalf}我……\n我想我完成了我的使命……$@c{smile_eclosed}答应我……在你拯救世界之后\n……要……平安到家。$@c{smile_ehalf}……谢谢你。"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/zh_CN/menu-ui-handler.json b/src/locales/zh_CN/menu-ui-handler.json
index beea79f34f2..c8ecaa6dd98 100644
--- a/src/locales/zh_CN/menu-ui-handler.json
+++ b/src/locales/zh_CN/menu-ui-handler.json
@@ -3,7 +3,6 @@
   "ACHIEVEMENTS": "成就",
   "STATS": "数据统计",
   "RUN_HISTORY": "历史记录",
-  "VOUCHERS": "兑换券",
   "EGG_LIST": "蛋列表",
   "EGG_GACHA": "扭蛋机",
   "MANAGE_DATA": "管理数据",
diff --git a/src/locales/zh_CN/move.json b/src/locales/zh_CN/move.json
index ad7212c3f67..5974271abb2 100644
--- a/src/locales/zh_CN/move.json
+++ b/src/locales/zh_CN/move.json
@@ -2913,7 +2913,7 @@
   },
   "zippyZap": {
     "name": "电电加速",
-    "effect": "迅猛无比的电击。必定能够先制攻击，\n并且提高自己的闪避率。"
+    "effect": "迅猛无比的电击。必定能够先制攻击，击中对方的要害。"
   },
   "splishySplash": {
     "name": "滔滔冲浪",
@@ -3807,4 +3807,4 @@
     "name": "邪毒锁链",
     "effect": "用由毒形成的锁链缠住对手注入毒\n素加以侵蚀。有时会让对手陷入剧毒状态"
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/zh_CN/pokemon-form.json b/src/locales/zh_CN/pokemon-form.json
index b0f3c05d1d4..09ec54be804 100644
--- a/src/locales/zh_CN/pokemon-form.json
+++ b/src/locales/zh_CN/pokemon-form.json
@@ -64,6 +64,7 @@
   "landorusIncarnate": "化身",
   "keldeoOrdinary": "通常",
   "meloettaAria": "歌声",
+  "meloettaPirouette": "舞步形态",
   "froakieBattleBond": "牵绊变身",
   "scatterbugMeadow": "花园花纹",
   "scatterbugIcySnow": "冰雪花纹",
diff --git a/src/locales/zh_CN/run-history-ui-handler.json b/src/locales/zh_CN/run-history.json
similarity index 71%
rename from src/locales/zh_CN/run-history-ui-handler.json
rename to src/locales/zh_CN/run-history.json
index 2f5991d2472..08f430364fc 100644
--- a/src/locales/zh_CN/run-history-ui-handler.json
+++ b/src/locales/zh_CN/run-history.json
@@ -4,12 +4,12 @@
   "defeatedTrainer": "被打败",
   "defeatedTrainerDouble": "被组合打败",
   "defeatedRival": "被劲敌打败",
-  "defeatedM": "被打败",
-  "defeatedWildF": "被打败",
-  "defeatedTrainerF": "被打败",
-  "defeatedTrainerDoubleF": "被组合打败",
-  "defeatedRivalF": "被劲敌打败",
-  "defeatedF": "被打败",
+  "defeated": "被打败",
+  "defeatedWild_female": "被打败",
+  "defeatedTrainer_female": "被打败",
+  "defeatedTrainerDouble_female": "被组合打败",
+  "defeatedRival_female": "被劲敌打败",
+  "defeated_female": "被打败",
   "luck": "幸运",
   "score": "分数",
   "mode": "模式",
@@ -30,8 +30,8 @@
   "money": "金钱",
   "runLength": "游戏时长",
   "viewHeldItems": "持有道具",
-  "hallofFameTextM": "欢迎来到名人堂！",
-  "hallofFameTextF": "欢迎来到名人堂！",
+  "hallofFameText": "欢迎来到名人堂！",
+  "hallofFameText_female": "欢迎来到名人堂！",
   "viewHallOfFame": "浏览名人堂！",
   "viewEndingSplash": "浏览结算画面"
 }
\ No newline at end of file
diff --git a/src/locales/zh_CN/settings.json b/src/locales/zh_CN/settings.json
index 140ed3b78ad..3ae0fa8204c 100644
--- a/src/locales/zh_CN/settings.json
+++ b/src/locales/zh_CN/settings.json
@@ -61,6 +61,7 @@
   "typeHints": "属性提示",
   "masterVolume": "主音量",
   "bgmVolume": "音乐",
+  "fieldVolume": "场景音量",
   "seVolume": "音效",
   "musicPreference": "音乐偏好",
   "mixed": "全曲混合",
diff --git a/src/locales/zh_CN/trainer-classes.json b/src/locales/zh_CN/trainer-classes.json
index fe5b9f43592..3a50acf5c01 100644
--- a/src/locales/zh_CN/trainer-classes.json
+++ b/src/locales/zh_CN/trainer-classes.json
@@ -117,5 +117,14 @@
   "plasma_grunts": "等离子队手下们",
   "flare_grunt": "闪焰队手下",
   "flare_grunt_female": "闪焰队手下",
-  "flare_grunts": "闪焰队手下们"
-}
\ No newline at end of file
+  "flare_grunts": "闪焰队手下们",
+  "aether_grunt": "以太基金会职员",
+  "aether_grunt_female": "以太基金会职员",
+  "aether_grunts": "以太基金会职员",
+  "skull_grunt": "骷髅队手下",
+  "skull_grunt_female": "骷髅队手下",
+  "skull_grunts": "骷髅队手下",
+  "macro_grunt": "马洛科蒙训练师",
+  "macro_grunt_female": "马洛科蒙训练师",
+  "macro_grunts": "马洛科蒙训练师"
+}
diff --git a/src/locales/zh_CN/trainer-names.json b/src/locales/zh_CN/trainer-names.json
index 74d97c22846..9e03a514ff7 100644
--- a/src/locales/zh_CN/trainer-names.json
+++ b/src/locales/zh_CN/trainer-names.json
@@ -30,6 +30,10 @@
   "crasher_wake": "吉宪",
   "fantina": "梅丽莎",
   "byron": "东瓜",
+  "faba": "扎奥博",
+  "plumeria": "布尔美丽",
+  "oleana": "奥莉薇",
+
   "candice": "小菘",
   "volkner": "电次",
   "cilan": "天桐",
@@ -143,6 +147,10 @@
   "cyrus": "赤日",
   "ghetsis": "魁奇思",
   "lysandre": "弗拉达利",
+  "lusamine": "露莎米奈",
+  "guzma": "古兹马",
+  "rose": "洛兹",
+
   "blue_red_double": "青绿 & 赤红",
   "red_blue_double": "赤红 & 青绿",
   "tate_liza_double": "小枫 & 小南",
@@ -153,4 +161,4 @@
   "iris_alder_double": "艾莉丝 & 阿戴克",
   "marnie_piers_double": "玛俐 & 聂梓",
   "piers_marnie_double": "聂梓 & 玛俐"
-}
\ No newline at end of file
+}
diff --git a/src/locales/zh_CN/trainer-titles.json b/src/locales/zh_CN/trainer-titles.json
index 2961d65683c..07654ec8fc3 100644
--- a/src/locales/zh_CN/trainer-titles.json
+++ b/src/locales/zh_CN/trainer-titles.json
@@ -16,6 +16,10 @@
   "galactic_boss": "银河队老大",
   "plasma_boss": "等离子队老大",
   "flare_boss": "闪焰队老大",
+  "aether_boss": "以太基金会理事长",
+  "skull_boss": "骷髅队老大",
+  "macro_boss": "马洛科蒙总裁",
+
   "rocket_admin": "火箭队干部",
   "rocket_admin_female": "火箭队干部",
   "magma_admin": "熔岩队干部",
@@ -27,5 +31,8 @@
   "plasma_sage": "等离子队贤人",
   "plasma_admin": "等离子队干部",
   "flare_admin": "闪焰队干部",
-  "flare_admin_female": "闪焰队干部"
-}
\ No newline at end of file
+  "flare_admin_female": "闪焰队干部",
+  "aether_admin": "以太基金会干部",
+  "skull_admin": "骷髅队干部",
+  "macro_admin": "马洛科蒙干部"
+}
diff --git a/src/locales/zh_TW/achv-male.json b/src/locales/zh_TW/achv-male.json
deleted file mode 100644
index dcd6f26ae82..00000000000
--- a/src/locales/zh_TW/achv-male.json
+++ /dev/null
@@ -1,256 +0,0 @@
-{
-  "Achievements": {
-    "name": "成就"
-  },
-  "Locked": {
-    "name": "未解鎖"
-  },
-  "MoneyAchv": {
-    "description": "累計獲得 ₽{{moneyAmount}}"
-  },
-  "10K_MONEY": {
-    "name": "小有積蓄"
-  },
-  "100K_MONEY": {
-    "name": "大戶人家"
-  },
-  "1M_MONEY": {
-    "name": "百萬富翁"
-  },
-  "10M_MONEY": {
-    "name": "暴發戶"
-  },
-  "DamageAchv": {
-    "description": "在單次攻擊中造成 {{damageAmount}} 點傷害"
-  },
-  "250_DMG": {
-    "name": "重拳出擊"
-  },
-  "1000_DMG": {
-    "name": "神拳猛擊"
-  },
-  "2500_DMG": {
-    "name": "奪少？"
-  },
-  "10000_DMG": {
-    "name": "一拳超人"
-  },
-  "HealAchv": {
-    "description": "通過技能、能力或攜帶的道具一次性治療 {{healAmount}} {{HP}}點"
-  },
-  "250_HEAL": {
-    "name": "新手奶媽"
-  },
-  "1000_HEAL": {
-    "name": "治療擔當"
-  },
-  "2500_HEAL": {
-    "name": "牧師"
-  },
-  "10000_HEAL": {
-    "name": "泉水"
-  },
-  "LevelAchv": {
-    "description": "將一隻寶可夢提升到 Lv{{level}}"
-  },
-  "LV_100": {
-    "name": "别急，後面還有"
-  },
-  "LV_250": {
-    "name": "精英"
-  },
-  "LV_1000": {
-    "name": "天外有天"
-  },
-  "RibbonAchv": {
-    "description": "累計獲得 {{ribbonAmount}} 個勛章"
-  },
-  "10_RIBBONS": {
-    "name": "寶可夢聯盟冠軍"
-  },
-  "25_RIBBONS": {
-    "name": "超級球聯盟冠軍"
-  },
-  "50_RIBBONS": {
-    "name": "高級球聯盟冠軍"
-  },
-  "75_RIBBONS": {
-    "name": "肉鴿球聯盟冠軍"
-  },
-  "100_RIBBONS": {
-    "name": "大師球聯盟冠軍"
-  },
-  "TRANSFER_MAX_BATTLE_STAT": {
-    "name": "團隊協作",
-    "description": "在一項屬性強化至最大時用接力棒傳遞給其他寶可夢"
-  },
-  "MAX_FRIENDSHIP": {
-    "name": "親密無間",
-    "description": "使一隻寶可夢的親密度達到最大值"
-  },
-  "MEGA_EVOLVE": {
-    "name": "大變身",
-    "description": "超級進化一隻寶可夢"
-  },
-  "GIGANTAMAX": {
-    "name": "這位更是重量級",
-    "description": "極巨化一隻寶可夢"
-  },
-  "TERASTALLIZE": {
-    "name": "本系愛好者",
-    "description": "太晶化一隻寶可夢"
-  },
-  "STELLAR_TERASTALLIZE": {
-    "name": "隱藏屬性",
-    "description": "星晶化一隻寶可夢"
-  },
-  "SPLICE": {
-    "name": "無限融合",
-    "description": "使用基因之楔將兩隻寶可夢融合在一起"
-  },
-  "MINI_BLACK_HOLE": {
-    "name": "一大洞的道具",
-    "description": "獲得一個迷你黑洞"
-  },
-  "CATCH_MYTHICAL": {
-    "name": "神秘禮物",
-    "description": "捕捉一隻幻之寶可夢"
-  },
-  "CATCH_SUB_LEGENDARY": {
-    "name": "二級傳說",
-    "description": "捕捉一隻準傳說寶可夢"
-  },
-  "CATCH_LEGENDARY": {
-    "name": "傳說",
-    "description": "捕捉一隻傳說寶可夢"
-  },
-  "SEE_SHINY": {
-    "name": "閃耀奪目",
-    "description": "在野外找到一隻閃光寶可夢"
-  },
-  "SHINY_PARTY": {
-    "name": "嘔心瀝血",
-    "description": "擁有一支由閃光寶可夢組成的滿員隊伍"
-  },
-  "HATCH_MYTHICAL": {
-    "name": "幻獸蛋",
-    "description": "從蛋中孵化出一隻幻之寶可夢"
-  },
-  "HATCH_SUB_LEGENDARY": {
-    "name": "二級傳說蛋",
-    "description": "從蛋中孵化出一隻準傳說寶可夢"
-  },
-  "HATCH_LEGENDARY": {
-    "name": "傳說蛋",
-    "description": "從蛋中孵化出一隻傳說寶可夢"
-  },
-  "HATCH_SHINY": {
-    "name": "金色傳說！",
-    "description": "從蛋中孵化出一隻閃光寶可夢"
-  },
-  "HIDDEN_ABILITY": {
-    "name": "隱藏實力",
-    "description": "捕捉一隻擁有隱藏特性的寶可夢"
-  },
-  "PERFECT_IVS": {
-    "name": "合格證",
-    "description": "獲得一隻擁有完美個體值的寶可夢"
-  },
-  "CLASSIC_VICTORY": {
-    "name": "戰無不勝",
-    "description": "在經典模式中通關遊戲"
-  },
-  "MONO_GEN_ONE": {
-    "name": "最初的勁敵",
-    "description": "完成僅限第一世代的挑戰."
-  },
-  "MONO_GEN_TWO": {
-    "name": "1.5世代",
-    "description": "完成僅限第二世代的挑戰."
-  },
-  "MONO_GEN_THREE": {
-    "name": "“水太多了”",
-    "description": "完成僅限第三世代的挑戰."
-  },
-  "MONO_GEN_FOUR": {
-    "name": "她真是最強冠軍嗎？",
-    "description": "完成僅限第四世代的挑戰."
-  },
-  "MONO_GEN_FIVE": {
-    "name": "完全原創",
-    "description": "完成僅限第五世代的挑戰."
-  },
-  "MONO_GEN_SIX": {
-    "name": "女大公",
-    "description": "完成僅限第六世代的挑戰."
-  },
-  "MONO_GEN_SEVEN": {
-    "name": "首屆冠軍",
-    "description": "完成僅限第七世代的挑戰."
-  },
-  "MONO_GEN_EIGHT": {
-    "name": "冠軍時刻！",
-    "description": "完成僅限第八世代的挑戰."
-  },
-  "MONO_GEN_NINE": {
-    "name": "她又放水了",
-    "description": "完成僅限第九世代的挑戰."
-  },
-  "MonoType": {
-    "description": "完成 {{type}} 單屬性挑戰."
-  },
-  "MONO_NORMAL": {
-    "name": "異乎尋常的尋常"
-  },
-  "MONO_FIGHTING": {
-    "name": "我有真功夫"
-  },
-  "MONO_FLYING": {
-    "name": "憤怒的小鳥"
-  },
-  "MONO_POISON": {
-    "name": "關都地區特色"
-  },
-  "MONO_GROUND": {
-    "name": "地震預報"
-  },
-  "MONO_ROCK": {
-    "name": "堅如磐石"
-  },
-  "MONO_BUG": {
-    "name": "音箱蟀俠"
-  },
-  "MONO_GHOST": {
-    "name": "捉鬼敢死隊"
-  },
-  "MONO_STEEL": {
-    "name": "鐵巨人"
-  },
-  "MONO_FIRE": {
-    "name": "搓火球解決一切"
-  },
-  "MONO_WATER": {
-    "name": "當雨來臨，傾盆而下"
-  },
-  "MONO_GRASS": {
-    "name": "別踏這個青"
-  },
-  "MONO_ELECTRIC": {
-    "name": "瞄準大岩蛇的角！"
-  },
-  "MONO_PSYCHIC": {
-    "name": "腦洞大開"
-  },
-  "MONO_ICE": {
-    "name": "如履薄冰"
-  },
-  "MONO_DRAGON": {
-    "name": "準神俱樂部"
-  },
-  "MONO_DARK": {
-    "name": "總有叛逆期"
-  },
-  "MONO_FAIRY": {
-    "name": "林克，醒醒！"
-  }
-}
\ No newline at end of file
diff --git a/src/locales/zh_TW/achv-female.json b/src/locales/zh_TW/achv.json
similarity index 97%
rename from src/locales/zh_TW/achv-female.json
rename to src/locales/zh_TW/achv.json
index dcd6f26ae82..6587394cf41 100644
--- a/src/locales/zh_TW/achv-female.json
+++ b/src/locales/zh_TW/achv.json
@@ -252,5 +252,9 @@
   },
   "MONO_FAIRY": {
     "name": "林克，醒醒！"
+  },
+  "INVERSE_BATTLE": {
+    "name": "鏡子子鏡",
+    "description": "完成逆轉之戰挑戰\n戰挑戰之轉逆成完"
   }
 }
\ No newline at end of file
diff --git a/src/locales/zh_TW/battle.json b/src/locales/zh_TW/battle.json
index ada85d4d9b0..97b85a9cd5a 100644
--- a/src/locales/zh_TW/battle.json
+++ b/src/locales/zh_TW/battle.json
@@ -34,7 +34,7 @@
   "learnMoveNotLearned": "{{pokemonName}} 沒有學會 {{moveName}}.",
   "learnMoveForgetQuestion": "要忘記哪個技能？",
   "learnMoveForgetSuccess": "{{pokemonName}} 忘記了 {{moveName}}.",
-  "countdownPoof": "@d{32}1, @d{15}2, 和@d{15}… @d{15}… @d{15}… @d{15}@s{pb_bounce_1}噗！",
+  "countdownPoof": "@d{32}1, @d{15}2, 和@d{15}… @d{15}… @d{15}… @d{15}@s{se/pb_bounce_1}噗！",
   "learnMoveAnd": "然後…",
   "levelCapUp": "等級上限提升到 {{levelCap}}！",
   "moveNotImplemented": "{{moveName}} 未實裝，無法選擇。",
diff --git a/src/locales/zh_TW/challenges.json b/src/locales/zh_TW/challenges.json
index c6c4f90e65e..a1fc6b8f50f 100644
--- a/src/locales/zh_TW/challenges.json
+++ b/src/locales/zh_TW/challenges.json
@@ -19,5 +19,12 @@
     "name": "單屬性",
     "desc": "你只能使用{{type}}\n屬性的寶可夢",
     "desc_default": "你只能使用所選\n屬性的寶可夢"
+  },
+  "inverseBattle": {
+    "name": "逆轉之戰",
+    "shortName": "逆轉之戰",
+    "desc": "屬性相克關系被反轉，且沒有任何屬性對其他屬性免疫。\n禁用其他挑戰的成就。",
+    "value.0": "關閉",
+    "value.1": "開啓"
   }
 }
\ No newline at end of file
diff --git a/src/locales/zh_TW/config.ts b/src/locales/zh_TW/config.ts
index b0dfca1757c..cf505d683a5 100644
--- a/src/locales/zh_TW/config.ts
+++ b/src/locales/zh_TW/config.ts
@@ -4,8 +4,7 @@ import ability from "./ability.json";
 import abilityTriggers from "./ability-trigger.json";
 import arenaFlyout from "./arena-flyout.json";
 import arenaTag from "./arena-tag.json";
-import achvMale from "./achv-male.json";
-import achvFemale from "./achv-female.json";
+import achv from "./achv.json";
 import battle from "./battle.json";
 import battleScene from "./battle-scene.json";
 import battleInfo from "./battle-info.json";
@@ -16,14 +15,10 @@ import bgmName from "./bgm-name.json";
 import biome from "./biome.json";
 import challenges from "./challenges.json";
 import commandUiHandler from "./command-ui-handler.json";
-import dialogueMale from "./dialogue-male.json";
-import dialogueFemale from "./dialogue-female.json";
-import dialogueEndbossMale from "./dialogue-final-boss-male.json";
-import dialogueEndbossFemale from "./dialogue-final-boss-female.json";
-import dialogueMiscMale from "./dialogue-misc-male.json";
-import dialogueMiscFemale from "./dialogue-misc-female.json";
-import dialogueDoubleBattleMale from "./dialogue-double-battle-male.json";
-import dialogueDoubleBattleFemale from "./dialogue-double-battle-female.json";
+import dialogue from "./dialogue.json";
+import battleSpecDialogue from "./dialogue-final-boss.json";
+import miscDialogue from "./dialogue-misc.json";
+import doubleBattleDialogue from "./dialogue-double-battle.json";
 import egg from "./egg.json";
 import fightUiHandler from "./fight-ui-handler.json";
 import filterBar from "./filter-bar.json";
@@ -57,7 +52,7 @@ import weather from "./weather.json";
 import terrain from "./terrain.json";
 import modifierSelectUiHandler from "./modifier-select-ui-handler.json";
 import moveTriggers from "./move-trigger.json";
-import runHistory from "./run-history-ui-handler.json";
+import runHistory from "./run-history.json";
 
 export const zhTwConfig = {
   ability,
@@ -76,16 +71,11 @@ export const zhTwConfig = {
   challenges,
   commandUiHandler,
   common,
-  PGMachv: achvMale,
-  PGFachv: achvFemale,
-  PGMdialogue: dialogueMale,
-  PGFdialogue: dialogueFemale,
-  PGMbattleSpecDialogue: dialogueEndbossMale,
-  PGFbattleSpecDialogue: dialogueEndbossFemale,
-  PGMmiscDialogue: dialogueMiscMale,
-  PGFmiscDialogue: dialogueMiscFemale,
-  PGMdoubleBattleDialogue: dialogueDoubleBattleMale,
-  PGFdoubleBattleDialogue: dialogueDoubleBattleFemale,
+  achv,
+  dialogue,
+  battleSpecDialogue,
+  miscDialogue,
+  doubleBattleDialogue,
   egg,
   fightUiHandler,
   filterBar,
diff --git a/src/locales/zh_TW/dialogue-double-battle-male.json b/src/locales/zh_TW/dialogue-double-battle-male.json
deleted file mode 100644
index 684beac5eaf..00000000000
--- a/src/locales/zh_TW/dialogue-double-battle-male.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "blue_red_double": {
-    "encounter": {
-      "1": "青綠：嘿，赤紅，\n讓這傢伙看看我們是什麼來頭！$赤紅:...$青綠: 見識下真新鎮的實力！"
-    },
-    "victory": {
-      "1": "青綠：打得真不錯$赤紅: ..."
-    }
-  },
-  "red_blue_double": {
-    "encounter": {
-      "1": "赤紅: ...!$青綠：他人狠話不多。$青綠： 他人狠話不多。$青綠： 但別被他耍了，\n畢竟他可是個冠軍！"
-    },
-    "victory": {
-      "1": "赤紅: ...!$青綠: 下次我們一定會贏你！"
-    }
-  },
-  "tate_liza_double": {
-    "encounter": {
-      "1": "小楓:嘿嘿嘿……你驚訝嗎？$小南:這裡有兩個道館館主？$小楓: 我們是雙胞胎！$小南:我們無需交談，因為……我們可以通曉彼此的想法$小楓: 我們的組合……$小南: 你能打敗嗎？"
-    },
-    "victory": {
-      "1": "小楓：什麼？我們的組合……$小南：被瓦解了！"
-    }
-  },
-  "liza_tate_double": {
-    "encounter": {
-      "1": "小南：呵呵呵……你驚訝吧？$小楓：這裡有兩個道館館主？$小南：我們可以通曉……$小楓：彼此的想法……$小南：全在我們腦中！$小楓：我們的組合……$小南：你能打敗嗎？"
-    },
-    "victory": {
-      "1": "小楓：你和你的寶可夢……$小南：簡直像親兄弟姐妹！"
-    }
-  },
-  "wallace_steven_double": {
-    "encounter": {
-      "1": "大吾：米可利, 展現冠軍的實力吧！$米可利：我們將展示豐緣的實力！$米可利：我們將展示豐緣的實力！$大吾：要上了！"
-    },
-    "victory": {
-      "1": "大吾：打得真不錯！$米可利：我們下次會贏的！"
-    }
-  },
-  "steven_wallace_double": {
-    "encounter": {
-      "1": "大吾：你有什麼稀有的寶可夢嗎？$米可利：大吾……我們是來對戰的，\n不是來炫耀寶可夢的。$大吾：哦……知道了… 那麼要上了！"
-    },
-    "victory": {
-      "1": "大吾：戰鬥結束了，\n來看看我的稀有寶可夢！$米可利：大吾……"
-    }
-  },
-  "alder_iris_double": {
-    "encounter": {
-      "1": "阿戴克：我們倆是合眾最強的訓練家！$艾莉絲：與最強來一場最激烈的戰鬥吧！"
-    },
-    "victory": {
-      "1": "阿戴克：哇哦！你真是超級厲害！$艾莉絲：我們下次會贏的啦！"
-    }
-  },
-  "iris_alder_double": {
-    "encounter": {
-      "1": "艾莉絲：歡迎！挑戰者，\n合眾地區最強的冠軍大駕光臨！$阿戴克：艾莉絲，你是不是有點太興奮了…"
-    },
-    "victory": {
-      "1": "艾莉絲：這樣的失敗可不好受啊…$阿戴克：但是只有失敗才能讓我們變強！"
-    }
-  },
-  "piers_marnie_double": {
-    "encounter": {
-      "1": "瑪俐：哥哥，給他們展現尖釘鎮的實力！$聶梓：我們帶來黑暗！"
-    },
-    "victory": {
-      "1": "瑪俐：你的強光亮瞎我們的黑暗了啦……$聶梓：實在太亮了…"
-    }
-  },
-  "marnie_piers_double": {
-    "encounter": {
-      "1": "聶梓: 台下準備好了嗎！$瑪俐: 哥哥，我們是來對戰的，\n不是來唱歌的……"
-    },
-    "victory": {
-      "1": "聶梓：這首歌獻給大家！$瑪俐：哥哥……"
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/locales/zh_TW/dialogue-double-battle-female.json b/src/locales/zh_TW/dialogue-double-battle.json
similarity index 100%
rename from src/locales/zh_TW/dialogue-double-battle-female.json
rename to src/locales/zh_TW/dialogue-double-battle.json
diff --git a/src/locales/zh_TW/dialogue-final-boss-male.json b/src/locales/zh_TW/dialogue-final-boss-male.json
deleted file mode 100644
index 13bfee9eb96..00000000000
--- a/src/locales/zh_TW/dialogue-final-boss-male.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "encounter": "看來終於又到了那個時候。\n你知道自己為何會來到這裡，不是嗎？\n$你被吸引到這裡，因為你以前就來過這裡。\n無數次。\n$儘管，或許可以數一數。\n準確地說，這實際上是你的第{{cycleCount}}次循環。\n$每一次循環，你的思想都會恢復到之前的狀態。\n即便如此，不知何故，你之前自我的殘留仍然存在。\n$直到現在，你仍未成功，但我感覺這次你身上有一種異樣的氣息。\n$你是這裡唯一的人，儘管感覺上還有……另一個人。\n$你最終會成為對我來的一個硬茬嗎？\n我渴望了數千年的挑戰？\n$我們，開始。",
-  "firstStageWin": "我明白了。我所感覺到的氣息確實是真實的。\n看來我不再需要保留實力了。\n$別讓我失望。",
-  "secondStageWin": "…漂亮。"
-}
\ No newline at end of file
diff --git a/src/locales/zh_TW/dialogue-final-boss-female.json b/src/locales/zh_TW/dialogue-final-boss.json
similarity index 100%
rename from src/locales/zh_TW/dialogue-final-boss-female.json
rename to src/locales/zh_TW/dialogue-final-boss.json
diff --git a/src/locales/zh_TW/dialogue-male.json b/src/locales/zh_TW/dialogue-male.json
deleted file mode 100644
index 4236e239622..00000000000
--- a/src/locales/zh_TW/dialogue-male.json
+++ /dev/null
@@ -1,2137 +0,0 @@
-{
-  "youngster": {
-    "encounter": {
-      "1": "嘿，想來對戰嗎？",
-      "2": "你也是新人訓練師嗎？",
-      "3": "嘿，我之前沒見過你。我們來對戰吧！",
-      "4": "我剛輸了，所以我正在尋找更多的寶可夢。$等等！你看起來很弱！\n來吧，我們對戰吧！",
-      "5": "我們見過面嗎？我記不太清了。$嗯，不管怎樣，很高興見到你！",
-      "6": "好的！我們上吧！",
-      "7": "好的！我來啦！我會向你展示我的實力！",
-      "8": "嚯嚯嚯...我會向你展示我的寶可夢有多厲害！",
-      "9": "不要浪費時間打招呼。你準備好了就放馬過來！",
-      "10": "別掉以輕心，$否則你可能會被小朋友打到哭鼻子哦。",
-      "11": "我精心培養了我的寶可夢。不許你傷害它們！",
-      "12": "恭喜你成功了！從這以後可不輕鬆哦。",
-      "13": "戰鬥永無止境！歡迎來到沒有盡頭的世界！"
-    },
-    "victory": {
-      "1": "哇！你很強！",
-      "2": "我根本沒機會贏，對吧？",
-      "3": "我會等長大了再來打敗你！",
-      "4": "呃。我沒有更多寶可夢了。",
-      "5": "不可能…不可能！我怎麼可能又輸了…",
-      "6": "不！我輸了！",
-      "7": "哇！你真是太不可思議了！我既驚訝又欽佩！",
-      "8": "這怎麼…怎麼可能…$明明我和我的寶可夢是最強大的…",
-      "9": "下次我不會輸了！我們找時間再對戰吧！",
-      "10": "天哪！你看不出我還只是個小孩子嗎！$你那樣全力以赴太賴了！",
-      "11": "你的寶可夢更棒啊！和我交換吧！",
-      "12": "我之前有點上頭，我說了什麼來著？",
-      "13": "啊哈哈！就是這樣！$對！你已經熟悉這個世界了！"
-    }
-  },
-  "lass": {
-    "encounter": {
-      "1": "我們來對戰吧，好嗎？",
-      "2": "你看起來像是個新人訓練師。我們來戰鬥吧！",
-      "3": "我不認識你。來對戰怎麼樣？",
-      "4": "讓我們來進行一場有趣的寶可夢對戰吧！",
-      "5": "我會向你展示如何真正使用寶可夢！",
-      "6": "一場認真的對戰從始於認真的開場白！$你確定你準備好了嗎？",
-      "7": "花無重開日，人無再少年。$你在對戰中只有一次機會。$很快，你就只能活在回憶中了。",
-      "8": "你最好對我手下留情，好嗎？$當然我會認真對戰的！",
-      "9": "學校很無聊，我無事可做。$*哈欠*…我只是來對戰打發時間。"
-    },
-    "victory": {
-      "1": "那真是令人印象深刻！我還有很多要學習。",
-      "2": "我沒想到你會這麼輕易地打敗我…",
-      "3": "我希望有一天，我們能再進行一場對戰。",
-      "4": "那真是場非常有趣的對戰！$你讓我精疲力盡了…",
-      "5": "你給我上了一課！你真是太棒了！",
-      "6": "說真的，我輸了。$這，怎麼說，真的好難過，但你也真的很厲害。",
-      "7": "我不需要像這樣的記憶。刪除記憶中…",
-      "8": "嘿！我告訴過你要對我手下留情！$不過，當你認真的時候，你真的很酷。",
-      "9": "實際上，我開始厭倦對戰了…$一定有新的事情可以做…"
-    }
-  },
-  "breeder": {
-    "encounter": {
-      "1": "聽話的寶可夢，自私的寶可夢…$寶可夢有獨特的性格呢。",
-      "2": "儘管我出生貧寒，但我的寶可夢培養的很好。",
-      "3": "嗯，你有沒有管教你的寶可夢？$過度溺愛是不好的。"
-    },
-    "victory": {
-      "1": "對每個寶可夢因材施教是很重要的。",
-      "2": "不像一無是處的我…這些寶可夢都很優秀。",
-      "3": "過度的讚美會寵壞寶可夢和人。"
-    },
-    "defeat": {
-      "1": "即使輸了，也不應該對你的寶可夢發火。",
-      "2": "相當好的寶可夢，對吧？我很會養東西。",
-      "3": "無論你多麼愛你的寶可夢，$你仍要在它沒做好時管教它們。"
-    }
-  },
-  "breeder_female": {
-    "encounter": {
-      "1": "寶可夢永遠不會背叛你。$它們會回報你對它們的愛。",
-      "2": "要我教教你訓練優秀寶可夢的技巧嗎？",
-      "3": "特別的寶可夢有特別的培育技巧。"
-    },
-    "victory": {
-      "1": "呃…事情不應該是這樣的。$我是不是用錯了能量方塊？",
-      "2": "這怎麼會發生在我的寶可夢身上…$你給你的寶可夢餵了什麼？",
-      "3": "如果我輸了，我告訴你我只是在消磨時間。$你根本不會傷害到我的自尊心。"
-    },
-    "defeat": {
-      "1": "這證明了我的寶可夢已經接受了我的愛。",
-      "2": "訓出好寶可夢的真正技巧是捉到好的寶可夢。",
-      "3": "寶可夢的強弱取決於你的飼養方式。"
-    }
-  },
-  "fisherman": {
-    "encounter": {
-      "1": "啊！你讓我錯過了一次咬鉤！$你打算怎麼辦？",
-      "2": "走開！你嚇跑了寶可夢！",
-      "3": "讓我看看你能否贏得勝利！"
-    },
-    "victory": {
-      "1": "算了吧。",
-      "2": "下一次，我將捲土重來，凱旋而歸！",
-      "3": "我想這次我低估了海流。"
-    }
-  },
-  "fisherman_female": {
-    "encounter": {
-      "1": "哇！我釣到了一條大魚！",
-      "2": "線已收好，準備提竿！",
-      "3": "準備製造波浪！"
-    },
-    "victory": {
-      "1": "我會帶著更強大的魚鉤回來。",
-      "2": "下次我會贏得勝利。",
-      "3": "我只是在為回歸磨利我的魚鉤！"
-    }
-  },
-  "swimmer": {
-    "encounter": {
-      "1": "是時候潛水了！",
-      "2": "讓我們一起乘風破浪，贏得勝利！",
-      "3": "該一鳴驚人了！"
-    },
-    "victory": {
-      "1": "沉浸在失敗中！",
-      "2": "失敗的波浪！",
-      "3": "後浪死在沙灘上，我猜。"
-    }
-  },
-  "backpacker": {
-    "encounter": {
-      "1": "收拾行李，開始遊戲！",
-      "2": "讓我看看你是否能跟上！",
-      "3": "全副武裝，挑戰者！",
-      "4": "我花了20年時間試圖找到自己……但我在哪裡？"
-    },
-    "victory": {
-      "1": "這次絆倒了！",
-      "2": "哦，我覺得我迷路了。",
-      "3": "死路！",
-      "4": "等一下！嘿！你不知道我是誰嗎？"
-    }
-  },
-  "ace_trainer": {
-    "encounter": {
-      "1": "你看起來挺自信的。",
-      "2": "你的寶可夢…… 讓我看看……",
-      "3": "因為我是王牌訓練師，人們認為我很強。",
-      "4": "你知道成為王牌訓練師需要什麼嗎？"
-    },
-    "victory": {
-      "1": "是的…… 你的寶可夢很棒……",
-      "2": "什麼？！我是戰鬥天才啊！",
-      "3": "理所應當，你才是主角！",
-      "4": "好好好！你可以成為王牌訓練師！"
-    },
-    "defeat": {
-      "1": "我將把我的身體和靈魂全都奉獻給寶可夢對戰！",
-      "2": "一切都在我的預料之中… \n沒有什麼好驚訝的…",
-      "3": "我覺得我長大後有點玻璃心，$你太壓力我我會垮的……",
-      "4": "我當然很強大，不會輸。$而且重要的是我要優雅地贏。"
-    }
-  },
-  "parasol_lady": {
-    "encounter": {
-      "1": "是時候用優雅和從容來為戰鬥添彩了！"
-    },
-    "victory": {
-      "1": "我的優雅依然完好無損！"
-    }
-  },
-  "twins": {
-    "encounter": {
-      "1": "準備好囉，因為我們聯手，\n麻煩雙倍！",
-      "2": "兩顆心，一條繩$讓我們看看你能否跟上我們雙胞胎的力量！",
-      "3": "希望你準備好了面對雙倍的麻煩，$因為我們即將燃起來啦！"
-    },
-    "victory": {
-      "1": "雖然我們在這一輪輸了，$但我們的羈絆依然堅不可摧！",
-      "2": "我們的雙胞胎精神，才不會就此熄滅。",
-      "3": "我們會作為充滿活力的二人組，$捲土重來，變得更強！"
-    },
-    "defeat": {
-      "1": "雙胞胎的力量至高無上！",
-      "2": "兩顆心，一起贏！",
-      "3": "笑容成雙，共舞成雙！"
-    }
-  },
-  "cyclist": {
-    "encounter": {
-      "1": "準備好在我後面吃土吧！",
-      "2": "挑戰者，準備好！我要把你打得落花流水！",
-      "3": "全速前進，讓我看看你能不能跟得上！"
-    },
-    "victory": {
-      "1": "輪子可能不轉了，但我的決心沒有停下。",
-      "2": "被超越了！",
-      "3": "通往勝利的道路還有許多曲折等待探索。"
-    }
-  },
-  "black_belt": {
-    "encounter": {
-      "1": "我讚揚你挑戰我的勇氣！$因為我是踢力最強的人！",
-      "2": "哦，我明白了。你想被切成碎片嗎？$或者你更喜歡當個沙袋？"
-    },
-    "victory": {
-      "1": "哦。是寶可夢在戰鬥。$我強大的踢擊一點忙都沒幫上。",
-      "2": "嗯…如果我無論如何都會輸，我希望能被徹底打敗。"
-    }
-  },
-  "battle_girl": {
-    "encounter": {
-      "1": "你不必試圖勾引我。你可以輸給我。"
-    },
-    "victory": {
-      "1": "很難說再見，但我們快沒時間了……"
-    }
-  },
-  "hiker": {
-    "encounter": {
-      "1": "人到中年後，我的身體和我爬過的山一樣強壯！",
-      "2": "我從父母那裡遺傳了這副魁梧的身材…$就像一座活生生的山脈…"
-    },
-    "victory": {
-      "1": "至少在BMI方面我不能輸！",
-      "2": "這還不夠……永遠不夠。$我的壞膽固醇還不夠高……"
-    }
-  },
-  "ranger": {
-    "encounter": {
-      "1": "當我身處大自然中，其他事情都不重要了。",
-      "2": "如果我生活中沒有大自然，有時就會突然感到焦慮。"
-    },
-    "victory": {
-      "1": "無論我是贏是輸，\n對廣闊的大自然來說並不重要……",
-      "2": "與城市生活的窒息感相比，\n這種事情微不足道。"
-    },
-    "defeat": {
-      "1": "我贏了。但與浩瀚的大自然相比，\n勝利算不了什麼…",
-      "2": "與我的焦慮症相比，我覺得你也不會怎樣…"
-    }
-  },
-  "scientist": {
-    "encounter": {
-      "1": "我的研究將引導這個世界走向和平與歡樂。"
-    },
-    "victory": {
-      "1": "我是個天才…我不應該輸給你這樣的人…"
-    }
-  },
-  "school_kid": {
-    "encounter": {
-      "1": "……嘿嘿。我對計算和分析很有信心。",
-      "2": "我正在盡可能地積累經驗，$因為我希望有一天能成為道館館主。"
-    },
-    "victory": {
-      "1": "哦…計算和分析也許和個例不太匹配呀…",
-      "2": "我想，即使是艱難困苦的經歷，也有存在的意義。"
-    }
-  },
-  "artist": {
-    "encounter": {
-      "1": "我以前很受歡迎，但現在已經徹底過氣了。"
-    },
-    "victory": {
-      "1": "隨著時代的變遷，價值觀也在變化。$我意識到這一點已經太晚了。"
-    }
-  },
-  "guitarist": {
-    "encounter": {
-      "1": "當我彈奏著走向勝利的旋律時，$準備好感受失敗的節奏吧！"
-    },
-    "victory": {
-      "1": "暫時沉默了，但我不屈的旋律將繼續演奏。"
-    }
-  },
-  "worker": {
-    "encounter": {
-      "1": "人們總誤解我，這讓我很煩。$我比大家想象的要乾淨得多。"
-    },
-    "victory": {
-      "1": "我真的不想曬傷皮膚，所以我想在陰涼處工作。"
-    }
-  },
-  "worker_female": {
-    "encounter": {
-      "1": "人們總是誤解我，這讓我很煩。 $我比大家想象的要乾淨得多。"
-    },
-    "victory": {
-      "1": "我真的不想曬傷皮膚，\n所以我想在陰涼處工作。"
-    },
-    "defeat": {
-      "1": "我的身體和心靈並不總同步。"
-    }
-  },
-  "worker_double": {
-    "encounter": {
-      "1": "你會知道我們怎麼擊敗你的。我們在工地訓練過！"
-    },
-    "victory": {
-      "1": "真奇怪…怎麼會這樣…我不應該被打敗的。"
-    }
-  },
-  "hex_maniac": {
-    "encounter": {
-      "1": "我通常只聽古典音樂，但如果我輸了，$我想我應該試試新時代的音樂！",
-      "2": "我的每一滴眼淚都讓我變得更加堅強。"
-    },
-    "victory": {
-      "1": "樂壇新時代的曙光就此出現了嗎？",
-      "2": "現在我變得更強了。我隨著他人怨恨而成長。"
-    },
-    "defeat": {
-      "1": "“新時代”指的是二十世紀的古典作曲家，對吧？",
-      "2": "不要糾結於悲傷或沮喪。$你可以用悲憤來激勵自己。"
-    }
-  },
-  "psychic": {
-    "encounter": {
-      "1": "嘿！集中！"
-    },
-    "victory": {
-      "1": "呃呃呃！"
-    }
-  },
-  "officer": {
-    "encounter": {
-      "1": "準備好，因為正義即將得到伸張！",
-      "2": "準備好維護法律，在戰場上伸張正義！"
-    },
-    "victory": {
-      "1": "正義的分量比以往還要沉重……",
-      "2": "失敗的陰影，在警局中徘徊。"
-    }
-  },
-  "beauty": {
-    "encounter": {
-      "1": "我最後的戰鬥…我就是這麼看待這場對戰的…"
-    },
-    "victory": {
-      "1": "很有趣…有時間再來一場最後的戰鬥…"
-    }
-  },
-  "baker": {
-    "encounter": {
-      "1": "希望你準備好品嚐失敗的滋味！"
-    },
-    "victory": {
-      "1": "我會捲土重來的。"
-    }
-  },
-  "biker": {
-    "encounter": {
-      "1": "是時候加速，把你甩在後面了！"
-    },
-    "victory": {
-      "1": "我會為下一場比賽調整狀態。"
-    }
-  },
-  "firebreather": {
-    "encounter": {
-      "1": "我的火焰會吞噬你！",
-      "2": "我的靈魂在燃燒，我要讓你看看它有多滾燙！",
-      "3": "快來看看吧！"
-    },
-    "victory": {
-      "1": "我燃成灰了…",
-      "2": "哟！ 好燙！",
-      "3": "嗷！ 我的鼻尖燒焦了！"
-    }
-  },
-  "sailor": {
-    "encounter": {
-      "1": "夥計，如果你輸了，你就得挨板子！",
-      "2": "來吧！這關係到我作為水手的尊嚴！",
-      "3": "你好啊！你暈船麼？"
-    },
-    "victory": {
-      "1": "啊，被孩子打敗了。",
-      "2": "你的精神讓我沉淪！",
-      "3": "好像是我暈船了…"
-    }
-  },
-  "brock": {
-    "encounter": {
-      "1": "我對岩石屬性寶可夢的專精會擊敗你！來吧！",
-      "2": "我磐石般的意志將壓倒你！",
-      "3": "讓我展示給你看看，我寶可夢真正的力量！"
-    },
-    "victory": {
-      "1": "你寶可夢的力量戰勝了我堅如磐石的防禦！",
-      "2": "世界很大！很高興有機會和你戰鬥。",
-      "3": "也許我應該回去追尋我成為寶可夢飼養員的夢想……"
-    },
-    "defeat": {
-      "1": "最好的進攻就是堅固的防守！$那是我做事的方式！",
-      "2": "下次來和我一起研究岩石屬性，$更好地了解如何與它們對戰！",
-      "3": "哈哈，我在各地的旅行有所回報了！"
-    }
-  },
-  "misty": {
-    "encounter": {
-      "1": "我的戰策就是使用水屬性寶可夢全面進攻！",
-      "2": "嗨，我會讓你見識我的水屬性寶可夢的力量！",
-      "3": "我的夢想是踏上旅程，與強大的訓練師戰鬥……$你能滿足我嗎？"
-    },
-    "victory": {
-      "1": "你真的很強……我承認，你有技術的……",
-      "2": "哼……你知道你只是運氣好，對吧？！",
-      "3": "哇，你太過分了！不敢相信你打敗我了！"
-    },
-    "defeat": {
-      "1": "強大的小霞對你來說，太過分了嗎？",
-      "2": "我希望你看到了我寶可夢優雅的游泳技巧！",
-      "3": "你的寶可夢無法匹敵我的心腹和驕傲！"
-    }
-  },
-  "lt_surge": {
-    "encounter": {
-      "1": "我的電屬性寶可夢在戰爭中救了我！$我來給你展示一下！",
-      "2": "立正！我要電到你投降！",
-      "3": "我會像對待敵軍一樣，狠狠電你！"
-    },
-    "victory": {
-      "1": "哇！你的隊伍有真傢伙，小子！",
-      "2": "啊啊，你很強！連我的電擊技巧都輸給了你。",
-      "3": "這失敗真是把我給電麻了！"
-    },
-    "defeat": {
-      "1": "哦耶！我的電屬性寶可夢是世界第一！",
-      "2": "哈哈哈！真是一場電動人心的戰鬥，小子！",
-      "3": "寶可夢對戰等於戰爭，$我向你展示了軍隊中的格鬥技巧！"
-    }
-  },
-  "erika": {
-    "encounter": {
-      "1": "啊，這裡天氣真好…$哦，對戰？那好吧。",
-      "2": "我在寶可夢對戰上的造詣，$可以與我的插花技巧相媲美。",
-      "3": "哦，希望我寶可夢的宜人香氣\n不會再讓我睡著…",
-      "4": "看看花園裡的花朵，如此令人心曠神怡。"
-    },
-    "victory": {
-      "1": "哦！我認輸啦~",
-      "2": "這場比賽非常愉快。",
-      "3": "啊，看來我輸了…",
-      "4": "哦，我的天哪。"
-    },
-    "defeat": {
-      "1": "我怕我會打瞌睡…",
-      "2": "哦，我天。看來我的草屬性寶可夢擊敗了你。",
-      "3": "那場戰鬥是如此令人心曠神怡。",
-      "4": "哦…這就完啦？"
-    }
-  },
-  "janine": {
-    "encounter": {
-      "1": "我正在掌握毒屬性攻擊的藝術。$今天我來和你過過招！",
-      "2": "父親相信我能獨當一面。$我來證明他說的對！",
-      "3": "我的忍術，僅次於我的父親！$你能跟的上嗎？"
-    },
-    "victory": {
-      "1": "就算現在，我仍然需要繼續訓練…我明白了。",
-      "2": "你的戰鬥技巧，超過了我。",
-      "3": "我要好好努力提高我的技術。"
-    },
-    "defeat": {
-      "1": "呵呵…毒液耗盡了你所有的力量。",
-      "2": "哈！你根本無法抵擋我卓越的忍技！",
-      "3": "我沒有辜負父親對我的信任。"
-    }
-  },
-  "sabrina": {
-    "encounter": {
-      "1": "我的超能力預見了你的到來！",
-      "2": "我不喜歡戰鬥，但如果你想，$我會展示我的實力！",
-      "3": "我能感覺到你的雄心壯志。$我倒要看看你是不是虛有其表。"
-    },
-    "victory": {
-      "1": "你的力量……遠遠超出了我的預知……",
-      "2": "我沒有準確預測到你的實力。",
-      "3": "即使我強大的超能力也無法感知到你這樣強大的人。"
-    },
-    "defeat": {
-      "1": "這場勝利……和我看到的未來一樣啊！",
-      "2": "也許我預感到有強大實力的人，是另一個……",
-      "3": "在你奮不顧身投入戰鬥之前，\n磨練你的能力。$如果你這樣做，你才未來可期……"
-    }
-  },
-  "blaine": {
-    "encounter": {
-      "1": "哈！希望你帶了燒傷治療藥！",
-      "2": "我火熱的寶可夢將所有挑戰者都焚燒殆盡！",
-      "3": "準備好玩火吧！"
-    },
-    "victory": {
-      "1": "我已經焚燒殆盡了！甚至連灰燼都沒有留下！",
-      "2": "我沒有把火焰煽得足夠高嗎？",
-      "3": "我燃盡了……但這讓我進步的動力燃燒得更旺了！"
-    },
-    "defeat": {
-      "1": "我的熊熊烈火無法被撲滅！",
-      "2": "我的寶可夢因這次勝利而變得更加強大！",
-      "3": "哈！我的激情燃得比你的更熱烈！"
-    }
-  },
-  "giovanni": {
-    "encounter": {
-      "1": "我，火箭隊的領袖，\n會讓你的世界感受到痛苦！",
-      "2": "我在這裡的訓練在我再次面對老朋友之前至關重要。",
-      "3": "我認為你還沒有準備好迎接你即將經歷的失敗！"
-    },
-    "victory": {
-      "1": "什麼！我輸了？！ 我沒什麼可和你說的！",
-      "2": "哼……你永遠無法理解我希望實現的目標。",
-      "3": "這次失敗只是暫時的。$我將找準時機，讓火箭隊浴火重生。"
-    },
-    "defeat": {
-      "1": "不知自己幾斤幾兩，\n說明你仍然只是一個孩子。",
-      "2": "不要再試圖干涉我。",
-      "3": "我希望你明白挑戰我是多麼愚蠢。"
-    }
-  },
-  "roxanne": {
-    "encounter": {
-      "1": "您能否展示一下您是如何戰鬥的麼？",
-      "2": "你可以和更多訓練師戰鬥來學到很多東西。",
-      "3": "哦，被你抓到我正在用功了~$你想戰鬥嗎？"
-    },
-    "victory": {
-      "1": "哦，看來我輸了。$我明白了。",
-      "2": "看來我在戰鬥方面還有更多東西要學。",
-      "3": "我會把今天在這裡學到的東西銘記於心。"
-    },
-    "defeat": {
-      "1": "從我們的對戰中，我學到了很多。$希望你也是。",
-      "2": "我期待再次與你戰鬥。$希望你能運用在此學到的東西。",
-      "3": "我憑借我所學到的一切贏得了勝利。"
-    }
-  },
-  "brawly": {
-    "encounter": {
-      "1": "哦，夥計，挑戰者！$讓我看看你的能耐！",
-      "2": "你看起來很厲害嘛。$來對戰吧！",
-      "3": "是時候掀起風暴了！$我們上吧！"
-    },
-    "victory": {
-      "1": "哦哇，你把我沖走了！",
-      "2": "你駕馭了我的海浪，把我打敗了！",
-      "3": "我覺得我就像是在武鬥洞窟裡迷路了！"
-    },
-    "defeat": {
-      "1": "哈哈，我駕馭了大浪！$有時間再挑戰我吧。",
-      "2": "再和我一起衝浪吧！",
-      "3": "就像潮水的漲落，\n我希望你也能再來挑戰我。"
-    }
-  },
-  "wattson": {
-    "encounter": {
-      "1": "是時候被電擊了！$哈哈哈！",
-      "2": "我要讓火星子飛蹦！$哈哈哈！",
-      "3": "我希望你帶了麻痺藥！$哇哈哈哈！"
-    },
-    "victory": {
-      "1": "看來我的電量用完了！$哇哈哈哈！",
-      "2": "你完全接地了是吧！$哇哈哈哈！",
-      "3": "謝謝你給我電了一下！$哇哈哈哈！"
-    },
-    "defeat": {
-      "1": "電充充滿，有時間再挑戰我吧！$哇哈哈哈！",
-      "2": "我希望你覺得我們的戰鬥激情似電！$哇哈哈哈！",
-      "3": "你沒想到我贏了吧？$哇哈哈哈！"
-    }
-  },
-  "flannery": {
-    "encounter": {
-      "1": "很高興見到你！等等，不對……$我要粉碎你！",
-      "2": "我才當道館主沒多久，\n但我會讓你灰飛煙滅！",
-      "3": "是時候展示爺爺教給我的招式了！來對戰吧！"
-    },
-    "victory": {
-      "1": "你讓我想起了我的爺爺……$難怪我輸了。",
-      "2": "我是不是太努力了？$我應該放鬆，不能太上頭了。",
-      "3": "失敗才不會嗆到我。$是時候重新點燃訓練了！"
-    },
-    "defeat": {
-      "1": "我希望我讓祖父感到驕傲了……$有時間我們再戰鬥吧。",
-      "2": "我……我簡直不敢相信我贏了！$按照自己的方式做事奏效了！",
-      "3": "早點用炙熱的招式再來交手吧！"
-    }
-  },
-  "norman": {
-    "encounter": {
-      "1": "我沒想到你能一路來到這裡。$我們來對戰吧。",
-      "2": "作為道館主，我會盡一切努力贏得勝利。$我們開始吧！",
-      "3": "你最好全力以赴。$對戰的時候到了！"
-    },
-    "victory": {
-      "1": "我輸給了你……？$但規則就是規則。",
-      "2": "難道我不該從城都搬家嗎……？",
-      "3": "我不敢相信。$這是一場好對戰。"
-    },
-    "defeat": {
-      "1": "我們都盡力了。$希望我們不久之後能再對戰。",
-      "2": "你應該嘗試挑戰我的孩子。$可能會有一些收穫！",
-      "3": "謝謝你精彩的戰鬥。$下次好運。"
-    }
-  },
-  "winona": {
-    "encounter": {
-      "1": "我一直在天空中翱翔尋找獵物…$而你就是我的目標！",
-      "2": "不管戰況如何，我都會和我的飛行寶可夢$以優雅的姿態獲勝。來戰鬥吧！",
-      "3": "我希望你不怕高。$我們一起升上高空吧！"
-    },
-    "victory": {
-      "1": "你是我見過的第一位比我更有風度的訓練師。$打的非常出色。",
-      "2": "哦，我的飛行系寶可夢都已經墜落了！$好吧。",
-      "3": "儘管我倒下了，我的寶可夢將繼續翱翔！"
-    },
-    "defeat": {
-      "1": "我與我的飛行系寶可夢，\n將永遠優雅地起舞！",
-      "2": "我希望你喜歡我們的演出。$我們優雅的舞蹈已經落幕。",
-      "3": "你願意再來觀看我們優雅的編舞嗎？"
-    }
-  },
-  "tate": {
-    "encounter": {
-      "1": "嘿嘿嘿…$看到我沒和妹妹在一起，很驚訝麼？",
-      "2": "我可以讀懂你在想什麼…$你想要戰鬥！",
-      "3": "你如何擊敗一個…$讀懂你一舉一動的人？"
-    },
-    "victory": {
-      "1": "贏不了啊…$我想小南了…",
-      "2": "你和寶可夢之間的聯繫比我們更強。",
-      "3": "如果我和小南聯手，我們會贏的。$我們可以了解彼此的想法！"
-    },
-    "defeat": {
-      "1": "我和我的寶可夢無與倫比！",
-      "2": "如果你連我都打不過，\n你肯定也打不過小南。",
-      "3": "這多虧了我和小南的嚴格訓練。$我可以與寶可夢一心同體。"
-    }
-  },
-  "liza": {
-    "encounter": {
-      "1": "呵呵呵…$看到我沒和哥哥一起，很驚訝嗎？",
-      "2": "我可以讀懂你渴望什麼…$你想戰鬥，不是嗎？",
-      "3": "你如何擊敗一個…$與寶可夢們一心同體的人？"
-    },
-    "victory": {
-      "1": "贏不了啊…$我想小楓了…",
-      "2": "你和寶可夢之間的聯繫…$比我強。",
-      "3": "如果我和小楓在一起，我們會贏的。$我們甚至可以接上彼此的話！"
-    },
-    "defeat": {
-      "1": "我和我的寶可夢勢不可擋。",
-      "2": "如果你連我都打不過，\n你肯定也打不過小楓。",
-      "3": "這多虧了我和小楓的嚴格訓練。$我可以與我的寶可夢一心同體。"
-    }
-  },
-  "juan": {
-    "encounter": {
-      "1": "別害羞啊。$我們來戰鬥吧！",
-      "2": "啊哈哈哈，敬請期待\n我和水屬性寶可夢的盛大演出！",
-      "3": "我就是正在逼近的風暴！$你能經受住考驗嗎？",
-      "4": "請你見證我們的表演。$由我和寶可夢共同創造的宏偉水之幻境！"
-    },
-    "victory": {
-      "1": "你可能是一個能挑戰米可利的天才！",
-      "2": "我專注於優雅，而你刻苦鍛鍊。$你能擊敗我是很正常的。",
-      "3": "啊哈哈哈！$好吧，這次你贏了。",
-      "4": "從你身上，我感受到了技巧的光輝，\n它將戰勝一切。"
-    },
-    "defeat": {
-      "1": "寶可夢和我創造的水之幻境，讓我取得了勝利。",
-      "2": "啊哈哈哈，我贏了，你輸了。",
-      "3": "要我把我的服裝借給你嗎？\n可能能幫到你對戰啊！$啊哈哈哈，我開玩笑的！",
-      "4": "我是贏家！也就是說，你輸了。"
-    }
-  },
-  "crasher_wake": {
-    "encounter": {
-      "1": "極限! 極限! 看好了!$極限假面…就此…登場!",
-      "2": "極限! 極限! 極限假面!",
-      "3": "我是滔滔巨浪，將你沖走！"
-    },
-    "victory": {
-      "1": "我真是笑得合不攏嘴啊！$哈哈哈！那真是太有趣了！",
-      "2": "呼哇！結束收尾了！$我該怎麼說呢……$我還想再對戰！我還想再繼續戰鬥！",
-      "3": "啊啊啊啊啊!?"
-    },
-    "defeat": {
-      "1": "耶！就是這樣！",
-      "2": "我贏了，但我還想要更多！\n我還想再更多地戰鬥！",
-      "3": "再見！"
-    }
-  },
-  "falkner": {
-    "encounter": {
-      "1": "我將向你展示華麗的飛行寶可夢真正的力量！",
-      "2": "風啊，伴我同行！",
-      "3": "爸爸！我希望你能在空中注視著我的戰鬥！"
-    },
-    "victory": {
-      "1": "明白了……我會禮貌地退場。",
-      "2": "輸了就是輸了。你確實很強大。",
-      "3": "…行吧! 嗯, 我輸了。"
-    },
-    "defeat": {
-      "1": "爸爸！我用你珍愛的飛行寶可夢贏了……",
-      "2": "飛行系寶可夢才是最強的！",
-      "3": "感覺我正在追趕上我的父親！"
-    }
-  },
-  "nessa": {
-    "encounter": {
-      "1": "無論你的小腦瓜子在搞什麼陰謀詭計，$我和我的搭檔都會確保它石沉大海。",
-      "2": "我來這裡可不是為了閒聊，\n而是為了贏！",
-      "3": "這是我的寶可夢給你的一點小禮物……\n我希望你能接受！"
-    },
-    "victory": {
-      "1": "你和你的寶可夢太過分了……",
-      "2": "怎麼……？這怎麼可能？！",
-      "3": "我完全被沖走了！"
-    },
-    "defeat": {
-      "1": "洶湧的海浪再次襲來！",
-      "2": "是時候乘風破浪，取得勝利了！",
-      "3": "誒嘿嘿！"
-    }
-  },
-  "melony": {
-    "encounter": {
-      "1": "我不會手下留情！",
-      "2": "好吧，我想我們應該開始了。",
-      "3": "我會把你凍得結結實實的！"
-    },
-    "victory": {
-      "1": "你……你可厲害了，是不是？",
-      "2": "如果你找到瑪瓜，一定要好好教訓他，好嗎？",
-      "3": "你的破冰方式有點過於直接了呢……"
-    },
-    "defeat": {
-      "1": "現在你知道戰鬥有多殘酷了吧？",
-      "2": "嘿！看來我又贏了！",
-      "3": "你是在保留實力嗎？"
-    }
-  },
-  "marlon": {
-    "encounter": {
-      "1": "你看起來很強！來吧！讓我們開始吧！",
-      "2": "我的強大像大海一樣無邊無際。$你會被我沖走，絕對的。",
-      "3": "哦豁，由我來面對你！這可不得了咯！"
-    },
-    "victory": {
-      "1": "你太厲害了！\n你培養了一些非常強大的寶可夢啊，$你已經掌握了訓練師的精髓！",
-      "2": "你不僅僅是看起來，\n你是真的強，真的！$呃，我也被沖走了！",
-      "3": "你像兇猛的波浪一樣強壯！"
-    },
-    "defeat": {
-      "1": "你很強，但這還不足以動搖大海，懂？",
-      "2": "嘻！看來我又贏了！",
-      "3": "甜蜜的勝利！"
-    }
-  },
-  "shauntal": {
-    "encounter": {
-      "1": "打擾了。你是挑戰者，對嗎？$我是四天王的幽靈系寶可夢使用者，$婉龍，我將是你的對手。",
-      "2": "我非常喜歡描寫來到這裡的訓練師，\n以及他們訓練的寶可夢。$我可以用你和你的寶可夢作為主題嗎？",
-      "3": "每個與寶可夢相處的人都有故事要講。$接下來要講的故事是怎樣的呢？"
-    },
-    "victory": {
-      "1": "哇。我驚呆了！",
-      "2": "對…對不起！我必須先向我的寶可夢道歉……$都是因為我讓你們有了不好的經歷，真的很抱歉！",
-      "3": "你要知道，我仍然是四天王之一！"
-    },
-    "defeat": {
-      "1": "額呵呵。",
-      "2": "給了我下一部小說的絕佳素材！",
-      "3": "就這樣，又一篇故事來到尾聲……"
-    }
-  },
-  "marshal": {
-    "encounter": {
-      "1": "我的師傅，阿戴克，\n看到了你作為訓練師的潛力，$對你很有興趣。$我要來考驗你——挖掘你力量的極限。\n丹田發力！",
-      "2": "勝利，決定性的勝利，\n正是我所求！挑戰者，我來了！",
-      "3": "在我的心中，我尋求著成為戰士的力量，\n克服自身的所有弱點！$以我的信念，取勝！"
-    },
-    "victory": {
-      "1": "呼！幹得好！",
-      "2": "不要停止戰鬥，追求更高的目標！",
-      "3": "你和你寶可夢展現的力量\n給我留下了深刻的印象……"
-    },
-    "defeat": {
-      "1": "嗯…",
-      "2": "這真是場好戰鬥。",
-      "3": "哈啊！哈啊！嗨呀啊！"
-    }
-  },
-  "cheren": {
-    "encounter": {
-      "1": "你讓我想起了一位老朋友。$這讓我對這場寶可夢戰鬥感到興奮！",
-      "2": "不考慮清楚這一點，\n寶可夢對戰就沒有了意義。$這就是失去了和寶可夢一同戰鬥的意義。",
-      "3": "我的名字是黑連！我是道館館主，\n也是老師！$很高興認識你。"
-    },
-    "victory": {
-      "1": "謝謝……我又能發現自己的不足了。",
-      "2": "謝謝…接近理想的道路…我好像隱約看到了。",
-      "3": "嗯……這值得思考。"
-    },
-    "defeat": {
-      "1": "作為道館館主，我要成為你要跨越的壁壘！",
-      "2": "好吧！",
-      "3": "正因為有寶可夢，我們才能走到這裡。$為什麼寶可夢會幫助我們，\n這個恐怕不僅是寶可夢與訓練家…$而是生命與生命之間的問題。"
-    }
-  },
-  "chili": {
-    "encounter": {
-      "1": "咿呀！是時候玩火了！！我是三兄弟中最強的！",
-      "2": "嗒噠！如火似焰的伯特——就是我\n——你接下來的對手！",
-      "3": "我將向你展示，\n我和我熾熱的火系寶可夢的能耐！"
-    },
-    "victory": {
-      "1": "被你幹掉了。我……燃盡了……",
-      "2": "哇吼！你燃起來了！",
-      "3": "啊！被你幹碎了！"
-    },
-    "defeat": {
-      "1": "我燃起來啦！和我玩兒，你就會被燙傷！",
-      "2": "你要是玩兒火，就會被燙傷！",
-      "3": "我說，拜託，\n你的對手是我，沒機會贏的！"
-    }
-  },
-  "cilan": {
-    "encounter": {
-      "1": "無關個人情感…也不會有艱難的感受…$我和我的草屬性寶可夢會…$呃…不管什麼樣的對手我們都會應戰的。",
-      "2": "所以，呃，如果你願意的話，我會，\n呃，盡我所能做好，呃，你知道的，你的對手。",
-      "3": "好吧……所以，我是天桐，\n我喜歡草屬性寶可夢。"
-    },
-    "victory": {
-      "1": "呃……已經結束了嗎？",
-      "2": "…真是太意外了。你真…強。$看起來就算是伯特或寇恩都贏不了你…",
-      "3": "…嗯。看起來我來的…不是時候？"
-    },
-    "defeat": {
-      "1": "哈？我贏了？",
-      "2": "我想…$我想我贏了，因為我一直在和我的兄弟伯特和寇恩競爭，\n我們都變得更強了。",
-      "3": "…這…這是一次非常嚇人的經歷呢…"
-    }
-  },
-  "roark": {
-    "encounter": {
-      "1": "我需要看看你作為訓練師的潛力。$還有，我要看看與你並肩作戰的寶可夢的堅韌！",
-      "2": "來吧！這些是我的岩石系寶可夢，我的驕傲！",
-      "3": "岩石屬性寶可夢就是最強的！",
-      "4": "我要看看你作為訓練師的潛力。$還要看看與你並肩作戰的寶可夢的堅韌！"
-    },
-    "victory": {
-      "1": "什麼？不可能！我強化的寶可夢們！",
-      "2": "……我大腦過載了。$下次邀請你參加地下的化石挖掘比賽。",
-      "3": "有你這種技術，贏得勝利是很正常的。",
-      "4": "什麼？！連這也不夠？",
-      "5": "我搞砸了。"
-    },
-    "defeat": {
-      "1": "看？我為我的搖滾戰鬥風格感到驕傲！",
-      "2": "謝謝！這場戰鬥給了我自信，$我感覺能夠打敗我父親了！",
-      "3": "我感覺就像我砸穿了一塊頑石！"
-    }
-  },
-  "morty": {
-    "encounter": {
-      "1": "只要我再多努力一點，我就能看到我遇到傳說中的寶可夢的未來！$你會幫助我達到那個水平！",
-      "2": "據說，彩虹色的寶可夢會\n出現在真正強大的訓練師面前。 $我一直相信著這個美麗的傳說，\n所以，從出生開始，\n就在這裡進行著秘密的修行。$因為這樣，其他人看不到的東西\n我也能夠看得到…$我看到的，是那個將傳說中的寶可夢\n召喚到這片大地上的人的影子。$我一直相信，那就是我自己！\n希望你也能助我一臂之力！",
-      "3": "無論你相信還是不相信，神秘的力量確實存在。",
-      "4": "你可以見證我訓練的成果。",
-      "5": "你必須讓你與寶可夢的靈魂合二為一。你能做到嗎？",
-      "6": "嘿，你想成為我訓練的一部分嗎？"
-    },
-    "victory": {
-      "1": "我還不夠好……",
-      "2": "我明白了…你的旅程…去了遙遠的地方，你見過的比我多得多。$我羨慕你…",
-      "3": "這怎麼可能……",
-      "4": "我認為我們的潛力沒什麼不同。$但是，我覺得你並不簡單，似乎還有什麼……",
-      "5": "我想我需要更多的訓練。",
-      "6": "那太遺憾了"
-    },
-    "defeat": {
-      "1": "我又向前邁進了一步。",
-      "2": "呵呵呵……",
-      "3": "什…麼？！那還不夠？",
-      "4": "我感覺就像我砸穿了一塊頑石！",
-      "5": "哈哈哈啊！",
-      "6": "我知道我會贏！"
-    }
-  },
-  "crispin": {
-    "encounter": {
-      "1": "我想贏，所以接下來我正要贏！",
-      "2": "我想對戰就對戰！懂嗎！就應該這樣！"
-    },
-    "victory": {
-      "1": "我想贏……但我還是輸了！",
-      "2": "我輸了……因為我贏不了！"
-    },
-    "defeat": {
-      "1": "嘿，等一下。我是不是贏了？$我覺得我贏了！太滿足了！",
-      "2": "哇哦！那太棒了！"
-    }
-  },
-  "amarys": {
-    "encounter": {
-      "1": "我想幫助某個人。因此，我不能輸。$…我們的戰鬥現在開始。"
-    },
-    "victory": {
-      "1": "我還不夠，我明白了。"
-    },
-    "defeat": {
-      "1": "勝利屬於我。打得好。"
-    }
-  },
-  "lacey": {
-    "encounter": {
-      "1": "我將用我平時的隊伍\n作為四天王的一員面對你。"
-    },
-    "victory": {
-      "1": "打得真好呀~"
-    },
-    "defeat": {
-      "1": "讓我們為你寶可夢的努力給予熱烈的掌聲！"
-    }
-  },
-  "drayton": {
-    "encounter": {
-      "1": "哥們，我喜歡椅子。\n你喜歡椅子嗎？簡直是救星。$我不明白為什麼大家不一直坐著。\n站著多累人！"
-    },
-    "victory": {
-      "1": "我早該想到的！"
-    },
-    "defeat": {
-      "1": "嘿嘿嘿！別介意我，\n我只是在這裡小贏一下。$如果你不開心，我懂，\n但別因為我對烏栗發火，OK？"
-    }
-  },
-  "ramos": {
-    "encounter": {
-      "1": "我用那些強壯的植物\n蓋出來的遊樂場精彩嗎？$它們的力量象徵著我這個園丁兼道館館主的實力，\n你真的確定能夠與之抗衡嗎？"
-    },
-    "victory": {
-      "1": "你信任你的寶可夢，\n它們也信任你…不錯的戰鬥，小豆芽。"
-    },
-    "defeat": {
-      "1": "呵呵呵…確實，\n脆弱的小草甚至能穿透混凝土。"
-    }
-  },
-  "viola": {
-    "encounter": {
-      "1": "敗陣時的後悔，勝利的瞬間…$都是最棒的影象！很好呀，很好呀！$那麼來吧！",
-      "2": "我的鏡頭總會聚焦在勝利上，\n我不會讓任何事情破壞這個畫面！"
-    },
-    "victory": {
-      "1": "你和你的寶可夢向我展示了一個全新的鏡頭機位！\n很好呀，很好呀！",
-      "2": "你通過鏡頭看到的世界，\n和你與寶可夢並肩作戰時看到的世界…$視角不同，即使是同一個世界看起來也完全不同。"
-    },
-    "defeat": {
-      "1": "我勝利那一刻的照片，\n將是一個真正的贏家，對吧！",
-      "2": "是的！我拍了些很棒的照片！"
-    }
-  },
-  "candice": {
-    "encounter": {
-      "1": "向小菘我挑戰嗎？好啊！\n我就是在等待強者$但是我也氣勢高昂，很強哦？",
-      "2": "寶可夢也好，時尚也好，戀愛也好，\n無論做什麼都氣勢高昂！$就說到這兒吧，讓你見識一下我的氣勢，\n要做好覺悟哦！"
-    },
-    "victory": {
-      "1": "好厲害！我有點尊敬你了。",
-      "2": "好厲害！我有點尊敬你了！$嗯，感覺是被你的氣勢給壓倒了。"
-    },
-    "defeat": {
-      "1": "你的氣勢我看到了，但我還是不會輸的！",
-      "2": "怎麼樣？小菘我的氣勢！\n寶可夢們的氣勢滿滿哦！"
-    }
-  },
-  "gardenia": {
-    "encounter": {
-      "1": "你身上有一種勝利的氣息。\n那麼不管怎樣，$這應該會是場有趣的戰鬥。\n讓我們對戰吧！"
-    },
-    "victory": {
-      "1": "太棒了！你可擅長對戰了，不是嗎？"
-    },
-    "defeat": {
-      "1": "太好了！我的寶可夢和我都很棒！"
-    }
-  },
-  "aaron": {
-    "encounter": {
-      "1": "好的！讓我來接受你的挑戰！"
-    },
-    "victory": {
-      "1": "戰鬥是一件深刻而複雜的事情……"
-    },
-    "defeat": {
-      "1": "戰勝一位四天王並不容易。"
-    }
-  },
-  "cress": {
-    "encounter": {
-      "1": "沒！錯！你必須面對\n與我和我高貴的水屬性的戰鬥！"
-    },
-    "victory": {
-      "1": "輸了？我？我不敢相信。"
-    },
-    "defeat": {
-      "1": "當你的對手是我時，這是必然的結果。"
-    }
-  },
-  "allister": {
-    "encounter": {
-      "1": "我是歐尼奧。$我…我來了……"
-    },
-    "victory": {
-      "1": "我差點被嚇得丟了面具…那真是…$哇。我可以看清你真正的實力。"
-    },
-    "defeat": {
-      "1": "這真是太棒了！"
-    }
-  },
-  "clay": {
-    "encounter": {
-      "1": "咳咳! 讓我好等，不是嗎，孩子？$好吧，是時候看看你能做到什麼了！"
-    },
-    "victory": {
-      "1": "真是的……我先說好，\n我可沒有手下留情。"
-    },
-    "defeat": {
-      "1": "最重要的是輸掉的時候該怎麼辦。$只要你能在失敗中找到教訓，\n就能夠不斷地成長！"
-    }
-  },
-  "kofu": {
-    "encounter": {
-      "1": "我會給你上一整道水系寶可夢大餐！\n但別真吃了它們！"
-    },
-    "victory": {
-      "1": "吃了嗎！你真是活力又新鮮啊，\n不是嗎！$就是有點太鮮活了！"
-    },
-    "defeat": {
-      "1": "你要再來找我，聽見了嗎？"
-    }
-  },
-  "tulip": {
-    "encounter": {
-      "1": "請讓我運用我的化妝技巧，$讓你可愛的小寶可夢變得更美麗！"
-    },
-    "victory": {
-      "1": "你妝點的力量宛如魔法加固，\n完全沖洗不掉啊。"
-    },
-    "defeat": {
-      "1": "你知道嗎，在我這行，\n那些沒天賦的人往往會很快消失，$再也不會被提起。"
-    }
-  },
-  "sidney": {
-    "encounter": {
-      "1": "你給我的印象不錯，\n我猜這會是一場精彩的對戰。$很棒！看起來真的很棒！$你和我，讓我們享受一場\n只能在這裡上演的戰鬥吧！"
-    },
-    "victory": {
-      "1": "嗯，你覺得怎樣？我輸了！\n嗯，不過這很有趣，所以無所謂啊。"
-    },
-    "defeat": {
-      "1": "別介意，OK？"
-    }
-  },
-  "phoebe": {
-    "encounter": {
-      "1": "過去我在修行時得到了\n能與幽靈寶可夢親密交流的能力。$沒錯，我和寶可夢之間\n有著強烈的羈絆。$那麼，來試試看你有沒有能力\n傷到我的寶可夢吧！"
-    },
-    "victory": {
-      "1": "哦，天呀。我輸了。"
-    },
-    "defeat": {
-      "1": "我期待著下次再和你戰鬥！"
-    }
-  },
-  "glacia": {
-    "encounter": {
-      "1": "我在這兒見到的盡是些\n弱不禁風的訓練家和寶可夢。$你又如何呢？如果你能讓我不得不用\n上全力的話就再好不過了！"
-    },
-    "victory": {
-      "1": "你和你的寶可夢…\n你們的靈魂燃燒得多麼熱烈啊！$這股激烈的熱能仿佛能征服一切。\n$難怪我的冰屬性技巧也奈何不了你了。"
-    },
-    "defeat": {
-      "1": "一場充滿激情的戰鬥，確實。"
-    }
-  },
-  "drake": {
-    "encounter": {
-      "1": "對於我們這些將寶可夢視為\n同伴一同戰鬥的訓練家來說，$你知道怎樣才能贏得勝利嗎？\n你知道獲得勝利的條件嗎？$如果你不知道，\n那麼你永遠也無法戰勝我！"
-    },
-    "victory": {
-      "1": "幹得漂亮，就是這樣。"
-    },
-    "defeat": {
-      "1": "我在這場戰鬥中全力以赴了！"
-    }
-  },
-  "wallace": {
-    "encounter": {
-      "1": "你的氣質變了，\n我能感覺到這一點。$現在，把你和你的寶可夢\n的力量展現給我看吧。$作為回禮，就由我和我的寶可夢\n演出一場水之幻影吧！"
-    },
-    "victory": {
-      "1": "精彩。此刻，我能從你身上感覺到\n身為寶可夢訓練家的可靠與高貴。$我真榮幸能遇到你和你的寶可夢。"
-    },
-    "defeat": {
-      "1": "偉大的幻影！"
-    }
-  },
-  "lorelei": {
-    "encounter": {
-      "1": "只要能讓我用冰屬性寶可夢，\n就絕對沒人能贏得過我！\n能凍住對方可是很厲害的哦！$因為如果被凍住，你的寶可夢就無法動彈了！\n啊哈哈！你做好覺悟了吧！"
-    },
-    "victory": {
-      "1": "你怎麼敢！"
-    },
-    "defeat": {
-      "1": "一旦你被凍結，你就什麼都做不了。"
-    }
-  },
-  "will": {
-    "encounter": {
-      "1": "我曾經環遊世界，\n日以繼夜地做著超能力寶可夢的修行之旅。$我會不斷變強！沒理由會在這裡輸掉！"
-    },
-    "victory": {
-      "1": "……不會吧……"
-    },
-    "defeat": {
-      "1": "就差一點。\n我想知道你缺少了什麼。"
-    }
-  },
-  "malva": {
-    "encounter": {
-      "1": "我的內心可是一直燃燒著呢。$燃燒著對你的怒火！"
-    },
-    "victory": {
-      "1": "挑戰者出色地擊敗了四天王之一，帕琦拉。"
-    },
-    "defeat": {
-      "1": "真開心啊，能將你徹底粉碎！"
-    }
-  },
-  "hala": {
-    "encounter": {
-      "1": "老哈拉讓你放開嗓子！"
-    },
-    "victory": {
-      "1": "我能感受到你在旅途中所獲得的力量。"
-    },
-    "defeat": {
-      "1": "啊哈哈。多麼有趣的戰鬥。"
-    }
-  },
-  "molayne": {
-    "encounter": {
-      "1": "我將隊長的位置讓給了我的表弟馬瑪內,\n但我對自己的能力很有信心。 $我的力量就像超新星一樣！"
-    },
-    "victory": {
-      "1": "我發現了一個有趣的訓練師對手！"
-    },
-    "defeat": {
-      "1": "啊哈哈。多麼有趣的戰鬥。"
-    }
-  },
-  "rika": {
-    "encounter": {
-      "1": "我要對你手下留情，但……騙你的啦！ $好好動腦！"
-    },
-    "victory": {
-      "1": "不錯，小子。"
-    },
-    "defeat": {
-      "1": "啊哈哈哈哈！你真的很特别，小子！"
-    }
-  },
-  "bruno": {
-    "encounter": {
-      "1": "我們將用勢不可擋的力量磨滅你！呼哈！"
-    },
-    "victory": {
-      "1": "為什麼？我怎麼會輸？"
-    },
-    "defeat": {
-      "1": "你可以隨意挑戰我，\n但結果永遠不會改變！"
-    }
-  },
-  "bugsy": {
-    "encounter": {
-      "1": "我是阿筆！\n對蟲系寶可夢的熟悉不會輸給任何人的！"
-    },
-    "victory": {
-      "1": "哇，太棒了！\n你是個寶可夢專家！$我的研究還沒有完成。\n好吧，你贏了。"
-    },
-    "defeat": {
-      "1": "謝謝！多虧了我們的戰鬥，\n我的研究也取得了進展！"
-    }
-  },
-  "koga": {
-    "encounter": {
-      "1": "哇哈哈哈哈！$寶可夢不僅僅是關於蠻力，拭目以待吧！"
-    },
-    "victory": {
-      "1": "啊！你證明了自己！"
-    },
-    "defeat": {
-      "1": "懂不懂要對忍者的技巧心神畏懼？"
-    }
-  },
-  "bertha": {
-    "encounter": {
-      "1": "啊，讓老婆婆看看你學到了什麼？"
-    },
-    "victory": {
-      "1": "好吧，親愛的孩子，\n不得不說，那令人印象深刻。$你的寶可夢相信你並盡最大努力為你贏得勝利。$儘管我輸了，\n我也止不住笑呢！"
-    },
-    "defeat": {
-      "1": "哈哈哈！看來老婆婆我贏了！"
-    }
-  },
-  "lenora": {
-    "encounter": {
-      "1": "那麼，挑戰者，讓我來研究$你與你精心養育的寶可夢要如何戰鬥！"
-    },
-    "victory": {
-      "1": "我關於你的理論是正確的。$你不僅僅是有天賦……你很努力！\n我向你致敬！"
-    },
-    "defeat": {
-      "1": "啊哈哈！如果你輸了，\n一定要分析原因，$並在下一場戰鬥中運用那些知識！"
-    }
-  },
-  "siebold": {
-    "encounter": {
-      "1": "只要我活著，我將不斷努力尋求終極美食…$以及和最強的對手戰鬥！"
-    },
-    "victory": {
-      "1": "您的事蹟，我志米銘記在心。"
-    },
-    "defeat": {
-      "1": "我們的寶可夢戰鬥就像我靈魂的養料。\n它將讓我繼續前進。$這就是我將向你表示敬意的方式，\n感謝你在戰鬥中全力以赴！"
-    }
-  },
-  "roxie": {
-    "encounter": {
-      "1": "準備好了嗎！我要給你上一課！"
-    },
-    "victory": {
-      "1": "夠野的！你的想法比我的還要毒！"
-    },
-    "defeat": {
-      "1": "嘿，拜託！認真點！\n你要加把勁啊!"
-    }
-  },
-  "olivia": {
-    "encounter": {
-      "1": "沒什麼開場白。\n是時候和我麗姿，戰鬥了！"
-    },
-    "victory": {
-      "1": "真的很可愛……你和你的寶可夢……"
-    },
-    "defeat": {
-      "1": "嗯哼。"
-    }
-  },
-  "poppy": {
-    "encounter": {
-      "1": "哦！你想和我進行寶可夢對戰麼？"
-    },
-    "victory": {
-      "1": "嗚哇？！嘛……"
-    },
-    "defeat": {
-      "1": "耶！我做到了！我擊~敗~了~你！\n你可以來…打…復仇之戰？$只要你想，隨時來打復仇之戰吧！"
-    }
-  },
-  "agatha": {
-    "encounter": {
-      "1": "寶可夢是用來戰鬥的！我會讓你看看真正訓練家的戰鬥！"
-    },
-    "victory": {
-      "1": "哦，我的天！你真是個特別的孩子！"
-    },
-    "defeat": {
-      "1": "哈哈哈，這才是正確的戰鬥方式！"
-    }
-  },
-  "flint": {
-    "encounter": {
-      "1": "希望你已經熱身完畢，\n因為這裡即將大爆炸！"
-    },
-    "victory": {
-      "1": "不可思議！$你的動作如此火熱，讓我看起來溫吞吞的！"
-    },
-    "defeat": {
-      "1": "嗯？就這嗎？\n我覺得你得再激情點。"
-    }
-  },
-  "grimsley": {
-    "encounter": {
-      "1": "一無所有，\n或者，贏下所有！"
-    },
-    "victory": {
-      "1": "一旦失敗，\n就意味著失去一切……$下一次我要追尋勝利！"
-    },
-    "defeat": {
-      "1": "如果有人贏了，\n和他對戰的人就會輸。"
-    }
-  },
-  "caitlin": {
-    "encounter": {
-      "1": "當花兒綻開時、我便出現。\n成為你在等待的人…$你似乎同時具備實力和善意$我所尋找的是擁有卓越力量的對手…$請用出你的全力吧！"
-    },
-    "victory": {
-      "1": "我和我的寶可夢學到了很多！非常感謝。"
-    },
-    "defeat": {
-      "1": "我渴望以優雅的姿態取得勝利。"
-    }
-  },
-  "diantha": {
-    "encounter": {
-      "1": "與你的寶可夢對戰\n讓你充滿了未來的希望…$說真的，這讓我更有活力地面對新的一天，確實如此！"
-    },
-    "victory": {
-      "1": "擁有高尚靈魂的訓練家和寶可夢的身姿，\n讓我的心激烈地震顫…"
-    },
-    "defeat": {
-      "1": "哦，太棒了！你覺得怎麼樣？\n我的隊伍很酷吧~對吧？"
-    }
-  },
-  "wikstrom": {
-    "encounter": {
-      "1": "年輕的挑戰者，幸會！\n我乃是著名的鋼鐵之刃，公爵雁鎧! $讓我們開始戰鬥吧！預備！"
-    },
-    "victory": {
-      "1": "輝煌！你與你尊貴的\n寶可夢之間的信任居然勝過了我！"
-    },
-    "defeat": {
-      "1": "哦哦哦！這是怎麼回事，\n我的心止不住地在震顫！ $與如此有價值的對手的勝利\n讓我的靈魂飛翔——我心翱翔！"
-    }
-  },
-  "acerola": {
-    "encounter": {
-      "1": "對戰只是找個樂子！來吧，我來會會你！"
-    },
-    "victory": {
-      "1": "我……我說不出話！你是怎麼做到的？！"
-    },
-    "defeat": {
-      "1": "哈哈！真是嚇人倒怪的勝利呀！"
-    }
-  },
-  "larry_elite": {
-    "encounter": {
-      "1": "……你好，我是青木。$麻煩的是我還要兼任四天王。"
-    },
-    "victory": {
-      "1": "好吧，我們翅膀下的疾風止於你這了啊…"
-    },
-    "defeat": {
-      "1": "是時候和老闆開會了。"
-    }
-  },
-  "lance": {
-    "encounter": {
-      "1": "我一直在等你。讓我來試試你有幾斤幾兩。",
-      "2": "我知道你能走這麼遠。讓我們開始吧。"
-    },
-    "victory": {
-      "1": "被你拿下了啊。你太出色了!",
-      "2": "我從沒想到會有另一個訓練師打敗我……$我很驚訝。"
-    },
-    "defeat": {
-      "1": "就差一點。想再試一次嗎？",
-      "2": "我沒覺得你弱，別因此困擾。"
-    }
-  },
-  "karen": {
-    "encounter": {
-      "1": "我是梨花，你想和我的惡屬性寶可夢$來一場對決嗎？",
-      "2": "我和你見過的那些人不一樣。",
-      "3": "你組建了一支迷人的隊伍。$我們的戰鬥應該會是場精彩的比賽。"
-    },
-    "victory": {
-      "1": "不！我贏不了。你是怎麼做到變得這麼強的？",
-      "2": "我不會偏離我所選擇的道路。",
-      "3": "冠軍正期待與你見面。"
-    },
-    "defeat": {
-      "1": "意料之中。",
-      "2": "嗯，還算有點意思。",
-      "3": "隨時歡迎你來找我。"
-    }
-  },
-  "milo": {
-    "encounter": {
-      "1": "看起來你顯然很了解寶可夢。$這會是一場激烈的戰鬥！$如果我想贏，我得讓我的寶可夢極巨化！"
-    },
-    "victory": {
-      "1": "草的力量凋謝了…多麼不可思議的挑戰者！"
-    },
-    "defeat": {
-      "1": "這必將讓你大吃一驚。"
-    }
-  },
-  "lucian": {
-    "encounter": {
-      "1": "請稍等，我正在讀的書\n正要進入最精彩的部分…$英雄獲得了一把神秘之劍，\n即將面臨最後的考驗…啊，算了。$既然你能走到這一步，\n我就不說這些了，和你戰鬥吧。$讓我看看你是否\n能像我書中的主角一樣榮耀！"
-    },
-    "victory": {
-      "1": "我明白了…看來你把我逼入了絕境。"
-    },
-    "defeat": {
-      "1": "我得維護我的名譽。"
-    }
-  },
-  "drasna": {
-    "encounter": {
-      "1": "你很厲害吧，\n而且相當相當地厲害呢。$我很高興，能和這樣的對手交手，\n就能更好地培養寶可夢們了。"
-    },
-    "victory": {
-      "1": "哎呀，就這麼結束了，\n不好意思，可以的話歡迎再來。"
-    },
-    "defeat": {
-      "1": "怎麼會這樣？"
-    }
-  },
-  "kahili": {
-    "encounter": {
-      "1": "那麼，既然來了……\n要不來看看今天的風更青睞誰？$是你……還是我？"
-    },
-    "victory": {
-      "1": "讓我這個四天王都感到沮喪，$看來你的力量貨真價實。"
-    },
-    "defeat": {
-      "1": "那真是一記好球！"
-    }
-  },
-  "hassel": {
-    "encounter": {
-      "1": "讓你親身感受一下什麼叫做猛烈的對戰氣息吧！"
-    },
-    "victory": {
-      "1": "這次幸運之神對我微笑了，但是……$誰知道我下次會不會這麼幸運。"
-    },
-    "defeat": {
-      "1": "那可真厲害！"
-    }
-  },
-  "blue": {
-    "encounter": {
-      "1": "能走到這裡，你一定非常優秀。"
-    },
-    "victory": {
-      "1": "我只輸給過他，現在又是你……？$你問他是誰？哈哈哈……"
-    },
-    "defeat": {
-      "1": "看吧？我的實力就是我來到這裡的原因。"
-    }
-  },
-  "piers": {
-    "encounter": {
-      "1": "準備好和我的隊伍來個大狂歡吧！$尖釘鎮，是時候嗨起來了！"
-    },
-    "victory": {
-      "1": "我和我的隊伍已經盡力了。$找個時間再來對戰吧……"
-    },
-    "defeat": {
-      "1": "我的喉嚨因為呼喊而變得沙啞……$但這是一場激動人心的戰鬥！"
-    }
-  },
-  "red": {
-    "encounter": {
-      "1": "…!"
-    },
-    "victory": {
-      "1": "…?"
-    },
-    "defeat": {
-      "1": "…!"
-    }
-  },
-  "jasmine": {
-    "encounter": {
-      "1": "哦……你的寶可夢給人印象深刻。$我想我會享受這場戰鬥的。"
-    },
-    "victory": {
-      "1": "你真的很強。我也得加把勁了。"
-    },
-    "defeat": {
-      "1": "我從沒想到會贏。"
-    }
-  },
-  "lance_champion": {
-    "encounter": {
-      "1": "我依舊是冠軍，所以我不會留情的。"
-    },
-    "victory": {
-      "1": "這就是新冠軍的崛起。"
-    },
-    "defeat": {
-      "1": "我成功捍衛了冠軍的頭銜。"
-    }
-  },
-  "steven": {
-    "encounter": {
-      "1": "告訴我…你在和寶可夢的旅途過程中看到了什麼？$邂逅了那麼多的訓練師，\n你都會有什麼樣的感受呢？$在這豐饒的大地上旅行…\n有沒有喚醒你內在的某種東西？$你不如就用一場對戰來告訴我你心中的答案吧。$我也會和我的寶可夢用這種方式\n將我們所知道的告訴你的！"
-    },
-    "victory": {
-      "1": "沒想到連我這個聯盟冠軍\n都敗在你的手上了呢…"
-    },
-    "defeat": {
-      "1": "正如我所期待的。謝謝！"
-    }
-  },
-  "cynthia": {
-    "encounter": {
-      "1": "我，竹蘭，接受你的挑戰！\n我是絕不會手軟的！"
-    },
-    "victory": {
-      "1": "無論對戰多麼有趣，\n它總會有結束的時候……"
-    },
-    "defeat": {
-      "1": "即使你輸了，\n也永遠不要失去你對寶可夢的熱愛。"
-    }
-  },
-  "iris": {
-    "encounter": {
-      "1": "你知道嗎？\n我真的很期待和強大的訓練師進行認真的戰鬥！$我的意思是，來吧！\n到達這裡的是那些渴望勝利的訓練師，$他們與經歷過無數艱難\n戰鬥的寶可夢一起戰鬥！$如果我和那樣的人戰鬥，\n不僅我會變得更強，我的寶可夢也會！$我們也會更好地了解彼此！\n好！做好準備吧！$我是艾莉絲，寶可夢聯盟冠軍，\n我，將打敗你！"
-    },
-    "victory": {
-      "1": "啊……我盡力了，但我們輸了……"
-    },
-    "defeat": {
-      "1": "耶！我們贏了！"
-    }
-  },
-  "hau": {
-    "encounter": {
-      "1": "我想知道，訓練師是否會根據他們是\n來自溫暖地區還是寒冷地區而以不同的方式戰鬥。$讓我們來測試一下！"
-    },
-    "victory": {
-      "1": "那太棒了！我覺得我現在有點了解你的感覺了！"
-    },
-    "defeat": {
-      "1": "老鐵，這才叫戰鬥！"
-    }
-  },
-  "geeta": {
-    "encounter": {
-      "1": "我決定再試一次。$來吧…讓我看看你的訓練成果。"
-    },
-    "victory": {
-      "1": "我期待著你的成就！"
-    },
-    "defeat": {
-      "1": "怎麼，這就結束了？"
-    }
-  },
-  "nemona": {
-    "encounter": {
-      "1": "耶！我太興奮了！讓我們稍微放輕鬆！"
-    },
-    "victory": {
-      "1": "好吧，太糟了，但我還是玩得很開心！$下次我一定會贏你！"
-    },
-    "defeat": {
-      "1": "好吧，那是一場很棒的戰鬥！$肯定是會有收穫的啦。"
-    }
-  },
-  "leon": {
-    "encounter": {
-      "1": "來享受一段冠軍時刻吧！"
-    },
-    "victory": {
-      "1": "我的冠軍生涯結束了……但這是多麼美好的冠軍時刻啊！但這是多麼美好的冠軍時刻啊！謝謝你給了我最精彩的一戰！"
-    },
-    "defeat": {
-      "1": "名副其實的冠軍時刻！"
-    }
-  },
-  "whitney": {
-    "encounter": {
-      "1": "嘿！你不認為寶可夢超級可愛嗎？"
-    },
-    "victory": {
-      "1": "哇啊！哇啊！你太壞了！"
-    },
-    "defeat": {
-      "1": "就是這樣！"
-    }
-  },
-  "chuck": {
-    "encounter": {
-      "1": "哈！你想挑戰我？你是勇敢還是無知？"
-    },
-    "victory": {
-      "1": "你很強！能不能收我為徒？"
-    },
-    "defeat": {
-      "1": "搞定。你明白我比你強得多了嗎？"
-    }
-  },
-  "katy": {
-    "encounter": {
-      "1": "不要放鬆警惕，除非你想被蟲絲絆倒哦！"
-    },
-    "victory": {
-      "1": "我可愛的寶可夢們都像蒼蠅一樣墜落了！"
-    },
-    "defeat": {
-      "1": "開飯啦，我可愛的彩粉蝶！"
-    }
-  },
-  "pryce": {
-    "encounter": {
-      "1": "年輕不代表能獲得勝利！經驗才是關鍵。"
-    },
-    "victory": {
-      "1": "無與倫比！贏得完美，試著不要忘記你現在的感受。"
-    },
-    "defeat": {
-      "1": "正如我所料。"
-    }
-  },
-  "clair": {
-    "encounter": {
-      "1": "你知道我是誰嗎？知道還敢挑戰我？"
-    },
-    "victory": {
-      "1": "我想知道以你現在的水平能走多遠，有趣。"
-    },
-    "defeat": {
-      "1": "就是這樣。"
-    }
-  },
-  "maylene": {
-    "encounter": {
-      "1": "我現在要挑戰你，我不會保留任何實力。$請準備好戰鬥！"
-    },
-    "victory": {
-      "1": "是我輸了…"
-    },
-    "defeat": {
-      "1": "太棒了。"
-    }
-  },
-  "fantina": {
-    "encounter": {
-      "1": "你來挑戰吧。我會勝利。$這就是家緣市的道館館主。"
-    },
-    "victory": {
-      "1": "你是最強的，我認輸了。"
-    },
-    "defeat": {
-      "1": "我非常，非常高興！"
-    }
-  },
-  "byron": {
-    "encounter": {
-      "1": "和我兒子瓢太一樣的年輕人啊！$我相信培養年輕人\n關係到寶可夢光明的未來！$為此就讓我來成為\n年輕人必須跨越的堡壘吧！"
-    },
-    "victory": {
-      "1": "唔！我千錘百煉的寶可夢！"
-    },
-    "defeat": {
-      "1": "哈哈哈哈！怎麼樣！我千錘百煉的寶可夢！"
-    }
-  },
-  "olympia": {
-    "encounter": {
-      "1": "戰鬥是決定命運的古老傳統。讓我們開始吧！"
-    },
-    "victory": {
-      "1": "創造你自己的道路。$不要讓任何東西阻擋你的路、你的命運、你的未來。"
-    },
-    "defeat": {
-      "1": "我們的道路現在已經清晰了。"
-    }
-  },
-  "volkner": {
-    "encounter": {
-      "1": "能留到最後的訓練家想必肯定是很強的…$希望你會是能讓我回憶起\n寶可夢對戰樂趣的訓練家！"
-    },
-    "victory": {
-      "1": "我輸了…$你的心意，寶可夢的不顧一切。$戰鬥的時候就讓我熱血沸騰。"
-    },
-    "defeat": {
-      "1": "完全沒感覺…$和我希望的完全不一樣！"
-    }
-  },
-  "burgh": {
-    "encounter": {
-      "1": "唔…我有預感，\n只要贏了這場戰鬥就能畫出更好的畫來…$嗯！戰鬥充滿了幻象！那麼，馬上開始吧。",
-      "2": "當然，我對我所有的寶可夢都相當驕傲！ $現在…讓我們馬上開始吧！"
-    },
-    "victory": {
-      "1": "結束了嗎？我的女神拋棄我了嗎？",
-      "2": "啊唔，輸了……你還真是很強啊。"
-    },
-    "defeat": {
-      "1": "唔啊……好……好美啊！",
-      "2": "偶爾也有一些不是很好看的勝利，$但只要努力了，\n不管怎麼樣的戰鬥，都是很美麗的。"
-    }
-  },
-  "elesa": {
-    "encounter": {
-      "1": "最後一擊！\n在確信這一點的時候全身會流淌過電流！$為追求這個快感，\n我要用可愛的寶可夢們讓你頭暈眼花。"
-    },
-    "victory": {
-      "1": "本想讓你頭暈的，\n結果我倒反被你電到了。"
-    },
-    "defeat": {
-      "1": "感覺還不夠啊……下次能使出全力來嗎？"
-    }
-  },
-  "skyla": {
-    "encounter": {
-      "1": "終於到決戰了！\n這是決定頂點的寶可夢對戰吧？$我最喜歡頂點了！\n在高的地方能看到很遠很遠！$好了！就讓我和你好好地玩一場吧！"
-    },
-    "victory": {
-      "1": "和你的戰鬥讓我更強了……謝謝。"
-    },
-    "defeat": {
-      "1": "不管是贏了還是輸了，戰鬥都能得到一些東西。"
-    }
-  },
-  "brycen": {
-    "encounter": {
-      "1": "有其他的人和寶可夢在一起，$這份支持會讓自己更強…\n讓我來給你展示一下這樣的強大吧！"
-    },
-    "victory": {
-      "1": "你和你的寶可夢！配合得天衣無縫！\n華麗的友情！"
-    },
-    "defeat": {
-      "1": "嘗試極限！鍛鍊！"
-    }
-  },
-  "drayden": {
-    "encounter": {
-      "1": "現在我尋求的是\n能讓我看到光明未來的年輕訓練家。$你有多少實力，就讓我用我的經驗，\n我對寶可夢傾注的愛來驗證吧！"
-    },
-    "victory": {
-      "1": "失敗後湧現的這灼熱的意志…\n該怎麼說呢…"
-    },
-    "defeat": {
-      "1": "啊啊啊！你的實力就這種程度嗎！"
-    }
-  },
-  "grant": {
-    "encounter": {
-      "1": "我只期待一件事。. $通過超越彼此，\n我們找到通往更高境界的道路。"
-    },
-    "victory": {
-      "1": "你是一堵我無法逾越的牆！"
-    },
-    "defeat": {
-      "1": "不要放棄。\n這就是人生的真諦。$大道至簡。"
-    }
-  },
-  "korrina": {
-    "encounter": {
-      "1": "小女子科爾尼來大顯身手啦！"
-    },
-    "victory": {
-      "1": "正因為有你，\n才能讓你的寶可夢進化！"
-    },
-    "defeat": {
-      "1": "好勁爆的戰鬥呀！"
-    }
-  },
-  "clemont": {
-    "encounter": {
-      "1": "哦！我很高興我們能見面！"
-    },
-    "victory": {
-      "1": "你對戰鬥的熱情激勵了我！"
-    },
-    "defeat": {
-      "1": "看來我的訓練師成長強化機-馬克2號，\n真的起作用了！"
-    }
-  },
-  "valerie": {
-    "encounter": {
-      "1": "哦，這不是一個年輕的訓練師嗎……\n能這樣遇見你真是太好了。 $我想你已經獲得了這場戰鬥的資格，\n作為對你努力的獎勵。 $難以捉摸的妖精可能看起來像微風一樣脆弱，\n像花朵一樣精緻，但很堅強。"
-    },
-    "victory": {
-      "1": "我希望明天你也能找到一些值得會心微笑的事物……"
-    },
-    "defeat": {
-      "1": "哦，天哪，這太遺憾了……"
-    }
-  },
-  "wulfric": {
-    "encounter": {
-      "1": "你知道嗎？\n我們都說戰鬥能學到東西，羈絆之類的，$但實際上，我這麼做只是因為有趣。 $誰在乎那些華而不實的東西？\n我們來戰鬥吧！"
-    },
-    "victory": {
-      "1": "傑出！我像冰山一樣堅硬，但你徹底擊潰了我！"
-    },
-    "defeat": {
-      "1": "和我幹的結果就是這樣！"
-    }
-  },
-  "kabu": {
-    "encounter": {
-      "1": "每個訓練師和寶可夢都在努力追求勝利。$但這意味著你的對手也在努力贏得勝利。$最終，比賽是由哪一方\n能夠發揮出他們真正的潛力來決定的。"
-    },
-    "victory": {
-      "1": "我很高興今天能和你戰鬥！"
-    },
-    "defeat": {
-      "1": "這是我感覺自己的成長的好方式！"
-    }
-  },
-  "bea": {
-    "encounter": {
-      "1": "你有沒有一種不可動搖的精神，\n受到什麼攻擊都安如磐石？ $就讓我來試試吧？"
-    },
-    "victory": {
-      "1": "我感受到了你的寶可夢\n在戰鬥中被你指揮時的戰鬥之魂。"
-    },
-    "defeat": {
-      "1": "每個人都希望能有一場這樣的好比賽。"
-    }
-  },
-  "opal": {
-    "encounter": {
-      "1": "讓我看看你和你的寶可夢的表現如何！"
-    },
-    "victory": {
-      "1": "你不夠粉嫩呀，\n但你是一個優秀的訓練師，$還擁有著優秀的寶可夢。"
-    },
-    "defeat": {
-      "1": "對你來說太慘了，我覺得。"
-    }
-  },
-  "bede": {
-    "encounter": {
-      "1": "就讓我來證明你有多可憐，我有多強大。"
-    },
-    "victory": {
-      "1": "我懂了……好吧。其實我還沒拿出全力呢。"
-    },
-    "defeat": {
-      "1": "我覺得我打得不錯。"
-    }
-  },
-  "gordie": {
-    "encounter": {
-      "1": "好了，我們來做個了結吧！"
-    },
-    "victory": {
-      "1": "我只想要挖一個洞爬進去……$好吧，現在更像是掉了進去。"
-    },
-    "defeat": {
-      "1": "像往常一樣戰鬥，勝利就會隨之而來！"
-    }
-  },
-  "marnie": {
-    "encounter": {
-      "1": "事實上，言而總之… \n人家自己也想當冠軍呀! $所以別認為我在針對你！"
-    },
-    "victory": {
-      "1": "好吧，我還是輸了……\n但是我看到了很多你和你寶可夢的優點哦"
-    },
-    "defeat": {
-      "1": "希望你喜歡我們的戰鬥策略。"
-    }
-  },
-  "raihan": {
-    "encounter": {
-      "1": "我打算擊敗冠軍，贏得錦標賽，\n並向世界證明奇巴納大人有多強！"
-    },
-    "victory": {
-      "1": "就算輸了我也好帥。$真是罪孽深重啊。$看來得再來張自拍了！"
-    },
-    "defeat": {
-      "1": "為了紀念此刻，來張自拍吧！"
-    }
-  },
-  "brassius": {
-    "encounter": {
-      "1": "你應該準備好了吧，\n一起完成這美麗的藝術作品吧！"
-    },
-    "victory": {
-      "1": "啊……前衛！"
-    },
-    "defeat": {
-      "1": "我將立即開始新的創作！"
-    }
-  },
-  "iono": {
-    "encounter": {
-      "1": "誰在奇述！是我奇樹！\n做好準備了嗎！$...$直播開始！\n今天的小挑戰者有多強？$奇樹不知道哦~\n讓我們一起來看看吧！"
-    },
-    "victory": {
-      "1": "你的閃耀如1000萬伏特！朋友！"
-    },
-    "defeat": {
-      "1": "奇樹奇樹捕獲你的眼球！"
-    }
-  },
-  "larry": {
-    "encounter": {
-      "1": "歸根結底，普普通通就是最強。"
-    },
-    "victory": {
-      "1": "哼，給我上了一道“戰敗”。"
-    },
-    "defeat": {
-      "1": "下班打卡，走了"
-    }
-  },
-  "ryme": {
-    "encounter": {
-      "1": "寶貝, 一起! \n搖滾搖到骨子裡!"
-    },
-    "victory": {
-      "1": "你好酷！我佩服！\n我的靈魂為你哭！"
-    },
-    "defeat": {
-      "1": "再會, 寶貝!"
-    }
-  },
-  "grusha": {
-    "encounter": {
-      "1": "我保證我寶可夢的力量\n會讓你感到寒冷徹骨！"
-    },
-    "victory": {
-      "1": "你燃燒的熱情……老實說，我有點喜歡。"
-    },
-    "defeat": {
-      "1": "你沒有升溫。"
-    }
-  },
-  "marnie_elite": {
-    "encounter": {
-      "1": "你已經走到這一步了？$哼~ 看看你能不能對付我的寶可夢！",
-      "2": "我將全力以赴, 別覺得我會手下留情哦~"
-    },
-    "victory": {
-      "1": "不敢相信…我輸掉了… $但是你確實贏得好，幹得漂亮捏~",
-      "2": "看來我還要多多學習呀，\n不過你打得很不錯哦~"
-    },
-    "defeat": {
-      "1": "你打得不錯，但是我更勝一籌！$祝你下次好運啦~",
-      "2": "看來我的練習有所回報了。\n感謝一戰！"
-    }
-  },
-  "nessa_elite": {
-    "encounter": {
-      "1": "海流正在朝著對我有利的方向轉變。$準備好被捲走了嗎？",
-      "2": "讓我們在這場戰鬥中掀起波瀾！$我希望你做好準備！"
-    },
-    "victory": {
-      "1": "你完美地渡過了這片水域......幹得好！",
-      "2": "看來我現在無法與你匹敵。幹得好！"
-    },
-    "defeat": {
-      "1": "水總能找到出路。\n真是爽快的一戰！",
-      "2": "你打得很好，\n但海洋的力量是不可阻擋的！"
-    }
-  },
-  "bea_elite": {
-    "encounter": {
-      "1": "做好準備！我的鬥志熊熊燃燒！",
-      "2": "讓我們看看你是否能跟上我永不停歇的節奏！"
-    },
-    "victory": {
-      "1": "你的實力......令人印象深刻。\n你真的值得這場勝利。",
-      "2": "我以前從未感受過這種強度。\n太棒了！"
-    },
-    "defeat": {
-      "1": "我的高強度訓練又帶來勝利了！\n幹得好！",
-      "2": "你有實力，但我的訓練更努力。\n精彩的戰鬥！"
-    }
-  },
-  "allister_elite": {
-    "encounter": {
-      "1": "黑暗降臨...你準備好面對你的恐懼了嗎？",
-      "2": "讓我們看看你能否應對我所操控的黑暗。"
-    },
-    "victory": {
-      "1": "你已經驅散了陰影......\n暫時。幹得很好。",
-      "2": "你的光芒刺穿了我的黑暗。幹得好。"
-    },
-    "defeat": {
-      "1": "黑影在輕語...\n你的力量還不夠。",
-      "2": "黑暗獲勝了......\n也許下次你會看到光明。"
-    }
-  },
-  "raihan_elite": {
-    "encounter": {
-      "1": "風暴來臨！你能挺過這場戰鬥嗎！",
-      "2": "準備好面對風暴之眼！"
-    },
-    "victory": {
-      "1": "你戰勝了風暴...難以置信！",
-      "2": "你完美地駕馭了風……打得好！"
-    },
-    "defeat": {
-      "1": "又一場風暴襲來，又一場勝利！打得好！",
-      "2": "你被我的風暴捲入了！祝你下次好運！"
-    }
-  },
-  "alder": {
-    "encounter": {
-      "1": "準備好和合眾最強的訓練家交手吧！"
-    },
-    "victory": {
-      "1": "精彩！簡直就是天下無雙！"
-    },
-    "defeat": {
-      "1": "戰鬥結束後，我的心像是吹過了溫和的風…\n$真是厲害！"
-    }
-  },
-  "kieran": {
-    "encounter": {
-      "1": "我的努力讓我越來越強！\n$所以我不會輸。"
-    },
-    "victory": {
-      "1": "不可能…\n$真是一場有趣又激動人心的戰鬥啊！"
-    },
-    "defeat": {
-      "1": "哇塞，好一場戰鬥！\n$你得多練練了。"
-    }
-  },
-  "rival": {
-    "encounter": {
-      "1": "@c{smile}嘿，我在找你呢！我知道你急著上路，\n但至少說個再見吧…$@c{smile_eclosed}所以你終於要開始追逐夢想了？\n我幾乎不敢相信。$@c{serious_smile_fists}來都來了，來一場對戰怎麼樣？\n畢竟，我想看看你是不是準備周全了。$@c{serious_mopen_fists}不要手下留情，我想讓你全力以赴！"
-    },
-    "victory": {
-      "1": "@c{shock}哇…你徹底擊敗了我。\n你是真初學者嗎？$@c{smile}也許是靠點運氣，但是…\n誰知道，你可能真的能一路走下去。$順便說一下，博士讓我給你這些東西。它們看起來可牛了。$@c{serious_smile_fists}祝你好运！"
-    }
-  },
-  "rival_female": {
-    "encounter": {
-      "1": "@c{smile_wave}你在這兒啊！我到處找你呢！$@c{angry_mopen}你忘了和你最好的朋友說再見了嗎？$@c{smile_ehalf}你要去追逐夢想了，對吧？\n從今天開始，是不是…$@c{smile}不管怎樣，忘了我的事就原諒你吧，\n但有個條件。@c{smile_wave_wink}你必須和我對戰！$@c{angry_mopen}全力以赴！\n你也不想讓你的冒險在開始之前就結束了，對吧？"
-    },
-    "victory": {
-      "1": "@c{shock}你剛開始就已經這麼強了？！@d{96}$@c{angry}你是不是開了？$@c{smile_wave_wink}只是開個玩笑啦！@d{64} @c{smile_eclosed}我輸地心服口服了…\n我感覺你出去挺有天賦的。$@c{smile}順便說一下，博士想讓我給你一些東西。\n希望它們能幫上忙！$@c{smile_wave}像往常一樣盡力而為！\n我相信你！"
-    }
-  },
-  "rival_2": {
-    "encounter": {
-      "1": "@c{smile}嘿，你也在這裡嗎？$@c{smile_eclosed}一路過關斬將，是吧？$@c{serious_mopen_fists}我知道看起來好像我尾隨著你來到這裡，\n怎麼可能啦。$@c{serious_smile_fists}說真的，自從你在老家打敗我後，\n我就一直很渴望再比一場。$我自己也進行了很多訓練，\n所以這次我肯定會好好打一場。$@c{serious_mopen_fists}不要手下留情，就像以前一樣！$讓我們開始吧！"
-    },
-    "victory": {
-      "1": "@c{neutral_eclosed}哦。我過於自信了。$@c{smile}不過沒關係。我猜到可能會這樣。$@c{serious_mopen_fists}這只意味著我下次需要更努力！$$@c{smile}呃，不是特意幫你，我正好有多餘的這個，\n我覺得你可能想要。$$@c{serious_smile_fists}不過這次之後別指望再有了！$我不能一直給我的對手優勢。$@c{smile}反正，保重！"
-    }
-  },
-  "rival_2_female": {
-    "encounter": {
-      "1": "@c{smile_wave}哦，真巧，在這裡遇見你。\n看來你還沒輸過嘛。@c{angry_mopen}哈……好傢伙！$@c{angry_mopen}我知道你在想什麼，\n不，我才不會跟蹤你什麼呢。 @c{smile_eclosed}我只是碰巧在附近。$@c{smile_ehalf}我為你感到高興，但我只想讓你知道\n有時輸了是可以接受的。$@c{smile}我們從錯誤中學到的東西\n往往比我們一直成功時學到的還要多。$@c{angry_mopen}無論如何，我為了我們的複賽已經努力訓練了\n所以你最好全力以赴！"
-    },
-    "victory": {
-      "1": "@c{neutral}我……沒打算會輸來著……$@c{smile}嗷……好吧。看來我要再更加努力訓練了！$@c{smile_wave}我還給你帶了個這個$@c{smile_wave_wink}不用謝我哦~.$@c{angry_mopen}不過，這是最後一個啦！\n 你可別想再從我這賺小便宜了~$@c{smile_wave}要保重哦！"
-    },
-    "defeat": {
-      "1": "輸了有時候也不要緊的…"
-    }
-  },
-  "rival_3": {
-    "encounter": {
-      "1": "@c{smile}嘿，看看這是誰！好久不見啊。$@c{neutral}你……還是沒輸過？哈…$@c{neutral_eclosed}這有點……不太對勁。$沒有你一起，回家的感覺有很不一樣。$@c{serious}雖然我知道這挺別扭的，但我就直說了。$@c{neutral_eclosed}我覺得你有點兒難以理解。$@c{serious}沒有人能夠戰無不勝。$失敗乃成功之母。$@c{neutral_eclosed}你已經贏得了夠好的成績，\n但前面道阻且長，只會愈發艱難。 @c{neutral}你做好準備了沒？$@c{serious_mopen_fists}如果做好了，證明給我看吧。"
-    },
-    "victory": {
-      "1": "@c{angry_mhalf}這太離譜了……我幾乎從沒停下訓練……$我們之間的差距怎麼還是這麼大？"
-    }
-  },
-  "rival_3_female": {
-    "encounter": {
-      "1": "@c{smile_wave}好久不見！還沒輸過，對吧。$@c{angry}我覺得你點煩了。@c{smile_wave_wink}開玩笑啦！$@c{smile_ehalf}但說真的，你現在不想家嗎？\n 不想…我嗎?$我……我的意思是，我們真的很想你。$@c{smile_eclosed}我支持你的一切，包括你的夢想。\n但現實就是你早晚會經歷失敗。$@c{smile}當你失敗的時候，我想像往常一樣陪在你身邊。$@c{angry_mopen}現在，給你看看我變得多強了吧！"
-    },
-    "victory": {
-      "1": "@c{shock}都這樣了……還是不夠嗎？$這樣下去，你就永遠不會回來了……"
-    },
-    "defeat": {
-      "1": "你盡力了，現在讓我們回家吧。"
-    }
-  },
-  "rival_4": {
-    "encounter": {
-      "1": "@c{neutral}嘿。$我不會對你說什麼拐彎抹角的客套話。$@c{neutral_eclosed}我來，就是為了贏，簡單明了。$@c{serious_mhalf_fists}我將所有時間都投入到訓練中，\n掌握了如何發揮我的潛力。$@c{smile}當你削減掉不必要的睡眠和社交後，\n你會得到很多額外的時間。$@c{serious_mopen_fists}但在我獲勝之前，這些都不重要了。$@c{neutral_eclosed}我甚至已經到達了戰無不敗的境地。$@c{smile_eclosed}我覺得你的思路倒是也沒毛病。$@c{angry_mhalf}失敗是屬於弱者的，\n我已經不再軟弱了。$@c{serious_mopen_fists}準備好吧。"
-    },
-    "victory": {
-      "1": "@c{neutral}你…@d{64} 你是人嗎？"
-    }
-  },
-  "rival_4_female": {
-    "encounter": {
-      "1": "@c{neutral}是我哦！沒又把我忘了吧……是嗎？$@c{smile}你應該為自己走了這麼遠感到驕傲。恭喜你！$但看來你的旅程到此為止了。$@c{smile_eclosed}你喚醒了我體內一些我從未有過的東西。\n就像我現在滿腦子除了訓練還是訓練。$@c{smile_ehalf}我幾乎已經沒空吃飯睡覺了，\n我沒日沒夜訓練我的寶可夢，每次都能變得更強。$@c{neutral}事實上，我……幾乎不認識自己了。$現在，我終於達到了巔峰。\n我感覺我已經戰無不勝了。$而且你知道嗎？這一切都是因為你。$@c{smile_ehalf}我不知道到底是該感謝你還是恨你。$@c{angry_mopen}做好準備…"
-    },
-    "victory": {
-      "1": "@c{neutral}你…@d{64} 你是人嗎？"
-    },
-    "defeat": {
-      "1": "@c{smile}你應該為自己走了這麼遠感到驕傲。"
-    }
-  },
-  "rival_5": {
-    "encounter": {
-      "1": "@c{neutral}…"
-    },
-    "victory": {
-      "1": "@c{neutral}…"
-    }
-  },
-  "rival_5_female": {
-    "encounter": {
-      "1": "@c{neutral}…"
-    },
-    "victory": {
-      "1": "@c{neutral}…"
-    },
-    "defeat": {
-      "1": "$@c{smile_ehalf}…"
-    }
-  },
-  "rival_6": {
-    "encounter": {
-      "1": "@c{smile_eclosed}又見面了。$@c{neutral}我花了點時間思考反思\n有理由說明為什麼這一切都顯得如此奇妙。$@c{neutral_eclosed}你所追逐的夢想，我想擊敗你的決心…$這都是某種龐大使命的一部分。$@c{serious}這不僅僅是關於我和你… 而是關於這個世界， @c{serious_mhalf_fists}我的使命就是將你推向極限。$@c{neutral_eclosed}我是否達成了那個使命，我說不上來，但我已盡我所能。$@c{neutral}我們最終到達的這個地方看起來很可怕\n 然而不知何故，我心中毫無畏懼，好像我早就來過這裡。$@c{serious_mhalf_fists}你也有同樣的感覺，對吧？$@c{serious}……這裡好像有什麼東西在呼喚我。\n這是世界早已記錄的一切。$那些我們經歷過的時光，那些記憶猶新的過去，\n其實只是遙遠的回憶。$@c{neutral_eclosed}誰能保證它們是否真的發生過。$@c{serious_mopen_fists}你必須繼續前進，不然的話，這一切將永無止境。\n這件事而只有你能辦成。$@c{serious_smile_fists}我不清楚這一切意味著什麼，但我知道……$@c{serious_mopen_fists}如果現在你不能就此擊敗我，\n你將毫無機會可言。"
-    },
-    "victory": {
-      "1": "@c{smile_eclosed}看來我的使命在這裡已經完成了。\n我想讓你答應我一件事。$@c{smile}在你拯救世界之後，要回家。"
-    }
-  },
-  "rival_6_female": {
-    "encounter": {
-      "1": "@c{smile_ehalf}又只有我們兩個人了。$@c{smile_eclosed}你知道嗎，我在心裡想啊想，\n想了好久……$@c{smile_ehalf}這一切背後是有什麼原因嗎，\n為什麼一切現在看起來都這麼奇怪……$@c{smile}你有你的夢想，而我內心有這個抱負……$我不禁感覺這一切背後有一個更龐大的力量，$掌控者我們所做的一切，你和我之間。$@c{smile_eclosed}我想我注定要推動你……到你的極限。$@c{smile_ehalf}我不清楚我是否一直做得很好，\n但到現在為止，我已經盡力了。$這個奇怪而可怕的地方……\n一切看起來都那麼清晰……$這是世界早已記錄的一切。$@c{smile_eclosed}我好像記不清我們一起度過的日子了。$@c{smile_ehalf}那些回憶到底是真的嗎？\n怎麼感覺這麼久遠……$@c{angry_mopen}你得繼續前進，不然的話，這一切將永無止境。\n你是唯一能做到這件事的。$@c{smile_ehalf}我……不知道這一切意味著什麼……\n但我明白$@c{neutral}如果你現在不能就此擊敗我，\n你將毫無機會可言。"
-    },
-    "victory": {
-      "1": "@c{smile_ehalf}我……\n我想我完成了我的使命……$@c{smile_eclosed}答應我……在你拯救世界之後\n……要……平安到家。$@c{smile_ehalf}……謝謝你。"
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/locales/zh_TW/dialogue-misc-male.json b/src/locales/zh_TW/dialogue-misc-male.json
deleted file mode 100644
index 24e2109e5b3..00000000000
--- a/src/locales/zh_TW/dialogue-misc-male.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "ending": "@c{smile}哦?你贏了？@d{96} @c{smile_eclosed}我應該早猜到了\n你回來了。\n$@c{smile}結束了。@d{64} 你終結了這個循環。\n$@c{serious_smile_fists}你也完成了自己的夢想，不是嗎？\n你甚至一次都沒失敗。\n$@c{neutral}我是唯一能夠記得你所作所為的人@d{96}\n我覺得這應該也還行吧？\n$@c{serious_smile_fists}你的傳奇將永遠留存於我們心中。\n$@c{smile_eclosed}不管了，我真是受夠這個地方了，你也一樣嗎？我們回家吧。\n$@c{serious_smile_fists}可能等我們回家以後，再打一場？\n要是你想的話",
-  "ending_female": "@c{shock}你回來了？@d{32} 也就是說…@d{96} 你贏了呀！？\n@c{smile_ehalf}我應該早料到了。\n$@c{smile_eclosed}當然…我一直有這種感覺\n@c{smile}一切都結束了，對麼？ 你打破了循環。\n$@c{smile_ehalf}你也完成了自己的夢想，不是嗎？\n你甚至一次都沒失敗。\n$我是唯一能夠記得你所作所為的人\n@c{angry_mopen}我會努力不忘掉哒！\n$@c{smile_wave_wink}開玩笑啦，@d{64} @c{smile}我才不會忘呢。@d{32}\n你的傳奇將永遠留存於我們心中。\n$@c{smile_wave}不管了，@d{64} 時候不早了@d{96} ，應該吧？\n在這地方還真搞不清楚。\n$一起回家吧。 @c{smile_wave_wink}可能明天，我們再來打一場，為了重溫回憶嘛~"
-}
\ No newline at end of file
diff --git a/src/locales/zh_TW/dialogue-misc-female.json b/src/locales/zh_TW/dialogue-misc.json
similarity index 100%
rename from src/locales/zh_TW/dialogue-misc-female.json
rename to src/locales/zh_TW/dialogue-misc.json
diff --git a/src/locales/zh_TW/dialogue-female.json b/src/locales/zh_TW/dialogue.json
similarity index 100%
rename from src/locales/zh_TW/dialogue-female.json
rename to src/locales/zh_TW/dialogue.json
diff --git a/src/locales/zh_TW/menu-ui-handler.json b/src/locales/zh_TW/menu-ui-handler.json
index 645b147b9a5..33e6b44d73d 100644
--- a/src/locales/zh_TW/menu-ui-handler.json
+++ b/src/locales/zh_TW/menu-ui-handler.json
@@ -3,7 +3,6 @@
   "ACHIEVEMENTS": "成就",
   "STATS": "數據",
   "RUN_HISTORY": "歷史記錄",
-  "VOUCHERS": "兌換劵",
   "EGG_LIST": "蛋列表",
   "EGG_GACHA": "扭蛋機",
   "MANAGE_DATA": "管理數據",
diff --git a/src/locales/zh_TW/pokemon-form.json b/src/locales/zh_TW/pokemon-form.json
index 9e26dfeeb6e..b98a1e946b8 100644
--- a/src/locales/zh_TW/pokemon-form.json
+++ b/src/locales/zh_TW/pokemon-form.json
@@ -1 +1,3 @@
-{}
\ No newline at end of file
+{
+    "meloettaPirouette": "舞步形態"
+}
\ No newline at end of file
diff --git a/src/locales/zh_TW/run-history-ui-handler.json b/src/locales/zh_TW/run-history.json
similarity index 59%
rename from src/locales/zh_TW/run-history-ui-handler.json
rename to src/locales/zh_TW/run-history.json
index 2658fe341f4..76cb2592ce2 100644
--- a/src/locales/zh_TW/run-history-ui-handler.json
+++ b/src/locales/zh_TW/run-history.json
@@ -1,15 +1,15 @@
 {
   "victory": "勝利！",
-  "defeatedWildM": "被打敗",
-  "defeatedTrainerM": "被打敗",
-  "defeatedTrainerDoubleM": "被組合打敗",
-  "defeatedRivalM": "被勁敵打敗",
-  "defeatedM": "被打敗",
-  "defeatedWildF": "被打敗",
-  "defeatedTrainerF": "被打敗",
-  "defeatedTrainerDoubleF": "被組合打敗",
-  "defeatedRivalF": "被勁敵打敗",
-  "defeatedF": "被打敗",
+  "defeatedWild": "被打敗",
+  "defeatedTrainer": "被打敗",
+  "defeatedTrainerDouble": "被組合打敗",
+  "defeatedRival": "被勁敵打敗",
+  "defeated": "被打敗",
+  "defeatedWild_female": "被打敗",
+  "defeatedTrainer_female": "被打敗",
+  "defeatedTrainerDouble_female": "被組合打敗",
+  "defeatedRival_female": "被勁敵打敗",
+  "defeated_female": "被打敗",
   "luck": "幸運",
   "score": "分數",
   "mode": "模式",
@@ -30,8 +30,8 @@
   "money": "金錢",
   "runLength": "遊戲時長",
   "viewHeldItems": "持有道具",
-  "hallofFameTextM": "歡迎來到名人堂！",
-  "hallofFameTextF": "歡迎來到名人堂！",
+  "hallofFameText": "歡迎來到名人堂！",
+  "hallofFameText_female": "歡迎來到名人堂！",
   "viewHallOfFame": "浏覽名人堂！",
   "viewEndingSplash": "浏覽結算畫面"
 }
\ No newline at end of file
diff --git a/src/locales/zh_TW/settings.json b/src/locales/zh_TW/settings.json
index eac573f2cba..b077e0216a3 100644
--- a/src/locales/zh_TW/settings.json
+++ b/src/locales/zh_TW/settings.json
@@ -61,6 +61,7 @@
   "typeHints": "屬性提示",
   "masterVolume": "主音量",
   "bgmVolume": "音樂",
+  "fieldVolume": "場景音量",
   "seVolume": "音效",
   "musicPreference": "音樂偏好",
   "mixed": "全曲混合",
diff --git a/src/main.ts b/src/main.ts
index 41cd68afc1e..8a69d3f1b72 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -73,75 +73,13 @@ const config: Phaser.Types.Core.GameConfig = {
 
 /**
  * Sets this object's position relative to another object with a given offset
- * @param guideObject {@linkcode Phaser.GameObjects.GameObject} to base the position off of
- * @param x The relative x position
- * @param y The relative y position
  */
-const setPositionRelative = function (guideObject: any, x: number, y: number) {
+const setPositionRelative = function (guideObject: Phaser.GameObjects.GameObject, x: number, y: number) {
   const offsetX = guideObject.width * (-0.5 + (0.5 - guideObject.originX));
   const offsetY = guideObject.height * (-0.5 + (0.5 - guideObject.originY));
   this.setPosition(guideObject.x + offsetX + x, guideObject.y + offsetY + y);
 };
 
-declare module "phaser" {
-	namespace GameObjects {
-		interface Container {
-      /**
-       * Sets this object's position relative to another object with a given offset
-       * @param guideObject {@linkcode Phaser.GameObjects.GameObject} to base the position off of
-       * @param x The relative x position
-       * @param y The relative y position
-       */
-			setPositionRelative(guideObject: any, x: number, y: number): void;
-		}
-		interface Sprite {
-      /**
-       * Sets this object's position relative to another object with a given offset
-       * @param guideObject {@linkcode Phaser.GameObjects.GameObject} to base the position off of
-       * @param x The relative x position
-       * @param y The relative y position
-       */
-			setPositionRelative(guideObject: any, x: number, y: number): void;
-		}
-		interface Image {
-      /**
-       * Sets this object's position relative to another object with a given offset
-       * @param guideObject {@linkcode Phaser.GameObjects.GameObject} to base the position off of
-       * @param x The relative x position
-       * @param y The relative y position
-       */
-			setPositionRelative(guideObject: any, x: number, y: number): void;
-		}
-		interface NineSlice {
-      /**
-       * Sets this object's position relative to another object with a given offset
-       * @param guideObject {@linkcode Phaser.GameObjects.GameObject} to base the position off of
-       * @param x The relative x position
-       * @param y The relative y position
-       */
-			setPositionRelative(guideObject: any, x: number, y: number): void;
-		}
-		interface Text {
-      /**
-       * Sets this object's position relative to another object with a given offset
-       * @param guideObject {@linkcode Phaser.GameObjects.GameObject} to base the position off of
-       * @param x The relative x position
-       * @param y The relative y position
-       */
-			setPositionRelative(guideObject: any, x: number, y: number): void;
-		}
-		interface Rectangle {
-      /**
-       * Sets this object's position relative to another object with a given offset
-       * @param guideObject {@linkcode Phaser.GameObjects.GameObject} to base the position off of
-       * @param x The relative x position
-       * @param y The relative y position
-       */
-			setPositionRelative(guideObject: any, x: number, y: number): void;
-		}
-	}
-}
-
 Phaser.GameObjects.Container.prototype.setPositionRelative = setPositionRelative;
 Phaser.GameObjects.Sprite.prototype.setPositionRelative = setPositionRelative;
 Phaser.GameObjects.Image.prototype.setPositionRelative = setPositionRelative;
diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts
index 365fc433d2f..3afeb79ff2b 100644
--- a/src/modifier/modifier-type.ts
+++ b/src/modifier/modifier-type.ts
@@ -57,7 +57,7 @@ export class ModifierType {
     this.localeKey = localeKey!; // TODO: is this bang correct?
     this.iconImage = iconImage!; // TODO: is this bang correct?
     this.group = group!; // TODO: is this bang correct?
-    this.soundName = soundName ?? "restore";
+    this.soundName = soundName ?? "se/restore";
     this.newModifierFunc = newModifierFunc;
   }
 
@@ -169,7 +169,7 @@ class AddPokeballModifierType extends ModifierType {
   private count: integer;
 
   constructor(iconImage: string, pokeballType: PokeballType, count: integer) {
-    super("", iconImage, (_type, _args) => new Modifiers.AddPokeballModifier(this, pokeballType, count), "pb", "pb_bounce_1");
+    super("", iconImage, (_type, _args) => new Modifiers.AddPokeballModifier(this, pokeballType, count), "pb", "se/pb_bounce_1");
     this.pokeballType = pokeballType;
     this.count = count;
   }
@@ -677,7 +677,7 @@ export class MoneyRewardModifierType extends ModifierType {
   private moneyMultiplierDescriptorKey: string;
 
   constructor(localeKey: string, iconImage: string, moneyMultiplier: number, moneyMultiplierDescriptorKey: string) {
-    super(localeKey, iconImage, (_type, _args) => new Modifiers.MoneyRewardModifier(this, moneyMultiplier), "money", "buy");
+    super(localeKey, iconImage, (_type, _args) => new Modifiers.MoneyRewardModifier(this, moneyMultiplier), "money", "se/buy");
 
     this.moneyMultiplier = moneyMultiplier;
     this.moneyMultiplierDescriptorKey = moneyMultiplierDescriptorKey;
@@ -791,10 +791,10 @@ export class EvolutionItemModifierType extends PokemonModifierType implements Ge
     super("", EvolutionItem[evolutionItem].toLowerCase(), (_type, args) => new Modifiers.EvolutionItemModifier(this, (args[0] as PlayerPokemon).id),
       (pokemon: PlayerPokemon) => {
         if (pokemonEvolutions.hasOwnProperty(pokemon.species.speciesId) && pokemonEvolutions[pokemon.species.speciesId].filter(e => e.item === this.evolutionItem
-          && (!e.condition || e.condition.predicate(pokemon))).length && (pokemon.getFormKey() !== SpeciesFormKey.GIGANTAMAX)) {
+          && (!e.condition || e.condition.predicate(pokemon)) && (e.preFormKey === null || e.preFormKey === pokemon.getFormKey())).length && (pokemon.getFormKey() !== SpeciesFormKey.GIGANTAMAX)) {
           return null;
         } else if (pokemon.isFusion() && pokemon.fusionSpecies && pokemonEvolutions.hasOwnProperty(pokemon.fusionSpecies.speciesId) && pokemonEvolutions[pokemon.fusionSpecies.speciesId].filter(e => e.item === this.evolutionItem
-        && (!e.condition || e.condition.predicate(pokemon))).length && (pokemon.getFusionFormKey() !== SpeciesFormKey.GIGANTAMAX)) {
+        && (!e.condition || e.condition.predicate(pokemon)) && (e.preFormKey === null || e.preFormKey === pokemon.getFusionFormKey())).length && (pokemon.getFusionFormKey() !== SpeciesFormKey.GIGANTAMAX)) {
           return null;
         }
 
@@ -829,7 +829,7 @@ export class FormChangeItemModifierType extends PokemonModifierType implements G
         // Make sure the Pokemon has alternate forms
         if (pokemonFormChanges.hasOwnProperty(pokemon.species.speciesId)
           // Get all form changes for this species with an item trigger, including any compound triggers
-          && pokemonFormChanges[pokemon.species.speciesId].filter(fc => fc.trigger.hasTriggerType(SpeciesFormChangeItemTrigger))
+          && pokemonFormChanges[pokemon.species.speciesId].filter(fc => fc.trigger.hasTriggerType(SpeciesFormChangeItemTrigger) && (fc.preFormKey === pokemon.getFormKey()))
           // Returns true if any form changes match this item
             .map(fc => fc.findTrigger(SpeciesFormChangeItemTrigger) as SpeciesFormChangeItemTrigger)
             .flat().flatMap(fc => fc.item).includes(this.formChangeItem)
@@ -1053,7 +1053,8 @@ class FormChangeItemModifierTypeGenerator extends ModifierTypeGenerator {
         const formChanges = pokemonFormChanges[p.species.speciesId];
         let formChangeItemTriggers = formChanges.filter(fc => ((fc.formKey.indexOf(SpeciesFormKey.MEGA) === -1 && fc.formKey.indexOf(SpeciesFormKey.PRIMAL) === -1) || party[0].scene.getModifiers(Modifiers.MegaEvolutionAccessModifier).length)
           && ((fc.formKey.indexOf(SpeciesFormKey.GIGANTAMAX) === -1 && fc.formKey.indexOf(SpeciesFormKey.ETERNAMAX) === -1) || party[0].scene.getModifiers(Modifiers.GigantamaxAccessModifier).length)
-          && (!fc.conditions.length || fc.conditions.filter(cond => cond instanceof SpeciesFormChangeCondition && cond.predicate(p)).length))
+          && (!fc.conditions.length || fc.conditions.filter(cond => cond instanceof SpeciesFormChangeCondition && cond.predicate(p)).length)
+          && (fc.preFormKey === p.getFormKey()))
           .map(fc => fc.findTrigger(SpeciesFormChangeItemTrigger) as SpeciesFormChangeItemTrigger)
           .filter(t => t && t.active && !p.scene.findModifier(m => m instanceof Modifiers.PokemonFormChangeItemModifier && m.pokemonId === p.id && m.formChangeItem === t.item));
 
@@ -1461,7 +1462,7 @@ export const modifierTypes = {
   VOUCHER_PLUS: () => new AddVoucherModifierType(VoucherType.PLUS, 1),
   VOUCHER_PREMIUM: () => new AddVoucherModifierType(VoucherType.PREMIUM, 1),
 
-  GOLDEN_POKEBALL: () => new ModifierType("modifierType:ModifierType.GOLDEN_POKEBALL", "pb_gold", (type, _args) => new Modifiers.ExtraModifierModifier(type), undefined, "pb_bounce_1"),
+  GOLDEN_POKEBALL: () => new ModifierType("modifierType:ModifierType.GOLDEN_POKEBALL", "pb_gold", (type, _args) => new Modifiers.ExtraModifierModifier(type), undefined, "se/pb_bounce_1"),
 
   ENEMY_DAMAGE_BOOSTER: () => new ModifierType("modifierType:ModifierType.ENEMY_DAMAGE_BOOSTER", "wl_item_drop", (type, _args) => new Modifiers.EnemyDamageBoosterModifier(type, 5)),
   ENEMY_DAMAGE_REDUCTION: () => new ModifierType("modifierType:ModifierType.ENEMY_DAMAGE_REDUCTION", "wl_guard_spec", (type, _args) => new Modifiers.EnemyDamageReducerModifier(type, 2.5)),
diff --git a/src/overrides.ts b/src/overrides.ts
index 8b3d628e05e..32ff116f41d 100644
--- a/src/overrides.ts
+++ b/src/overrides.ts
@@ -46,14 +46,14 @@ class DefaultOverrides {
   readonly SEED_OVERRIDE: string = "";
   readonly WEATHER_OVERRIDE: WeatherType = WeatherType.NONE;
   readonly BATTLE_TYPE_OVERRIDE: "double" | "single" | null = null;
-  readonly STARTING_WAVE_OVERRIDE: integer = 0;
+  readonly STARTING_WAVE_OVERRIDE: number = 0;
   readonly STARTING_BIOME_OVERRIDE: Biome = Biome.TOWN;
   readonly ARENA_TINT_OVERRIDE: TimeOfDay | null = null;
   /** Multiplies XP gained by this value including 0. Set to null to ignore the override */
   readonly XP_MULTIPLIER_OVERRIDE: number | null = null;
   readonly NEVER_CRIT_OVERRIDE: boolean = false;
   /** default 1000 */
-  readonly STARTING_MONEY_OVERRIDE: integer = 0;
+  readonly STARTING_MONEY_OVERRIDE: number = 0;
   /** Sets all shop item prices to 0 */
   readonly WAIVE_SHOP_FEES_OVERRIDE: boolean = false;
   /** Sets reroll price to 0 */
@@ -86,14 +86,14 @@ class DefaultOverrides {
   readonly STARTER_FORM_OVERRIDES: Partial<Record<Species, number>> = {};
 
   /** default 5 or 20 for Daily */
-  readonly STARTING_LEVEL_OVERRIDE: integer = 0;
+  readonly STARTING_LEVEL_OVERRIDE: number = 0;
   /**
    * SPECIES OVERRIDE
    * will only apply to the first starter in your party or each enemy pokemon
    * default is 0 to not override
    * @example SPECIES_OVERRIDE = Species.Bulbasaur;
    */
-  readonly STARTER_SPECIES_OVERRIDE: Species | integer = 0;
+  readonly STARTER_SPECIES_OVERRIDE: Species | number = 0;
   readonly ABILITY_OVERRIDE: Abilities = Abilities.NONE;
   readonly PASSIVE_ABILITY_OVERRIDE: Abilities = Abilities.NONE;
   readonly STATUS_OVERRIDE: StatusEffect = StatusEffect.NONE;
@@ -105,7 +105,7 @@ class DefaultOverrides {
   // --------------------------
   // OPPONENT / ENEMY OVERRIDES
   // --------------------------
-  readonly OPP_SPECIES_OVERRIDE: Species | integer = 0;
+  readonly OPP_SPECIES_OVERRIDE: Species | number = 0;
   readonly OPP_LEVEL_OVERRIDE: number = 0;
   readonly OPP_ABILITY_OVERRIDE: Abilities = Abilities.NONE;
   readonly OPP_PASSIVE_ABILITY_OVERRIDE: Abilities = Abilities.NONE;
@@ -114,7 +114,8 @@ class DefaultOverrides {
   readonly OPP_MOVESET_OVERRIDE: Array<Moves> = [];
   readonly OPP_SHINY_OVERRIDE: boolean = false;
   readonly OPP_VARIANT_OVERRIDE: Variant = 0;
-  readonly OPP_IVS_OVERRIDE: integer | integer[] = [];
+  readonly OPP_IVS_OVERRIDE: number | number[] = [];
+  readonly OPP_FORM_OVERRIDES: Partial<Record<Species, number>> = {};
 
   // -------------
   // EGG OVERRIDES
diff --git a/src/phases/attempt-capture-phase.ts b/src/phases/attempt-capture-phase.ts
index 3c165a25157..72995c0f006 100644
--- a/src/phases/attempt-capture-phase.ts
+++ b/src/phases/attempt-capture-phase.ts
@@ -54,7 +54,7 @@ export class AttemptCapturePhase extends PokemonPhase {
     this.pokeball.setOrigin(0.5, 0.625);
     this.scene.field.add(this.pokeball);
 
-    this.scene.playSound("pb_throw");
+    this.scene.playSound("se/pb_throw");
     this.scene.time.delayedCall(300, () => {
       this.scene.field.moveBelow(this.pokeball as Phaser.GameObjects.GameObject, pokemon);
     });
@@ -67,7 +67,7 @@ export class AttemptCapturePhase extends PokemonPhase {
       onComplete: () => {
         this.pokeball.setTexture("pb", `${pokeballAtlasKey}_opening`);
         this.scene.time.delayedCall(17, () => this.pokeball.setTexture("pb", `${pokeballAtlasKey}_open`));
-        this.scene.playSound("pb_rel");
+        this.scene.playSound("se/pb_rel");
         pokemon.tint(getPokeballTintColor(this.pokeballType));
 
         addPokeballOpenParticles(this.scene, this.pokeball.x, this.pokeball.y, this.pokeballType);
@@ -81,7 +81,7 @@ export class AttemptCapturePhase extends PokemonPhase {
           onComplete: () => {
             this.pokeball.setTexture("pb", `${pokeballAtlasKey}_opening`);
             pokemon.setVisible(false);
-            this.scene.playSound("pb_catch");
+            this.scene.playSound("se/pb_catch");
             this.scene.time.delayedCall(17, () => this.pokeball.setTexture("pb", `${pokeballAtlasKey}`));
 
             const doShake = () => {
@@ -109,13 +109,13 @@ export class AttemptCapturePhase extends PokemonPhase {
                     this.failCatch(shakeCount);
                   } else if (shakeCount++ < 3) {
                     if (pokeballMultiplier === -1 || pokemon.randSeedInt(65536) < y) {
-                      this.scene.playSound("pb_move");
+                      this.scene.playSound("se/pb_move");
                     } else {
                       shakeCounter.stop();
                       this.failCatch(shakeCount);
                     }
                   } else {
-                    this.scene.playSound("pb_lock");
+                    this.scene.playSound("se/pb_lock");
                     addPokeballCaptureStars(this.scene, this.pokeball);
 
                     const pbTint = this.scene.add.sprite(this.pokeball.x, this.pokeball.y, "pb", "pb");
@@ -156,7 +156,7 @@ export class AttemptCapturePhase extends PokemonPhase {
   failCatch(shakeCount: integer) {
     const pokemon = this.getPokemon();
 
-    this.scene.playSound("pb_rel");
+    this.scene.playSound("se/pb_rel");
     pokemon.setY(this.originalY);
     if (pokemon.status?.effect !== StatusEffect.SLEEP) {
       pokemon.cry(pokemon.getHpRatio() > 0.25 ? undefined : { rate: 0.85 });
diff --git a/src/phases/attempt-run-phase.ts b/src/phases/attempt-run-phase.ts
index 17625c57fc6..817801985d2 100644
--- a/src/phases/attempt-run-phase.ts
+++ b/src/phases/attempt-run-phase.ts
@@ -26,7 +26,7 @@ export class AttemptRunPhase extends PokemonPhase {
     applyAbAttrs(RunSuccessAbAttr, playerPokemon, null, false, escapeChance);
 
     if (playerPokemon.randSeedInt(256) < escapeChance.value) {
-      this.scene.playSound("flee");
+      this.scene.playSound("se/flee");
       this.scene.queueMessage(i18next.t("battle:runAwaySuccess"), null, true, 500);
 
       this.scene.tweens.add({
diff --git a/src/phases/damage-phase.ts b/src/phases/damage-phase.ts
index 9f63ce35cf2..029c1e717f1 100644
--- a/src/phases/damage-phase.ts
+++ b/src/phases/damage-phase.ts
@@ -42,14 +42,14 @@ export class DamagePhase extends PokemonPhase {
   applyDamage() {
     switch (this.damageResult) {
     case HitResult.EFFECTIVE:
-      this.scene.playSound("hit");
+      this.scene.playSound("se/hit");
       break;
     case HitResult.SUPER_EFFECTIVE:
     case HitResult.ONE_HIT_KO:
-      this.scene.playSound("hit_strong");
+      this.scene.playSound("se/hit_strong");
       break;
     case HitResult.NOT_VERY_EFFECTIVE:
-      this.scene.playSound("hit_weak");
+      this.scene.playSound("se/hit_weak");
       break;
     }
 
diff --git a/src/phases/egg-hatch-phase.ts b/src/phases/egg-hatch-phase.ts
index 6f3f0b37905..a5b0252d4de 100644
--- a/src/phases/egg-hatch-phase.ts
+++ b/src/phases/egg-hatch-phase.ts
@@ -178,7 +178,7 @@ export class EggHatchPhase extends Phase {
                   if (this.hatched) {
                     return;
                   }
-                  this.scene.playSound("egg_crack");
+                  this.scene.playSound("se/egg_crack");
                   this.doSpray(4);
                   this.eggCrackSprite.setFrame("3");
                   this.scene.time.delayedCall(125, () => this.eggCrackSprite.setFrame("4"));
@@ -220,7 +220,7 @@ export class EggHatchPhase extends Phase {
       if (count === undefined) {
         count = 0;
       }
-      this.scene.playSound("pb_move");
+      this.scene.playSound("se/pb_move");
       this.scene.tweens.add({
         targets: this.eggContainer,
         x: `-=${intensity / (count ? 1 : 2)}`,
@@ -281,7 +281,7 @@ export class EggHatchPhase extends Phase {
       SoundFade.fadeOut(this.scene, this.evolutionBgm, Utils.fixedInt(100));
     }
     for (let e = 0; e < 5; e++) {
-      this.scene.time.delayedCall(Utils.fixedInt(375 * e), () => this.scene.playSound("egg_hatch", { volume: 1 - (e * 0.2) }));
+      this.scene.time.delayedCall(Utils.fixedInt(375 * e), () => this.scene.playSound("se/egg_hatch", { volume: 1 - (e * 0.2) }));
     }
     this.eggLightraysOverlay.setVisible(true);
     this.eggLightraysOverlay.play("egg_lightrays");
@@ -334,7 +334,7 @@ export class EggHatchPhase extends Phase {
       if (isShiny) {
         this.scene.time.delayedCall(Utils.fixedInt(500), () => {
           this.pokemonShinySparkle.play(`sparkle${this.pokemon.variant ? `_${this.pokemon.variant + 1}` : ""}`);
-          this.scene.playSound("sparkle");
+          this.scene.playSound("se/sparkle");
         });
       }
       this.scene.time.delayedCall(Utils.fixedInt(!this.skipped ? !isShiny ? 1250 : 1750 : !isShiny ? 250 : 750), () => {
diff --git a/src/phases/encounter-phase.ts b/src/phases/encounter-phase.ts
index dfa198c8339..9d74063627a 100644
--- a/src/phases/encounter-phase.ts
+++ b/src/phases/encounter-phase.ts
@@ -366,7 +366,9 @@ export class EncounterPhase extends BattlePhase {
         const currentLanguage = i18next.resolvedLanguage ?? "en";
         const ordinalIndex = (ordinalUse.includes(currentLanguage)) ? ["st", "nd", "rd"][((count + 90) % 100 - 10) % 10 - 1] ?? "th" : "";
         const cycleCount = count.toLocaleString() + ordinalIndex;
-        const encounterDialogue = i18next.t(`${(this.scene.gameData.gender === PlayerGender.FEMALE) ? "PGF" : "PGM"}battleSpecDialogue:encounter`, {cycleCount: cycleCount});
+        const genderIndex = this.scene.gameData.gender ?? PlayerGender.UNSET;
+        const genderStr = PlayerGender[genderIndex].toLowerCase();
+        const encounterDialogue = i18next.t("battleSpecDialogue:encounter", { context: genderStr, cycleCount: cycleCount });
         this.scene.ui.showDialogue(encounterDialogue, enemy?.species.name, null, () => {
           this.doEncounterCommon(false);
         });
diff --git a/src/phases/evolution-phase.ts b/src/phases/evolution-phase.ts
index 398450ec693..0c3c2fa5bcf 100644
--- a/src/phases/evolution-phase.ts
+++ b/src/phases/evolution-phase.ts
@@ -157,7 +157,7 @@ export class EvolutionPhase extends Phase {
                 this.evolutionBg.setVisible(true);
                 this.evolutionBg.play();
               });
-              this.scene.playSound("charge");
+              this.scene.playSound("se/charge");
               this.doSpiralUpward();
               this.scene.tweens.addCounter({
                 from: 0,
@@ -169,7 +169,7 @@ export class EvolutionPhase extends Phase {
                 onComplete: () => {
                   this.pokemonSprite.setVisible(false);
                   this.scene.time.delayedCall(1100, () => {
-                    this.scene.playSound("beam");
+                    this.scene.playSound("se/beam");
                     this.doArcDownward();
                     this.scene.time.delayedCall(1500, () => {
                       this.pokemonEvoTintSprite.setScale(0.25);
@@ -214,7 +214,7 @@ export class EvolutionPhase extends Phase {
                           return;
                         }
 
-                        this.scene.playSound("sparkle");
+                        this.scene.playSound("se/sparkle");
                         this.pokemonEvoSprite.setVisible(true);
                         this.doCircleInward();
                         this.scene.time.delayedCall(900, () => {
@@ -227,7 +227,7 @@ export class EvolutionPhase extends Phase {
                             }
                             this.scene.unshiftPhase(new EndEvolutionPhase(this.scene));
 
-                            this.scene.playSound("shine");
+                            this.scene.playSound("se/shine");
                             this.doSpray();
                             this.scene.tweens.add({
                               targets: this.evolutionOverlay,
diff --git a/src/phases/faint-phase.ts b/src/phases/faint-phase.ts
index 14727f992d2..66946d268cb 100644
--- a/src/phases/faint-phase.ts
+++ b/src/phases/faint-phase.ts
@@ -126,7 +126,7 @@ export class FaintPhase extends PokemonPhase {
         pokemon.addFriendship(-10);
       }
       pokemon.hideInfo();
-      this.scene.playSound("faint");
+      this.scene.playSound("se/faint");
       this.scene.tweens.add({
         targets: pokemon,
         duration: 500,
diff --git a/src/phases/form-change-phase.ts b/src/phases/form-change-phase.ts
index 88e0dd00ce1..33c1f8e8cef 100644
--- a/src/phases/form-change-phase.ts
+++ b/src/phases/form-change-phase.ts
@@ -68,7 +68,7 @@ export class FormChangePhase extends EvolutionPhase {
               this.evolutionBg.setVisible(true);
               this.evolutionBg.play();
             });
-            this.scene.playSound("charge");
+            this.scene.playSound("se/charge");
             this.doSpiralUpward();
             this.scene.tweens.addCounter({
               from: 0,
@@ -80,13 +80,13 @@ export class FormChangePhase extends EvolutionPhase {
               onComplete: () => {
                 this.pokemonSprite.setVisible(false);
                 this.scene.time.delayedCall(1100, () => {
-                  this.scene.playSound("beam");
+                  this.scene.playSound("se/beam");
                   this.doArcDownward();
                   this.scene.time.delayedCall(1000, () => {
                     this.pokemonEvoTintSprite.setScale(0.25);
                     this.pokemonEvoTintSprite.setVisible(true);
                     this.doCycle(1, 1).then(_success => {
-                      this.scene.playSound("sparkle");
+                      this.scene.playSound("se/sparkle");
                       this.pokemonEvoSprite.setVisible(true);
                       this.doCircleInward();
                       this.scene.time.delayedCall(900, () => {
@@ -95,7 +95,7 @@ export class FormChangePhase extends EvolutionPhase {
                             this.scene.unshiftPhase(new EndEvolutionPhase(this.scene));
                           }
 
-                          this.scene.playSound("shine");
+                          this.scene.playSound("se/shine");
                           this.doSpray();
                           this.scene.tweens.add({
                             targets: this.evolutionOverlay,
diff --git a/src/phases/game-over-modifier-reward-phase.ts b/src/phases/game-over-modifier-reward-phase.ts
index e2f4d134cba..c27659bf9d4 100644
--- a/src/phases/game-over-modifier-reward-phase.ts
+++ b/src/phases/game-over-modifier-reward-phase.ts
@@ -13,6 +13,7 @@ export class GameOverModifierRewardPhase extends ModifierRewardPhase {
     return new Promise<void>(resolve => {
       const newModifier = this.modifierType.newModifier();
       this.scene.addModifier(newModifier).then(() => {
+        // Sound loaded into game as is
         this.scene.playSound("level_up_fanfare");
         this.scene.ui.setMode(Mode.MESSAGE);
         this.scene.ui.fadeIn(250).then(() => {
diff --git a/src/phases/game-over-phase.ts b/src/phases/game-over-phase.ts
index a42e8472952..78dd73057a1 100644
--- a/src/phases/game-over-phase.ts
+++ b/src/phases/game-over-phase.ts
@@ -1,19 +1,19 @@
-import { clientSessionId } from "#app/account.js";
-import BattleScene from "#app/battle-scene.js";
-import { BattleType } from "#app/battle.js";
-import { miscDialogue, getCharVariantFromDialogue } from "#app/data/dialogue.js";
-import { pokemonEvolutions } from "#app/data/pokemon-evolutions.js";
-import PokemonSpecies, { getPokemonSpecies } from "#app/data/pokemon-species.js";
-import { trainerConfigs } from "#app/data/trainer-config.js";
-import { PlayerGender } from "#app/enums/player-gender.js";
-import { TrainerType } from "#app/enums/trainer-type.js";
-import Pokemon from "#app/field/pokemon.js";
-import { modifierTypes } from "#app/modifier/modifier-type.js";
-import { achvs, ChallengeAchv } from "#app/system/achv.js";
-import { Unlockables } from "#app/system/unlockables.js";
-import { Mode } from "#app/ui/ui.js";
+import { clientSessionId } from "#app/account";
+import BattleScene from "#app/battle-scene";
+import { BattleType } from "#app/battle";
+import { miscDialogue, getCharVariantFromDialogue } from "#app/data/dialogue";
+import { pokemonEvolutions } from "#app/data/pokemon-evolutions";
+import PokemonSpecies, { getPokemonSpecies } from "#app/data/pokemon-species";
+import { trainerConfigs } from "#app/data/trainer-config";
+import { PlayerGender } from "#app/enums/player-gender";
+import { TrainerType } from "#app/enums/trainer-type";
+import Pokemon from "#app/field/pokemon";
+import { modifierTypes } from "#app/modifier/modifier-type";
+import { achvs, ChallengeAchv } from "#app/system/achv";
+import { Unlockables } from "#app/system/unlockables";
+import { Mode } from "#app/ui/ui";
 import i18next from "i18next";
-import * as Utils from "#app/utils.js";
+import * as Utils from "#app/utils";
 import { BattlePhase } from "./battle-phase";
 import { CheckSwitchPhase } from "./check-switch-phase";
 import { EncounterPhase } from "./encounter-phase";
@@ -23,6 +23,12 @@ import { SummonPhase } from "./summon-phase";
 import { EndCardPhase } from "./end-card-phase";
 import { PostGameOverPhase } from "./post-game-over-phase";
 import { UnlockPhase } from "./unlock-phase";
+import { SessionSaveData } from "../system/game-data";
+import TrainerData from "../system/trainer-data";
+import PokemonData from "../system/pokemon-data";
+import PersistentModifierData from "../system/modifier-data";
+import ChallengeData from "../system/challenge-data";
+import ArenaData from "../system/arena-data";
 
 export class GameOverPhase extends BattlePhase {
   private victory: boolean;
@@ -98,13 +104,7 @@ export class GameOverPhase extends BattlePhase {
             this.scene.gameData.gameStats.dailyRunSessionsWon++;
           }
         }
-        this.scene.gameData.getSession(this.scene.sessionSlotId).then(sessionData => {
-          if (sessionData) {
-            this.scene.gameData.saveRunHistory(this.scene, sessionData, this.victory);
-          }
-        }).catch(err => {
-          console.error("Failed to save run to history.", err);
-        });
+        this.scene.gameData.saveRunHistory(this.scene, this.getFinalSessionData(), this.victory);
         const fadeDuration = this.victory ? 10000 : 5000;
         this.scene.fadeOutBgm(fadeDuration, true);
         const activeBattlers = this.scene.getField().filter(p => p?.isActive(true));
@@ -207,4 +207,32 @@ export class GameOverPhase extends BattlePhase {
       this.firstRibbons.push(getPokemonSpecies(pokemon.species.getRootSpeciesId(forStarter)));
     }
   }
+
+  /**
+   * This function mirrors game-data.ts' getSessionSaveData() to update the session data to reflect any changes that occurred within the last wave
+   * This means that level ups, item usage, evolutions, etc. will all be accurately reflected.
+   * @returns {@linkCode SessionSaveData} an updated version of the wave's SessionSaveData that accurately reflects the events of the wave
+   */
+  private getFinalSessionData(): SessionSaveData {
+    return {
+      seed: this.scene.seed,
+      playTime: this.scene.sessionPlayTime,
+      gameMode: this.scene.gameMode.modeId,
+      party: this.scene.getParty().map(p => new PokemonData(p)),
+      enemyParty: this.scene.getEnemyParty().map(p => new PokemonData(p)),
+      modifiers: this.scene.findModifiers(() => true).map(m => new PersistentModifierData(m, true)),
+      enemyModifiers: this.scene.findModifiers(() => true, false).map(m => new PersistentModifierData(m, false)),
+      arena: new ArenaData(this.scene.arena),
+      pokeballCounts: this.scene.pokeballCounts,
+      money: this.scene.money,
+      score: this.scene.score,
+      waveIndex: this.scene.currentBattle.waveIndex,
+      battleType: this.scene.currentBattle.battleType,
+      trainer: this.scene.currentBattle.battleType === BattleType.TRAINER ? new TrainerData(this.scene.currentBattle.trainer) : null,
+      gameVersion: this.scene.game.config.gameVersion,
+      timestamp: new Date().getTime(),
+      challenges: this.scene.gameMode.challenges.map(c => new ChallengeData(c))
+    } as SessionSaveData;
+  }
 }
+
diff --git a/src/phases/learn-move-phase.ts b/src/phases/learn-move-phase.ts
index e30fc0c3d10..5a9a16b6f5e 100644
--- a/src/phases/learn-move-phase.ts
+++ b/src/phases/learn-move-phase.ts
@@ -45,6 +45,7 @@ export class LearnMovePhase extends PlayerPartyMemberPokemonPhase {
         loadMoveAnimAssets(this.scene, [this.moveId], true)
           .then(() => {
             this.scene.ui.setMode(messageMode).then(() => {
+              // Sound loaded into game as is
               this.scene.playSound("level_up_fanfare");
               this.scene.ui.showText(i18next.t("battle:learnMove", { pokemonName: getPokemonNameWithAffix(pokemon), moveName: move.name }), null, () => {
                 this.scene.triggerPokemonFormChange(pokemon, SpeciesFormChangeMoveLearnedTrigger, true);
diff --git a/src/phases/level-cap-phase.ts b/src/phases/level-cap-phase.ts
index 4a07e7d131e..db59fbd6473 100644
--- a/src/phases/level-cap-phase.ts
+++ b/src/phases/level-cap-phase.ts
@@ -12,6 +12,7 @@ export class LevelCapPhase extends FieldPhase {
     super.start();
 
     this.scene.ui.setMode(Mode.MESSAGE).then(() => {
+      // Sound loaded into game as is
       this.scene.playSound("level_up_fanfare");
       this.scene.ui.showText(i18next.t("battle:levelCapUp", { levelCap: this.scene.getMaxExpLevel() }), null, () => this.end(), null, true);
       this.executeForAll(pokemon => pokemon.updateInfo(true));
diff --git a/src/phases/move-effect-phase.ts b/src/phases/move-effect-phase.ts
index 12018656458..f100a763219 100644
--- a/src/phases/move-effect-phase.ts
+++ b/src/phases/move-effect-phase.ts
@@ -311,8 +311,6 @@ export class MoveEffectPhase extends PokemonPhase {
   }
 
   end() {
-    const move = this.move.getMove();
-    move.type = move.defaultType;
     const user = this.getUserPokemon();
     /**
        * If this phase isn't for the invoked move's last strike,
diff --git a/src/phases/select-modifier-phase.ts b/src/phases/select-modifier-phase.ts
index 57b842e7b38..1c96d278d69 100644
--- a/src/phases/select-modifier-phase.ts
+++ b/src/phases/select-modifier-phase.ts
@@ -69,7 +69,7 @@ export class SelectModifierPhase extends BattlePhase {
               this.scene.updateMoneyText();
               this.scene.animateMoneyChanged(false);
             }
-            this.scene.playSound("buy");
+            this.scene.playSound("se/buy");
           }
           break;
         case 1:
@@ -128,7 +128,7 @@ export class SelectModifierPhase extends BattlePhase {
                 this.scene.updateMoneyText();
                 this.scene.animateMoneyChanged(false);
               }
-              this.scene.playSound("buy");
+              this.scene.playSound("se/buy");
               (this.scene.ui.getHandler() as ModifierSelectUiHandler).updateCostText();
             } else {
               this.scene.ui.playError();
diff --git a/src/phases/stat-change-phase.ts b/src/phases/stat-change-phase.ts
index 99f30304502..856d0a33eea 100644
--- a/src/phases/stat-change-phase.ts
+++ b/src/phases/stat-change-phase.ts
@@ -134,7 +134,7 @@ export class StatChangePhase extends PokemonPhase {
       statSprite.setScale(6);
       statSprite.setOrigin(0.5, 1);
 
-      this.scene.playSound(`stat_${levels.value >= 1 ? "up" : "down"}`);
+      this.scene.playSound(`se/stat_${levels.value >= 1 ? "up" : "down"}`);
 
       statSprite.setMask(new Phaser.Display.Masks.BitmapMask(this.scene, pokemonMaskSprite ?? undefined));
 
diff --git a/src/phases/summon-phase.ts b/src/phases/summon-phase.ts
index 50424170ea7..f65a2063d4c 100644
--- a/src/phases/summon-phase.ts
+++ b/src/phases/summon-phase.ts
@@ -127,7 +127,7 @@ export class SummonPhase extends PartyMemberPokemonPhase {
           angle: 1440,
           y: (this.player ? 132 : 86) + fpOffset[1],
           onComplete: () => {
-            this.scene.playSound("pb_rel");
+            this.scene.playSound("se/pb_rel");
             pokeball.destroy();
             this.scene.add.existing(pokemon);
             this.scene.field.add(pokemon);
diff --git a/src/phases/switch-summon-phase.ts b/src/phases/switch-summon-phase.ts
index 3e401925cea..68dc8f8bf65 100644
--- a/src/phases/switch-summon-phase.ts
+++ b/src/phases/switch-summon-phase.ts
@@ -74,7 +74,7 @@ export class SwitchSummonPhase extends SummonPhase {
         pokemonName: getPokemonNameWithAffix(pokemon)
       })
     );
-    this.scene.playSound("pb_rel");
+    this.scene.playSound("se/pb_rel");
     pokemon.hideInfo();
     pokemon.tint(getPokeballTintColor(pokemon.pokeball), 1, 250, "Sine.easeIn");
     this.scene.tweens.add({
@@ -160,6 +160,8 @@ export class SwitchSummonPhase extends SummonPhase {
     this.lastPokemon?.resetSummonData();
 
     this.scene.triggerPokemonFormChange(pokemon, SpeciesFormChangeActiveTrigger, true);
+    // Reverts to weather-based forms when weather suppressors (Cloud Nine/Air Lock) are switched out
+    this.scene.arena.triggerWeatherBasedFormChanges();
   }
 
   queuePostSummon(): void {
diff --git a/src/phases/trainer-victory-phase.ts b/src/phases/trainer-victory-phase.ts
index 7b8ee05de44..a38874c9acd 100644
--- a/src/phases/trainer-victory-phase.ts
+++ b/src/phases/trainer-victory-phase.ts
@@ -1,6 +1,5 @@
 import BattleScene from "#app/battle-scene.js";
 import { getCharVariantFromDialogue } from "#app/data/dialogue.js";
-import { TrainerSlot } from "#app/data/trainer-config.js";
 import { TrainerType } from "#app/enums/trainer-type.js";
 import { modifierTypes } from "#app/modifier/modifier-type.js";
 import { vouchers } from "#app/system/voucher.js";
@@ -9,6 +8,7 @@ import * as Utils from "#app/utils.js";
 import { BattlePhase } from "./battle-phase";
 import { ModifierRewardPhase } from "./modifier-reward-phase";
 import { MoneyRewardPhase } from "./money-reward-phase";
+import { TrainerSlot } from "#app/data/trainer-config";
 
 export class TrainerVictoryPhase extends BattlePhase {
   constructor(scene: BattleScene) {
@@ -42,7 +42,7 @@ export class TrainerVictoryPhase extends BattlePhase {
 
       const showMessage = () => {
         const originalFunc = showMessageOrEnd;
-        showMessageOrEnd = () => this.scene.ui.showDialogue(message, this.scene.currentBattle.trainer?.getName(), null, originalFunc);
+        showMessageOrEnd = () => this.scene.ui.showDialogue(message, this.scene.currentBattle.trainer?.getName(TrainerSlot.TRAINER, true), null, originalFunc);
 
         showMessageOrEnd();
       };
diff --git a/src/phases/turn-end-phase.ts b/src/phases/turn-end-phase.ts
index 62589e99b79..9f4de46b0fa 100644
--- a/src/phases/turn-end-phase.ts
+++ b/src/phases/turn-end-phase.ts
@@ -60,6 +60,7 @@ export class TurnEndPhase extends FieldPhase {
 
     if (this.scene.arena.weather && !this.scene.arena.weather.lapse()) {
       this.scene.arena.trySetWeather(WeatherType.NONE, false);
+      this.scene.arena.triggerWeatherBasedFormChangesToNormal();
     }
 
     if (this.scene.arena.terrain && !this.scene.arena.terrain.lapse()) {
diff --git a/src/phases/unlock-phase.ts b/src/phases/unlock-phase.ts
index ce06e2445ac..1662afaa758 100644
--- a/src/phases/unlock-phase.ts
+++ b/src/phases/unlock-phase.ts
@@ -16,6 +16,7 @@ export class UnlockPhase extends Phase {
   start(): void {
     this.scene.time.delayedCall(2000, () => {
       this.scene.gameData.unlocks[this.unlockable] = true;
+      // Sound loaded into game as is
       this.scene.playSound("level_up_fanfare");
       this.scene.ui.setMode(Mode.MESSAGE);
       this.scene.ui.showText(i18next.t("battle:unlockedSomething", { unlockedThing: getUnlockableName(this.unlockable) }), null, () => {
diff --git a/src/scene-base.ts b/src/scene-base.ts
index 1d7a2518300..298b8096e54 100644
--- a/src/scene-base.ts
+++ b/src/scene-base.ts
@@ -73,7 +73,7 @@ export class SceneBase extends Phaser.Scene {
       filenames = `${key}.wav`;
     }
     if (!folder) {
-      folder = "";
+      folder = "se/";
     } else {
       folder += "/";
     }
@@ -81,7 +81,7 @@ export class SceneBase extends Phaser.Scene {
       filenames = [ filenames ];
     }
     for (const f of filenames as string[]) {
-      this.load.audio(key, this.getCachedUrl(`audio/se/${folder}${f}`));
+      this.load.audio(folder+key, this.getCachedUrl(`audio/${folder}${f}`));
     }
   }
 
diff --git a/src/system/achv.ts b/src/system/achv.ts
index 62772758f61..5436cce24ab 100644
--- a/src/system/achv.ts
+++ b/src/system/achv.ts
@@ -5,9 +5,9 @@ import { pokemonEvolutions } from "#app/data/pokemon-evolutions";
 import i18next from "i18next";
 import * as Utils from "../utils";
 import { PlayerGender } from "#enums/player-gender";
-import { ParseKeys } from "i18next";
-import { Challenge, FreshStartChallenge, SingleGenerationChallenge, SingleTypeChallenge } from "#app/data/challenge.js";
-import { ConditionFn } from "#app/@types/common.js";
+import { Challenge, FreshStartChallenge, InverseBattleChallenge, SingleGenerationChallenge, SingleTypeChallenge } from "#app/data/challenge";
+import { Challenges } from "#app/enums/challenges";
+import { ConditionFn } from "#app/@types/common";
 
 export enum AchvTier {
   COMMON,
@@ -42,13 +42,13 @@ export class Achv {
 
   /**
    * Get the name of the achievement based on the gender of the player
-   * @param playerGender - the gender of the player
+   * @param playerGender - the gender of the player (default: {@linkcode PlayerGender.UNSET})
    * @returns the name of the achievement localized for the player gender
    */
-  getName(playerGender: PlayerGender): string {
-    const prefix = playerGender === PlayerGender.FEMALE ?"PGF" : "PGM";
+  getName(playerGender: PlayerGender = PlayerGender.UNSET): string {
+    const genderStr = PlayerGender[playerGender].toLowerCase();
     // Localization key is used to get the name of the achievement
-    return i18next.t(`${prefix}achv:${this.localizationKey}.name` as ParseKeys);
+    return i18next.t(`achv:${this.localizationKey}.name`, { context: genderStr });
   }
 
   getDescription(): string {
@@ -138,8 +138,8 @@ export class ModifierAchv extends Achv {
 }
 
 export class ChallengeAchv extends Achv {
-  constructor(localizationKey: string, name: string, description: string, iconImage: string, score: integer, challengeFunc: (challenge: Challenge) => boolean) {
-    super(localizationKey, name, description, iconImage, score, (_scene: BattleScene, args: any[]) => challengeFunc((args[0] as Challenge)));
+  constructor(localizationKey: string, name: string, description: string, iconImage: string, score: integer, challengeFunc: (challenge: Challenge, scene: BattleScene) => boolean) {
+    super(localizationKey, name, description, iconImage, score, (_scene: BattleScene, args: any[]) => challengeFunc(args[0] as Challenge, _scene));
   }
 }
 
@@ -151,116 +151,110 @@ export class ChallengeAchv extends Achv {
  */
 export function getAchievementDescription(localizationKey: string): string {
   // We need to get the player gender from the game data to add the correct prefix to the achievement name
-  let playerGender = PlayerGender.MALE;
-  if (this?.scene) {
-    playerGender = this.scene.gameData.gender;
-  }
-  let genderPrefix = "PGM";
-  if (playerGender === PlayerGender.FEMALE) {
-    genderPrefix = "PGF";
-  }
+  const genderIndex = this?.scene?.gameData?.gender ?? PlayerGender.MALE; //TODO: why is `this` being used here!? We are not inside a scope (copied from original)
+  const genderStr = PlayerGender[genderIndex].toLowerCase();
 
   switch (localizationKey) {
   case "10K_MONEY":
-    return i18next.t(`${genderPrefix}achv:MoneyAchv.description` as ParseKeys, {"moneyAmount": achvs._10K_MONEY.moneyAmount.toLocaleString("en-US")});
+    return i18next.t("achv:MoneyAchv.description", {context: genderStr, "moneyAmount": achvs._10K_MONEY.moneyAmount.toLocaleString("en-US")});
   case "100K_MONEY":
-    return i18next.t(`${genderPrefix}achv:MoneyAchv.description` as ParseKeys, {"moneyAmount": achvs._100K_MONEY.moneyAmount.toLocaleString("en-US")});
+    return i18next.t("achv:MoneyAchv.description", {context: genderStr, "moneyAmount": achvs._100K_MONEY.moneyAmount.toLocaleString("en-US")});
   case "1M_MONEY":
-    return i18next.t(`${genderPrefix}achv:MoneyAchv.description` as ParseKeys, {"moneyAmount": achvs._1M_MONEY.moneyAmount.toLocaleString("en-US")});
+    return i18next.t("achv:MoneyAchv.description", {context: genderStr, "moneyAmount": achvs._1M_MONEY.moneyAmount.toLocaleString("en-US")});
   case "10M_MONEY":
-    return i18next.t(`${genderPrefix}achv:MoneyAchv.description` as ParseKeys, {"moneyAmount": achvs._10M_MONEY.moneyAmount.toLocaleString("en-US")});
+    return i18next.t("achv:MoneyAchv.description", {context: genderStr, "moneyAmount": achvs._10M_MONEY.moneyAmount.toLocaleString("en-US")});
   case "250_DMG":
-    return i18next.t(`${genderPrefix}achv:DamageAchv.description` as ParseKeys, {"damageAmount": achvs._250_DMG.damageAmount.toLocaleString("en-US")});
+    return i18next.t("achv:DamageAchv.description", {context: genderStr, "damageAmount": achvs._250_DMG.damageAmount.toLocaleString("en-US")});
   case "1000_DMG":
-    return i18next.t(`${genderPrefix}achv:DamageAchv.description` as ParseKeys, {"damageAmount": achvs._1000_DMG.damageAmount.toLocaleString("en-US")});
+    return i18next.t("achv:DamageAchv.description", {context: genderStr, "damageAmount": achvs._1000_DMG.damageAmount.toLocaleString("en-US")});
   case "2500_DMG":
-    return i18next.t(`${genderPrefix}achv:DamageAchv.description` as ParseKeys, {"damageAmount": achvs._2500_DMG.damageAmount.toLocaleString("en-US")});
+    return i18next.t("achv:DamageAchv.description", {context: genderStr, "damageAmount": achvs._2500_DMG.damageAmount.toLocaleString("en-US")});
   case "10000_DMG":
-    return i18next.t(`${genderPrefix}achv:DamageAchv.description` as ParseKeys, {"damageAmount": achvs._10000_DMG.damageAmount.toLocaleString("en-US")});
+    return i18next.t("achv:DamageAchv.description", {context: genderStr, "damageAmount": achvs._10000_DMG.damageAmount.toLocaleString("en-US")});
   case "250_HEAL":
-    return i18next.t(`${genderPrefix}achv:HealAchv.description` as ParseKeys, {"healAmount": achvs._250_HEAL.healAmount.toLocaleString("en-US"), "HP": i18next.t("pokemonInfo:Stat.HPshortened")});
+    return i18next.t("achv:HealAchv.description", {context: genderStr, "healAmount": achvs._250_HEAL.healAmount.toLocaleString("en-US"), "HP": i18next.t("pokemonInfo:Stat.HPshortened")});
   case "1000_HEAL":
-    return i18next.t(`${genderPrefix}achv:HealAchv.description` as ParseKeys, {"healAmount": achvs._1000_HEAL.healAmount.toLocaleString("en-US"), "HP": i18next.t("pokemonInfo:Stat.HPshortened")});
+    return i18next.t("achv:HealAchv.description", {context: genderStr, "healAmount": achvs._1000_HEAL.healAmount.toLocaleString("en-US"), "HP": i18next.t("pokemonInfo:Stat.HPshortened")});
   case "2500_HEAL":
-    return i18next.t(`${genderPrefix}achv:HealAchv.description` as ParseKeys, {"healAmount": achvs._2500_HEAL.healAmount.toLocaleString("en-US"), "HP": i18next.t("pokemonInfo:Stat.HPshortened")});
+    return i18next.t("achv:HealAchv.description", {context: genderStr, "healAmount": achvs._2500_HEAL.healAmount.toLocaleString("en-US"), "HP": i18next.t("pokemonInfo:Stat.HPshortened")});
   case "10000_HEAL":
-    return i18next.t(`${genderPrefix}achv:HealAchv.description` as ParseKeys, {"healAmount": achvs._10000_HEAL.healAmount.toLocaleString("en-US"), "HP": i18next.t("pokemonInfo:Stat.HPshortened")});
+    return i18next.t("achv:HealAchv.description", {context: genderStr, "healAmount": achvs._10000_HEAL.healAmount.toLocaleString("en-US"), "HP": i18next.t("pokemonInfo:Stat.HPshortened")});
   case "LV_100":
-    return i18next.t(`${genderPrefix}achv:LevelAchv.description` as ParseKeys, {"level": achvs.LV_100.level});
+    return i18next.t("achv:LevelAchv.description", {context: genderStr, "level": achvs.LV_100.level});
   case "LV_250":
-    return i18next.t(`${genderPrefix}achv:LevelAchv.description` as ParseKeys, {"level": achvs.LV_250.level});
+    return i18next.t("achv:LevelAchv.description", {context: genderStr, "level": achvs.LV_250.level});
   case "LV_1000":
-    return i18next.t(`${genderPrefix}achv:LevelAchv.description` as ParseKeys, {"level": achvs.LV_1000.level});
+    return i18next.t("achv:LevelAchv.description", {context: genderStr, "level": achvs.LV_1000.level});
   case "10_RIBBONS":
-    return i18next.t(`${genderPrefix}achv:RibbonAchv.description` as ParseKeys, {"ribbonAmount": achvs._10_RIBBONS.ribbonAmount.toLocaleString("en-US")});
+    return i18next.t("achv:RibbonAchv.description", {context: genderStr, "ribbonAmount": achvs._10_RIBBONS.ribbonAmount.toLocaleString("en-US")});
   case "25_RIBBONS":
-    return i18next.t(`${genderPrefix}achv:RibbonAchv.description` as ParseKeys, {"ribbonAmount": achvs._25_RIBBONS.ribbonAmount.toLocaleString("en-US")});
+    return i18next.t("achv:RibbonAchv.description", {context: genderStr, "ribbonAmount": achvs._25_RIBBONS.ribbonAmount.toLocaleString("en-US")});
   case "50_RIBBONS":
-    return i18next.t(`${genderPrefix}achv:RibbonAchv.description` as ParseKeys, {"ribbonAmount": achvs._50_RIBBONS.ribbonAmount.toLocaleString("en-US")});
+    return i18next.t("achv:RibbonAchv.description", {context: genderStr, "ribbonAmount": achvs._50_RIBBONS.ribbonAmount.toLocaleString("en-US")});
   case "75_RIBBONS":
-    return i18next.t(`${genderPrefix}achv:RibbonAchv.description` as ParseKeys, {"ribbonAmount": achvs._75_RIBBONS.ribbonAmount.toLocaleString("en-US")});
+    return i18next.t("achv:RibbonAchv.description", {context: genderStr, "ribbonAmount": achvs._75_RIBBONS.ribbonAmount.toLocaleString("en-US")});
   case "100_RIBBONS":
-    return i18next.t(`${genderPrefix}achv:RibbonAchv.description` as ParseKeys, {"ribbonAmount": achvs._100_RIBBONS.ribbonAmount.toLocaleString("en-US")});
+    return i18next.t("achv:RibbonAchv.description", {context: genderStr, "ribbonAmount": achvs._100_RIBBONS.ribbonAmount.toLocaleString("en-US")});
   case "TRANSFER_MAX_BATTLE_STAT":
-    return i18next.t(`${genderPrefix}achv:TRANSFER_MAX_BATTLE_STAT.description` as ParseKeys);
+    return i18next.t("achv:TRANSFER_MAX_BATTLE_STAT.description", { context: genderStr });
   case "MAX_FRIENDSHIP":
-    return i18next.t(`${genderPrefix}achv:MAX_FRIENDSHIP.description` as ParseKeys);
+    return i18next.t("achv:MAX_FRIENDSHIP.description", { context: genderStr });
   case "MEGA_EVOLVE":
-    return i18next.t(`${genderPrefix}achv:MEGA_EVOLVE.description` as ParseKeys);
+    return i18next.t("achv:MEGA_EVOLVE.description", { context: genderStr });
   case "GIGANTAMAX":
-    return i18next.t(`${genderPrefix}achv:GIGANTAMAX.description` as ParseKeys);
+    return i18next.t("achv:GIGANTAMAX.description", { context: genderStr });
   case "TERASTALLIZE":
-    return i18next.t(`${genderPrefix}achv:TERASTALLIZE.description` as ParseKeys);
+    return i18next.t("achv:TERASTALLIZE.description", { context: genderStr });
   case "STELLAR_TERASTALLIZE":
-    return i18next.t(`${genderPrefix}achv:STELLAR_TERASTALLIZE.description` as ParseKeys);
+    return i18next.t("achv:STELLAR_TERASTALLIZE.description", { context: genderStr });
   case "SPLICE":
-    return i18next.t(`${genderPrefix}achv:SPLICE.description` as ParseKeys);
+    return i18next.t("achv:SPLICE.description", { context: genderStr });
   case "MINI_BLACK_HOLE":
-    return i18next.t(`${genderPrefix}achv:MINI_BLACK_HOLE.description` as ParseKeys);
+    return i18next.t("achv:MINI_BLACK_HOLE.description", { context: genderStr });
   case "CATCH_MYTHICAL":
-    return i18next.t(`${genderPrefix}achv:CATCH_MYTHICAL.description` as ParseKeys);
+    return i18next.t("achv:CATCH_MYTHICAL.description", { context: genderStr });
   case "CATCH_SUB_LEGENDARY":
-    return i18next.t(`${genderPrefix}achv:CATCH_SUB_LEGENDARY.description` as ParseKeys);
+    return i18next.t("achv:CATCH_SUB_LEGENDARY.description", { context: genderStr });
   case "CATCH_LEGENDARY":
-    return i18next.t(`${genderPrefix}achv:CATCH_LEGENDARY.description` as ParseKeys);
+    return i18next.t("achv:CATCH_LEGENDARY.description", { context: genderStr });
   case "SEE_SHINY":
-    return i18next.t(`${genderPrefix}achv:SEE_SHINY.description` as ParseKeys);
+    return i18next.t("achv:SEE_SHINY.description", { context: genderStr });
   case "SHINY_PARTY":
-    return i18next.t(`${genderPrefix}achv:SHINY_PARTY.description` as ParseKeys);
+    return i18next.t("achv:SHINY_PARTY.description", { context: genderStr });
   case "HATCH_MYTHICAL":
-    return i18next.t(`${genderPrefix}achv:HATCH_MYTHICAL.description` as ParseKeys);
+    return i18next.t("achv:HATCH_MYTHICAL.description", { context: genderStr });
   case "HATCH_SUB_LEGENDARY":
-    return i18next.t(`${genderPrefix}achv:HATCH_SUB_LEGENDARY.description` as ParseKeys);
+    return i18next.t("achv:HATCH_SUB_LEGENDARY.description", { context: genderStr });
   case "HATCH_LEGENDARY":
-    return i18next.t(`${genderPrefix}achv:HATCH_LEGENDARY.description` as ParseKeys);
+    return i18next.t("achv:HATCH_LEGENDARY.description", { context: genderStr });
   case "HATCH_SHINY":
-    return i18next.t(`${genderPrefix}achv:HATCH_SHINY.description` as ParseKeys);
+    return i18next.t("achv:HATCH_SHINY.description", { context: genderStr });
   case "HIDDEN_ABILITY":
-    return i18next.t(`${genderPrefix}achv:HIDDEN_ABILITY.description` as ParseKeys);
+    return i18next.t("achv:HIDDEN_ABILITY.description", { context: genderStr });
   case "PERFECT_IVS":
-    return i18next.t(`${genderPrefix}achv:PERFECT_IVS.description` as ParseKeys);
+    return i18next.t("achv:PERFECT_IVS.description", { context: genderStr });
   case "CLASSIC_VICTORY":
-    return i18next.t(`${genderPrefix}achv:CLASSIC_VICTORY.description` as ParseKeys);
+    return i18next.t("achv:CLASSIC_VICTORY.description", { context: genderStr });
   case "UNEVOLVED_CLASSIC_VICTORY":
-    return i18next.t(`${genderPrefix}achv:UNEVOLVED_CLASSIC_VICTORY.description` as ParseKeys);
+    return i18next.t("achv:UNEVOLVED_CLASSIC_VICTORY.description", { context: genderStr });
   case "MONO_GEN_ONE":
-    return i18next.t(`${genderPrefix}achv:MONO_GEN_ONE.description` as ParseKeys);
+    return i18next.t("achv:MONO_GEN_ONE.description", { context: genderStr });
   case "MONO_GEN_TWO":
-    return i18next.t(`${genderPrefix}achv:MONO_GEN_TWO.description` as ParseKeys);
+    return i18next.t("achv:MONO_GEN_TWO.description", { context: genderStr });
   case "MONO_GEN_THREE":
-    return i18next.t(`${genderPrefix}achv:MONO_GEN_THREE.description` as ParseKeys);
+    return i18next.t("achv:MONO_GEN_THREE.description", { context: genderStr });
   case "MONO_GEN_FOUR":
-    return i18next.t(`${genderPrefix}achv:MONO_GEN_FOUR.description` as ParseKeys);
+    return i18next.t("achv:MONO_GEN_FOUR.description", { context: genderStr });
   case "MONO_GEN_FIVE":
-    return i18next.t(`${genderPrefix}achv:MONO_GEN_FIVE.description` as ParseKeys);
+    return i18next.t("achv:MONO_GEN_FIVE.description", { context: genderStr });
   case "MONO_GEN_SIX":
-    return i18next.t(`${genderPrefix}achv:MONO_GEN_SIX.description` as ParseKeys);
+    return i18next.t("achv:MONO_GEN_SIX.description", { context: genderStr });
   case "MONO_GEN_SEVEN":
-    return i18next.t(`${genderPrefix}achv:MONO_GEN_SEVEN.description` as ParseKeys);
+    return i18next.t("achv:MONO_GEN_SEVEN.description", { context: genderStr });
   case "MONO_GEN_EIGHT":
-    return i18next.t(`${genderPrefix}achv:MONO_GEN_EIGHT.description` as ParseKeys);
+    return i18next.t("achv:MONO_GEN_EIGHT.description", { context: genderStr });
   case "MONO_GEN_NINE":
-    return i18next.t(`${genderPrefix}achv:MONO_GEN_NINE.description` as ParseKeys);
+    return i18next.t("achv:MONO_GEN_NINE.description", { context: genderStr });
   case "MONO_NORMAL":
   case "MONO_FIGHTING":
   case "MONO_FLYING":
@@ -279,9 +273,11 @@ export function getAchievementDescription(localizationKey: string): string {
   case "MONO_DRAGON":
   case "MONO_DARK":
   case "MONO_FAIRY":
-    return i18next.t(`${genderPrefix}achv:MonoType.description` as ParseKeys, {"type": i18next.t(`pokemonInfo:Type.${localizationKey.slice(5)}`)});
+    return i18next.t("achv:MonoType.description", { context: genderStr, "type": i18next.t(`pokemonInfo:Type.${localizationKey.slice(5)}`) });
   case "FRESH_START":
-    return i18next.t(`${genderPrefix}achv:FRESH_START.description` as ParseKeys);
+    return i18next.t("achv:FRESH_START.description", { context: genderStr });
+  case "INVERSE_BATTLE":
+    return i18next.t("achv:INVERSE_BATTLE.description", { context: genderStr });
   default:
     return "";
   }
@@ -330,34 +326,35 @@ export const achvs = {
   PERFECT_IVS: new Achv("PERFECT_IVS", "",  "PERFECT_IVS.description", "blunder_policy", 100),
   CLASSIC_VICTORY: new Achv("CLASSIC_VICTORY", "",  "CLASSIC_VICTORY.description", "relic_crown", 150),
   UNEVOLVED_CLASSIC_VICTORY: new Achv("UNEVOLVED_CLASSIC_VICTORY", "", "UNEVOLVED_CLASSIC_VICTORY.description", "eviolite", 175, c => c.getParty().some(p => p.getSpeciesForm(true).speciesId in pokemonEvolutions)),
-  MONO_GEN_ONE_VICTORY: new ChallengeAchv("MONO_GEN_ONE", "",  "MONO_GEN_ONE.description", "ribbon_gen1", 100, c => c instanceof SingleGenerationChallenge && c.value === 1),
-  MONO_GEN_TWO_VICTORY: new ChallengeAchv("MONO_GEN_TWO", "",  "MONO_GEN_TWO.description", "ribbon_gen2", 100, c => c instanceof SingleGenerationChallenge && c.value === 2),
-  MONO_GEN_THREE_VICTORY: new ChallengeAchv("MONO_GEN_THREE", "",  "MONO_GEN_THREE.description", "ribbon_gen3", 100, c => c instanceof SingleGenerationChallenge && c.value === 3),
-  MONO_GEN_FOUR_VICTORY: new ChallengeAchv("MONO_GEN_FOUR", "",  "MONO_GEN_FOUR.description", "ribbon_gen4", 100, c => c instanceof SingleGenerationChallenge && c.value === 4),
-  MONO_GEN_FIVE_VICTORY: new ChallengeAchv("MONO_GEN_FIVE", "",  "MONO_GEN_FIVE.description", "ribbon_gen5", 100, c => c instanceof SingleGenerationChallenge && c.value === 5),
-  MONO_GEN_SIX_VICTORY: new ChallengeAchv("MONO_GEN_SIX", "",  "MONO_GEN_SIX.description", "ribbon_gen6", 100, c => c instanceof SingleGenerationChallenge && c.value === 6),
-  MONO_GEN_SEVEN_VICTORY: new ChallengeAchv("MONO_GEN_SEVEN", "",  "MONO_GEN_SEVEN.description", "ribbon_gen7", 100, c => c instanceof SingleGenerationChallenge && c.value === 7),
-  MONO_GEN_EIGHT_VICTORY: new ChallengeAchv("MONO_GEN_EIGHT", "",  "MONO_GEN_EIGHT.description", "ribbon_gen8", 100, c => c instanceof SingleGenerationChallenge && c.value === 8),
-  MONO_GEN_NINE_VICTORY: new ChallengeAchv("MONO_GEN_NINE", "",  "MONO_GEN_NINE.description", "ribbon_gen9", 100, c => c instanceof SingleGenerationChallenge && c.value === 9),
-  MONO_NORMAL: new ChallengeAchv("MONO_NORMAL", "", "MONO_NORMAL.description", "silk_scarf", 100, c => c instanceof SingleTypeChallenge && c.value === 1),
-  MONO_FIGHTING: new ChallengeAchv("MONO_FIGHTING", "", "MONO_FIGHTING.description", "black_belt", 100, c => c instanceof SingleTypeChallenge && c.value === 2),
-  MONO_FLYING: new ChallengeAchv("MONO_FLYING", "", "MONO_FLYING.description", "sharp_beak", 100, c => c instanceof SingleTypeChallenge && c.value === 3),
-  MONO_POISON: new ChallengeAchv("MONO_POISON", "", "MONO_POISON.description", "poison_barb", 100, c => c instanceof SingleTypeChallenge && c.value === 4),
-  MONO_GROUND: new ChallengeAchv("MONO_GROUND", "", "MONO_GROUND.description", "soft_sand", 100, c => c instanceof SingleTypeChallenge && c.value === 5),
-  MONO_ROCK: new ChallengeAchv("MONO_ROCK", "", "MONO_ROCK.description", "hard_stone", 100, c => c instanceof SingleTypeChallenge && c.value === 6),
-  MONO_BUG: new ChallengeAchv("MONO_BUG", "", "MONO_BUG.description", "silver_powder", 100, c => c instanceof SingleTypeChallenge && c.value === 7),
-  MONO_GHOST: new ChallengeAchv("MONO_GHOST", "", "MONO_GHOST.description", "spell_tag", 100, c => c instanceof SingleTypeChallenge && c.value === 8),
-  MONO_STEEL: new ChallengeAchv("MONO_STEEL", "", "MONO_STEEL.description", "metal_coat", 100, c => c instanceof SingleTypeChallenge && c.value === 9),
-  MONO_FIRE: new ChallengeAchv("MONO_FIRE", "", "MONO_FIRE.description", "charcoal", 100, c => c instanceof SingleTypeChallenge && c.value === 10),
-  MONO_WATER: new ChallengeAchv("MONO_WATER", "", "MONO_WATER.description", "mystic_water", 100, c => c instanceof SingleTypeChallenge && c.value === 11),
-  MONO_GRASS: new ChallengeAchv("MONO_GRASS", "", "MONO_GRASS.description", "miracle_seed", 100, c => c instanceof SingleTypeChallenge && c.value === 12),
-  MONO_ELECTRIC: new ChallengeAchv("MONO_ELECTRIC", "", "MONO_ELECTRIC.description", "magnet", 100, c => c instanceof SingleTypeChallenge && c.value === 13),
-  MONO_PSYCHIC: new ChallengeAchv("MONO_PSYCHIC", "", "MONO_PSYCHIC.description", "twisted_spoon", 100, c => c instanceof SingleTypeChallenge && c.value === 14),
-  MONO_ICE: new ChallengeAchv("MONO_ICE", "", "MONO_ICE.description", "never_melt_ice", 100, c => c instanceof SingleTypeChallenge && c.value === 15),
-  MONO_DRAGON: new ChallengeAchv("MONO_DRAGON", "", "MONO_DRAGON.description", "dragon_fang", 100, c => c instanceof SingleTypeChallenge && c.value === 16),
-  MONO_DARK: new ChallengeAchv("MONO_DARK", "", "MONO_DARK.description", "black_glasses", 100, c => c instanceof SingleTypeChallenge && c.value === 17),
-  MONO_FAIRY: new ChallengeAchv("MONO_FAIRY", "", "MONO_FAIRY.description", "fairy_feather", 100, c => c instanceof SingleTypeChallenge && c.value === 18),
-  FRESH_START: new ChallengeAchv("FRESH_START", "", "FRESH_START.description", "reviver_seed", 100, c => c instanceof FreshStartChallenge && c.value === 1),
+  MONO_GEN_ONE_VICTORY: new ChallengeAchv("MONO_GEN_ONE", "",  "MONO_GEN_ONE.description", "ribbon_gen1", 100, (c, scene) => c instanceof SingleGenerationChallenge && c.value === 1 && !scene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)),
+  MONO_GEN_TWO_VICTORY: new ChallengeAchv("MONO_GEN_TWO", "",  "MONO_GEN_TWO.description", "ribbon_gen2", 100, (c, scene) => c instanceof SingleGenerationChallenge && c.value === 2 && !scene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)),
+  MONO_GEN_THREE_VICTORY: new ChallengeAchv("MONO_GEN_THREE", "",  "MONO_GEN_THREE.description", "ribbon_gen3", 100, (c, scene) => c instanceof SingleGenerationChallenge && c.value === 3 && !scene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)),
+  MONO_GEN_FOUR_VICTORY: new ChallengeAchv("MONO_GEN_FOUR", "",  "MONO_GEN_FOUR.description", "ribbon_gen4", 100, (c, scene) => c instanceof SingleGenerationChallenge && c.value === 4 && !scene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)),
+  MONO_GEN_FIVE_VICTORY: new ChallengeAchv("MONO_GEN_FIVE", "",  "MONO_GEN_FIVE.description", "ribbon_gen5", 100, (c, scene) => c instanceof SingleGenerationChallenge && c.value === 5 && !scene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)),
+  MONO_GEN_SIX_VICTORY: new ChallengeAchv("MONO_GEN_SIX", "",  "MONO_GEN_SIX.description", "ribbon_gen6", 100, (c, scene) => c instanceof SingleGenerationChallenge && c.value === 6 && !scene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)),
+  MONO_GEN_SEVEN_VICTORY: new ChallengeAchv("MONO_GEN_SEVEN", "",  "MONO_GEN_SEVEN.description", "ribbon_gen7", 100, (c, scene) => c instanceof SingleGenerationChallenge && c.value === 7 && !scene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)),
+  MONO_GEN_EIGHT_VICTORY: new ChallengeAchv("MONO_GEN_EIGHT", "",  "MONO_GEN_EIGHT.description", "ribbon_gen8", 100, (c, scene) => c instanceof SingleGenerationChallenge && c.value === 8 && !scene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)),
+  MONO_GEN_NINE_VICTORY: new ChallengeAchv("MONO_GEN_NINE", "",  "MONO_GEN_NINE.description", "ribbon_gen9", 100, (c, scene) => c instanceof SingleGenerationChallenge && c.value === 9 && !scene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)),
+  MONO_NORMAL: new ChallengeAchv("MONO_NORMAL", "", "MONO_NORMAL.description", "silk_scarf", 100, (c, scene) => c instanceof SingleTypeChallenge && c.value === 1 && !scene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)),
+  MONO_FIGHTING: new ChallengeAchv("MONO_FIGHTING", "", "MONO_FIGHTING.description", "black_belt", 100, (c, scene) => c instanceof SingleTypeChallenge && c.value === 2 && !scene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)),
+  MONO_FLYING: new ChallengeAchv("MONO_FLYING", "", "MONO_FLYING.description", "sharp_beak", 100, (c, scene) => c instanceof SingleTypeChallenge && c.value === 3 && !scene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)),
+  MONO_POISON: new ChallengeAchv("MONO_POISON", "", "MONO_POISON.description", "poison_barb", 100, (c, scene) => c instanceof SingleTypeChallenge && c.value === 4 && !scene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)),
+  MONO_GROUND: new ChallengeAchv("MONO_GROUND", "", "MONO_GROUND.description", "soft_sand", 100, (c, scene) => c instanceof SingleTypeChallenge && c.value === 5 && !scene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)),
+  MONO_ROCK: new ChallengeAchv("MONO_ROCK", "", "MONO_ROCK.description", "hard_stone", 100, (c, scene) => c instanceof SingleTypeChallenge && c.value === 6 && !scene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)),
+  MONO_BUG: new ChallengeAchv("MONO_BUG", "", "MONO_BUG.description", "silver_powder", 100, (c, scene) => c instanceof SingleTypeChallenge && c.value === 7 && !scene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)),
+  MONO_GHOST: new ChallengeAchv("MONO_GHOST", "", "MONO_GHOST.description", "spell_tag", 100, (c, scene) => c instanceof SingleTypeChallenge && c.value === 8 && !scene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)),
+  MONO_STEEL: new ChallengeAchv("MONO_STEEL", "", "MONO_STEEL.description", "metal_coat", 100, (c, scene) => c instanceof SingleTypeChallenge && c.value === 9 && !scene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)),
+  MONO_FIRE: new ChallengeAchv("MONO_FIRE", "", "MONO_FIRE.description", "charcoal", 100, (c, scene) => c instanceof SingleTypeChallenge && c.value === 10 && !scene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)),
+  MONO_WATER: new ChallengeAchv("MONO_WATER", "", "MONO_WATER.description", "mystic_water", 100, (c, scene) => c instanceof SingleTypeChallenge && c.value === 11 && !scene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)),
+  MONO_GRASS: new ChallengeAchv("MONO_GRASS", "", "MONO_GRASS.description", "miracle_seed", 100, (c, scene) => c instanceof SingleTypeChallenge && c.value === 12 && !scene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)),
+  MONO_ELECTRIC: new ChallengeAchv("MONO_ELECTRIC", "", "MONO_ELECTRIC.description", "magnet", 100, (c, scene) => c instanceof SingleTypeChallenge && c.value === 13 && !scene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)),
+  MONO_PSYCHIC: new ChallengeAchv("MONO_PSYCHIC", "", "MONO_PSYCHIC.description", "twisted_spoon", 100, (c, scene) => c instanceof SingleTypeChallenge && c.value === 14 && !scene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)),
+  MONO_ICE: new ChallengeAchv("MONO_ICE", "", "MONO_ICE.description", "never_melt_ice", 100, (c, scene) => c instanceof SingleTypeChallenge && c.value === 15 && !scene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)),
+  MONO_DRAGON: new ChallengeAchv("MONO_DRAGON", "", "MONO_DRAGON.description", "dragon_fang", 100, (c, scene) => c instanceof SingleTypeChallenge && c.value === 16 && !scene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)),
+  MONO_DARK: new ChallengeAchv("MONO_DARK", "", "MONO_DARK.description", "black_glasses", 100, (c, scene) => c instanceof SingleTypeChallenge && c.value === 17 && !scene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)),
+  MONO_FAIRY: new ChallengeAchv("MONO_FAIRY", "", "MONO_FAIRY.description", "fairy_feather", 100, (c, scene) => c instanceof SingleTypeChallenge && c.value === 18 && !scene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)),
+  FRESH_START: new ChallengeAchv("FRESH_START", "", "FRESH_START.description", "reviver_seed", 100, (c, scene) => c instanceof FreshStartChallenge && c.value > 0 && !scene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)),
+  INVERSE_BATTLE: new ChallengeAchv("INVERSE_BATTLE", "", "INVERSE_BATTLE.description", "inverse", 100, c => c instanceof InverseBattleChallenge && c.value > 0),
 };
 
 export function initAchievements() {
diff --git a/src/system/game-data.ts b/src/system/game-data.ts
index 74558b255e1..f8d13286ca4 100644
--- a/src/system/game-data.ts
+++ b/src/system/game-data.ts
@@ -243,6 +243,8 @@ export class StarterPrefs {
     if (pStr !== StarterPrefers_private_latest) {
       // something changed, store the update
       localStorage.setItem(`starterPrefs_${loggedInUser?.username}`, pStr);
+      // update the latest prefs
+      StarterPrefers_private_latest = pStr;
     }
   }
 }
@@ -635,13 +637,13 @@ export class GameData {
   async saveRunHistory(scene: BattleScene, runEntry : SessionSaveData, isVictory: boolean): Promise<boolean> {
     const runHistoryData = await this.getRunHistoryData(scene);
     // runHistoryData should always return run history or {} empty object
-    const timestamps = Object.keys(runHistoryData);
-    const timestampsNo = timestamps.map(Number);
+    let timestamps = Object.keys(runHistoryData).map(Number);
 
     // Arbitrary limit of 25 entries per user --> Can increase or decrease
     while (timestamps.length >= RUN_HISTORY_LIMIT ) {
-      const oldestTimestamp = Math.min.apply(Math, timestampsNo);
+      const oldestTimestamp = (Math.min.apply(Math, timestamps)).toString();
       delete runHistoryData[oldestTimestamp];
+      timestamps = Object.keys(runHistoryData).map(Number);
     }
 
     const timestamp = (runEntry.timestamp).toString();
@@ -1411,6 +1413,7 @@ export class GameData {
               case GameDataType.RUN_HISTORY:
                 const data = JSON.parse(dataStr);
                 const keys = Object.keys(data);
+                dataName = i18next.t("menuUiHandler:RUN_HISTORY").toLowerCase();
                 keys.forEach((key) => {
                   const entryKeys = Object.keys(data[key]);
                   valid = ["isFavorite", "isVictory", "entry"].every(v => entryKeys.includes(v)) && entryKeys.length === 3;
diff --git a/src/system/settings/settings.ts b/src/system/settings/settings.ts
index 4bd69788f04..7b0fea95a98 100644
--- a/src/system/settings/settings.ts
+++ b/src/system/settings/settings.ts
@@ -117,7 +117,9 @@ export const SettingKeys = {
   Type_Hints: "TYPE_HINTS",
   Master_Volume: "MASTER_VOLUME",
   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",
@@ -541,6 +543,13 @@ export const Setting: Array<Setting> = [
     default: 10,
     type: SettingType.AUDIO
   },
+  {
+    key: SettingKeys.Field_Volume,
+    label: i18next.t("settings:fieldVolume"),
+    options: VOLUME_OPTIONS,
+    default: 10,
+    type: SettingType.AUDIO
+  },
   {
     key: SettingKeys.SE_Volume,
     label: i18next.t("settings:seVolume"),
@@ -548,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"),
@@ -654,10 +670,17 @@ export function setSetting(scene: BattleScene, setting: string, value: integer):
     scene.bgmVolume = value ? parseInt(Setting[index].options[value].value) * 0.01 : 0;
     scene.updateSoundVolume();
     break;
+  case SettingKeys.Field_Volume:
+    scene.fieldVolume = value ? parseInt(Setting[index].options[value].value) * 0.01 : 0;
+    scene.updateSoundVolume();
+    break;
   case SettingKeys.SE_Volume:
     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/test/abilities/disguise.test.ts b/src/test/abilities/disguise.test.ts
index 58087b408a5..85141fdb491 100644
--- a/src/test/abilities/disguise.test.ts
+++ b/src/test/abilities/disguise.test.ts
@@ -207,4 +207,18 @@ describe("Abilities - Disguise", () => {
 
     expect(mimikyu1.formIndex).toBe(disguisedForm);
   }, TIMEOUT);
+
+  it("doesn't faint twice when fainting due to Disguise break damage, nor prevent faint from Disguise break damage if using Endure", async () => {
+    game.override.enemyMoveset(Array(4).fill(Moves.ENDURE));
+    await game.startBattle();
+
+    const mimikyu = game.scene.getEnemyPokemon()!;
+    mimikyu.hp = 1;
+
+    game.move.select(Moves.SHADOW_SNEAK);
+    await game.toNextWave();
+
+    expect(game.scene.getCurrentPhase()?.constructor.name).toBe("CommandPhase");
+    expect(game.scene.currentBattle.waveIndex).toBe(2);
+  }, TIMEOUT);
 });
diff --git a/src/test/abilities/forecast.test.ts b/src/test/abilities/forecast.test.ts
new file mode 100644
index 00000000000..78453c5f4d2
--- /dev/null
+++ b/src/test/abilities/forecast.test.ts
@@ -0,0 +1,298 @@
+import { BattlerIndex } from "#app/battle";
+import { allAbilities } from "#app/data/ability";
+import { Abilities } from "#app/enums/abilities";
+import { WeatherType } from "#app/enums/weather-type";
+import { DamagePhase } from "#app/phases/damage-phase";
+import { MovePhase } from "#app/phases/move-phase";
+import { PostSummonPhase } from "#app/phases/post-summon-phase";
+import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase";
+import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/utils/gameManager";
+import { SPLASH_ONLY } from "#test/utils/testUtils";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+describe("Abilities - Forecast", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+  const NORMAL_FORM = 0;
+  const SUNNY_FORM = 1;
+  const RAINY_FORM = 2;
+  const SNOWY_FORM = 3;
+
+  /**
+   * Tests form changes based on weather changes
+   * @param {GameManager} game The game manager instance
+   * @param {WeatherType} weather The active weather to set
+   * @param form The expected form based on the active weather
+   * @param initialForm The initial form pre form change
+   */
+  const testWeatherFormChange = async (game: GameManager, weather: WeatherType, form: number, initialForm?: number) => {
+    game.override.weather(weather).starterForms({ [Species.CASTFORM]: initialForm });
+    await game.startBattle([Species.CASTFORM]);
+
+    game.move.select(Moves.SPLASH);
+
+    expect(game.scene.getPlayerPokemon()?.formIndex).toBe(form);
+  };
+
+  /**
+   * Tests reverting to normal form when Cloud Nine/Air Lock is active on the field
+   * @param {GameManager} game The game manager instance
+   * @param {Abilities} ability The ability that is active on the field
+   */
+  const testRevertFormAgainstAbility = async (game: GameManager, ability: Abilities) => {
+    game.override.starterForms({ [Species.CASTFORM]: SUNNY_FORM }).enemyAbility(ability);
+    await game.startBattle([Species.CASTFORM]);
+
+    game.move.select(Moves.SPLASH);
+
+    expect(game.scene.getPlayerPokemon()?.formIndex).toBe(NORMAL_FORM);
+  };
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .moveset([Moves.SPLASH, Moves.RAIN_DANCE, Moves.SUNNY_DAY, Moves.TACKLE])
+      .enemySpecies(Species.MAGIKARP)
+      .enemyMoveset(SPLASH_ONLY)
+      .enemyAbility(Abilities.BALL_FETCH);
+  });
+
+  it("changes form based on weather", async () => {
+    game.override
+      .moveset([Moves.RAIN_DANCE, Moves.SUNNY_DAY, Moves.SNOWSCAPE, Moves.SPLASH])
+      .battleType("double")
+      .starterForms({
+        [Species.KYOGRE]: 1,
+        [Species.GROUDON]: 1,
+        [Species.RAYQUAZA]: 1
+      });
+    await game.startBattle([Species.CASTFORM, Species.FEEBAS, Species.KYOGRE, Species.GROUDON, Species.RAYQUAZA, Species.ALTARIA]);
+
+    vi.spyOn(game.scene.getParty()[5], "getAbility").mockReturnValue(allAbilities[Abilities.CLOUD_NINE]);
+
+    const castform = game.scene.getPlayerField()[0];
+    expect(castform.formIndex).toBe(NORMAL_FORM);
+
+    game.move.select(Moves.RAIN_DANCE);
+    game.move.select(Moves.SPLASH, 1);
+    await game.phaseInterceptor.to("MovePhase");
+    await game.toNextTurn();
+
+    expect(castform.formIndex).toBe(RAINY_FORM);
+
+    game.move.select(Moves.SUNNY_DAY);
+    game.move.select(Moves.SPLASH, 1);
+    await game.phaseInterceptor.to("MovePhase");
+    await game.toNextTurn();
+
+    expect(castform.formIndex).toBe(SUNNY_FORM);
+
+    game.move.select(Moves.SNOWSCAPE);
+    game.move.select(Moves.SPLASH, 1);
+    await game.phaseInterceptor.to("MovePhase");
+    await game.toNextTurn();
+
+    expect(castform.formIndex).toBe(SNOWY_FORM);
+
+    game.override.moveset([Moves.HAIL, Moves.SANDSTORM, Moves.SNOWSCAPE, Moves.SPLASH]);
+
+    game.move.select(Moves.SANDSTORM);
+    game.move.select(Moves.SPLASH, 1);
+    await game.phaseInterceptor.to("MovePhase");
+    await game.toNextTurn();
+
+    expect(castform.formIndex).toBe(NORMAL_FORM);
+
+    game.move.select(Moves.HAIL);
+    game.move.select(Moves.SPLASH, 1);
+    await game.phaseInterceptor.to("MovePhase");
+    await game.toNextTurn();
+
+    expect(castform.formIndex).toBe(SNOWY_FORM);
+
+    game.move.select(Moves.SPLASH);
+    game.doSwitchPokemon(2); // Feebas now 2, Kyogre 1
+    await game.phaseInterceptor.to("MovePhase");
+    await game.toNextTurn();
+
+    expect(castform.formIndex).toBe(RAINY_FORM);
+
+    game.move.select(Moves.SPLASH);
+    game.doSwitchPokemon(3); // Kyogre now 3, Groudon 1
+    await game.phaseInterceptor.to("MovePhase");
+    await game.toNextTurn();
+
+    expect(castform.formIndex).toBe(SUNNY_FORM);
+
+    game.move.select(Moves.SPLASH);
+    game.doSwitchPokemon(4); // Groudon now 4, Rayquaza 1
+    await game.phaseInterceptor.to("MovePhase");
+    await game.toNextTurn();
+
+    expect(castform.formIndex).toBe(NORMAL_FORM);
+
+    game.move.select(Moves.SPLASH);
+    game.doSwitchPokemon(2); // Rayquaza now 2, Feebas 1
+    await game.phaseInterceptor.to("MovePhase");
+    await game.toNextTurn();
+
+    expect(castform.formIndex).toBe(NORMAL_FORM);
+
+    game.move.select(Moves.SNOWSCAPE);
+    game.move.select(Moves.SPLASH, 1);
+    await game.phaseInterceptor.to("MovePhase");
+    await game.toNextTurn();
+
+    expect(castform.formIndex).toBe(SNOWY_FORM);
+
+    game.move.select(Moves.SPLASH);
+    game.doSwitchPokemon(5); // Feebas now 5, Altaria 1
+    await game.phaseInterceptor.to("MovePhase");
+    await game.toNextTurn();
+
+    expect(castform.formIndex).toBe(NORMAL_FORM);
+
+    game.move.select(Moves.SPLASH);
+    game.doSwitchPokemon(5); // Altaria now 5, Feebas 1
+    await game.phaseInterceptor.to("MovePhase");
+    await game.toNextTurn();
+
+    expect(castform.formIndex).toBe(SNOWY_FORM);
+
+    game.scene.arena.trySetWeather(WeatherType.FOG, false);
+    game.move.select(Moves.SPLASH);
+    game.move.select(Moves.SPLASH, 1);
+    await game.phaseInterceptor.to("TurnStartPhase");
+
+    expect(castform.formIndex).toBe(NORMAL_FORM);
+  }, 30 * 1000);
+
+  it("reverts to Normal Form during Clear weather", async () => {
+    await testWeatherFormChange(game, WeatherType.NONE, NORMAL_FORM, SUNNY_FORM);
+  });
+
+  it("reverts to Normal Form if a Pokémon on the field has Air Lock", async () => {
+    await testRevertFormAgainstAbility(game, Abilities.AIR_LOCK);
+  });
+
+  it("has no effect on Pokémon other than Castform", async () => {
+    game.override.enemyAbility(Abilities.FORECAST).enemySpecies(Species.SHUCKLE);
+    await game.startBattle([Species.CASTFORM]);
+
+    game.move.select(Moves.RAIN_DANCE);
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(game.scene.getPlayerPokemon()?.formIndex).toBe(RAINY_FORM);
+    expect(game.scene.getEnemyPokemon()?.formIndex).not.toBe(RAINY_FORM);
+  });
+
+  it("reverts to Normal Form when Castform loses Forecast, changes form to match the weather when it regains it", async () => {
+    game.override.moveset([Moves.SKILL_SWAP, Moves.WORRY_SEED, Moves.SPLASH]).weather(WeatherType.RAIN).battleType("double");
+    await game.startBattle([Species.CASTFORM, Species.FEEBAS]);
+
+    const castform = game.scene.getPlayerField()[0];
+
+    expect(castform.formIndex).toBe(RAINY_FORM);
+
+    game.move.select(Moves.SKILL_SWAP, 0, BattlerIndex.PLAYER_2);
+    game.move.select(Moves.SKILL_SWAP, 1, BattlerIndex.PLAYER);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
+
+    await game.phaseInterceptor.to("MoveEndPhase");
+    expect(castform.formIndex).toBe(NORMAL_FORM);
+
+    await game.phaseInterceptor.to("MoveEndPhase");
+    expect(castform.formIndex).toBe(RAINY_FORM);
+
+    await game.toNextTurn();
+
+    game.move.select(Moves.SPLASH);
+    game.move.select(Moves.WORRY_SEED, 1, BattlerIndex.PLAYER);
+    await game.setTurnOrder([BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
+    await game.phaseInterceptor.to("MoveEndPhase");
+
+    expect(castform.formIndex).toBe(NORMAL_FORM);
+  });
+
+  it("reverts to Normal Form when Forecast is suppressed, changes form to match the weather when it regains it", async () => {
+    game.override.enemyMoveset(Array(4).fill(Moves.GASTRO_ACID)).weather(WeatherType.RAIN);
+    await game.startBattle([Species.CASTFORM, Species.PIKACHU]);
+    const castform = game.scene.getPlayerPokemon()!;
+
+    expect(castform.formIndex).toBe(RAINY_FORM);
+
+    // First turn - Forecast is suppressed
+    game.move.select(Moves.SPLASH);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.move.forceHit();
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(castform.summonData.abilitySuppressed).toBe(true);
+    expect(castform.formIndex).toBe(NORMAL_FORM);
+
+    await game.toNextTurn();
+
+    // Second turn - switch out Castform, regains Forecast
+    game.doSwitchPokemon(1);
+    await game.toNextTurn();
+
+    // Third turn - switch in Castform
+    game.doSwitchPokemon(1);
+    await game.phaseInterceptor.to(MovePhase);
+
+    expect(castform.summonData.abilitySuppressed).toBe(false);
+    expect(castform.formIndex).toBe(RAINY_FORM);
+  });
+
+  it("does not change Castform's form until after Stealth Rock deals damage", async () => {
+    game.override.weather(WeatherType.RAIN).enemyMoveset(Array(4).fill(Moves.STEALTH_ROCK));
+    await game.startBattle([Species.PIKACHU, Species.CASTFORM]);
+
+    // First turn - set up stealth rock
+    game.move.select(Moves.SPLASH);
+    await game.toNextTurn();
+
+    // Second turn - switch in Castform, regains Forecast
+    game.doSwitchPokemon(1);
+    await game.phaseInterceptor.to(PostSummonPhase);
+
+    const castform = game.scene.getPlayerPokemon()!;
+
+    // Damage phase should come first
+    await game.phaseInterceptor.to(DamagePhase);
+    expect(castform.hp).toBeLessThan(castform.getMaxHp());
+
+    // Then change form
+    await game.phaseInterceptor.to(QuietFormChangePhase);
+    expect(castform.formIndex).toBe(RAINY_FORM);
+  });
+
+  it("should be in Normal Form after the user is switched out", async () => {
+    game.override.weather(WeatherType.RAIN);
+
+    await game.startBattle([Species.CASTFORM, Species.MAGIKARP]);
+    const castform = game.scene.getPlayerPokemon()!;
+
+    expect(castform.formIndex).toBe(RAINY_FORM);
+
+    game.doSwitchPokemon(1);
+    await game.toNextTurn();
+
+    expect(castform.formIndex).toBe(NORMAL_FORM);
+  });
+});
diff --git a/src/test/abilities/galvanize.test.ts b/src/test/abilities/galvanize.test.ts
new file mode 100644
index 00000000000..4b0ddc14d7c
--- /dev/null
+++ b/src/test/abilities/galvanize.test.ts
@@ -0,0 +1,133 @@
+import { BattlerIndex } from "#app/battle";
+import { allMoves } from "#app/data/move";
+import { Type } from "#app/data/type";
+import { Abilities } from "#app/enums/abilities";
+import { Moves } from "#app/enums/moves";
+import { Species } from "#app/enums/species";
+import { HitResult } from "#app/field/pokemon";
+import GameManager from "#test/utils/gameManager";
+import { SPLASH_ONLY } from "#test/utils/testUtils";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+const TIMEOUT = 20 * 1000;
+
+describe("Abilities - Galvanize", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+
+    game.override
+      .battleType("single")
+      .startingLevel(100)
+      .ability(Abilities.GALVANIZE)
+      .moveset([Moves.TACKLE, Moves.REVELATION_DANCE, Moves.FURY_SWIPES])
+      .enemySpecies(Species.DUSCLOPS)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(SPLASH_ONLY)
+      .enemyLevel(100);
+  });
+
+  it("should change Normal-type attacks to Electric type and boost their power", async () => {
+    await game.startBattle();
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    vi.spyOn(playerPokemon, "getMoveType");
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    vi.spyOn(enemyPokemon, "apply");
+
+    const move = allMoves[Moves.TACKLE];
+    vi.spyOn(move, "calculateBattlePower");
+
+    game.move.select(Moves.TACKLE);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(playerPokemon.getMoveType).toHaveLastReturnedWith(Type.ELECTRIC);
+    expect(enemyPokemon.apply).toHaveReturnedWith(HitResult.EFFECTIVE);
+    expect(move.calculateBattlePower).toHaveReturnedWith(48);
+    expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
+  }, TIMEOUT);
+
+  it("should cause Normal-type attacks to activate Volt Absorb", async () => {
+    game.override.enemyAbility(Abilities.VOLT_ABSORB);
+
+    await game.startBattle();
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    vi.spyOn(playerPokemon, "getMoveType");
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    vi.spyOn(enemyPokemon, "apply");
+
+    enemyPokemon.hp = Math.floor(enemyPokemon.getMaxHp() * 0.8);
+
+    game.move.select(Moves.TACKLE);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(playerPokemon.getMoveType).toHaveLastReturnedWith(Type.ELECTRIC);
+    expect(enemyPokemon.apply).toHaveReturnedWith(HitResult.NO_EFFECT);
+    expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
+  }, TIMEOUT);
+
+  it("should not change the type of variable-type moves", async () => {
+    game.override.enemySpecies(Species.MIGHTYENA);
+
+    await game.startBattle([Species.ESPEON]);
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    vi.spyOn(playerPokemon, "getMoveType");
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    vi.spyOn(enemyPokemon, "apply");
+
+    game.move.select(Moves.REVELATION_DANCE);
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(playerPokemon.getMoveType).not.toHaveLastReturnedWith(Type.ELECTRIC);
+    expect(enemyPokemon.apply).toHaveReturnedWith(HitResult.NO_EFFECT);
+    expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
+  }, TIMEOUT);
+
+  it("should affect all hits of a Normal-type multi-hit move", async () => {
+    await game.startBattle();
+
+    const playerPokemon = game.scene.getPlayerPokemon()!;
+    vi.spyOn(playerPokemon, "getMoveType");
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    vi.spyOn(enemyPokemon, "apply");
+
+    game.move.select(Moves.FURY_SWIPES);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.move.forceHit();
+
+    await game.phaseInterceptor.to("MoveEffectPhase");
+    expect(playerPokemon.turnData.hitCount).toBeGreaterThan(1);
+    expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp());
+
+    while (playerPokemon.turnData.hitsLeft > 0) {
+      const enemyStartingHp = enemyPokemon.hp;
+      await game.phaseInterceptor.to("MoveEffectPhase");
+
+      expect(playerPokemon.getMoveType).toHaveLastReturnedWith(Type.ELECTRIC);
+      expect(enemyPokemon.hp).toBeLessThan(enemyStartingHp);
+    }
+
+    expect(enemyPokemon.apply).not.toHaveReturnedWith(HitResult.NO_EFFECT);
+  }, TIMEOUT);
+});
diff --git a/src/test/abilities/libero.test.ts b/src/test/abilities/libero.test.ts
index 16597e90285..7895e7de6bf 100644
--- a/src/test/abilities/libero.test.ts
+++ b/src/test/abilities/libero.test.ts
@@ -76,7 +76,7 @@ describe("Abilities - Libero", () => {
 
       expect(leadPokemon.summonData.abilitiesApplied.filter((a) => a === Abilities.LIBERO)).toHaveLength(1);
       const leadPokemonType = Type[leadPokemon.getTypes()[0]];
-      const moveType = Type[allMoves[Moves.AGILITY].defaultType];
+      const moveType = Type[allMoves[Moves.AGILITY].type];
       expect(leadPokemonType).not.toBe(moveType);
 
       await game.toNextTurn();
@@ -249,7 +249,7 @@ describe("Abilities - Libero", () => {
       const leadPokemon = game.scene.getPlayerPokemon()!;
       expect(leadPokemon).not.toBe(undefined);
 
-      leadPokemon.summonData.types = [allMoves[Moves.SPLASH].defaultType];
+      leadPokemon.summonData.types = [allMoves[Moves.SPLASH].type];
       game.move.select(Moves.SPLASH);
       await game.phaseInterceptor.to(TurnEndPhase);
 
@@ -357,6 +357,6 @@ function testPokemonTypeMatchesDefaultMoveType(pokemon: PlayerPokemon, move: Mov
   expect(pokemon.summonData.abilitiesApplied).toContain(Abilities.LIBERO);
   expect(pokemon.getTypes()).toHaveLength(1);
   const pokemonType = Type[pokemon.getTypes()[0]],
-    moveType = Type[allMoves[move].defaultType];
+    moveType = Type[allMoves[move].type];
   expect(pokemonType).toBe(moveType);
 }
diff --git a/src/test/abilities/protean.test.ts b/src/test/abilities/protean.test.ts
index a7c6799132f..6ecabbfade0 100644
--- a/src/test/abilities/protean.test.ts
+++ b/src/test/abilities/protean.test.ts
@@ -76,7 +76,7 @@ describe("Abilities - Protean", () => {
 
       expect(leadPokemon.summonData.abilitiesApplied.filter((a) => a === Abilities.PROTEAN)).toHaveLength(1);
       const leadPokemonType = Type[leadPokemon.getTypes()[0]];
-      const moveType = Type[allMoves[Moves.AGILITY].defaultType];
+      const moveType = Type[allMoves[Moves.AGILITY].type];
       expect(leadPokemonType).not.toBe(moveType);
 
       await game.toNextTurn();
@@ -249,7 +249,7 @@ describe("Abilities - Protean", () => {
       const leadPokemon = game.scene.getPlayerPokemon()!;
       expect(leadPokemon).not.toBe(undefined);
 
-      leadPokemon.summonData.types = [allMoves[Moves.SPLASH].defaultType];
+      leadPokemon.summonData.types = [allMoves[Moves.SPLASH].type];
       game.move.select(Moves.SPLASH);
       await game.phaseInterceptor.to(TurnEndPhase);
 
@@ -357,6 +357,6 @@ function testPokemonTypeMatchesDefaultMoveType(pokemon: PlayerPokemon, move: Mov
   expect(pokemon.summonData.abilitiesApplied).toContain(Abilities.PROTEAN);
   expect(pokemon.getTypes()).toHaveLength(1);
   const pokemonType = Type[pokemon.getTypes()[0]],
-    moveType = Type[allMoves[move].defaultType];
+    moveType = Type[allMoves[move].type];
   expect(pokemonType).toBe(moveType);
 }
diff --git a/src/test/battle/battle.test.ts b/src/test/battle/battle.test.ts
index c79eee63a7c..be89fdeb2af 100644
--- a/src/test/battle/battle.test.ts
+++ b/src/test/battle/battle.test.ts
@@ -43,6 +43,7 @@ describe("Test Battle Phase", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
+    game.scene.gameData.gender = undefined!; // just for these tests!
   });
 
   it("test phase interceptor with prompt", async () => {
diff --git a/src/test/battle/inverse_battle.test.ts b/src/test/battle/inverse_battle.test.ts
new file mode 100644
index 00000000000..be8b04155eb
--- /dev/null
+++ b/src/test/battle/inverse_battle.test.ts
@@ -0,0 +1,203 @@
+import { BattlerIndex } from "#app/battle";
+import { allMoves } from "#app/data/move";
+import { Type } from "#app/data/type";
+import { MoveEndPhase } from "#app/phases/move-end-phase";
+import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Abilities } from "#enums/abilities";
+import { ArenaTagType } from "#enums/arena-tag-type";
+import { Challenges } from "#enums/challenges";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { StatusEffect } from "#enums/status-effect";
+import GameManager from "#test/utils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+const TIMEOUT = 20 * 1000;
+
+describe("Inverse Battle", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+
+    game.challengeMode.addChallenge(Challenges.INVERSE_BATTLE, 1, 1);
+
+    game.override
+      .battleType("single")
+      .starterSpecies(Species.FEEBAS)
+      .ability(Abilities.BALL_FETCH)
+      .enemySpecies(Species.MAGIKARP)
+      .enemyAbility(Abilities.BALL_FETCH);
+  });
+
+  it("1. immune types are 2x effective - Thunderbolt against Ground Type", async () => {
+    game.override.enemySpecies(Species.SANDSHREW);
+
+    await game.challengeMode.startBattle();
+
+    const player = game.scene.getPlayerPokemon()!;
+    const enemy = game.scene.getEnemyPokemon()!;
+
+    expect(enemy.getMoveEffectiveness(player, allMoves[Moves.THUNDERBOLT])).toBe(2);
+  }, TIMEOUT);
+
+  it("2. 2x effective types are 0.5x effective - Thunderbolt against Flying Type", async () => {
+    game.override.enemySpecies(Species.PIDGEY);
+
+    await game.challengeMode.startBattle();
+
+    const player = game.scene.getPlayerPokemon()!;
+    const enemy = game.scene.getEnemyPokemon()!;
+
+    expect(enemy.getMoveEffectiveness(player, allMoves[Moves.THUNDERBOLT])).toBe(0.5);
+  }, TIMEOUT);
+
+  it("3. 0.5x effective types are 2x effective - Thunderbolt against Electric Type", async () => {
+    game.override.enemySpecies(Species.CHIKORITA);
+
+    await game.challengeMode.startBattle();
+
+    const player = game.scene.getPlayerPokemon()!;
+    const enemy = game.scene.getEnemyPokemon()!;
+
+    expect(enemy.getMoveEffectiveness(player, allMoves[Moves.THUNDERBOLT])).toBe(2);
+  }, TIMEOUT);
+
+  it("4. Stealth Rock follows the inverse matchups - Stealth Rock against Charizard deals 1/32 of max HP", async () => {
+    game.scene.arena.addTag(ArenaTagType.STEALTH_ROCK, 1, Moves.STEALTH_ROCK, 0);
+    game.override
+      .enemySpecies(Species.CHARIZARD)
+      .enemyLevel(100);
+
+    await game.challengeMode.startBattle();
+
+    const charizard = game.scene.getEnemyPokemon()!;
+
+    const maxHp = charizard.getMaxHp();
+    const damage_prediction = Math.max(Math.round(charizard.getMaxHp() / 32), 1);
+    console.log("Damage calcuation before round: " + charizard.getMaxHp() / 32);
+    const currentHp = charizard.hp;
+    const expectedHP = maxHp - damage_prediction;
+
+    console.log("Charizard's max HP: " + maxHp, "Damage: " + damage_prediction, "Current HP: " + currentHp, "Expected HP: " + expectedHP);
+    expect(currentHp).toBeGreaterThan(maxHp * 31 / 32 - 1);
+  }, TIMEOUT);
+
+  it("5. Freeze Dry is 2x effective against Water Type like other Ice type Move - Freeze Dry against Squirtle", async () => {
+    game.override.enemySpecies(Species.SQUIRTLE);
+
+    await game.challengeMode.startBattle();
+
+    const player = game.scene.getPlayerPokemon()!;
+    const enemy = game.scene.getEnemyPokemon()!;
+
+    expect(enemy.getMoveEffectiveness(player, allMoves[Moves.FREEZE_DRY])).toBe(2);
+  }, TIMEOUT);
+
+  it("6. Water Absorb should heal against water moves - Water Absorb against Water gun", async () => {
+    game.override
+      .moveset([Moves.WATER_GUN])
+      .enemyAbility(Abilities.WATER_ABSORB);
+
+    await game.challengeMode.startBattle();
+
+    const enemy = game.scene.getEnemyPokemon()!;
+    enemy.hp = enemy.getMaxHp() - 1;
+    game.move.select(Moves.WATER_GUN);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+
+    await game.phaseInterceptor.to(MoveEndPhase);
+
+    expect(enemy.hp).toBe(enemy.getMaxHp());
+  }, TIMEOUT);
+
+  it("7. Fire type does not get burned - Will-O-Wisp against Charmander", async () => {
+    game.override
+      .moveset([Moves.WILL_O_WISP])
+      .enemySpecies(Species.CHARMANDER);
+
+    await game.challengeMode.startBattle();
+
+    const enemy = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.WILL_O_WISP);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.move.forceHit();
+
+    await game.phaseInterceptor.to(MoveEndPhase);
+
+    expect(enemy.status?.effect).not.toBe(StatusEffect.BURN);
+  }, TIMEOUT);
+
+  it("8. Electric type does not get paralyzed - Nuzzle against Pikachu", async () => {
+    game.override
+      .moveset([Moves.NUZZLE])
+      .enemySpecies(Species.PIKACHU)
+      .enemyLevel(50);
+
+    await game.challengeMode.startBattle();
+
+    const enemy = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.NUZZLE);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+
+    await game.phaseInterceptor.to(MoveEndPhase);
+
+    expect(enemy.status?.effect).not.toBe(StatusEffect.PARALYSIS);
+  }, TIMEOUT);
+
+
+  it("10. Anticipation should trigger on 2x effective moves - Anticipation against Thunderbolt", async () => {
+    game.override
+      .moveset([Moves.THUNDERBOLT])
+      .enemySpecies(Species.SANDSHREW)
+      .enemyAbility(Abilities.ANTICIPATION);
+
+    await game.challengeMode.startBattle();
+
+    expect(game.scene.getEnemyPokemon()?.summonData.abilitiesApplied[0]).toBe(Abilities.ANTICIPATION);
+  }, TIMEOUT);
+
+  it("11. Conversion 2 should change the type to the resistive type - Conversion 2 against Dragonite", async () => {
+    game.override
+      .moveset([Moves.CONVERSION_2])
+      .enemyMoveset([Moves.DRAGON_CLAW, Moves.DRAGON_CLAW, Moves.DRAGON_CLAW, Moves.DRAGON_CLAW]);
+
+    await game.challengeMode.startBattle();
+
+    const player = game.scene.getPlayerPokemon()!;
+
+    game.move.select(Moves.CONVERSION_2);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(player.getTypes()[0]).toBe(Type.DRAGON);
+  }, TIMEOUT);
+
+  it("12. Flying Press should be 0.25x effective against Grass + Dark Type - Flying Press against Meowscarada", async () => {
+    game.override
+      .moveset([Moves.FLYING_PRESS])
+      .enemySpecies(Species.MEOWSCARADA);
+
+    await game.challengeMode.startBattle();
+
+    const player = game.scene.getPlayerPokemon()!;
+    const enemy = game.scene.getEnemyPokemon()!;
+
+    expect(enemy.getMoveEffectiveness(player, allMoves[Moves.FLYING_PRESS])).toBe(0.25);
+  }, TIMEOUT);
+});
diff --git a/src/test/eggs/egg.test.ts b/src/test/eggs/egg.test.ts
index 7f3d92fa51c..28f1b7f0a6c 100644
--- a/src/test/eggs/egg.test.ts
+++ b/src/test/eggs/egg.test.ts
@@ -8,7 +8,6 @@ import { Species } from "#enums/species";
 import GameManager from "#test/utils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import BattleScene from "../../battle-scene";
 
 describe("Egg Generation Tests", () => {
   let phaserGame: Phaser.Game;
@@ -18,6 +17,7 @@ describe("Egg Generation Tests", () => {
     phaserGame = new Phaser.Game({
       type: Phaser.HEADLESS,
     });
+    game = new GameManager(phaserGame);
   });
 
   afterEach(() => {
@@ -25,13 +25,12 @@ describe("Egg Generation Tests", () => {
     vi.restoreAllMocks();
   });
 
-  beforeEach(async() => {
-    game = new GameManager(phaserGame);
+  beforeEach(async () => {
     await game.importData("src/test/utils/saves/everything.prsv");
   });
 
   it("should return Arceus for the 10th of June", () => {
-    const scene = new BattleScene();
+    const scene = game.scene;
     const timestamp = new Date(2024, 5, 10, 15, 0, 0, 0).getTime();
     const expectedSpecies = Species.ARCEUS;
 
@@ -40,7 +39,7 @@ describe("Egg Generation Tests", () => {
     expect(result).toBe(expectedSpecies);
   });
   it("should return Arceus for the 10th of July", () => {
-    const scene = new BattleScene();
+    const scene = game.scene;
     const timestamp = new Date(2024, 6, 10, 15, 0, 0, 0).getTime();
     const expectedSpecies = Species.ARCEUS;
 
@@ -48,12 +47,12 @@ describe("Egg Generation Tests", () => {
 
     expect(result).toBe(expectedSpecies);
   });
-  it("should hatch an Arceus. Set from legendary gacha", async() => {
+  it("should hatch an Arceus. Set from legendary gacha", async () => {
     const scene = game.scene;
     const timestamp = new Date(2024, 6, 10, 15, 0, 0, 0).getTime();
     const expectedSpecies = Species.ARCEUS;
 
-    const result = new Egg({scene, timestamp, sourceType: EggSourceType.GACHA_LEGENDARY, tier: EggTier.MASTER}).generatePlayerPokemon(scene).species.speciesId;
+    const result = new Egg({ scene, timestamp, sourceType: EggSourceType.GACHA_LEGENDARY, tier: EggTier.MASTER }).generatePlayerPokemon(scene).species.speciesId;
 
     expect(result).toBe(expectedSpecies);
   });
@@ -61,7 +60,7 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const expectedSpecies = Species.ARCEUS;
 
-    const result = new Egg({scene, species: expectedSpecies}).generatePlayerPokemon(scene).species.speciesId;
+    const result = new Egg({ scene, species: expectedSpecies }).generatePlayerPokemon(scene).species.speciesId;
 
     expect(result).toBe(expectedSpecies);
   });
@@ -69,7 +68,7 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const expectedTier = EggTier.COMMON;
 
-    const result = new Egg({scene, tier: expectedTier}).tier;
+    const result = new Egg({ scene, tier: expectedTier }).tier;
 
     expect(result).toBe(expectedTier);
   });
@@ -77,7 +76,7 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const expectedTier = EggTier.GREAT;
 
-    const result = new Egg({scene, tier: expectedTier}).tier;
+    const result = new Egg({ scene, tier: expectedTier }).tier;
 
     expect(result).toBe(expectedTier);
   });
@@ -85,7 +84,7 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const expectedTier = EggTier.ULTRA;
 
-    const result = new Egg({scene, tier: expectedTier}).tier;
+    const result = new Egg({ scene, tier: expectedTier }).tier;
 
     expect(result).toBe(expectedTier);
   });
@@ -93,7 +92,7 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const expectedTier = EggTier.MASTER;
 
-    const result = new Egg({scene, tier: expectedTier}).tier;
+    const result = new Egg({ scene, tier: expectedTier }).tier;
 
     expect(result).toBe(expectedTier);
   });
@@ -101,7 +100,7 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const expectedResult = true;
 
-    const result = new Egg({scene, species: Species.MANAPHY}).isManaphyEgg();
+    const result = new Egg({ scene, species: Species.MANAPHY }).isManaphyEgg();
 
     expect(result).toBe(expectedResult);
   });
@@ -109,7 +108,7 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const expectedResult = true;
 
-    const result = new Egg({scene, tier: EggTier.COMMON, id: 204}).isManaphyEgg();
+    const result = new Egg({ scene, tier: EggTier.COMMON, id: 204 }).isManaphyEgg();
 
     expect(result).toBe(expectedResult);
   });
@@ -117,7 +116,7 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const expectedHatchWaves = 1000;
 
-    const result = new Egg({scene, hatchWaves: expectedHatchWaves}).hatchWaves;
+    const result = new Egg({ scene, hatchWaves: expectedHatchWaves }).hatchWaves;
 
     expect(result).toBe(expectedHatchWaves);
   });
@@ -125,7 +124,7 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const expectedResult = true;
 
-    const result = new Egg({scene, isShiny: expectedResult, species: Species.BULBASAUR}).generatePlayerPokemon(scene).isShiny();
+    const result = new Egg({ scene, isShiny: expectedResult, species: Species.BULBASAUR }).generatePlayerPokemon(scene).isShiny();
 
     expect(result).toBe(expectedResult);
   });
@@ -133,7 +132,7 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const expectedVariantTier = VariantTier.COMMON;
 
-    const result = new Egg({scene, isShiny: true, variantTier: expectedVariantTier, species: Species.BULBASAUR}).generatePlayerPokemon(scene).variant;
+    const result = new Egg({ scene, isShiny: true, variantTier: expectedVariantTier, species: Species.BULBASAUR }).generatePlayerPokemon(scene).variant;
 
     expect(result).toBe(expectedVariantTier);
   });
@@ -141,7 +140,7 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const expectedVariantTier = VariantTier.RARE;
 
-    const result = new Egg({scene, isShiny: true, variantTier: expectedVariantTier, species: Species.BULBASAUR}).generatePlayerPokemon(scene).variant;
+    const result = new Egg({ scene, isShiny: true, variantTier: expectedVariantTier, species: Species.BULBASAUR }).generatePlayerPokemon(scene).variant;
 
     expect(result).toBe(expectedVariantTier);
   });
@@ -149,14 +148,14 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const expectedVariantTier = VariantTier.EPIC;
 
-    const result = new Egg({scene, isShiny: true, variantTier: expectedVariantTier, species: Species.BULBASAUR}).generatePlayerPokemon(scene).variant;
+    const result = new Egg({ scene, isShiny: true, variantTier: expectedVariantTier, species: Species.BULBASAUR }).generatePlayerPokemon(scene).variant;
 
     expect(result).toBe(expectedVariantTier);
   });
   it("should return an egg with an egg move index of 0, 1, 2 or 3", () => {
     const scene = game.scene;
 
-    const eggMoveIndex = new Egg({scene}).eggMoveIndex;
+    const eggMoveIndex = new Egg({ scene }).eggMoveIndex;
     const result = eggMoveIndex && eggMoveIndex >= 0 && eggMoveIndex <= 3;
 
     expect(result).toBe(true);
@@ -165,14 +164,14 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const expectedEggMoveIndex = 3;
 
-    const result = new Egg({scene, eggMoveIndex: expectedEggMoveIndex}).eggMoveIndex;
+    const result = new Egg({ scene, eggMoveIndex: expectedEggMoveIndex }).eggMoveIndex;
 
     expect(result).toBe(expectedEggMoveIndex);
   });
   it("should return a hatched pokemon with a hidden ability", () => {
     const scene = game.scene;
 
-    const playerPokemon = new Egg({scene, overrideHiddenAbility: true, species: Species.BULBASAUR}).generatePlayerPokemon(scene);
+    const playerPokemon = new Egg({ scene, overrideHiddenAbility: true, species: Species.BULBASAUR }).generatePlayerPokemon(scene);
     const expectedAbilityIndex = playerPokemon.species.ability2 ? 2 : 1;
 
     const result = playerPokemon.abilityIndex;
@@ -183,7 +182,7 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const expectedEggCount = 1;
 
-    new Egg({scene, sourceType: EggSourceType.GACHA_LEGENDARY, pulled: true});
+    new Egg({ scene, sourceType: EggSourceType.GACHA_LEGENDARY, pulled: true });
 
     const result = scene.gameData.eggs.length;
 
@@ -193,7 +192,7 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const expectedEggTier = EggTier.COMMON;
 
-    const result = new Egg({scene, tier: EggTier.MASTER, species: Species.BULBASAUR}).tier;
+    const result = new Egg({ scene, tier: EggTier.MASTER, species: Species.BULBASAUR }).tier;
 
     expect(result).toBe(expectedEggTier);
   });
@@ -201,7 +200,7 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const expectedHatchWaves = 10;
 
-    const result = new Egg({scene, tier: EggTier.MASTER, species: Species.BULBASAUR}).hatchWaves;
+    const result = new Egg({ scene, tier: EggTier.MASTER, species: Species.BULBASAUR }).hatchWaves;
 
     expect(result).toBe(expectedHatchWaves);
   });
@@ -232,7 +231,7 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const startPityValues = [...scene.gameData.eggPity];
 
-    new Egg({scene, sourceType: EggSourceType.GACHA_MOVE, pulled: true, tier: EggTier.COMMON});
+    new Egg({ scene, sourceType: EggSourceType.GACHA_MOVE, pulled: true, tier: EggTier.COMMON });
 
     expect(scene.gameData.eggPity[EggTier.GREAT]).toBe(startPityValues[EggTier.GREAT] + 1);
     expect(scene.gameData.eggPity[EggTier.ULTRA]).toBe(startPityValues[EggTier.ULTRA] + 1);
@@ -242,7 +241,7 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const startPityValues = [...scene.gameData.eggPity];
 
-    new Egg({scene, sourceType: EggSourceType.GACHA_LEGENDARY, pulled: true, tier: EggTier.COMMON});
+    new Egg({ scene, sourceType: EggSourceType.GACHA_LEGENDARY, pulled: true, tier: EggTier.COMMON });
 
     expect(scene.gameData.eggPity[EggTier.GREAT]).toBe(startPityValues[EggTier.GREAT] + 1);
     expect(scene.gameData.eggPity[EggTier.ULTRA]).toBe(startPityValues[EggTier.ULTRA] + 1);
@@ -253,7 +252,7 @@ describe("Egg Generation Tests", () => {
     const startingManaphyEggCount = scene.gameData.gameStats.manaphyEggsPulled;
 
     for (let i = 0; i < 200; i++) {
-      new Egg({scene, sourceType: EggSourceType.GACHA_MOVE, pulled: true, species: Species.BULBASAUR});
+      new Egg({ scene, sourceType: EggSourceType.GACHA_MOVE, pulled: true, species: Species.BULBASAUR });
     }
 
     expect(scene.gameData.gameStats.manaphyEggsPulled).toBe(startingManaphyEggCount);
@@ -262,7 +261,7 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const startingManaphyEggCount = scene.gameData.gameStats.manaphyEggsPulled;
 
-    new Egg({scene, sourceType: EggSourceType.GACHA_MOVE, pulled: true, id: 204, tier: EggTier.COMMON});
+    new Egg({ scene, sourceType: EggSourceType.GACHA_MOVE, pulled: true, id: 204, tier: EggTier.COMMON });
 
     expect(scene.gameData.gameStats.manaphyEggsPulled).toBe(startingManaphyEggCount + 1);
   });
@@ -270,7 +269,7 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const startingRareEggsPulled = scene.gameData.gameStats.rareEggsPulled;
 
-    new Egg({scene, sourceType: EggSourceType.GACHA_MOVE, pulled: true, tier: EggTier.GREAT});
+    new Egg({ scene, sourceType: EggSourceType.GACHA_MOVE, pulled: true, tier: EggTier.GREAT });
 
     expect(scene.gameData.gameStats.rareEggsPulled).toBe(startingRareEggsPulled + 1);
   });
@@ -278,7 +277,7 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const startingEpicEggsPulled = scene.gameData.gameStats.epicEggsPulled;
 
-    new Egg({scene, sourceType: EggSourceType.GACHA_MOVE, pulled: true, tier: EggTier.ULTRA});
+    new Egg({ scene, sourceType: EggSourceType.GACHA_MOVE, pulled: true, tier: EggTier.ULTRA });
 
     expect(scene.gameData.gameStats.epicEggsPulled).toBe(startingEpicEggsPulled + 1);
   });
@@ -286,7 +285,7 @@ describe("Egg Generation Tests", () => {
     const scene = game.scene;
     const startingLegendaryEggsPulled = scene.gameData.gameStats.legendaryEggsPulled;
 
-    new Egg({scene, sourceType: EggSourceType.GACHA_MOVE, pulled: true, tier: EggTier.MASTER});
+    new Egg({ scene, sourceType: EggSourceType.GACHA_MOVE, pulled: true, tier: EggTier.MASTER });
 
     expect(scene.gameData.gameStats.legendaryEggsPulled).toBe(startingLegendaryEggsPulled + 1);
   });
@@ -297,8 +296,8 @@ describe("Egg Generation Tests", () => {
     const expectedTier1 = EggTier.MASTER;
     const expectedTier2 = EggTier.ULTRA;
 
-    const result1 = new Egg({scene, sourceType: EggSourceType.GACHA_LEGENDARY, pulled: true}).tier;
-    const result2 = new Egg({scene, sourceType: EggSourceType.GACHA_MOVE, pulled: true}).tier;
+    const result1 = new Egg({ scene, sourceType: EggSourceType.GACHA_LEGENDARY, pulled: true }).tier;
+    const result2 = new Egg({ scene, sourceType: EggSourceType.GACHA_MOVE, pulled: true }).tier;
 
     expect(result1).toBe(expectedTier1);
     expect(result2).toBe(expectedTier2);
@@ -306,7 +305,7 @@ describe("Egg Generation Tests", () => {
 
   it("should generate an epic shiny from pokemon with a different form", () => {
     const scene = game.scene;
-    const egg = new Egg({scene, isShiny: true, variantTier: VariantTier.EPIC, species: Species.MIRAIDON});
+    const egg = new Egg({ scene, isShiny: true, variantTier: VariantTier.EPIC, species: Species.MIRAIDON });
 
     expect(egg.variantTier).toBe(VariantTier.EPIC);
   });
diff --git a/src/test/moves/belly_drum.test.ts b/src/test/moves/belly_drum.test.ts
index 631de952a58..e4956c6e83a 100644
--- a/src/test/moves/belly_drum.test.ts
+++ b/src/test/moves/belly_drum.test.ts
@@ -6,6 +6,8 @@ import { Species } from "#enums/species";
 import GameManager from "#test/utils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
+import { SPLASH_ONLY } from "../utils/testUtils";
+import { Abilities } from "#app/enums/abilities";
 
 const TIMEOUT = 20 * 1000;
 // RATIO : HP Cost of Move
@@ -29,12 +31,14 @@ describe("Moves - BELLY DRUM", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override.starterSpecies(Species.MAGIKARP);
-    game.override.enemySpecies(Species.SNORLAX);
-    game.override.startingLevel(100);
-    game.override.enemyLevel(100);
-    game.override.moveset([Moves.BELLY_DRUM]);
-    game.override.enemyMoveset([Moves.SPLASH]);
+    game.override
+      .starterSpecies(Species.MAGIKARP)
+      .enemySpecies(Species.SNORLAX)
+      .startingLevel(100)
+      .enemyLevel(100)
+      .moveset([Moves.BELLY_DRUM])
+      .enemyMoveset(SPLASH_ONLY)
+      .enemyAbility(Abilities.BALL_FETCH);
   });
 
   // Bulbapedia Reference: https://bulbapedia.bulbagarden.net/wiki/Belly_Drum_(move)
diff --git a/src/test/moves/effectiveness.test.ts b/src/test/moves/effectiveness.test.ts
new file mode 100644
index 00000000000..af44586b69d
--- /dev/null
+++ b/src/test/moves/effectiveness.test.ts
@@ -0,0 +1,70 @@
+import { allMoves } from "#app/data/move";
+import { getPokemonSpecies } from "#app/data/pokemon-species";
+import { TrainerSlot } from "#app/data/trainer-config";
+import { Abilities } from "#app/enums/abilities";
+import { Moves } from "#app/enums/moves";
+import { Species } from "#app/enums/species";
+import * as Messages from "#app/messages";
+import GameManager from "#test/utils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, describe, expect, it, vi } from "vitest";
+
+function testMoveEffectiveness(game: GameManager, move: Moves, targetSpecies: Species,
+  expected: number, targetAbility: Abilities = Abilities.BALL_FETCH): void {
+  // Suppress getPokemonNameWithAffix because it calls on a null battle spec
+  vi.spyOn(Messages, "getPokemonNameWithAffix").mockReturnValue("");
+  game.override.enemyAbility(targetAbility);
+  const user = game.scene.addPlayerPokemon(getPokemonSpecies(Species.SNORLAX), 5);
+  const target = game.scene.addEnemyPokemon(getPokemonSpecies(targetSpecies), 5, TrainerSlot.NONE);
+
+  expect(target.getMoveEffectiveness(user, allMoves[move])).toBe(expected);
+}
+
+describe("Moves - Type Effectiveness", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+    game = new GameManager(phaserGame);
+    game.override.ability(Abilities.BALL_FETCH);
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  it("Normal-type attacks are neutrally effective against Normal-type Pokemon",
+    () => testMoveEffectiveness(game, Moves.TACKLE, Species.SNORLAX, 1)
+  );
+
+  it("Normal-type attacks are not very effective against Steel-type Pokemon",
+    () => testMoveEffectiveness(game, Moves.TACKLE, Species.REGISTEEL, 0.5)
+  );
+
+  it("Normal-type attacks are doubly resisted by Steel/Rock-type Pokemon",
+    () => testMoveEffectiveness(game, Moves.TACKLE, Species.AGGRON, 0.25)
+  );
+
+  it("Normal-type attacks have no effect on Ghost-type Pokemon",
+    () => testMoveEffectiveness(game, Moves.TACKLE, Species.DUSCLOPS, 0)
+  );
+
+  it("Normal-type status moves are not affected by type matchups",
+    () => testMoveEffectiveness(game, Moves.GROWL, Species.DUSCLOPS, 1)
+  );
+
+  it("Electric-type attacks are super-effective against Water-type Pokemon",
+    () => testMoveEffectiveness(game, Moves.THUNDERBOLT, Species.BLASTOISE, 2)
+  );
+
+  it("Electric-type attacks are doubly super-effective against Water/Flying-type Pokemon",
+    () => testMoveEffectiveness(game, Moves.THUNDERBOLT, Species.GYARADOS, 4)
+  );
+
+  it("Electric-type attacks are negated by Volt Absorb",
+    () => testMoveEffectiveness(game, Moves.THUNDERBOLT, Species.GYARADOS, 0, Abilities.VOLT_ABSORB)
+  );
+});
diff --git a/src/test/moves/lunar_blessing.test.ts b/src/test/moves/lunar_blessing.test.ts
new file mode 100644
index 00000000000..73647716f06
--- /dev/null
+++ b/src/test/moves/lunar_blessing.test.ts
@@ -0,0 +1,83 @@
+import { StatusEffect } from "#app/enums/status-effect.js";
+import { CommandPhase } from "#app/phases/command-phase.js";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/utils/gameManager";
+import { SPLASH_ONLY } from "#test/utils/testUtils";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+describe("Moves - Lunar Blessing", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({ type: Phaser.HEADLESS });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+
+    game.override.battleType("double");
+
+    game.override.enemySpecies(Species.SHUCKLE);
+    game.override.enemyMoveset(SPLASH_ONLY);
+    game.override.enemyAbility(Abilities.BALL_FETCH);
+
+    game.override.moveset([Moves.LUNAR_BLESSING, Moves.SPLASH]);
+    game.override.ability(Abilities.BALL_FETCH);
+  });
+
+  it("should restore 25% HP of the user and its ally", async () => {
+    await game.startBattle([Species.RATTATA, Species.RATTATA]);
+    const [leftPlayer, rightPlayer] = game.scene.getPlayerField();
+
+    vi.spyOn(leftPlayer, "getMaxHp").mockReturnValue(100);
+    vi.spyOn(rightPlayer, "getMaxHp").mockReturnValue(100);
+
+    const initialHp = 1;
+    leftPlayer["hp"] = initialHp;
+    rightPlayer["hp"] = initialHp;
+    const expectedHeal = 25;
+
+    vi.spyOn(leftPlayer, "heal");
+    vi.spyOn(rightPlayer, "heal");
+
+
+    game.move.select(Moves.LUNAR_BLESSING, 0);
+    await game.phaseInterceptor.to(CommandPhase);
+    game.move.select(Moves.SPLASH, 1);
+    await game.toNextTurn();
+
+    expect(leftPlayer.heal).toHaveBeenCalledOnce();
+    expect(leftPlayer.heal).toHaveReturnedWith(expectedHeal);
+
+    expect(rightPlayer.heal).toHaveBeenCalledOnce();
+    expect(rightPlayer.heal).toHaveReturnedWith(expectedHeal);
+  });
+
+  it("should cure status effect of the user and its ally", async () => {
+    game.override.statusEffect(StatusEffect.BURN);
+    await game.startBattle([Species.RATTATA, Species.RATTATA]);
+    const [leftPlayer, rightPlayer] = game.scene.getPlayerField();
+
+    vi.spyOn(leftPlayer, "resetStatus");
+    vi.spyOn(rightPlayer, "resetStatus");
+
+    game.move.select(Moves.LUNAR_BLESSING, 0);
+    await game.phaseInterceptor.to(CommandPhase);
+    game.move.select(Moves.SPLASH, 1);
+    await game.toNextTurn();
+
+    expect(leftPlayer.resetStatus).toHaveBeenCalledOnce();
+    expect(rightPlayer.resetStatus).toHaveBeenCalledOnce();
+
+    expect(leftPlayer.status?.effect).toBeUndefined();
+    expect(rightPlayer.status?.effect).toBeUndefined();
+  });
+});
diff --git a/src/test/moves/multi_target.test.ts b/src/test/moves/multi_target.test.ts
index b8c1f67b3df..16ccd5519b1 100644
--- a/src/test/moves/multi_target.test.ts
+++ b/src/test/moves/multi_target.test.ts
@@ -1,7 +1,7 @@
-import { getMoveTargets } from "#app/data/move";
+import { BattlerIndex } from "#app/battle";
 import { Abilities } from "#app/enums/abilities";
 import { Species } from "#app/enums/species";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import * as Utils from "#app/utils";
 import { Moves } from "#enums/moves";
 import GameManager from "#test/utils/gameManager";
 import { SPLASH_ONLY } from "#test/utils/testUtils";
@@ -10,7 +10,7 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
 const TIMEOUT = 20 * 1000;
 
-describe("Moves - Multi target", () => {
+describe("Multi-target damage reduction", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
 
@@ -21,160 +21,111 @@ describe("Moves - Multi target", () => {
   });
 
   afterEach(() => {
-    afterTrial(game);
+    game.phaseInterceptor.restoreOg();
   });
 
   beforeEach(() => {
-    game = beforeTrial(phaserGame);
+    game = new GameManager(phaserGame);
+    game.override
+      .disableCrits()
+      .battleType("double")
+      .enemyLevel(100)
+      .startingLevel(100)
+      .enemySpecies(Species.POLIWAG)
+      .enemyMoveset(SPLASH_ONLY)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .moveset([Moves.TACKLE, Moves.DAZZLING_GLEAM, Moves.EARTHQUAKE, Moves.SPLASH])
+      .ability(Abilities.BALL_FETCH);
   });
 
-  it("2v2 - target all near others - check modifier", () => checkTargetMultiplier(game, Moves.EARTHQUAKE, false, false, true), TIMEOUT);
+  it("should reduce d.gleam damage when multiple enemies but not tackle", async () => {
+    await game.startBattle([Species.MAGIKARP, Species.FEEBAS]);
 
-  it("2v2 - target all near others - damage decrase", () => checkDamageDecrease(game, Moves.EARTHQUAKE, false, false, true), TIMEOUT);
+    const [enemy1, enemy2] = game.scene.getEnemyField();
 
-  it("2v1 - target all near others - check modifier", () => checkTargetMultiplier(game, Moves.EARTHQUAKE, false, true, true), TIMEOUT);
+    game.move.select(Moves.DAZZLING_GLEAM);
+    game.move.select(Moves.TACKLE, 1, BattlerIndex.ENEMY);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
+    await game.phaseInterceptor.to("MoveEndPhase");
 
-  it("2v1 - target all near others - damage decrase", () => checkDamageDecrease(game, Moves.EARTHQUAKE, false, true, true), TIMEOUT);
+    const gleam1 = enemy1.getMaxHp() - enemy1.hp;
+    enemy1.hp = enemy1.getMaxHp();
 
-  it("1v2 - target all near others - check modifier", () => checkTargetMultiplier(game, Moves.EARTHQUAKE, true, false, true), TIMEOUT);
+    await game.phaseInterceptor.to("MoveEndPhase");
 
-  it("1v2 - target all near others - damage decrase", () => checkDamageDecrease(game, Moves.EARTHQUAKE, true, false, true), TIMEOUT);
+    const tackle1 = enemy1.getMaxHp() - enemy1.hp;
+    enemy1.hp = enemy1.getMaxHp();
 
-  it("1v1 - target all near others - check modifier", () => checkTargetMultiplier(game, Moves.EARTHQUAKE, true, true, false), TIMEOUT);
+    await game.killPokemon(enemy2);
+    await game.toNextTurn();
 
-  it("2v2 (immune) - target all near others - check modifier", () => checkTargetMultiplier(game, Moves.EARTHQUAKE, false, false, true, Abilities.LEVITATE), TIMEOUT);
+    game.move.select(Moves.DAZZLING_GLEAM);
+    game.move.select(Moves.TACKLE, 1, BattlerIndex.ENEMY);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY]);
 
-  it("2v2 (immune) - target all near others - damage decrase", () => checkDamageDecrease(game, Moves.EARTHQUAKE, false, false, true, Abilities.LEVITATE), TIMEOUT);
+    await game.phaseInterceptor.to("MoveEndPhase");
 
-  it("2v2 - target all near enemies - check modifier", () => checkTargetMultiplier(game, Moves.HYPER_VOICE, false, false, true), TIMEOUT);
+    const gleam2 = enemy1.getMaxHp() - enemy1.hp;
+    enemy1.hp = enemy1.getMaxHp();
 
-  it("2v2 - target all near enemies - damage decrase", () => checkDamageDecrease(game, Moves.HYPER_VOICE, false, false, true), TIMEOUT);
+    await game.phaseInterceptor.to("MoveEndPhase");
+    const tackle2 = enemy1.getMaxHp() - enemy1.hp;
 
-  it("2v1 - target all near enemies - check modifier", () => checkTargetMultiplier(game, Moves.HYPER_VOICE, false, true, false), TIMEOUT);
+    // Single target moves don't get reduced
+    expect(tackle1).toBe(tackle2);
+    // Moves that target all enemies get reduced if there's more than one enemy
+    expect(gleam1).toBeLessThanOrEqual(Utils.toDmgValue(gleam2 * 0.75) + 1);
+    expect(gleam1).toBeGreaterThanOrEqual(Utils.toDmgValue(gleam2 * 0.75) - 1);
+  }, TIMEOUT);
 
-  it("2v1 - target all near enemies - no damage decrase", () => checkDamageDecrease(game, Moves.HYPER_VOICE, false, true, false), TIMEOUT);
+  it("should reduce earthquake when more than one pokemon other than user is not fainted", async () => {
+    await game.startBattle([Species.MAGIKARP, Species.FEEBAS]);
 
-  it("1v2 - target all near enemies - check modifier", () => checkTargetMultiplier(game, Moves.HYPER_VOICE, true, false, true), TIMEOUT);
+    const player2 = game.scene.getParty()[1];
+    const [enemy1, enemy2] = game.scene.getEnemyField();
 
-  it("1v2 - target all near enemies - damage decrase", () => checkDamageDecrease(game, Moves.HYPER_VOICE, true, false, true), TIMEOUT);
-
-  it("1v1 - target all near enemies - check modifier", () => checkTargetMultiplier(game, Moves.HYPER_VOICE, true, true, false), TIMEOUT);
-
-  it("2v2 (immune) - target all near enemies - check modifier", () => checkTargetMultiplier(game, Moves.HYPER_VOICE, false, false, true, Abilities.SOUNDPROOF), TIMEOUT);
-
-  it("2v2 (immune) - target all near enemies - damage decrase", () => checkDamageDecrease(game, Moves.HYPER_VOICE, false, false, true, Abilities.SOUNDPROOF), TIMEOUT);
-
-});
-
-async function checkTargetMultiplier(game: GameManager, attackMove: Moves, killAlly: boolean, killSecondEnemy: boolean, shouldMultiplied: boolean, oppAbility?: Abilities) {
-  // play an attack and check target count
-  game.override.enemyAbility(oppAbility ? oppAbility : Abilities.BALL_FETCH);
-  await game.startBattle();
-
-  const playerPokemonRepr = game.scene.getPlayerField();
-
-  killAllyAndEnemy(game, killAlly, killSecondEnemy);
-
-  const targetCount = getMoveTargets(playerPokemonRepr[0], attackMove).targets.length;
-  const targetMultiplier = targetCount > 1 ? 0.75 : 1;
-
-  if (shouldMultiplied) {
-    expect(targetMultiplier).toBe(0.75);
-  } else {
-    expect(targetMultiplier).toBe(1);
-  }
-}
-
-async function checkDamageDecrease(game: GameManager, attackMove: Moves, killAlly: boolean, killSecondEnemy: boolean, shouldDecreased: boolean, ability?: Abilities) {
-  // Tested combination on first turn, 1v1 on second turn
-  await game.classicMode.runToSummon([Species.EEVEE, Species.EEVEE]);
-
-  if (ability !== undefined) {
-    game.scene.getPlayerField()[1].abilityIndex = ability;
-    game.scene.getEnemyField()[1].abilityIndex = ability;
-  }
-
-  game.move.select(Moves.SPLASH);
-  game.move.select(Moves.SPLASH, 1);
-
-
-  await game.phaseInterceptor.to(TurnEndPhase);
-
-  killAllyAndEnemy(game, killAlly, killSecondEnemy);
-  await game.toNextTurn();
-
-  const initialHp = game.scene.getEnemyField()[0].hp;
-  game.move.select(attackMove);
-  if (!killAlly) {
+    game.move.select(Moves.EARTHQUAKE);
     game.move.select(Moves.SPLASH, 1);
-  }
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
 
-  await game.phaseInterceptor.to(TurnEndPhase);
-  const afterHp = game.scene.getEnemyField()[0].hp;
+    await game.phaseInterceptor.to("MoveEndPhase");
 
-  killAllyAndEnemy(game, true, true);
-  await game.toNextTurn();
+    const damagePlayer2Turn1 = player2.getMaxHp() - player2.hp;
+    const damageEnemy1Turn1 = enemy1.getMaxHp() - enemy1.hp;
 
-  game.scene.getEnemyField()[0].hp = initialHp;
+    player2.hp = player2.getMaxHp();
+    enemy1.hp = enemy1.getMaxHp();
 
-  const initialHp1v1 = game.scene.getEnemyField()[0].hp;
-  game.move.select(attackMove);
+    await game.killPokemon(enemy2);
+    await game.toNextTurn();
 
-  await game.phaseInterceptor.to(TurnEndPhase);
-  const afterHp1v1 = game.scene.getEnemyField()[0].hp;
+    game.move.select(Moves.EARTHQUAKE);
+    game.move.select(Moves.SPLASH, 1);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY]);
 
-  if (shouldDecreased) {
-    expect(initialHp - afterHp).toBeLessThan(0.75 * (initialHp1v1 - afterHp1v1) + 2);
-    expect(initialHp - afterHp).toBeGreaterThan(0.75 * (initialHp1v1 - afterHp1v1) - 2);
-  } else {
-    expect(initialHp - afterHp).toBeLessThan(initialHp1v1 - afterHp1v1 + 2);
-    expect(initialHp - afterHp).toBeGreaterThan(initialHp1v1 - afterHp1v1 - 2);
-  }
+    await game.phaseInterceptor.to("MoveEndPhase");
 
-}
+    const damagePlayer2Turn2 = player2.getMaxHp() - player2.hp;
+    const damageEnemy1Turn2 = enemy1.getMaxHp() - enemy1.hp;
 
-// To simulate the situation where all of the enemies or the player's Pokemons dies except for one.
-function killAllyAndEnemy(game: GameManager, killAlly: boolean, killSecondEnemy: boolean) {
-  if (killAlly) {
-    leaveOnePlayerPokemon(game);
-    expect(game.scene.getPlayerField().filter(p => p.isActive()).length).toBe(1);
-  }
-  if (killSecondEnemy) {
-    leaveOneEnemyPokemon(game);
-    expect(game.scene.getEnemyField().filter(p => p.isActive()).length).toBe(1);
-  }
-}
+    enemy1.hp = enemy1.getMaxHp();
 
-function leaveOnePlayerPokemon(game: GameManager) {
-  const playerPokemons = game.scene.getParty();
-  for (let i = 1; i < playerPokemons.length; i++) {
-    playerPokemons[i].hp = 0;
-  }
-  expect(playerPokemons.filter(pokemon => pokemon.hp > 0).length).toBe(1);
-}
+    // Turn 1: 3 targets, turn 2: 2 targets
+    // Both should have damage reduction
+    expect(damageEnemy1Turn1).toBe(damageEnemy1Turn2);
+    expect(damagePlayer2Turn1).toBe(damagePlayer2Turn2);
 
-function leaveOneEnemyPokemon(game: GameManager) {
-  const enemyPokemons = game.scene.getEnemyParty();
-  for (let i = 1; i < enemyPokemons.length; i++) {
-    enemyPokemons[i].hp = 0;
-  }
-}
+    await game.killPokemon(player2);
+    await game.toNextTurn();
 
-function beforeTrial(phaserGame: Phaser.Game, single: boolean = false) {
-  const game = new GameManager(phaserGame);
-  game.override
-    .battleType("double")
-    .moveset([Moves.EARTHQUAKE, Moves.HYPER_VOICE, Moves.SURF, Moves.SPLASH])
-    .ability(Abilities.BALL_FETCH)
-    .passiveAbility(Abilities.UNNERVE)
-    .enemyMoveset(SPLASH_ONLY)
-    .disableCrits()
-    .startingLevel(50)
-    .enemyLevel(40)
-    .enemySpecies(Species.EEVEE);
-  return game;
-}
+    game.move.select(Moves.EARTHQUAKE);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
 
-function afterTrial(game: GameManager) {
-  game.phaseInterceptor.restoreOg();
-}
+    await game.phaseInterceptor.to("MoveEndPhase");
+
+    const damageEnemy1Turn3 = enemy1.getMaxHp() - enemy1.hp;
+    // Turn 3: 1 target, should be no damage reduction
+    expect(damageEnemy1Turn1).toBeLessThanOrEqual(Utils.toDmgValue(damageEnemy1Turn3 * 0.75) + 1);
+    expect(damageEnemy1Turn1).toBeGreaterThanOrEqual(Utils.toDmgValue(damageEnemy1Turn3 * 0.75) - 1);
+  }, TIMEOUT);
+});
diff --git a/src/test/moves/tera_blast.test.ts b/src/test/moves/tera_blast.test.ts
index d261d4b856b..bd7df8403d1 100644
--- a/src/test/moves/tera_blast.test.ts
+++ b/src/test/moves/tera_blast.test.ts
@@ -62,9 +62,6 @@ describe("Moves - Tera Blast", () => {
 
   it("increases power if user is Stellar tera type", async () => {
     game.override.startingHeldItems([{ name: "TERA_SHARD", type: Type.STELLAR }]);
-    const stellarTypeMultiplier = 2;
-    const stellarTypeDmgBonus = 20;
-    const basePower = moveToCheck.power;
 
     await game.startBattle();
 
@@ -72,9 +69,25 @@ describe("Moves - Tera Blast", () => {
     await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
     await game.phaseInterceptor.to("MoveEffectPhase");
 
-    expect(moveToCheck.calculateBattlePower).toHaveReturnedWith((basePower + stellarTypeDmgBonus) * stellarTypeMultiplier);
+    expect(moveToCheck.calculateBattlePower).toHaveReturnedWith(100);
   }, 20000);
 
+  it("is super effective against terastallized targets if user is Stellar tera type", async () => {
+    game.override.startingHeldItems([{ name: "TERA_SHARD", type: Type.STELLAR }]);
+
+    await game.startBattle();
+
+    const enemyPokemon = game.scene.getEnemyPokemon()!;
+    vi.spyOn(enemyPokemon, "apply");
+    vi.spyOn(enemyPokemon, "isTerastallized").mockReturnValue(true);
+
+    game.move.select(Moves.TERA_BLAST);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to("MoveEffectPhase");
+
+    expect(enemyPokemon.apply).toHaveReturnedWith(HitResult.SUPER_EFFECTIVE);
+  });
+
   // Currently abilities are bugged and can't see when a move's category is changed
   it.skip("uses the higher stat of the user's Atk and SpAtk for damage calculation", async () => {
     game.override.enemyAbility(Abilities.TOXIC_DEBRIS);
diff --git a/src/test/moves/thunder_wave.test.ts b/src/test/moves/thunder_wave.test.ts
new file mode 100644
index 00000000000..0c91be29714
--- /dev/null
+++ b/src/test/moves/thunder_wave.test.ts
@@ -0,0 +1,102 @@
+import { StatusEffect } from "#app/data/status-effect";
+import { Abilities } from "#app/enums/abilities";
+import { EnemyPokemon } from "#app/field/pokemon";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import GameManager from "#test/utils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+import { SPLASH_ONLY } from "../utils/testUtils";
+
+const TIMEOUT = 20 * 1000;
+
+describe("Moves - Thunder Wave", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .battleType("single")
+      .starterSpecies(Species.PIKACHU)
+      .moveset([Moves.THUNDER_WAVE])
+      .enemyMoveset(SPLASH_ONLY);
+  });
+
+  // References: https://bulbapedia.bulbagarden.net/wiki/Thunder_Wave_(move)
+
+  it("paralyzes non-statused Pokemon that are not Ground types", async () => {
+    game.override.enemySpecies(Species.MAGIKARP);
+    await game.startBattle();
+
+    const enemyPokemon: EnemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.THUNDER_WAVE);
+    await game.move.forceHit();
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(enemyPokemon.status?.effect).toBe(StatusEffect.PARALYSIS);
+  }, TIMEOUT);
+
+  it("does not paralyze if the Pokemon is a Ground-type", async () => {
+    game.override.enemySpecies(Species.DIGLETT);
+    await game.startBattle();
+
+    const enemyPokemon: EnemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.THUNDER_WAVE);
+    await game.move.forceHit();
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(enemyPokemon.status).toBeUndefined();
+  }, TIMEOUT);
+
+  it("does not paralyze if the Pokemon already has a status effect", async () => {
+    game.override.enemySpecies(Species.MAGIKARP).enemyStatusEffect(StatusEffect.BURN);
+    await game.startBattle();
+
+    const enemyPokemon: EnemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.THUNDER_WAVE);
+    await game.move.forceHit();
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(enemyPokemon.status?.effect).not.toBe(StatusEffect.PARALYSIS);
+  }, TIMEOUT);
+
+  it("affects Ground types if the user has Normalize", async () => {
+    game.override.ability(Abilities.NORMALIZE).enemySpecies(Species.DIGLETT);
+    await game.startBattle();
+
+    const enemyPokemon: EnemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.THUNDER_WAVE);
+    await game.move.forceHit();
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(enemyPokemon.status?.effect).toBe(StatusEffect.PARALYSIS);
+  }, TIMEOUT);
+
+  it("does not affect Ghost types if the user has Normalize", async () => {
+    game.override.ability(Abilities.NORMALIZE).enemySpecies(Species.HAUNTER);
+    await game.startBattle();
+
+    const enemyPokemon: EnemyPokemon = game.scene.getEnemyPokemon()!;
+
+    game.move.select(Moves.THUNDER_WAVE);
+    await game.move.forceHit();
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(enemyPokemon.status).toBeUndefined();
+  }, TIMEOUT);
+});
diff --git a/src/test/utils/gameManager.ts b/src/test/utils/gameManager.ts
index cb3c547744b..60d07065090 100644
--- a/src/test/utils/gameManager.ts
+++ b/src/test/utils/gameManager.ts
@@ -1,6 +1,7 @@
 import { updateUserInfo } from "#app/account";
 import { BattlerIndex } from "#app/battle";
 import BattleScene from "#app/battle-scene";
+import { BattleStyle } from "#app/enums/battle-style";
 import { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon";
 import Trainer from "#app/field/trainer";
 import { GameModes, getGameMode } from "#app/game-mode";
@@ -39,6 +40,7 @@ import fs from "fs";
 import { vi } from "vitest";
 import { ClassicModeHelper } from "./helpers/classicModeHelper";
 import { DailyModeHelper } from "./helpers/dailyModeHelper";
+import { ChallengeModeHelper } from "./helpers/challengeModeHelper";
 import { MoveHelper } from "./helpers/moveHelper";
 import { OverridesHelper } from "./helpers/overridesHelper";
 import { SettingsHelper } from "./helpers/settingsHelper";
@@ -56,6 +58,7 @@ export default class GameManager {
   public readonly move: MoveHelper;
   public readonly classicMode: ClassicModeHelper;
   public readonly dailyMode: DailyModeHelper;
+  public readonly challengeMode: ChallengeModeHelper;
   public readonly settings: SettingsHelper;
 
   /**
@@ -76,6 +79,7 @@ export default class GameManager {
     this.move = new MoveHelper(this);
     this.classicMode = new ClassicModeHelper(this);
     this.dailyMode = new DailyModeHelper(this);
+    this.challengeMode = new ChallengeModeHelper(this);
     this.settings = new SettingsHelper(this);
   }
 
@@ -133,7 +137,7 @@ export default class GameManager {
     this.scene.expParty = ExpNotification.SKIP;
     this.scene.hpBarSpeed = 3;
     this.scene.enableTutorials = false;
-    this.scene.gameData.gender = PlayerGender.MALE;
+    this.scene.gameData.gender = PlayerGender.MALE; // set initial player gender
 
   }
 
@@ -170,6 +174,8 @@ export default class GameManager {
   }
 
   /**
+   * @deprecated Use `game.classicMode.startBattle()` or `game.dailyMode.startBattle()` instead
+   *
    * Transitions to the start of a battle.
    * @param species - Optional array of species to start the battle with.
    * @returns A promise that resolves when the battle is started.
@@ -177,15 +183,17 @@ export default class GameManager {
   async startBattle(species?: Species[]) {
     await this.classicMode.runToSummon(species);
 
-    this.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => {
-      this.setMode(Mode.MESSAGE);
-      this.endPhase();
-    }, () => this.isCurrentPhase(CommandPhase) || this.isCurrentPhase(TurnInitPhase));
+    if (this.scene.battleStyle === BattleStyle.SWITCH) {
+      this.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => {
+        this.setMode(Mode.MESSAGE);
+        this.endPhase();
+      }, () => this.isCurrentPhase(CommandPhase) || this.isCurrentPhase(TurnInitPhase));
 
-    this.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => {
-      this.setMode(Mode.MESSAGE);
-      this.endPhase();
-    }, () => this.isCurrentPhase(CommandPhase) || this.isCurrentPhase(TurnInitPhase));
+      this.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => {
+        this.setMode(Mode.MESSAGE);
+        this.endPhase();
+      }, () => this.isCurrentPhase(CommandPhase) || this.isCurrentPhase(TurnInitPhase));
+    }
 
     await this.phaseInterceptor.to(CommandPhase);
     console.log("==================[New Turn]==================");
diff --git a/src/test/utils/helpers/challengeModeHelper.ts b/src/test/utils/helpers/challengeModeHelper.ts
new file mode 100644
index 00000000000..184f11f505c
--- /dev/null
+++ b/src/test/utils/helpers/challengeModeHelper.ts
@@ -0,0 +1,78 @@
+import { BattleStyle } from "#app/enums/battle-style";
+import { Species } from "#app/enums/species";
+import overrides from "#app/overrides";
+import { EncounterPhase } from "#app/phases/encounter-phase";
+import { SelectStarterPhase } from "#app/phases/select-starter-phase";
+import { Mode } from "#app/ui/ui";
+import { generateStarter } from "../gameManagerUtils";
+import { GameManagerHelper } from "./gameManagerHelper";
+import { Challenge } from "#app/data/challenge";
+import { CommandPhase } from "#app/phases/command-phase";
+import { TurnInitPhase } from "#app/phases/turn-init-phase";
+import { Challenges } from "#enums/challenges";
+import { copyChallenge } from "data/challenge";
+
+/**
+ * Helper to handle Challenge mode specifics
+ */
+export class ChallengeModeHelper extends GameManagerHelper {
+
+  challenges: Challenge[] = [];
+
+  /**
+   * Adds a challenge to the challenge mode helper.
+   * @param id - The challenge id.
+   * @param value - The challenge value.
+   * @param severity - The challenge severity.
+   */
+  addChallenge(id: Challenges, value: number, severity: number) {
+    const challenge = copyChallenge({ id, value, severity });
+    this.challenges.push(challenge);
+  }
+
+  /**
+   * Runs the Challenge game to the summon phase.
+   * @param gameMode - Optional game mode to set.
+   * @returns A promise that resolves when the summon phase is reached.
+   */
+  async runToSummon(species?: Species[]) {
+    await this.game.runToTitle();
+
+    this.game.onNextPrompt("TitlePhase", Mode.TITLE, () => {
+      this.game.scene.gameMode.challenges = this.challenges;
+      const starters = generateStarter(this.game.scene, species);
+      const selectStarterPhase = new SelectStarterPhase(this.game.scene);
+      this.game.scene.pushPhase(new EncounterPhase(this.game.scene, false));
+      selectStarterPhase.initBattle(starters);
+    });
+
+    await this.game.phaseInterceptor.run(EncounterPhase);
+    if (overrides.OPP_HELD_ITEMS_OVERRIDE.length === 0) {
+      this.game.removeEnemyHeldItems();
+    }
+  }
+
+  /**
+   * Transitions to the start of a battle.
+   * @param species - Optional array of species to start the battle with.
+   * @returns A promise that resolves when the battle is started.
+   */
+  async startBattle(species?: Species[]) {
+    await this.runToSummon(species);
+
+    if (this.game.scene.battleStyle === BattleStyle.SWITCH) {
+      this.game.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => {
+        this.game.setMode(Mode.MESSAGE);
+        this.game.endPhase();
+      }, () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase));
+
+      this.game.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => {
+        this.game.setMode(Mode.MESSAGE);
+        this.game.endPhase();
+      }, () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase));
+    }
+
+    await this.game.phaseInterceptor.to(CommandPhase);
+    console.log("==================[New Turn]==================");
+  }
+}
diff --git a/src/test/utils/helpers/classicModeHelper.ts b/src/test/utils/helpers/classicModeHelper.ts
index f41472303b4..55e995fc9dc 100644
--- a/src/test/utils/helpers/classicModeHelper.ts
+++ b/src/test/utils/helpers/classicModeHelper.ts
@@ -1,8 +1,11 @@
+import { BattleStyle } from "#app/enums/battle-style";
 import { Species } from "#app/enums/species";
 import { GameModes, getGameMode } from "#app/game-mode";
 import overrides from "#app/overrides";
+import { CommandPhase } from "#app/phases/command-phase";
 import { EncounterPhase } from "#app/phases/encounter-phase";
 import { SelectStarterPhase } from "#app/phases/select-starter-phase";
+import { TurnInitPhase } from "#app/phases/turn-init-phase";
 import { Mode } from "#app/ui/ui";
 import { generateStarter } from "../gameManagerUtils";
 import { GameManagerHelper } from "./gameManagerHelper";
@@ -33,4 +36,28 @@ export class ClassicModeHelper extends GameManagerHelper {
       this.game.removeEnemyHeldItems();
     }
   }
+
+  /**
+   * Transitions to the start of a battle.
+   * @param species - Optional array of species to start the battle with.
+   * @returns A promise that resolves when the battle is started.
+   */
+  async startBattle(species?: Species[]) {
+    await this.runToSummon(species);
+
+    if (this.game.scene.battleStyle === BattleStyle.SWITCH) {
+      this.game.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => {
+        this.game.setMode(Mode.MESSAGE);
+        this.game.endPhase();
+      }, () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase));
+
+      this.game.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => {
+        this.game.setMode(Mode.MESSAGE);
+        this.game.endPhase();
+      }, () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase));
+    }
+
+    await this.game.phaseInterceptor.to(CommandPhase);
+    console.log("==================[New Turn]==================");
+  }
 }
diff --git a/src/test/utils/helpers/dailyModeHelper.ts b/src/test/utils/helpers/dailyModeHelper.ts
index 8f60981f4d8..e40fada8ac7 100644
--- a/src/test/utils/helpers/dailyModeHelper.ts
+++ b/src/test/utils/helpers/dailyModeHelper.ts
@@ -1,7 +1,10 @@
+import { BattleStyle } from "#app/enums/battle-style";
 import { Button } from "#app/enums/buttons";
 import overrides from "#app/overrides";
+import { CommandPhase } from "#app/phases/command-phase";
 import { EncounterPhase } from "#app/phases/encounter-phase";
 import { TitlePhase } from "#app/phases/title-phase";
+import { TurnInitPhase } from "#app/phases/turn-init-phase";
 import SaveSlotSelectUiHandler from "#app/ui/save-slot-select-ui-handler";
 import { Mode } from "#app/ui/ui";
 import { GameManagerHelper } from "./gameManagerHelper";
@@ -28,10 +31,33 @@ export class DailyModeHelper extends GameManagerHelper {
       uihandler.processInput(Button.ACTION); // select first slot. that's fine
     });
 
-    await this.game.phaseInterceptor.run(EncounterPhase);
+    await this.game.phaseInterceptor.to(EncounterPhase);
 
     if (overrides.OPP_HELD_ITEMS_OVERRIDE.length === 0) {
       this.game.removeEnemyHeldItems();
     }
   }
+
+  /**
+   * Transitions to the start of a battle.
+   * @returns A promise that resolves when the battle is started.
+   */
+  async startBattle() {
+    await this.runToSummon();
+
+    if (this.game.scene.battleStyle === BattleStyle.SWITCH) {
+      this.game.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => {
+        this.game.setMode(Mode.MESSAGE);
+        this.game.endPhase();
+      }, () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase));
+
+      this.game.onNextPrompt("CheckSwitchPhase", Mode.CONFIRM, () => {
+        this.game.setMode(Mode.MESSAGE);
+        this.game.endPhase();
+      }, () => this.game.isCurrentPhase(CommandPhase) || this.game.isCurrentPhase(TurnInitPhase));
+    }
+
+    await this.game.phaseInterceptor.to(CommandPhase);
+    console.log("==================[New Turn]==================");
+  }
 }
diff --git a/src/test/utils/helpers/settingsHelper.ts b/src/test/utils/helpers/settingsHelper.ts
index dec9e160d51..76ffafdbe10 100644
--- a/src/test/utils/helpers/settingsHelper.ts
+++ b/src/test/utils/helpers/settingsHelper.ts
@@ -1,3 +1,4 @@
+import { PlayerGender } from "#app/enums/player-gender";
 import { GameManagerHelper } from "./gameManagerHelper";
 
 /**
@@ -11,5 +12,19 @@ export class SettingsHelper extends GameManagerHelper {
    */
   typeHints(enable: boolean) {
     this.game.scene.typeHints = enable;
+    this.log(`Type Hints ${enable? "enabled" : "disabled"}` );
+  }
+
+  /**
+   * Change the player gender
+   * @param gender the {@linkcode PlayerGender} to set
+   */
+  playerGender(gender: PlayerGender) {
+    this.game.scene.gameData.gender = gender;
+    this.log(`Gender set to: ${PlayerGender[gender]} (=${gender})` );
+  }
+
+  private log(...params: any[]) {
+    console.log("Settings:", ...params);
   }
 }
diff --git a/src/typings/phaser/index.d.ts b/src/typings/phaser/index.d.ts
new file mode 100644
index 00000000000..f3665768cec
--- /dev/null
+++ b/src/typings/phaser/index.d.ts
@@ -0,0 +1,68 @@
+import "phaser";
+
+declare module "phaser" {
+	namespace GameObjects {
+    interface GameObject {
+      width: number;
+
+      height: number;
+
+      originX: number;
+
+      originY: number;
+
+      x: number;
+
+      y: number;
+    }
+
+		interface Container {
+      /**
+       * Sets this object's position relative to another object with a given offset
+       */
+			setPositionRelative(guideObject: any, x: number, y: number): void;
+		}
+		interface Sprite {
+      /**
+       * Sets this object's position relative to another object with a given offset
+       */
+			setPositionRelative(guideObject: any, x: number, y: number): void;
+		}
+		interface Image {
+      /**
+       * Sets this object's position relative to another object with a given offset
+       */
+			setPositionRelative(guideObject: any, x: number, y: number): void;
+		}
+		interface NineSlice {
+      /**
+       * Sets this object's position relative to another object with a given offset
+       */
+			setPositionRelative(guideObject: any, x: number, y: number): void;
+		}
+		interface Text {
+      /**
+       * Sets this object's position relative to another object with a given offset
+       */
+			setPositionRelative(guideObject: any, x: number, y: number): void;
+		}
+		interface Rectangle {
+      /**
+       * Sets this object's position relative to another object with a given offset
+       */
+			setPositionRelative(guideObject: any, x: number, y: number): void;
+		}
+	}
+
+   namespace Input {
+    namespace Gamepad {
+      interface GamepadPlugin {
+        /**
+         * Refreshes the list of connected Gamepads.
+         * This is called automatically when a gamepad is connected or disconnected, and during the update loop.
+         */
+        refreshPads(): void;
+      }
+    }
+  }
+}
diff --git a/src/ui-inputs.ts b/src/ui-inputs.ts
index a8ecc860aab..5860702a15b 100644
--- a/src/ui-inputs.ts
+++ b/src/ui-inputs.ts
@@ -182,7 +182,7 @@ export class UiInputs {
       break;
     case Mode.MENU:
       this.scene.ui.revertMode();
-      this.scene.playSound("select");
+      this.scene.playSound("ui/select");
       break;
     default:
       return;
diff --git a/src/ui/achv-bar.ts b/src/ui/achv-bar.ts
index 0f3ab7c2e47..6e7b3185024 100644
--- a/src/ui/achv-bar.ts
+++ b/src/ui/achv-bar.ts
@@ -25,7 +25,7 @@ export default class AchvBar extends Phaser.GameObjects.Container {
   }
 
   setup(): void {
-    this.defaultWidth = 160;
+    this.defaultWidth = 200;
     this.defaultHeight = 40;
 
     this.bg = this.scene.add.nineslice(0, 0, "achv_bar", undefined, this.defaultWidth, this.defaultHeight, 41, 6, 16, 4);
@@ -90,7 +90,7 @@ export default class AchvBar extends Phaser.GameObjects.Container {
     this.bg.height = Math.max(this.defaultHeight, this.titleText.displayHeight + this.descriptionText.displayHeight + 8);
     this.icon.y = (this.bg.height / 2) - (this.icon.height / 2);
 
-    (this.scene as BattleScene).playSound("achv");
+    (this.scene as BattleScene).playSound("se/achv");
 
     this.scene.tweens.add({
       targets: this,
diff --git a/src/ui/achvs-ui-handler.ts b/src/ui/achvs-ui-handler.ts
index ad707fb52e1..eb4316dc24b 100644
--- a/src/ui/achvs-ui-handler.ts
+++ b/src/ui/achvs-ui-handler.ts
@@ -2,84 +2,122 @@ import BattleScene from "../battle-scene";
 import { Button } from "#enums/buttons";
 import i18next from "i18next";
 import { Achv, achvs, getAchievementDescription } from "../system/achv";
+import { Voucher, getVoucherTypeIcon, getVoucherTypeName, vouchers } from "../system/voucher";
 import MessageUiHandler from "./message-ui-handler";
 import { addTextObject, TextStyle } from "./text";
 import { Mode } from "./ui";
 import { addWindow } from "./ui-theme";
-import { ParseKeys } from "i18next";
 import { PlayerGender } from "#enums/player-gender";
 
+enum Page {
+  ACHIEVEMENTS,
+  VOUCHERS
+}
+
+interface LanguageSetting {
+  TextSize: string,
+}
+
+const languageSettings: { [key: string]: LanguageSetting } = {
+  "de":{
+    TextSize: "80px"
+  }
+};
+
 export default class AchvsUiHandler extends MessageUiHandler {
-  private readonly ACHV_ROWS = 4;
-  private readonly ACHV_COLS = 17;
+  private readonly ROWS = 4;
+  private readonly COLS = 17;
 
-  private achvsContainer: Phaser.GameObjects.Container;
-  private achvIconsContainer: Phaser.GameObjects.Container;
+  private mainContainer: Phaser.GameObjects.Container;
+  private iconsContainer: Phaser.GameObjects.Container;
+
+  private headerBg: Phaser.GameObjects.NineSlice;
+  private headerText: Phaser.GameObjects.Text;
+  private headerActionText: Phaser.GameObjects.Text;
+  private headerActionButton: Phaser.GameObjects.Sprite;
+  private headerBgX: number;
+  private iconsBg: Phaser.GameObjects.NineSlice;
+  private icons: Phaser.GameObjects.Sprite[];
 
-  private achvIconsBg: Phaser.GameObjects.NineSlice;
-  private achvIcons: Phaser.GameObjects.Sprite[];
   private titleText: Phaser.GameObjects.Text;
   private scoreText: Phaser.GameObjects.Text;
   private unlockText: Phaser.GameObjects.Text;
 
+  private achvsName: string;
   private achvsTotal: number;
-  private scrollCursor: number;
+  private vouchersName: string;
+  private vouchersTotal: number;
+  private currentTotal: number;
 
+  private scrollCursor: number;
   private cursorObj: Phaser.GameObjects.NineSlice | null;
+  private currentPage: Page;
 
   constructor(scene: BattleScene, mode: Mode | null = null) {
     super(scene, mode);
 
     this.achvsTotal = Object.keys(achvs).length;
+    this.vouchersTotal = Object.keys(vouchers).length;
     this.scrollCursor = 0;
   }
 
   setup() {
     const ui = this.getUi();
 
-    this.achvsContainer = this.scene.add.container(1, -(this.scene.game.canvas.height / 6) + 1);
+    this.mainContainer = this.scene.add.container(1, -(this.scene.game.canvas.height / 6) + 1);
 
-    this.achvsContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, this.scene.game.canvas.width / 6, this.scene.game.canvas.height / 6), Phaser.Geom.Rectangle.Contains);
+    this.mainContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, this.scene.game.canvas.width / 6, this.scene.game.canvas.height / 6), Phaser.Geom.Rectangle.Contains);
 
-    const headerBg = addWindow(this.scene, 0, 0, (this.scene.game.canvas.width / 6) - 2, 24);
-    headerBg.setOrigin(0, 0);
+    this.headerBg = addWindow(this.scene, 0, 0, (this.scene.game.canvas.width / 6) - 2, 24);
+    this.headerBg.setOrigin(0, 0);
+
+    this.headerText = addTextObject(this.scene, 0, 0, "", TextStyle.SETTINGS_LABEL);
+    this.headerText.setOrigin(0, 0);
+    this.headerText.setPositionRelative(this.headerBg, 8, 4);
+    this.headerActionButton = new Phaser.GameObjects.Sprite(this.scene, 0, 0, "keyboard", "SPACE.png");
+    this.headerActionButton.setOrigin(0, 0);
+    this.headerActionButton.setPositionRelative(this.headerBg, 236, 6);
+    this.headerActionText = addTextObject(this.scene, 0, 0, "", TextStyle.WINDOW, {fontSize:"60px"});
+    this.headerActionText.setOrigin(0, 0);
+    this.headerActionText.setPositionRelative(this.headerBg, 264, 8);
 
     // We need to get the player gender from the game data to add the correct prefix to the achievement name
-    const playerGender = this.scene.gameData.gender;
-    let genderPrefix = "PGM";
-    if (playerGender === PlayerGender.FEMALE) {
-      genderPrefix = "PGF";
-    }
+    const genderIndex = this.scene.gameData.gender ?? PlayerGender.MALE;
+    const genderStr = PlayerGender[genderIndex].toLowerCase();
 
-    const headerText = addTextObject(this.scene, 0, 0, i18next.t(`${genderPrefix}achv:Achievements.name` as ParseKeys), TextStyle.SETTINGS_LABEL);
-    headerText.setOrigin(0, 0);
-    headerText.setPositionRelative(headerBg, 8, 4);
+    this.achvsName = i18next.t("achv:Achievements.name", { context: genderStr });
+    this.vouchersName = i18next.t("voucher:vouchers");
 
-    this.achvIconsBg = addWindow(this.scene, 0, headerBg.height, (this.scene.game.canvas.width / 6) - 2, (this.scene.game.canvas.height / 6) - headerBg.height - 68);
-    this.achvIconsBg.setOrigin(0, 0);
+    this.iconsBg = addWindow(this.scene, 0, this.headerBg.height, (this.scene.game.canvas.width / 6) - 2, (this.scene.game.canvas.height / 6) - this.headerBg.height - 68);
+    this.iconsBg.setOrigin(0, 0);
 
-    this.achvIconsContainer = this.scene.add.container(6, headerBg.height + 6);
+    this.iconsContainer = this.scene.add.container(6, this.headerBg.height + 6);
 
-    this.achvIcons = [];
+    this.icons = [];
 
-    for (let a = 0; a < this.ACHV_ROWS * this.ACHV_COLS; a++) {
-      const x = (a % this.ACHV_COLS) * 18;
-      const y = Math.floor(a / this.ACHV_COLS) * 18;
+    for (let a = 0; a < this.ROWS * this.COLS; a++) {
+      const x = (a % this.COLS) * 18;
+      const y = Math.floor(a / this.COLS) * 18;
 
       const icon = this.scene.add.sprite(x, y, "items", "unknown");
       icon.setOrigin(0, 0);
       icon.setScale(0.5);
 
-      this.achvIcons.push(icon);
-      this.achvIconsContainer.add(icon);
+      this.icons.push(icon);
+      this.iconsContainer.add(icon);
     }
 
-    const titleBg = addWindow(this.scene, 0, headerBg.height + this.achvIconsBg.height, 174, 24);
+    const titleBg = addWindow(this.scene, 0, this.headerBg.height + this.iconsBg.height, 174, 24);
     titleBg.setOrigin(0, 0);
 
     this.titleText = addTextObject(this.scene, 0, 0, "", TextStyle.WINDOW);
+    const textSize = languageSettings[i18next.language]?.TextSize ?? this.titleText.style.fontSize;
+    this.titleText.setFontSize(textSize);
     this.titleText.setOrigin(0, 0);
-    this.titleText.setPositionRelative(titleBg, 8, 4);
+    const titleBgCenterX = titleBg.x + titleBg.width / 2;
+    const titleBgCenterY = titleBg.y + titleBg.height / 2;
+    this.titleText.setOrigin(0.5, 0.5);
+    this.titleText.setPosition(titleBgCenterX, titleBgCenterY);
 
     const scoreBg = addWindow(this.scene, titleBg.x + titleBg.width, titleBg.y, 46, 24);
     scoreBg.setOrigin(0, 0);
@@ -105,36 +143,40 @@ export default class AchvsUiHandler extends MessageUiHandler {
 
     this.message = descriptionText;
 
-    this.achvsContainer.add(headerBg);
-    this.achvsContainer.add(headerText);
-    this.achvsContainer.add(this.achvIconsBg);
-    this.achvsContainer.add(this.achvIconsContainer);
-    this.achvsContainer.add(titleBg);
-    this.achvsContainer.add(this.titleText);
-    this.achvsContainer.add(scoreBg);
-    this.achvsContainer.add(this.scoreText);
-    this.achvsContainer.add(unlockBg);
-    this.achvsContainer.add(this.unlockText);
-    this.achvsContainer.add(descriptionBg);
-    this.achvsContainer.add(descriptionText);
+    this.mainContainer.add(this.headerBg);
+    this.mainContainer.add(this.headerActionButton);
+    this.mainContainer.add(this.headerText);
+    this.mainContainer.add(this.headerActionText);
+    this.mainContainer.add(this.iconsBg);
+    this.mainContainer.add(this.iconsContainer);
+    this.mainContainer.add(titleBg);
+    this.mainContainer.add(this.titleText);
+    this.mainContainer.add(scoreBg);
+    this.mainContainer.add(this.scoreText);
+    this.mainContainer.add(unlockBg);
+    this.mainContainer.add(this.unlockText);
+    this.mainContainer.add(descriptionBg);
+    this.mainContainer.add(descriptionText);
 
-    ui.add(this.achvsContainer);
+    ui.add(this.mainContainer);
 
+    this.currentPage = Page.ACHIEVEMENTS;
     this.setCursor(0);
 
-    this.achvsContainer.setVisible(false);
+    this.mainContainer.setVisible(false);
   }
 
   show(args: any[]): boolean {
     super.show(args);
 
+    this.headerBgX = this.headerBg.getTopRight().x;
     this.updateAchvIcons();
 
-    this.achvsContainer.setVisible(true);
+    this.mainContainer.setVisible(true);
     this.setCursor(0);
     this.setScrollCursor(0);
 
-    this.getUi().moveTo(this.achvsContainer, this.getUi().length - 1);
+    this.getUi().moveTo(this.mainContainer, this.getUi().length - 1);
 
     this.getUi().hideTooltip();
 
@@ -143,13 +185,10 @@ export default class AchvsUiHandler extends MessageUiHandler {
 
   protected showAchv(achv: Achv) {
     // We need to get the player gender from the game data to add the correct prefix to the achievement name
-    const playerGender = this.scene.gameData.gender;
-    let genderPrefix = "PGM";
-    if (playerGender === PlayerGender.FEMALE) {
-      genderPrefix = "PGF";
-    }
+    const genderIndex = this.scene.gameData.gender ?? PlayerGender.MALE;
+    const genderStr = PlayerGender[genderIndex].toLowerCase();
 
-    achv.name = i18next.t(`${genderPrefix}achv:${achv.localizationKey}.name` as ParseKeys);
+    achv.name = i18next.t(`achv:${achv.localizationKey}.name`, { context: genderStr });
     achv.description = getAchievementDescription(achv.localizationKey);
     const achvUnlocks = this.scene.gameData.achvUnlocks;
     const unlocked = achvUnlocks.hasOwnProperty(achv.id);
@@ -157,7 +196,16 @@ export default class AchvsUiHandler extends MessageUiHandler {
     this.titleText.setText(unlocked ? achv.name : "???");
     this.showText(!hidden ? achv.description : "");
     this.scoreText.setText(`${achv.score}pt`);
-    this.unlockText.setText(unlocked ? new Date(achvUnlocks[achv.id]).toLocaleDateString() : i18next.t(`${genderPrefix}achv:Locked.name` as ParseKeys));
+    this.unlockText.setText(unlocked ? new Date(achvUnlocks[achv.id]).toLocaleDateString() : i18next.t("achv:Locked.name"));
+  }
+
+  protected showVoucher(voucher: Voucher) {
+    const voucherUnlocks = this.scene.gameData.voucherUnlocks;
+    const unlocked = voucherUnlocks.hasOwnProperty(voucher.id);
+
+    this.titleText.setText(getVoucherTypeName(voucher.voucherType));
+    this.showText(voucher.description);
+    this.unlockText.setText(unlocked ? new Date(voucherUnlocks[voucher.id]).toLocaleDateString() : i18next.t("voucher:locked"));
   }
 
   processInput(button: Button): boolean {
@@ -165,43 +213,56 @@ export default class AchvsUiHandler extends MessageUiHandler {
 
     let success = false;
 
+    if (button === Button.ACTION) {
+      success = true;
+      this.setScrollCursor(0);
+      if (this.currentPage === Page.ACHIEVEMENTS) {
+        this.currentPage = Page.VOUCHERS;
+        this.updateVoucherIcons();
+      } else if (this.currentPage === Page.VOUCHERS) {
+        this.currentPage = Page.ACHIEVEMENTS;
+        this.updateAchvIcons();
+      }
+      this.setCursor(0, true);
+      this.mainContainer.update();
+    }
     if (button === Button.CANCEL) {
       success = true;
       this.scene.ui.revertMode();
     } else {
-      const rowIndex = Math.floor(this.cursor / this.ACHV_COLS);
-      const itemOffset = (this.scrollCursor * this.ACHV_COLS);
+      const rowIndex = Math.floor(this.cursor / this.COLS);
+      const itemOffset = (this.scrollCursor * this.COLS);
       switch (button) {
       case Button.UP:
-        if (this.cursor < this.ACHV_COLS) {
+        if (this.cursor < this.COLS) {
           if (this.scrollCursor) {
             success = this.setScrollCursor(this.scrollCursor - 1);
           }
         } else {
-          success = this.setCursor(this.cursor - this.ACHV_COLS);
+          success = this.setCursor(this.cursor - this.COLS);
         }
         break;
       case Button.DOWN:
-        const canMoveDown = (this.cursor + itemOffset) + this.ACHV_COLS < this.achvsTotal;
-        if (rowIndex >= this.ACHV_ROWS - 1) {
-          if (this.scrollCursor < Math.ceil(this.achvsTotal / this.ACHV_COLS) - this.ACHV_ROWS && canMoveDown) {
+        const canMoveDown = (this.cursor + itemOffset) + this.COLS < this.currentTotal;
+        if (rowIndex >= this.ROWS - 1) {
+          if (this.scrollCursor < Math.ceil(this.currentTotal / this.COLS) - this.ROWS && canMoveDown) {
             success = this.setScrollCursor(this.scrollCursor + 1);
           }
         } else if (canMoveDown) {
-          success = this.setCursor(this.cursor + this.ACHV_COLS);
+          success = this.setCursor(this.cursor + this.COLS);
         }
         break;
       case Button.LEFT:
         if (!this.cursor && this.scrollCursor) {
-          success = this.setScrollCursor(this.scrollCursor - 1) && this.setCursor(this.cursor + (this.ACHV_COLS - 1));
+          success = this.setScrollCursor(this.scrollCursor - 1) && this.setCursor(this.cursor + (this.COLS - 1));
         } else if (this.cursor) {
           success = this.setCursor(this.cursor - 1);
         }
         break;
       case Button.RIGHT:
-        if (this.cursor + 1 === this.ACHV_ROWS * this.ACHV_COLS && this.scrollCursor < Math.ceil(this.achvsTotal / this.ACHV_COLS) - this.ACHV_ROWS) {
-          success = this.setScrollCursor(this.scrollCursor + 1) && this.setCursor(this.cursor - (this.ACHV_COLS - 1));
-        } else if (this.cursor + itemOffset < this.achvsTotal - 1) {
+        if (this.cursor + 1 === this.ROWS * this.COLS && this.scrollCursor < Math.ceil(this.currentTotal / this.COLS) - this.ROWS) {
+          success = this.setScrollCursor(this.scrollCursor + 1) && this.setCursor(this.cursor - (this.COLS - 1));
+        } else if (this.cursor + itemOffset < this.currentTotal - 1) {
           success = this.setCursor(this.cursor + 1);
         }
         break;
@@ -215,24 +276,30 @@ export default class AchvsUiHandler extends MessageUiHandler {
     return success;
   }
 
-  setCursor(cursor: integer): boolean {
+  setCursor(cursor: integer, pageChange?: boolean): boolean {
     const ret = super.setCursor(cursor);
 
-    let updateAchv = ret;
+    let update = ret;
 
     if (!this.cursorObj) {
       this.cursorObj = this.scene.add.nineslice(0, 0, "select_cursor_highlight", undefined, 16, 16, 1, 1, 1, 1);
       this.cursorObj.setOrigin(0, 0);
-      this.achvIconsContainer.add(this.cursorObj);
-      updateAchv = true;
+      this.iconsContainer.add(this.cursorObj);
+      update = true;
     }
 
-    this.cursorObj.setPositionRelative(this.achvIcons[this.cursor], 0, 0);
+    this.cursorObj.setPositionRelative(this.icons[this.cursor], 0, 0);
 
-    if (updateAchv) {
-      this.showAchv(achvs[Object.keys(achvs)[cursor + this.scrollCursor * this.ACHV_COLS]]);
+    if (update || pageChange) {
+      switch (this.currentPage) {
+      case Page.ACHIEVEMENTS:
+        this.showAchv(achvs[Object.keys(achvs)[cursor + this.scrollCursor * this.COLS]]);
+        break;
+      case Page.VOUCHERS:
+        this.showVoucher(vouchers[Object.keys(vouchers)[cursor + this.scrollCursor * this.COLS]]);
+        break;
+      }
     }
-
     return ret;
   }
 
@@ -249,10 +316,16 @@ export default class AchvsUiHandler extends MessageUiHandler {
 
     this.scrollCursor = scrollCursor;
 
-    this.updateAchvIcons();
-
-    this.showAchv(achvs[Object.keys(achvs)[Math.min(this.cursor + this.scrollCursor * this.ACHV_COLS, Object.values(achvs).length - 1)]]);
-
+    switch (this.currentPage) {
+    case Page.ACHIEVEMENTS:
+      this.updateAchvIcons();
+      this.showAchv(achvs[Object.keys(achvs)[Math.min(this.cursor + this.scrollCursor * this.COLS, Object.values(achvs).length - 1)]]);
+      break;
+    case Page.VOUCHERS:
+      this.updateVoucherIcons();
+      this.showVoucher(vouchers[Object.keys(vouchers)[Math.min(this.cursor + this.scrollCursor * this.COLS, Object.values(vouchers).length - 1)]]);
+      break;
+    }
     return true;
   }
 
@@ -262,15 +335,21 @@ export default class AchvsUiHandler extends MessageUiHandler {
    * Determines what data is to be displayed on the UI and updates it accordingly based on the current value of this.scrollCursor
    */
   updateAchvIcons(): void {
+    this.headerText.text = this.achvsName;
+    this.headerActionText.text = this.vouchersName;
+    const textPosition = this.headerBgX - this.headerActionText.displayWidth - 8;
+    this.headerActionText.setX(textPosition);
+    this.headerActionButton.setX(textPosition - this.headerActionButton.displayWidth - 4);
+
     const achvUnlocks = this.scene.gameData.achvUnlocks;
 
-    const itemOffset = this.scrollCursor * this.ACHV_COLS;
-    const itemLimit = this.ACHV_ROWS * this.ACHV_COLS;
+    const itemOffset = this.scrollCursor * this.COLS;
+    const itemLimit = this.ROWS * this.COLS;
 
     const achvRange = Object.values(achvs).slice(itemOffset, itemLimit + itemOffset);
 
     achvRange.forEach((achv: Achv, i: integer) => {
-      const icon = this.achvIcons[i];
+      const icon = this.icons[i];
       const unlocked = achvUnlocks.hasOwnProperty(achv.id);
       const hidden = !unlocked && achv.secret && (!achv.parentId || !achvUnlocks.hasOwnProperty(achv.parentId));
       const tinted = !hidden && !unlocked;
@@ -284,14 +363,54 @@ export default class AchvsUiHandler extends MessageUiHandler {
       }
     });
 
-    if (achvRange.length < this.achvIcons.length) {
-      this.achvIcons.slice(achvRange.length).map(i => i.setVisible(false));
+    if (achvRange.length < this.icons.length) {
+      this.icons.slice(achvRange.length).map(i => i.setVisible(false));
     }
+
+    this.currentTotal = this.achvsTotal;
+  }
+
+  /**
+   * updateVoucherIcons(): void
+   * Determines what data is to be displayed on the UI and updates it accordingly based on the current value of this.scrollCursor
+   */
+  updateVoucherIcons(): void {
+    this.headerText.text = this.vouchersName;
+    this.headerActionText.text = this.achvsName;
+    const textPosition = this.headerBgX - this.headerActionText.displayWidth - 8;
+    this.headerActionText.setX(textPosition);
+    this.headerActionButton.setX(textPosition - this.headerActionButton.displayWidth - 4);
+
+    const voucherUnlocks = this.scene.gameData.voucherUnlocks;
+
+    const itemOffset = this.scrollCursor * this.COLS;
+    const itemLimit = this.ROWS * this.COLS;
+
+    const voucherRange = Object.values(vouchers).slice(itemOffset, itemLimit + itemOffset);
+
+    voucherRange.forEach((voucher: Voucher, i: integer) => {
+      const icon = this.icons[i];
+      const unlocked = voucherUnlocks.hasOwnProperty(voucher.id);
+
+      icon.setFrame(getVoucherTypeIcon(voucher.voucherType));
+      icon.setVisible(true);
+      if (!unlocked) {
+        icon.setTintFill(0);
+      } else {
+        icon.clearTint();
+      }
+    });
+
+    if (voucherRange.length < this.icons.length) {
+      this.icons.slice(voucherRange.length).map(i => i.setVisible(false));
+    }
+    this.currentTotal = this.vouchersTotal;
   }
 
   clear() {
     super.clear();
-    this.achvsContainer.setVisible(false);
+    this.currentPage = Page.ACHIEVEMENTS;
+    this.mainContainer.setVisible(false);
     this.eraseCursor();
   }
 
diff --git a/src/ui/admin-ui-handler.ts b/src/ui/admin-ui-handler.ts
new file mode 100644
index 00000000000..5c91a36ab64
--- /dev/null
+++ b/src/ui/admin-ui-handler.ts
@@ -0,0 +1,88 @@
+import BattleScene from "#app/battle-scene.js";
+import { ModalConfig } from "./modal-ui-handler";
+import { Mode } from "./ui";
+import * as Utils from "../utils";
+import { FormModalUiHandler } from "./form-modal-ui-handler";
+import { Button } from "#app/enums/buttons.js";
+
+export default class AdminUiHandler extends FormModalUiHandler {
+
+  constructor(scene: BattleScene, mode: Mode | null = null) {
+    super(scene, mode);
+  }
+
+  setup(): void {
+    super.setup();
+  }
+
+  getModalTitle(config?: ModalConfig): string {
+    return "Admin panel";
+  }
+
+  getFields(config?: ModalConfig): string[] {
+    return ["Username", "Discord ID"];
+  }
+
+  getWidth(config?: ModalConfig): number {
+    return 160;
+  }
+
+  getMargin(config?: ModalConfig): [number, number, number, number] {
+    return [0, 0, 48, 0];
+  }
+
+  getButtonLabels(config?: ModalConfig): string[] {
+    return ["Link account", "Cancel"];
+  }
+
+  processInput(button: Button): boolean {
+    if (button === Button.SUBMIT && this.submitAction) {
+      this.submitAction();
+      return true;
+    }
+
+    return false;
+  }
+
+  show(args: any[]): boolean {
+    if (super.show(args)) {
+      const config = args[0] as ModalConfig;
+      const originalSubmitAction = this.submitAction;
+      this.submitAction = (_) => {
+        this.submitAction = originalSubmitAction;
+        this.scene.ui.setMode(Mode.LOADING, { buttonActions: [] });
+        const onFail = error => {
+          this.scene.ui.setMode(Mode.ADMIN, Object.assign(config, { errorMessage: error?.trim() }));
+          this.scene.ui.playError();
+        };
+        if (!this.inputs[0].text) {
+          return onFail("Username is required");
+        }
+        if (!this.inputs[1].text) {
+          return onFail("Discord Id is required");
+        }
+        Utils.apiPost("admin/account/discord-link", `username=${encodeURIComponent(this.inputs[0].text)}&discordId=${encodeURIComponent(this.inputs[1].text)}`, "application/x-www-form-urlencoded", true)
+          .then(response => {
+            if (!response.ok) {
+              console.error(response);
+            }
+            this.inputs[0].setText("");
+            this.inputs[1].setText("");
+            this.scene.ui.revertMode();
+          })
+          .catch((err) => {
+            console.error(err);
+            this.scene.ui.revertMode();
+          });
+        return false;
+      };
+      return true;
+    }
+    return false;
+
+  }
+
+  clear(): void {
+    super.clear();
+  }
+}
diff --git a/src/ui/battle-info.ts b/src/ui/battle-info.ts
index dbf0d5911c8..11b807e8ab7 100644
--- a/src/ui/battle-info.ts
+++ b/src/ui/battle-info.ts
@@ -713,7 +713,7 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
         this.lastLevelExp = pokemon.levelExp;
       }
       if (duration) {
-        (this.scene as BattleScene).playSound("exp");
+        (this.scene as BattleScene).playSound("se/exp");
       }
       this.scene.tweens.add({
         targets: this.expMaskRect,
@@ -725,10 +725,10 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
             return resolve();
           }
           if (duration) {
-            this.scene.sound.stopByKey("exp");
+            this.scene.sound.stopByKey("se/exp");
           }
           if (ratio === 1) {
-            (this.scene as BattleScene).playSound("level_up");
+            (this.scene as BattleScene).playSound("se/level_up");
             this.setLevel(this.lastLevel);
             this.scene.time.delayedCall(500 * levelDurationMultiplier, () => {
               this.expMaskRect.x = 0;
diff --git a/src/ui/battle-message-ui-handler.ts b/src/ui/battle-message-ui-handler.ts
index 3c4ab03efd9..189305ce4c1 100644
--- a/src/ui/battle-message-ui-handler.ts
+++ b/src/ui/battle-message-ui-handler.ts
@@ -252,9 +252,8 @@ export default class BattleMessageUiHandler extends MessageUiHandler {
           textStyle = TextStyle.SUMMARY_GREEN;
         }
       } else {
-        textStyle = TextStyle.SUMMARY;
+        textStyle = TextStyle.WINDOW;
       }
-      //const textStyle: TextStyle = isBetter ? TextStyle.SUMMARY_GREEN : TextStyle.SUMMARY;
       const color = getTextColor(textStyle, false, uiTheme);
       return `[color=${color}][shadow=${getTextColor(textStyle, true, uiTheme)}]${text}[/shadow][/color]`;
     };
diff --git a/src/ui/candy-bar.ts b/src/ui/candy-bar.ts
index 5496ce9afce..14015f02259 100644
--- a/src/ui/candy-bar.ts
+++ b/src/ui/candy-bar.ts
@@ -71,7 +71,7 @@ export default class CandyBar extends Phaser.GameObjects.Container {
         this.tween.stop();
       }
 
-      (this.scene as BattleScene).playSound("shing");
+      (this.scene as BattleScene).playSound("se/shing");
 
       this.tween = this.scene.tweens.add({
         targets: this,
diff --git a/src/ui/challenges-select-ui-handler.ts b/src/ui/challenges-select-ui-handler.ts
index 73c47da41fe..f1ba0da6c51 100644
--- a/src/ui/challenges-select-ui-handler.ts
+++ b/src/ui/challenges-select-ui-handler.ts
@@ -35,6 +35,8 @@ export default class GameChallengesUiHandler extends UiHandler {
 
   private startCursor: Phaser.GameObjects.NineSlice;
 
+  private optionsWidth: number;
+
   constructor(scene: BattleScene, mode: Mode | null = null) {
     super(scene, mode);
   }
@@ -74,18 +76,19 @@ export default class GameChallengesUiHandler extends UiHandler {
     // difficultyName.setOrigin(0, 0);
     // difficultyName.setPositionRelative(difficultyBg, difficultyBg.width - difficultyName.displayWidth - 8, 4);
 
-    this.optionsBg = addWindow(this.scene, 0, headerBg.height, (this.scene.game.canvas.width / 9), (this.scene.game.canvas.height / 6) - headerBg.height - 2);
+    this.optionsWidth = this.scene.scaledCanvas.width * 0.6;
+    this.optionsBg = addWindow(this.scene, 0, headerBg.height, this.optionsWidth, this.scene.scaledCanvas.height - headerBg.height - 2);
     this.optionsBg.setName("window-options-bg");
     this.optionsBg.setOrigin(0, 0);
 
-    const descriptionBg = addWindow(this.scene, 0, headerBg.height, (this.scene.game.canvas.width / 18) - 2, (this.scene.game.canvas.height / 6) - headerBg.height - 26);
+    const descriptionBg = addWindow(this.scene, 0, headerBg.height, this.scene.scaledCanvas.width - this.optionsWidth, this.scene.scaledCanvas.height - headerBg.height - 26);
     descriptionBg.setName("window-desc-bg");
     descriptionBg.setOrigin(0, 0);
     descriptionBg.setPositionRelative(this.optionsBg, this.optionsBg.width, 0);
 
     this.descriptionText = new BBCodeText(this.scene, descriptionBg.x + 6, descriptionBg.y + 4, "", {
       fontFamily: "emerald",
-      fontSize: 96,
+      fontSize: 84,
       color: Color.ORANGE,
       padding: {
         bottom: 6
@@ -109,12 +112,12 @@ export default class GameChallengesUiHandler extends UiHandler {
     const startText = addTextObject(this.scene, 0, 0, i18next.t("common:start"), TextStyle.SETTINGS_LABEL);
     startText.setName("text-start");
     startText.setOrigin(0, 0);
-    startText.setPositionRelative(startBg, 8, 4);
+    startText.setPositionRelative(startBg, (startBg.width - startText.displayWidth) / 2, 4);
 
-    this.startCursor = this.scene.add.nineslice(0, 0, "summary_moves_cursor", undefined, (this.scene.game.canvas.width / 18) - 10, 16, 1, 1, 1, 1);
+    this.startCursor = this.scene.add.nineslice(0, 0, "summary_moves_cursor", undefined, descriptionBg.width - 8, 16, 1, 1, 1, 1);
     this.startCursor.setName("9s-start-cursor");
     this.startCursor.setOrigin(0, 0);
-    this.startCursor.setPositionRelative(startBg, 4, 4);
+    this.startCursor.setPositionRelative(startBg, 4, 3);
     this.startCursor.setVisible(false);
 
     this.valuesContainer = this.scene.add.container(0, 0);
@@ -140,7 +143,7 @@ export default class GameChallengesUiHandler extends UiHandler {
       };
     }
 
-    this.monoTypeValue = this.scene.add.sprite(8, 98, `types${Utils.verifyLang(i18next.resolvedLanguage) ? `_${i18next.resolvedLanguage}` : ""}`);
+    this.monoTypeValue = this.scene.add.sprite(8, 98, Utils.getLocalizedSpriteKey("types"));
     this.monoTypeValue.setName("challenge-value-monotype-sprite");
     this.monoTypeValue.setScale(0.86);
     this.monoTypeValue.setVisible(false);
@@ -355,7 +358,7 @@ export default class GameChallengesUiHandler extends UiHandler {
     let ret = super.setCursor(cursor);
 
     if (!this.cursorObj) {
-      this.cursorObj = this.scene.add.nineslice(0, 0, "summary_moves_cursor", undefined, (this.scene.game.canvas.width / 9) - 10, 16, 1, 1, 1, 1);
+      this.cursorObj = this.scene.add.nineslice(0, 0, "summary_moves_cursor", undefined, this.optionsWidth - 8, 16, 1, 1, 1, 1);
       this.cursorObj.setOrigin(0, 0);
       this.valuesContainer.add(this.cursorObj);
     }
diff --git a/src/ui/egg-gacha-ui-handler.ts b/src/ui/egg-gacha-ui-handler.ts
index 1c3140158b7..9497dfe58c6 100644
--- a/src/ui/egg-gacha-ui-handler.ts
+++ b/src/ui/egg-gacha-ui-handler.ts
@@ -355,11 +355,11 @@ export default class EggGachaUiHandler extends MessageUiHandler {
       this.gachaContainers[this.gachaCursor].moveTo(egg, 2);
 
       const doPullAnim = () => {
-        this.scene.playSound("gacha_running", { loop: true });
+        this.scene.playSound("se/gacha_running", { loop: true });
         this.scene.time.delayedCall(this.getDelayValue(count ? 500 : 1250), () => {
-          this.scene.playSound("gacha_dispense");
+          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),
@@ -367,7 +367,7 @@ export default class EggGachaUiHandler extends MessageUiHandler {
               ease: "Bounce.easeOut",
               onComplete: () => {
                 this.scene.time.delayedCall(this.getDelayValue(125), () => {
-                  this.scene.playSound("pb_catch");
+                  this.scene.playSound("se/pb_catch");
                   this.gachaHatches[this.gachaCursor].play("open");
                   this.scene.tweens.add({
                     targets: egg,
@@ -405,7 +405,7 @@ export default class EggGachaUiHandler extends MessageUiHandler {
       };
 
       if (!count) {
-        this.scene.playSound("gacha_dial");
+        this.scene.playSound("se/gacha_dial");
         this.scene.tweens.add({
           targets: this.gachaKnobs[this.gachaCursor],
           duration: this.getDelayValue(350),
diff --git a/src/ui/fight-ui-handler.ts b/src/ui/fight-ui-handler.ts
index 977daf3dc7a..0beaddbb517 100644
--- a/src/ui/fight-ui-handler.ts
+++ b/src/ui/fight-ui-handler.ts
@@ -44,7 +44,7 @@ export default class FightUiHandler extends UiHandler {
     this.moveInfoContainer.setName("move-info");
     ui.add(this.moveInfoContainer);
 
-    this.typeIcon = this.scene.add.sprite(this.scene.scaledCanvas.width - 57, -36, `types${Utils.verifyLang(i18next.resolvedLanguage) ? `_${i18next.resolvedLanguage}` : ""}`, "unknown");
+    this.typeIcon = this.scene.add.sprite(this.scene.scaledCanvas.width - 57, -36, Utils.getLocalizedSpriteKey("types"), "unknown");
     this.typeIcon.setVisible(false);
     this.moveInfoContainer.add(this.typeIcon);
 
@@ -179,15 +179,20 @@ export default class FightUiHandler extends UiHandler {
 
     if (hasMove) {
       const pokemonMove = moveset[cursor]!; // TODO: is the bang correct?
-      this.typeIcon.setTexture(`types${Utils.verifyLang(i18next.resolvedLanguage) ? `_${i18next.resolvedLanguage}` : ""}`, Type[pokemonMove.getMove().type].toLowerCase()).setScale(0.8);
-      this.moveCategoryIcon.setTexture("categories", MoveCategory[pokemonMove.getMove().category].toLowerCase()).setScale(1.0);
+      const moveType = pokemon.getMoveType(pokemonMove.getMove());
+      const textureKey = Utils.getLocalizedSpriteKey("types");
+      this.typeIcon.setTexture(textureKey, Type[moveType].toLowerCase()).setScale(0.8);
 
+      const moveCategory = pokemonMove.getMove().category;
+      this.moveCategoryIcon.setTexture("categories", MoveCategory[moveCategory].toLowerCase()).setScale(1.0);
       const power = pokemonMove.getMove().power;
       const accuracy = pokemonMove.getMove().accuracy;
       const maxPP = pokemonMove.getMovePp();
       const pp = maxPP - pokemonMove.ppUsed;
 
-      this.ppText.setText(`${Utils.padInt(pp, 2, "  ")}/${Utils.padInt(maxPP, 2, "  ")}`);
+      const ppLeftStr = Utils.padInt(pp, 2, "  ");
+      const ppMaxStr = Utils.padInt(maxPP, 2, "  ");
+      this.ppText.setText(`${ppLeftStr}/${ppMaxStr}`);
       this.powerText.setText(`${power >= 0 ? power : "---"}`);
       this.accuracyText.setText(`${accuracy >= 0 ? accuracy : "---"}`);
 
@@ -231,7 +236,7 @@ export default class FightUiHandler extends UiHandler {
    * Returns undefined if it's a status move
    */
   private getEffectivenessText(pokemon: Pokemon, opponent: Pokemon, pokemonMove: PokemonMove): string | undefined {
-    const effectiveness = opponent.getMoveEffectiveness(pokemon, pokemonMove);
+    const effectiveness = opponent.getMoveEffectiveness(pokemon, pokemonMove.getMove(), !opponent.battleData?.abilityRevealed);
     if (effectiveness === undefined) {
       return undefined;
     }
@@ -274,7 +279,7 @@ export default class FightUiHandler extends UiHandler {
     }
 
     const moveColors = opponents
-      .map((opponent) => opponent.getMoveEffectiveness(pokemon, pokemonMove))
+      .map((opponent) => opponent.getMoveEffectiveness(pokemon, pokemonMove.getMove(), !opponent.battleData.abilityRevealed))
       .sort((a, b) => b - a)
       .map((effectiveness) => getTypeDamageMultiplierColor(effectiveness ?? 0, "offense"));
 
diff --git a/src/ui/form-modal-ui-handler.ts b/src/ui/form-modal-ui-handler.ts
index 4516e39675c..8c4ea5f6768 100644
--- a/src/ui/form-modal-ui-handler.ts
+++ b/src/ui/form-modal-ui-handler.ts
@@ -6,7 +6,7 @@ import { WindowVariant, addWindow } from "./ui-theme";
 import InputText from "phaser3-rex-plugins/plugins/inputtext";
 import * as Utils from "../utils";
 import i18next from "i18next";
-import {Button} from "#enums/buttons";
+import { Button } from "#enums/buttons";
 
 export interface FormModalConfig extends ModalConfig {
   errorMessage?: string;
@@ -60,7 +60,7 @@ export abstract class FormModalUiHandler extends ModalUiHandler {
       const inputBg = addWindow(this.scene, 0, 0, 80, 16, false, false, 0, 0, WindowVariant.XTHIN);
 
       const isPassword = field.includes(i18next.t("menu:password")) || field.includes(i18next.t("menu:confirmPassword"));
-      const input = addTextInputObject(this.scene, 4, -2, 440, 116, TextStyle.TOOLTIP_CONTENT, { type: isPassword ? "password" : "text", maxLength: isPassword ? 64 : 16 });
+      const input = addTextInputObject(this.scene, 4, -2, 440, 116, TextStyle.TOOLTIP_CONTENT, { type: isPassword ? "password" : "text", maxLength: isPassword ? 64 : 18 });
       input.setOrigin(0, 0);
 
       inputContainer.add(inputBg);
diff --git a/src/ui/game-stats-ui-handler.ts b/src/ui/game-stats-ui-handler.ts
index c28e5d851a2..967b3ae0dc4 100644
--- a/src/ui/game-stats-ui-handler.ts
+++ b/src/ui/game-stats-ui-handler.ts
@@ -9,6 +9,7 @@ import { DexAttr, GameData } from "../system/game-data";
 import { speciesStarters } from "../data/pokemon-species";
 import {Button} from "#enums/buttons";
 import i18next from "i18next";
+import { UiTheme } from "#app/enums/ui-theme";
 
 interface DisplayStat {
   label_key?: string;
@@ -218,6 +219,9 @@ export default class GameStatsUiHandler extends UiHandler {
   private statLabels: Phaser.GameObjects.Text[];
   private statValues: Phaser.GameObjects.Text[];
 
+  private arrowUp: Phaser.GameObjects.Sprite;
+  private arrowDown: Phaser.GameObjects.Sprite;
+
   constructor(scene: BattleScene, mode: Mode | null = null) {
     super(scene, mode);
 
@@ -241,11 +245,9 @@ export default class GameStatsUiHandler extends UiHandler {
 
     const statsBgWidth = ((this.scene.game.canvas.width / 6) - 2) / 2;
     const [ statsBgLeft, statsBgRight ] = new Array(2).fill(null).map((_, i) => {
-      let width = statsBgWidth;
-      if (!i) {
-        width += 5;
-      }
-      const statsBg = addWindow(this.scene, statsBgWidth * i, headerBg.height, width, (this.scene.game.canvas.height / 6) - headerBg.height - 2, false, !!i, 2);
+      const width = statsBgWidth + 2;
+      const height = Math.floor((this.scene.game.canvas.height / 6) - headerBg.height - 2);
+      const statsBg = addWindow(this.scene, (statsBgWidth - 2) * i, headerBg.height, width, height, false, false, i>0?-3:0, 1);
       statsBg.setOrigin(0, 0);
       return statsBg;
     });
@@ -272,6 +274,14 @@ export default class GameStatsUiHandler extends UiHandler {
     this.gameStatsContainer.add(statsBgRight);
     this.gameStatsContainer.add(this.statsContainer);
 
+    // arrows to show that we can scroll through the stats
+    const isLegacyTheme = this.scene.uiTheme === UiTheme.LEGACY;
+    this.arrowDown = this.scene.add.sprite(statsBgWidth, this.scene.game.canvas.height / 6 - (isLegacyTheme? 9 : 5), "prompt");
+    this.gameStatsContainer.add(this.arrowDown);
+    this.arrowUp = this.scene.add.sprite(statsBgWidth, headerBg.height + (isLegacyTheme? 7 : 3), "prompt");
+    this.arrowUp.flipY = true;
+    this.gameStatsContainer.add(this.arrowUp);
+
     ui.add(this.gameStatsContainer);
 
     this.setCursor(0);
@@ -286,6 +296,15 @@ export default class GameStatsUiHandler extends UiHandler {
 
     this.updateStats();
 
+    this.arrowUp.play("prompt");
+    this.arrowDown.play("prompt");
+    if (this.scene.uiTheme === UiTheme.LEGACY) {
+      this.arrowUp.setTint(0x484848);
+      this.arrowDown.setTint(0x484848);
+    }
+
+    this.updateArrows();
+
     this.gameStatsContainer.setVisible(true);
 
     this.getUi().moveTo(this.gameStatsContainer, this.getUi().length - 1);
@@ -311,6 +330,17 @@ export default class GameStatsUiHandler extends UiHandler {
     }
   }
 
+  /**
+   * Show arrows at the top / bottom of the page if it's possible to scroll in that direction
+   */
+  updateArrows(): void {
+    const showUpArrow = this.cursor > 0;
+    this.arrowUp.setVisible(showUpArrow);
+
+    const showDownArrow = this.cursor < Math.ceil((Object.keys(displayStats).length - 18) / 2);
+    this.arrowDown.setVisible(showDownArrow);
+  }
+
   processInput(button: Button): boolean {
     const ui = this.getUi();
 
@@ -346,6 +376,7 @@ export default class GameStatsUiHandler extends UiHandler {
 
     if (ret) {
       this.updateStats();
+      this.updateArrows();
     }
 
     return ret;
diff --git a/src/ui/menu-ui-handler.ts b/src/ui/menu-ui-handler.ts
index 8adf9eee094..0bbfe21e4f9 100644
--- a/src/ui/menu-ui-handler.ts
+++ b/src/ui/menu-ui-handler.ts
@@ -8,7 +8,7 @@ import { OptionSelectConfig, OptionSelectItem } from "./abstact-option-select-ui
 import { Tutorial, handleTutorial } from "../tutorial";
 import { loggedInUser, updateUserInfo } from "../account";
 import i18next from "i18next";
-import {Button} from "#enums/buttons";
+import { Button } from "#enums/buttons";
 import { GameDataType } from "#enums/game-data-type";
 import BgmBar from "#app/ui/bgm-bar";
 
@@ -17,7 +17,6 @@ enum MenuOptions {
   ACHIEVEMENTS,
   STATS,
   RUN_HISTORY,
-  VOUCHERS,
   EGG_LIST,
   EGG_GACHA,
   MANAGE_DATA,
@@ -98,7 +97,6 @@ export default class MenuUiHandler extends MessageUiHandler {
 
   render() {
     const ui = this.getUi();
-    console.log(ui.getModeChain());
     this.excludedMenus = () => [
       { condition: ![Mode.COMMAND, Mode.TITLE].includes(ui.getModeChain()[0]), options: [ MenuOptions.EGG_GACHA, MenuOptions.EGG_LIST] },
       { condition: bypassLogin, options: [ MenuOptions.LOG_OUT ] }
@@ -308,16 +306,34 @@ export default class MenuUiHandler extends MessageUiHandler {
           return true;
         },
         keepOpen: true
-      },
-      {
-        label: i18next.t("menuUiHandler:cancel"),
+      }];
+    if (!bypassLogin && loggedInUser?.hasAdminRole) {
+      communityOptions.push({
+        label: "Admin",
         handler: () => {
-          this.scene.ui.revertMode();
+          ui.playSelect();
+          ui.setOverlayMode(Mode.ADMIN, {
+            buttonActions: [
+              () => {
+                ui.revertMode();
+              },
+              () => {
+                ui.revertMode();
+              }
+            ]
+          });
           return true;
-        }
+        },
+        keepOpen: true
+      });
+    }
+    communityOptions.push({
+      label: i18next.t("menuUiHandler:cancel"),
+      handler: () => {
+        this.scene.ui.revertMode();
+        return true;
       }
-    ];
-
+    });
     this.communityConfig = {
       xOffset: 98,
       options: communityOptions
@@ -342,7 +358,7 @@ export default class MenuUiHandler extends MessageUiHandler {
 
     this.getUi().hideTooltip();
 
-    this.scene.playSound("menu_open");
+    this.scene.playSound("ui/menu_open");
 
     handleTutorial(this.scene, Tutorial.Menu);
 
@@ -388,10 +404,6 @@ export default class MenuUiHandler extends MessageUiHandler {
         ui.setOverlayMode(Mode.RUN_HISTORY);
         success = true;
         break;
-      case MenuOptions.VOUCHERS:
-        ui.setOverlayMode(Mode.VOUCHERS);
-        success = true;
-        break;
       case MenuOptions.EGG_LIST:
         if (this.scene.gameData.eggs.length) {
           ui.revertMode();
diff --git a/src/ui/modifier-select-ui-handler.ts b/src/ui/modifier-select-ui-handler.ts
index bb1f970fe1c..4a567c926d7 100644
--- a/src/ui/modifier-select-ui-handler.ts
+++ b/src/ui/modifier-select-ui-handler.ts
@@ -334,7 +334,11 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
             success = false;
             break;
           case 1:
-            success = this.rerollButtonContainer.visible && this.setCursor(0);
+            if (this.lockRarityButtonContainer.visible) {
+              success = this.setCursor(3);
+            } else {
+              success = this.rerollButtonContainer.visible && this.setCursor(0);
+            }
             break;
           case 2:
             if (this.transferButtonContainer.visible) {
@@ -368,6 +372,13 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
           case 2:
             success = false;
             break;
+          case 3:
+            if (this.transferButtonContainer.visible) {
+              success = this.setCursor(1);
+            } else {
+              success = this.setCursor(2);
+            }
+            break;
           }
         } else if (this.cursor < this.getRowItems(this.rowCursor) - 1) {
           success = this.setCursor(this.cursor + 1);
@@ -643,7 +654,7 @@ class ModifierOption extends Phaser.GameObjects.Container {
           }
           const value = t.getValue();
           if (!bounce && value > lastValue) {
-            (this.scene as BattleScene).playSound("pb_bounce_1", { volume: 1 / ++bounceCount });
+            (this.scene as BattleScene).playSound("se/pb_bounce_1", { volume: 1 / ++bounceCount });
             bounce = true;
           } else if (bounce && value < lastValue) {
             bounce = false;
@@ -655,7 +666,7 @@ class ModifierOption extends Phaser.GameObjects.Container {
       for (let u = 0; u < this.modifierTypeOption.upgradeCount; u++) {
         const upgradeIndex = u;
         this.scene.time.delayedCall(remainingDuration - 2000 * (this.modifierTypeOption.upgradeCount - (upgradeIndex + 1 + upgradeCountOffset)), () => {
-          (this.scene as BattleScene).playSound("upgrade", { rate: 1 + 0.25 * upgradeIndex });
+          (this.scene as BattleScene).playSound("se/upgrade", { rate: 1 + 0.25 * upgradeIndex });
           this.pbTint.setPosition(this.pb.x, this.pb.y);
           this.pbTint.setTintFill(0xFFFFFF);
           this.pbTint.setAlpha(0);
@@ -689,7 +700,7 @@ class ModifierOption extends Phaser.GameObjects.Container {
 
       if (!this.modifierTypeOption.cost) {
         this.pb.setTexture("pb", `${this.getPbAtlasKey(0)}_open`);
-        (this.scene as BattleScene).playSound("pb_rel");
+        (this.scene as BattleScene).playSound("se/pb_rel");
 
         this.scene.tweens.add({
           targets: this.pb,
diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts
index 66c777944d1..e7c4069c16e 100644
--- a/src/ui/party-ui-handler.ts
+++ b/src/ui/party-ui-handler.ts
@@ -5,7 +5,7 @@ import { Command } from "./command-ui-handler";
 import MessageUiHandler from "./message-ui-handler";
 import { Mode } from "./ui";
 import * as Utils from "../utils";
-import { PokemonBaseStatModifier, PokemonFormChangeItemModifier, PokemonHeldItemModifier, SwitchEffectTransferModifier } from "../modifier/modifier";
+import { PokemonFormChangeItemModifier, PokemonHeldItemModifier, SwitchEffectTransferModifier } from "../modifier/modifier";
 import { allMoves, ForceSwitchOutAttr } from "../data/move";
 import { getGenderColor, getGenderSymbol } from "../data/gender";
 import { StatusEffect } from "../data/status-effect";
@@ -989,14 +989,8 @@ export default class PartyUiHandler extends MessageUiHandler {
       optionText.setOrigin(0, 0);
 
       /** For every item that has stack bigger than 1, display the current quantity selection */
-      if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER && this.transferQuantitiesMax[option] > 1) {
-        const itemModifier = itemModifiers[option];
-
-        /** Not sure why getMaxHeldItemCount had an error, but it only checks the Pokemon parameter if the modifier is PokemonBaseStatModifier */
-        if (itemModifier === undefined || itemModifier instanceof PokemonBaseStatModifier) {
-          continue;
-        }
-
+      const itemModifier = itemModifiers[option];
+      if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER && this.transferQuantitiesMax[option] > 1 && !this.transferMode && itemModifier !== undefined && itemModifier.type.name === optionName) {
         let amountText = ` (${this.transferQuantities[option]})`;
 
         /** If the amount held is the maximum, display the count in red */
diff --git a/src/ui/pokeball-tray.ts b/src/ui/pokeball-tray.ts
index cf3b24c4d11..0313812ef79 100644
--- a/src/ui/pokeball-tray.ts
+++ b/src/ui/pokeball-tray.ts
@@ -57,7 +57,7 @@ export default class PokeballTray extends Phaser.GameObjects.Container {
         ball.setFrame(ballFrame);
       });
 
-      (this.scene as BattleScene).playSound("pb_tray_enter");
+      (this.scene as BattleScene).playSound("se/pb_tray_enter");
 
       this.scene.tweens.add({
         targets: this,
@@ -71,7 +71,7 @@ export default class PokeballTray extends Phaser.GameObjects.Container {
               x: `${this.player ? "-" : "+"}=104`,
               duration: b * 100,
               ease: "Sine.easeIn",
-              onComplete: () => (this.scene as BattleScene).playSound(b < party.length ? "pb_tray_ball" : "pb_tray_empty")
+              onComplete: () => (this.scene as BattleScene).playSound(`se/${(b < party.length ? "pb_tray_ball" : "pb_tray_empty")}`)
             });
           });
         }
diff --git a/src/ui/run-history-ui-handler.ts b/src/ui/run-history-ui-handler.ts
index 253c49cd6ce..8f132a1ab1c 100644
--- a/src/ui/run-history-ui-handler.ts
+++ b/src/ui/run-history-ui-handler.ts
@@ -278,11 +278,12 @@ class RunEntryContainer extends Phaser.GameObjects.Container {
       const gameOutcomeLabel = addTextObject(this.scene, 8, 5, `${i18next.t("runHistory:victory")}`, TextStyle.WINDOW);
       this.add(gameOutcomeLabel);
     } else { // Run Result: Defeats
-      const genderLabel = (this.scene.gameData.gender === PlayerGender.FEMALE) ? "F" : "M";
+      const genderIndex = this.scene.gameData.gender ?? PlayerGender.UNSET;
+      const genderStr = PlayerGender[genderIndex].toLowerCase();
       // Defeats from wild Pokemon battles will show the Pokemon responsible by the text of the run result.
       if (data.battleType === BattleType.WILD) {
         const enemyContainer = this.scene.add.container(8, 5);
-        const gameOutcomeLabel = addTextObject(this.scene, 0, 0, `${i18next.t("runHistory:defeatedWild"+genderLabel)}`, TextStyle.WINDOW);
+        const gameOutcomeLabel = addTextObject(this.scene, 0, 0, `${i18next.t("runHistory:defeatedWild", { context: genderStr })}`, TextStyle.WINDOW);
         enemyContainer.add(gameOutcomeLabel);
         data.enemyParty.forEach((enemyData, e) => {
           const enemyIconContainer = this.scene.add.container(65+(e*25), -8);
@@ -307,10 +308,10 @@ class RunEntryContainer extends Phaser.GameObjects.Container {
         const RIVAL_TRAINER_ID_THRESHOLD = 375;
         if (data.trainer.trainerType >= RIVAL_TRAINER_ID_THRESHOLD) {
           const rivalName = (tObj.variant === TrainerVariant.FEMALE) ? "trainerNames:rival_female" : "trainerNames:rival";
-          const gameOutcomeLabel = addTextObject(this.scene, 8, 5, `${i18next.t("runHistory:defeatedRival"+genderLabel)} ${i18next.t(rivalName)}`, TextStyle.WINDOW);
+          const gameOutcomeLabel = addTextObject(this.scene, 8, 5, `${i18next.t("runHistory:defeatedRival", { context: genderStr })} ${i18next.t(rivalName)}`, TextStyle.WINDOW);
           this.add(gameOutcomeLabel);
         } else {
-          const gameOutcomeLabel = addTextObject(this.scene, 8, 5, `${i18next.t("runHistory:defeatedTrainer"+genderLabel)}${tObj.getName(0, true)}`, TextStyle.WINDOW);
+          const gameOutcomeLabel = addTextObject(this.scene, 8, 5, `${i18next.t("runHistory:defeatedTrainer", { context: genderStr })}${tObj.getName(0, true)}`, TextStyle.WINDOW);
           this.add(gameOutcomeLabel);
         }
       }
diff --git a/src/ui/run-info-ui-handler.ts b/src/ui/run-info-ui-handler.ts
index 79fc61596a0..25210277edc 100644
--- a/src/ui/run-info-ui-handler.ts
+++ b/src/ui/run-info-ui-handler.ts
@@ -42,7 +42,6 @@ enum RunInfoUiMode {
 export default class RunInfoUiHandler extends UiHandler {
   protected runInfo: SessionSaveData;
   protected isVictory: boolean;
-  protected isPGF: boolean;
   protected pageMode: RunInfoUiMode;
   protected runContainer: Phaser.GameObjects.Container;
 
@@ -94,7 +93,6 @@ export default class RunInfoUiHandler extends UiHandler {
     // Assigning information necessary for the UI's creation
     this.runInfo = this.scene.gameData.parseSessionData(JSON.stringify(run.entry));
     this.isVictory = run.isVictory;
-    this.isPGF = this.scene.gameData.gender === PlayerGender.FEMALE;
     this.pageMode = RunInfoUiMode.MAIN;
 
     // Creates Header and adds to this.runContainer
@@ -173,8 +171,10 @@ export default class RunInfoUiHandler extends UiHandler {
    *
    */
   private async parseRunResult() {
+    const genderIndex = this.scene.gameData.gender ?? PlayerGender.UNSET;
+    const genderStr = PlayerGender[genderIndex];
     const runResultTextStyle = this.isVictory ? TextStyle.SUMMARY : TextStyle.SUMMARY_RED;
-    const runResultTitle = this.isVictory ? i18next.t("runHistory:victory") : (this.isPGF ? i18next.t("runHistory:defeatedF") : i18next.t("runHistory:defeatedM"));
+    const runResultTitle = this.isVictory ? i18next.t("runHistory:victory") : i18next.t("runHistory:defeated", { context: genderStr });
     const runResultText = addBBCodeTextObject(this.scene, 6, 5, `${runResultTitle} - ${i18next.t("saveSlotSelectUiHandler:wave")} ${this.runInfo.waveIndex}`, runResultTextStyle, {fontSize : "65px", lineSpacing: 0.1});
 
     if (this.isVictory) {
@@ -374,23 +374,14 @@ export default class RunInfoUiHandler extends UiHandler {
     case GameModes.CHALLENGE:
       modeText.appendText(`${i18next.t("gameMode:challenge")}`, false);
       modeText.appendText(`\t\t${i18next.t("runHistory:challengeRules")}: `);
-      const runChallenges = this.runInfo.challenges;
-      const rules: string[] = [];
-      for (let i = 0; i < runChallenges.length; i++) {
-        if (runChallenges[i].id === Challenges.SINGLE_GENERATION && runChallenges[i].value !== 0) {
-          rules.push(i18next.t(`runHistory:challengeMonoGen${runChallenges[i].value}`));
-        } else if (runChallenges[i].id === Challenges.SINGLE_TYPE && runChallenges[i].value !== 0) {
-          rules.push(i18next.t(`pokemonInfo:Type.${Type[runChallenges[i].value-1]}` as const));
-        } else if (runChallenges[i].id === Challenges.FRESH_START && runChallenges[i].value !== 0) {
-          rules.push(i18next.t("challenges:freshStart.name"));
-        }
-      }
+      const rules: string[] = this.challengeParser();
       if (rules) {
         for (let i = 0; i < rules.length; i++) {
+          const newline = i > 0 && i%2 === 0;
           if (i > 0) {
-            modeText.appendText(" + ", false);
+            modeText.appendText(" + ", newline);
           }
-          modeText.appendText(rules[i], false);
+          modeText.appendText(rules[i], newline);
         }
       }
       break;
@@ -409,10 +400,12 @@ export default class RunInfoUiHandler extends UiHandler {
 
     // Duration + Money
     const runInfoTextContainer = this.scene.add.container(0, 0);
-    const runInfoText = addBBCodeTextObject(this.scene, 7, 0, "", TextStyle.WINDOW, {fontSize : "50px", lineSpacing:3});
+    // Japanese is set to a greater line spacing of 35px in addBBCodeTextObject() if lineSpacing < 12.
+    const lineSpacing = (i18next.resolvedLanguage === "ja") ? 12 : 3;
+    const runInfoText = addBBCodeTextObject(this.scene, 7, 0, "", TextStyle.WINDOW, {fontSize: "50px", lineSpacing: lineSpacing});
     const runTime = Utils.getPlayTimeString(this.runInfo.playTime);
     runInfoText.appendText(`${i18next.t("runHistory:runLength")}: ${runTime}`, false);
-    const runMoney = Utils.formatMoney(this.runInfo.money, 1000);
+    const runMoney = Utils.formatMoney(this.scene.moneyFormat, this.runInfo.money);
     runInfoText.appendText(`[color=${getTextColor(TextStyle.MONEY)}]${i18next.t("battleScene:moneyOwned", {formattedMoney : runMoney})}[/color]`);
     runInfoText.setPosition(7, 70);
     runInfoTextContainer.add(runInfoText);
@@ -464,6 +457,34 @@ export default class RunInfoUiHandler extends UiHandler {
     this.runContainer.add(this.runInfoContainer);
   }
 
+  /**
+   * This function parses the Challenges section of the Run Entry and returns a list of active challenge.
+   * @return string[] of active challenge names
+   */
+  private challengeParser(): string[] {
+    const rules: string[] = [];
+    for (let i = 0; i < this.runInfo.challenges.length; i++) {
+      if (this.runInfo.challenges[i].value !== 0) {
+        switch (this.runInfo.challenges[i].id) {
+        case Challenges.SINGLE_GENERATION:
+          rules.push(i18next.t(`runHistory:challengeMonoGen${this.runInfo.challenges[i].value}`));
+          break;
+        case Challenges.SINGLE_TYPE:
+          rules.push(i18next.t(`pokemonInfo:Type.${Type[this.runInfo.challenges[i].value-1]}` as const));
+          break;
+        case Challenges.FRESH_START:
+          rules.push(i18next.t("challenges:freshStart.name"));
+          break;
+        case Challenges.INVERSE_BATTLE:
+          //
+          rules.push(i18next.t("challenges:inverseBattle.shortName").split("").reverse().join(""));
+          break;
+        }
+      }
+    }
+    return rules;
+  }
+
   /**
    * Parses and displays the run's player party.
    * Default Information: Icon, Level, Nature, Ability, Passive, Shiny Status, Fusion Status, Stats, and Moves.
@@ -513,7 +534,9 @@ export default class RunInfoUiHandler extends UiHandler {
       }
       const pPassiveInfo = pokemon.passive ? passiveLabel+": "+pokemon.getPassiveAbility().name : "";
       const pAbilityInfo = abilityLabel + ": " + pokemon.getAbility().name;
-      const pokeInfoText = addBBCodeTextObject(this.scene, 0, 0, pName, TextStyle.SUMMARY, {fontSize: textContainerFontSize, lineSpacing:3});
+      // Japanese is set to a greater line spacing of 35px in addBBCodeTextObject() if lineSpacing < 12.
+      const lineSpacing = (i18next.resolvedLanguage === "ja") ? 12 : 3;
+      const pokeInfoText = addBBCodeTextObject(this.scene, 0, 0, pName, TextStyle.SUMMARY, {fontSize: textContainerFontSize, lineSpacing: lineSpacing});
       pokeInfoText.appendText(`${i18next.t("saveSlotSelectUiHandler:lv")}${Utils.formatFancyLargeNumber(pokemon.level, 1)} - ${pNature}`);
       pokeInfoText.appendText(pAbilityInfo);
       pokeInfoText.appendText(pPassiveInfo);
@@ -537,12 +560,12 @@ export default class RunInfoUiHandler extends UiHandler {
       const speedLabel = (currentLanguage==="es"||currentLanguage==="pt_BR") ? i18next.t("runHistory:SPDshortened") : i18next.t("pokemonInfo:Stat.SPDshortened");
       const speed = speedLabel+": "+pStats[5];
       // Column 1: HP Atk Def
-      const pokeStatText1 = addBBCodeTextObject(this.scene, -5, 0, hp, TextStyle.SUMMARY, {fontSize: textContainerFontSize, lineSpacing:3});
+      const pokeStatText1 = addBBCodeTextObject(this.scene, -5, 0, hp, TextStyle.SUMMARY, {fontSize: textContainerFontSize, lineSpacing: lineSpacing});
       pokeStatText1.appendText(atk);
       pokeStatText1.appendText(def);
       pokeStatTextContainer.add(pokeStatText1);
       // Column 2: SpAtk SpDef Speed
-      const pokeStatText2 = addBBCodeTextObject(this.scene, 25, 0, spatk, TextStyle.SUMMARY, {fontSize: textContainerFontSize, lineSpacing:3});
+      const pokeStatText2 = addBBCodeTextObject(this.scene, 25, 0, spatk, TextStyle.SUMMARY, {fontSize: textContainerFontSize, lineSpacing: lineSpacing});
       pokeStatText2.appendText(spdef);
       pokeStatText2.appendText(speed);
       pokeStatTextContainer.add(pokeStatText2);
@@ -680,7 +703,9 @@ export default class RunInfoUiHandler extends UiHandler {
    */
   private createVictorySplash(): void {
     this.endCardContainer = this.scene.add.container(0, 0);
-    const endCard = this.scene.add.image(0, 0, `end_${this.isPGF ? "f" : "m"}`);
+    const genderIndex = this.scene.gameData.gender ?? PlayerGender.UNSET;
+    const isFemale = genderIndex === PlayerGender.FEMALE;
+    const endCard = this.scene.add.image(0, 0, `end_${isFemale ? "f" : "m"}`);
     endCard.setOrigin(0);
     endCard.setScale(0.5);
     const text = addTextObject(this.scene, this.scene.game.canvas.width / 12, (this.scene.game.canvas.height / 6) - 16, i18next.t("battle:congratulations"), TextStyle.SUMMARY, { fontSize: "128px" });
@@ -694,16 +719,19 @@ export default class RunInfoUiHandler extends UiHandler {
    * This could be adapted into a public-facing method for victory screens. Perhaps.
    */
   private createHallofFame(): void {
+    const genderIndex = this.scene.gameData.gender ?? PlayerGender.UNSET;
+    const isFemale = genderIndex === PlayerGender.FEMALE;
+    const genderStr = PlayerGender[genderIndex].toLowerCase();
     // Issue Note (08-05-2024): It seems as if fused pokemon do not appear with the averaged color b/c pokemonData's loadAsset requires there to be some active battle?
     // As an alternative, the icons of the second/bottom fused Pokemon have been placed next to their fellow fused Pokemon in Hall of Fame
     this.hallofFameContainer = this.scene.add.container(0, 0);
     // Thank you Hayuna for the code
-    const endCard = this.scene.add.image(0, 0, `end_${this.isPGF ? "f" : "m"}`);
+    const endCard = this.scene.add.image(0, 0, `end_${isFemale ? "f" : "m"}`);
     endCard.setOrigin(0);
     endCard.setPosition(-1, -1);
     endCard.setScale(0.5);
     const endCardCoords = endCard.getBottomCenter();
-    const overlayColor = this.isPGF ? "red" : "blue";
+    const overlayColor = isFemale ? "red" : "blue";
     const hallofFameBg = this.scene.add.image(0, 0, "hall_of_fame_"+overlayColor);
     hallofFameBg.setPosition(159, 89);
     hallofFameBg.setSize(this.scene.game.canvas.width, this.scene.game.canvas.height+10);
@@ -711,7 +739,7 @@ export default class RunInfoUiHandler extends UiHandler {
     this.hallofFameContainer.add(endCard);
     this.hallofFameContainer.add(hallofFameBg);
 
-    const hallofFameText = addTextObject(this.scene, 0, 0, i18next.t("runHistory:hallofFameText"+(this.isPGF ? "F" : "M")), TextStyle.WINDOW);
+    const hallofFameText = addTextObject(this.scene, 0, 0, i18next.t("runHistory:hallofFameText", { context: genderStr }), TextStyle.WINDOW);
     hallofFameText.setPosition(endCardCoords.x-(hallofFameText.displayWidth/2), 164);
     this.hallofFameContainer.add(hallofFameText);
     this.runInfo.party.forEach((p, i) => {
diff --git a/src/ui/settings/settings-audio-ui-handler.ts b/src/ui/settings/settings-audio-ui-handler.ts
index b834e37efe5..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 = 4;
+    this.rowsToDisplay = 6;
   }
 }
diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts
index 97064cd9061..267a62104e3 100644
--- a/src/ui/starter-select-ui-handler.ts
+++ b/src/ui/starter-select-ui-handler.ts
@@ -131,6 +131,8 @@ const starterCandyCosts: { passive: integer, costReduction: [integer, integer],
   { passive: 10, costReduction: [5, 15], egg: 10 },  // 10 Cost
 ];
 
+const valueReductionMax = 2;
+
 // Position of UI elements
 const filterBarHeight = 17;
 const speciesContainerX = 109; // if team on the RIGHT: 109 / if on the LEFT: 143
@@ -408,7 +410,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       if (index === 0 || index === 19) {
         return;
       }
-      const typeSprite = this.scene.add.sprite(0, 0, `types${Utils.verifyLang(i18next.resolvedLanguage) ? `_${i18next.resolvedLanguage}` : ""}`);
+      const typeSprite = this.scene.add.sprite(0, 0, Utils.getLocalizedSpriteKey("types"));
       typeSprite.setScale(0.5);
       typeSprite.setFrame(type.toLowerCase());
       typeOptions.push(new DropDownOption(this.scene, index, new DropDownLabel("", typeSprite)));
@@ -666,12 +668,12 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     this.pokemonSprite.setPipeline(this.scene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], ignoreTimeTint: true });
     this.starterSelectContainer.add(this.pokemonSprite);
 
-    this.type1Icon = this.scene.add.sprite(8, 98, `types${Utils.verifyLang(i18next.resolvedLanguage) ? `_${i18next.resolvedLanguage}` : ""}`);
+    this.type1Icon = this.scene.add.sprite(8, 98, Utils.getLocalizedSpriteKey("types"));
     this.type1Icon.setScale(0.5);
     this.type1Icon.setOrigin(0, 0);
     this.starterSelectContainer.add(this.type1Icon);
 
-    this.type2Icon = this.scene.add.sprite(26, 98, `types${Utils.verifyLang(i18next.resolvedLanguage) ? `_${i18next.resolvedLanguage}` : ""}`);
+    this.type2Icon = this.scene.add.sprite(26, 98, Utils.getLocalizedSpriteKey("types"));
     this.type2Icon.setScale(0.5);
     this.type2Icon.setOrigin(0, 0);
     this.starterSelectContainer.add(this.type2Icon);
@@ -913,7 +915,9 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       this.allSpecies.forEach((species, s) => {
         const icon = this.starterContainers[s].icon;
         const dexEntry = this.scene.gameData.dexData[species.speciesId];
-        this.starterPreferences[species.speciesId] = this.starterPreferences[species.speciesId] ?? {};
+
+        // Initialize the StarterAttributes for this species
+        this.starterPreferences[species.speciesId] = this.initStarterPrefs(species);
 
         if (dexEntry.caughtAttr) {
           icon.clearTint();
@@ -940,6 +944,93 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     return false;
   }
 
+  /**
+   * Get the starter attributes for the given PokemonSpecies, after sanitizing them.
+   * If somehow a preference is set for a form, variant, gender, ability or nature
+   * that wasn't actually unlocked or is invalid it will be cleared here
+   *
+   * @param species The species to get Starter Preferences for
+   * @returns StarterAttributes for the species
+   */
+  initStarterPrefs(species: PokemonSpecies): StarterAttributes {
+    const starterAttributes = this.starterPreferences[species.speciesId];
+    const dexEntry = this.scene.gameData.dexData[species.speciesId];
+    const starterData = this.scene.gameData.starterData[species.speciesId];
+
+    // no preferences or Pokemon wasn't caught, return empty attribute
+    if (!starterAttributes || !dexEntry.caughtAttr) {
+      return {};
+    }
+
+    const caughtAttr = dexEntry.caughtAttr;
+
+    const hasShiny = caughtAttr & DexAttr.SHINY;
+    const hasNonShiny = caughtAttr & DexAttr.NON_SHINY;
+    if (starterAttributes.shiny && !hasShiny) {
+      // shiny form wasn't unlocked, purging shiny and variant setting
+      delete starterAttributes.shiny;
+      delete starterAttributes.variant;
+    } else if (starterAttributes.shiny === false && !hasNonShiny) {
+      // non shiny form wasn't unlocked, purging shiny setting
+      delete starterAttributes.shiny;
+    }
+
+    if (starterAttributes.variant !== undefined && !isNaN(starterAttributes.variant)) {
+      const unlockedVariants = [
+        hasNonShiny,
+        hasShiny && caughtAttr & DexAttr.DEFAULT_VARIANT,
+        hasShiny && caughtAttr & DexAttr.VARIANT_2,
+        hasShiny && caughtAttr & DexAttr.VARIANT_3
+      ];
+      if (!unlockedVariants[starterAttributes.variant + 1]) { // add 1 as -1 = non-shiny
+        // requested variant wasn't unlocked, purging setting
+        delete starterAttributes.variant;
+      }
+    }
+
+    if (starterAttributes.female !== undefined) {
+      if (!(starterAttributes.female ? caughtAttr & DexAttr.FEMALE : caughtAttr & DexAttr.MALE)) {
+        // requested gender wasn't unlocked, purging setting
+        delete starterAttributes.female;
+      }
+    }
+
+    if (starterAttributes.ability !== undefined) {
+      const speciesHasSingleAbility = species.ability2 === species.ability1;
+      const abilityAttr = starterData.abilityAttr;
+      const hasAbility1 = abilityAttr & AbilityAttr.ABILITY_1;
+      const hasAbility2 = abilityAttr & AbilityAttr.ABILITY_2;
+      const hasHiddenAbility = abilityAttr & AbilityAttr.ABILITY_HIDDEN;
+      // Due to a past bug it is possible that some Pokemon with a single ability have the ability2 flag
+      // In this case, we only count ability2 as valid if ability1 was not unlocked, otherwise we ignore it
+      const unlockedAbilities = [
+        hasAbility1,
+        speciesHasSingleAbility ? hasAbility2 && !hasAbility1 : hasAbility2,
+        hasHiddenAbility
+      ];
+      if (!unlockedAbilities[starterAttributes.ability]) {
+        // requested ability wasn't unlocked, purging setting
+        delete starterAttributes.ability;
+      }
+    }
+
+    const selectedForm = starterAttributes.form;
+    if (selectedForm !== undefined && (!species.forms[selectedForm]?.isStarterSelectable || !(caughtAttr & this.scene.gameData.getFormAttr(selectedForm)))) {
+      // requested form wasn't unlocked/isn't a starter form, purging setting
+      delete starterAttributes.form;
+    }
+
+    if (starterAttributes.nature !== undefined) {
+      const unlockedNatures = this.scene.gameData.getNaturesForAttr(dexEntry.natureAttr);
+      if (unlockedNatures.indexOf(starterAttributes.nature as unknown as Nature) < 0) {
+        // requested nature wasn't unlocked, purging setting
+        delete starterAttributes.nature;
+      }
+    }
+
+    return starterAttributes;
+  }
+
   /**
    * Set the selections for all filters to their default starting value
    */
@@ -1009,11 +1100,11 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     const starterData = this.scene.gameData.starterData[speciesId];
 
     return starterData.candyCount >= getValueReductionCandyCounts(speciesStarters[speciesId])[starterData.valueReduction]
-        && starterData.valueReduction < 2;
+        && starterData.valueReduction < valueReductionMax;
   }
 
   /**
-   * Determines if an same species egg can be baught for the given species ID
+   * Determines if an same species egg can be bought for the given species ID
    * @param speciesId The ID of the species to check the value reduction of
    * @returns true if the user has enough candies
    */
@@ -1062,15 +1153,18 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
         }
       ],};
 
-    const passiveAvailable = this.isPassiveAvailable(species.speciesId);
-    // 'Only Passives' mode
+    const isPassiveAvailable = this.isPassiveAvailable(species.speciesId);
+    const isValueReductionAvailable = this.isValueReductionAvailable(species.speciesId);
+    const isSameSpeciesEggAvailable = this.isSameSpeciesEggAvailable(species.speciesId);
+
+    // 'Passives Only' mode
     if (this.scene.candyUpgradeNotification === 1) {
-      if (passiveAvailable) {
+      if (isPassiveAvailable) {
         this.scene.tweens.chain(tweenChain).paused = startPaused;
       }
     // 'On' mode
     } else if (this.scene.candyUpgradeNotification === 2) {
-      if (passiveAvailable || this.isValueReductionAvailable(species.speciesId)) {
+      if (isPassiveAvailable || isValueReductionAvailable || isSameSpeciesEggAvailable) {
         this.scene.tweens.chain(tweenChain).paused = startPaused;
       }
     }
@@ -1089,16 +1183,19 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       return;
     }
 
-    const passiveAvailable = this.isPassiveAvailable(species.speciesId);
-    // 'Only Passive Unlocks' mode
+    const isPassiveAvailable = this.isPassiveAvailable(species.speciesId);
+    const isValueReductionAvailable = this.isValueReductionAvailable(species.speciesId);
+    const isSameSpeciesEggAvailable = this.isSameSpeciesEggAvailable(species.speciesId);
+
+    // 'Passive Only' mode
     if (this.scene.candyUpgradeNotification === 1) {
-      starter.candyUpgradeIcon.setVisible(slotVisible && passiveAvailable);
+      starter.candyUpgradeIcon.setVisible(slotVisible && isPassiveAvailable);
       starter.candyUpgradeOverlayIcon.setVisible(slotVisible && starter.candyUpgradeIcon.visible);
 
       // 'On' mode
     } else if (this.scene.candyUpgradeNotification === 2) {
       starter.candyUpgradeIcon.setVisible(
-        slotVisible && ( passiveAvailable || this.isValueReductionAvailable(species.speciesId)));
+        slotVisible && ( isPassiveAvailable || isValueReductionAvailable || isSameSpeciesEggAvailable ));
       starter.candyUpgradeOverlayIcon.setVisible(slotVisible && starter.candyUpgradeIcon.visible);
     }
   }
@@ -1630,7 +1727,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
               });
             }
             const valueReduction = starterData.valueReduction;
-            if (valueReduction < 2) {
+            if (valueReduction < valueReductionMax) {
               const reductionCost = getValueReductionCandyCounts(speciesStarters[this.lastSpecies.speciesId])[valueReduction];
               options.push({
                 label: `x${reductionCost} ${i18next.t("starterSelectUiHandler:reduceCost")}`,
@@ -1648,7 +1745,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
                     });
                     this.tryUpdateValue(0);
                     ui.setMode(Mode.STARTER_SELECT);
-                    this.scene.playSound("buy");
+                    this.scene.playSound("se/buy");
 
                     // if starterContainer exists, update the value reduction background
                     if (starterContainer) {
@@ -1693,7 +1790,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
                     }
                   });
                   ui.setMode(Mode.STARTER_SELECT);
-                  this.scene.playSound("buy");
+                  this.scene.playSound("se/buy");
 
                   return true;
                 }
@@ -1741,21 +1838,17 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
         switch (button) {
         case Button.CYCLE_SHINY:
           if (this.canCycleShiny) {
-            const newVariant = props.variant;
+            const newVariant = starterAttributes.variant ? starterAttributes.variant as Variant : props.variant;
             starterAttributes.shiny = starterAttributes.shiny ? !starterAttributes.shiny : true;
-            this.setSpeciesDetails(this.lastSpecies, !props.shiny, undefined, undefined, props.shiny ? 0 : undefined, undefined, undefined);
+            this.setSpeciesDetails(this.lastSpecies, !props.shiny, undefined, undefined, props.shiny ? 0 : newVariant, 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));
               this.pokemonShinyIcon.setTint(tint);
               this.pokemonShinyIcon.setVisible(true);
             } else {
-              // starterAttributes.variant = 0;
-              if (starterAttributes?.variant) {
-                delete starterAttributes.variant;
-              }
               this.pokemonShinyIcon.setVisible(false);
               success = true;
             }
@@ -1787,15 +1880,17 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
           if (this.canCycleAbility) {
             const abilityCount = this.lastSpecies.getAbilityCount();
             const abilityAttr = this.scene.gameData.starterData[this.lastSpecies.speciesId].abilityAttr;
+            const hasAbility1 = abilityAttr & AbilityAttr.ABILITY_1;
             let newAbilityIndex = this.abilityCursor;
             do {
               newAbilityIndex = (newAbilityIndex + 1) % abilityCount;
-              if (!newAbilityIndex) {
-                if (abilityAttr & AbilityAttr.ABILITY_1) {
+              if (newAbilityIndex === 0) {
+                if (hasAbility1) {
                   break;
                 }
               } else if (newAbilityIndex === 1) {
-                if (this.lastSpecies.ability1 === this.lastSpecies.ability2) {
+                // If ability 1 and 2 are the same and ability 1 is unlocked, skip over ability 2
+                if (this.lastSpecies.ability1 === this.lastSpecies.ability2 && hasAbility1) {
                   newAbilityIndex = (newAbilityIndex + 1) % abilityCount;
                 }
                 break;
@@ -2266,43 +2361,39 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       container.cost = this.scene.gameData.getSpeciesStarterValue(container.species.speciesId);
 
       // First, ensure you have the caught attributes for the species else default to bigint 0
-      const isCaught = this.scene.gameData.dexData[container.species.speciesId]?.caughtAttr || BigInt(0);
-
-      // Define the variables based on whether their respective variants have been caught
-      const isVariant3Caught = !!(isCaught & DexAttr.VARIANT_3);
-      const isVariant2Caught = !!(isCaught & DexAttr.VARIANT_2);
-      const isVariantCaught = !!(isCaught & DexAttr.SHINY);
-      const isUncaught = !isCaught && !isVariantCaught && !isVariant2Caught && !isVariant3Caught;
-      const isPassiveUnlocked = this.scene.gameData.starterData[container.species.speciesId].passiveAttr > 0;
-      const isPassiveUnlockable = this.isPassiveAvailable(container.species.speciesId) && !isPassiveUnlocked;
-      const isCostReduced = this.scene.gameData.starterData[container.species.speciesId].valueReduction > 0;
-      const isCostReductionUnlockable = this.isValueReductionAvailable(container.species.speciesId);
-      const isFavorite = this.starterPreferences[container.species.speciesId]?.favorite ?? false;
-
-      const isWin = this.scene.gameData.starterData[container.species.speciesId].classicWinCount > 0;
-      const isNotWin = this.scene.gameData.starterData[container.species.speciesId].classicWinCount === 0;
-      const isUndefined = this.scene.gameData.starterData[container.species.speciesId].classicWinCount === undefined;
-      const isHA = this.scene.gameData.starterData[container.species.speciesId].abilityAttr & AbilityAttr.ABILITY_HIDDEN;
-      const isEggPurchasable = this.isSameSpeciesEggAvailable(container.species.speciesId);
+      const caughtAttr = this.scene.gameData.dexData[container.species.speciesId]?.caughtAttr || BigInt(0);
+      const starterData = this.scene.gameData.starterData[container.species.speciesId];
 
+      // Gen filter
       const fitsGen =   this.filterBar.getVals(DropDownColumn.GEN).includes(container.species.generation);
 
+      // Type filter
       const fitsType =  this.filterBar.getVals(DropDownColumn.TYPES).some(type => container.species.isOfType((type as number) - 1));
 
+      // Caught / Shiny filter
+      const isNonShinyCaught = !!(caughtAttr & DexAttr.NON_SHINY);
+      const isShinyCaught = !!(caughtAttr & DexAttr.SHINY);
+      const isVariant1Caught = isShinyCaught && !!(caughtAttr & DexAttr.DEFAULT_VARIANT);
+      const isVariant2Caught = isShinyCaught && !!(caughtAttr & DexAttr.VARIANT_2);
+      const isVariant3Caught = isShinyCaught && !!(caughtAttr & DexAttr.VARIANT_3);
+      const isUncaught = !isNonShinyCaught && !isVariant1Caught && !isVariant2Caught && !isVariant3Caught;
       const fitsCaught = this.filterBar.getVals(DropDownColumn.CAUGHT).some(caught => {
         if (caught === "SHINY3") {
           return isVariant3Caught;
         } else if (caught === "SHINY2") {
           return isVariant2Caught && !isVariant3Caught;
         } else if (caught === "SHINY") {
-          return isVariantCaught && !isVariant2Caught && !isVariant3Caught;
+          return isVariant1Caught && !isVariant2Caught && !isVariant3Caught;
         } else if (caught === "NORMAL") {
-          return isCaught && !isVariantCaught && !isVariant2Caught && !isVariant3Caught;
+          return isNonShinyCaught && !isVariant1Caught && !isVariant2Caught && !isVariant3Caught;
         } else if (caught === "UNCAUGHT") {
           return isUncaught;
         }
       });
 
+      // Passive Filter
+      const isPassiveUnlocked = starterData.passiveAttr > 0;
+      const isPassiveUnlockable = this.isPassiveAvailable(container.species.speciesId) && !isPassiveUnlocked;
       const fitsPassive = this.filterBar.getVals(DropDownColumn.UNLOCKS).some(unlocks => {
         if (unlocks.val === "PASSIVE" && unlocks.state === DropDownState.ON) {
           return isPassiveUnlocked;
@@ -2315,6 +2406,9 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
         }
       });
 
+      // Cost Reduction Filter
+      const isCostReduced = starterData.valueReduction > 0;
+      const isCostReductionUnlockable = this.isValueReductionAvailable(container.species.speciesId);
       const fitsCostReduction = this.filterBar.getVals(DropDownColumn.UNLOCKS).some(unlocks => {
         if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.ON) {
           return isCostReduced;
@@ -2327,6 +2421,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
         }
       });
 
+      // Favorite Filter
+      const isFavorite = this.starterPreferences[container.species.speciesId]?.favorite ?? false;
       const fitsFavorite = this.filterBar.getVals(DropDownColumn.MISC).some(misc => {
         if (misc.val === "FAVORITE" && misc.state === DropDownState.ON) {
           return isFavorite;
@@ -2339,28 +2435,34 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
         }
       });
 
+      // Ribbon / Classic Win Filter
+      const hasWon = starterData.classicWinCount > 0;
+      const hasNotWon = starterData.classicWinCount === 0;
+      const isUndefined = starterData.classicWinCount === undefined;
       const fitsWin = this.filterBar.getVals(DropDownColumn.MISC).some(misc => {
-        if (container.species.speciesId < 10) {
-        }
         if (misc.val === "WIN" && misc.state === DropDownState.ON) {
-          return isWin;
+          return hasWon;
         } else if (misc.val === "WIN" && misc.state === DropDownState.EXCLUDE) {
-          return isNotWin || isUndefined;
+          return hasNotWon || isUndefined;
         } else if (misc.val === "WIN" && misc.state === DropDownState.OFF) {
           return true;
         }
       });
 
+      // HA Filter
+      const hasHA = starterData.abilityAttr & AbilityAttr.ABILITY_HIDDEN;
       const fitsHA = this.filterBar.getVals(DropDownColumn.MISC).some(misc => {
         if (misc.val === "HIDDEN_ABILITY" && misc.state === DropDownState.ON) {
-          return isHA;
+          return hasHA;
         } else if (misc.val === "HIDDEN_ABILITY" && misc.state === DropDownState.EXCLUDE) {
-          return !isHA;
+          return !hasHA;
         } else if (misc.val === "HIDDEN_ABILITY" && misc.state === DropDownState.OFF) {
           return true;
         }
       });
 
+      // Egg Purchasable Filter
+      const isEggPurchasable = this.isSameSpeciesEggAvailable(container.species.speciesId);
       const fitsEgg = this.filterBar.getVals(DropDownColumn.MISC).some(misc => {
         if (misc.val === "EGG" && misc.state === DropDownState.ON) {
           return isEggPurchasable;
@@ -2371,6 +2473,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
         }
       });
 
+      // Pokerus Filter
       const fitsPokerus = this.filterBar.getVals(DropDownColumn.MISC).some(misc => {
         if (misc.val === "POKERUS" && misc.state === DropDownState.ON) {
           return this.pokerusSpecies.includes(container.species);
@@ -2569,56 +2672,13 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     this.natureCursor = species ? this.scene.gameData.getSpeciesDefaultNature(species) : 0;
 
     const starterAttributes : StarterAttributes | null = species ? {...this.starterPreferences[species.speciesId]} : null;
-    // validate starterAttributes
-    if (starterAttributes) {
-      // this may cause changes so we created a copy of the attributes before
-      if (starterAttributes.variant && !isNaN(starterAttributes.variant)) {
-        if (![
-          this.speciesStarterDexEntry!.caughtAttr & DexAttr.NON_SHINY, // TODO: is that bang correct?
-          this.speciesStarterDexEntry!.caughtAttr & DexAttr.DEFAULT_VARIANT, // TODO: is that bang correct?
-          this.speciesStarterDexEntry!.caughtAttr & DexAttr.VARIANT_2, // TODO: is that bang correct?
-          this.speciesStarterDexEntry!.caughtAttr & DexAttr.VARIANT_3 // TODO: is that bang correct?
-        ][starterAttributes.variant+1]) { // add 1 as -1 = non-shiny
-          // requested variant wasn't unlocked, purging setting
-          delete starterAttributes.variant;
-        }
-      }
-
-      if (typeof starterAttributes.female !== "boolean" || !(starterAttributes.female ?
-        this.speciesStarterDexEntry!.caughtAttr & DexAttr.FEMALE : // TODO: is this bang correct?
-        this.speciesStarterDexEntry!.caughtAttr & DexAttr.MALE // TODO: is this bang correct?
-      )) {
-        // requested gender wasn't unlocked, purging setting
-        delete starterAttributes.female;
-      }
-
-      const abilityAttr = this.scene.gameData.starterData[species!.speciesId].abilityAttr; // TODO: is this bang correct?
-      if (![
-        abilityAttr & AbilityAttr.ABILITY_1,
-        species!.ability2 ? (abilityAttr & AbilityAttr.ABILITY_2) : abilityAttr & AbilityAttr.ABILITY_HIDDEN, // TODO: is this bang correct?
-        species!.ability2 && abilityAttr & AbilityAttr.ABILITY_HIDDEN // TODO: is this bang correct?
-      ][starterAttributes.ability!]) { // TODO: is this bang correct?
-        // requested ability wasn't unlocked, purging setting
-        delete starterAttributes.ability;
-      }
-
-      if (!(species?.forms[starterAttributes.form!]?.isStarterSelectable && this.speciesStarterDexEntry!.caughtAttr & this.scene.gameData.getFormAttr(starterAttributes.form!))) { // TODO: are those bangs correct?
-        // requested form wasn't unlocked/isn't a starter form, purging setting
-        delete starterAttributes.form;
-      }
-
-      if (this.scene.gameData.getNaturesForAttr(this.speciesStarterDexEntry?.natureAttr).indexOf(starterAttributes.nature as unknown as Nature) < 0) {
-        // requested nature wasn't unlocked, purging setting
-        delete starterAttributes.nature;
-      }
-    }
 
     if (starterAttributes?.nature) {
       // load default nature from stater save data, if set
       this.natureCursor = starterAttributes.nature;
     }
     if (starterAttributes?.ability && !isNaN(starterAttributes.ability)) {
-      // load default nature from stater save data, if set
+      // load default ability from stater save data, if set
       this.abilityCursor = starterAttributes.ability;
     }
 
@@ -2665,7 +2725,6 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
         this.pokemonLuckText.setText(luck.toString());
         this.pokemonLuckText.setTint(getVariantTint(Math.min(luck - 1, 2) as Variant));
         this.pokemonLuckLabelText.setVisible(this.pokemonLuckText.visible);
-        this.pokemonShinyIcon.setVisible(this.starterPreferences[species.speciesId]?.shiny ?? false);
 
         //Growth translate
         let growthReadable = Utils.toReadableString(GrowthRate[species.growthRate]);
@@ -2689,12 +2748,14 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
           this.pokemonHatchedIcon.setFrame(getEggTierForSpecies(species));
         }
         this.pokemonHatchedCountText.setText(`${this.speciesStarterDexEntry.hatchedCount}`);
+
         const defaultDexAttr = this.getCurrentDexProps(species.speciesId);
         const defaultProps = this.scene.gameData.getSpeciesDexAttrProps(species, defaultDexAttr);
         const variant = defaultProps.variant;
         const tint = getVariantTint(variant);
         this.pokemonShinyIcon.setFrame(getVariantIcon(variant));
         this.pokemonShinyIcon.setTint(tint);
+        this.pokemonShinyIcon.setVisible(defaultProps.shiny);
         this.pokemonCaughtHatchedContainer.setVisible(true);
         if (pokemonPrevolutions.hasOwnProperty(species.speciesId)) {
           this.pokemonCaughtHatchedContainer.setY(16);
@@ -2884,21 +2945,13 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       const dexEntry = this.scene.gameData.dexData[species.speciesId];
       const abilityAttr = this.scene.gameData.starterData[species.speciesId].abilityAttr;
 
-      const isCaught = this.scene.gameData.dexData[species.speciesId]?.caughtAttr || BigInt(0);
-      const isVariant3Caught = !!(isCaught & DexAttr.VARIANT_3);
-      const isVariant2Caught = !!(isCaught & DexAttr.VARIANT_2);
-      const isDefaultVariantCaught = !!(isCaught & DexAttr.DEFAULT_VARIANT);
-      const isVariantCaught = !!(isCaught & DexAttr.SHINY);
-      const isMaleCaught = !!(isCaught & DexAttr.MALE);
-      const isFemaleCaught = !!(isCaught & DexAttr.FEMALE);
-
-      const starterAttributes = this.starterPreferences[species.speciesId];
-
-      const props = this.scene.gameData.getSpeciesDexAttrProps(species, this.getCurrentDexProps(species.speciesId));
-      const defaultAbilityIndex = this.scene.gameData.getStarterSpeciesDefaultAbilityIndex(species);
-      const defaultNature = this.scene.gameData.getSpeciesDefaultNature(species);
+      const caughtAttr = this.scene.gameData.dexData[species.speciesId]?.caughtAttr || BigInt(0);
 
       if (!dexEntry.caughtAttr) {
+        const props = this.scene.gameData.getSpeciesDexAttrProps(species, this.getCurrentDexProps(species.speciesId));
+        const defaultAbilityIndex = this.scene.gameData.getStarterSpeciesDefaultAbilityIndex(species);
+        const defaultNature = this.scene.gameData.getSpeciesDefaultNature(species);
+
         if (shiny === undefined || shiny !== props.shiny) {
           shiny = props.shiny;
         }
@@ -2917,83 +2970,6 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
         if (natureIndex === undefined || natureIndex !== defaultNature) {
           natureIndex = defaultNature;
         }
-      } else {
-        // compare current shiny, formIndex, female, variant, abilityIndex, natureIndex with the caught ones
-        // if the current ones are not caught, we need to find the next caught ones
-        if (shiny) {
-          if (!(isVariantCaught || isVariant2Caught || isVariant3Caught)) {
-            shiny = false;
-            starterAttributes.shiny = false;
-            variant = 0;
-            starterAttributes.variant = 0;
-          } else {
-            shiny = true;
-            starterAttributes.shiny = true;
-            if (variant === 0 && !isDefaultVariantCaught) {
-              if (isVariant2Caught) {
-                variant = 1;
-                starterAttributes.variant = 1;
-              } else if (isVariant3Caught) {
-                variant = 2;
-                starterAttributes.variant = 2;
-              } else {
-                variant = 0;
-                starterAttributes.variant = 0;
-              }
-            } else if (variant === 1 && !isVariant2Caught) {
-              if (isVariantCaught) {
-                variant = 0;
-                starterAttributes.variant = 0;
-              } else if (isVariant3Caught) {
-                variant = 2;
-                starterAttributes.variant = 2;
-              } else {
-                variant = 0;
-                starterAttributes.variant = 0;
-              }
-            } else if (variant === 2 && !isVariant3Caught) {
-              if (isVariantCaught) {
-                variant = 0;
-                starterAttributes.variant = 0;
-              } else if (isVariant2Caught) {
-                variant = 1;
-                starterAttributes.variant = 1;
-              } else {
-                variant = 0;
-                starterAttributes.variant = 0;
-              }
-            }
-          }
-        }
-        if (female) {
-          if (!isFemaleCaught) {
-            female = false;
-            starterAttributes.female = false;
-          }
-        } else {
-          if (!isMaleCaught) {
-            female = true;
-            starterAttributes.female = true;
-          }
-        }
-
-        if (species.forms) {
-          const formCount = species.forms.length;
-          let newFormIndex = formIndex??0;
-          if (species.forms[newFormIndex]) {
-            const isValidForm = species.forms[newFormIndex].isStarterSelectable && dexEntry.caughtAttr & this.scene.gameData.getFormAttr(newFormIndex);
-            if (!isValidForm) {
-              do {
-                newFormIndex = (newFormIndex + 1) % formCount;
-                if (species.forms[newFormIndex].isStarterSelectable && dexEntry.caughtAttr & this.scene.gameData.getFormAttr(newFormIndex)) {
-                  break;
-                }
-              } while (newFormIndex !== props.formIndex);
-              formIndex = newFormIndex;
-              starterAttributes.form = formIndex;
-            }
-          }
-        }
       }
 
       this.shinyOverlay.setVisible(shiny ?? false); // TODO: is false the correct default?
@@ -3035,13 +3011,38 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
           currentFilteredContainer.checkIconId(female, formIndex, shiny, variant);
         }
 
-        this.canCycleShiny = isVariantCaught || isVariant2Caught || isVariant3Caught;
+        const isNonShinyCaught = !!(caughtAttr & DexAttr.NON_SHINY);
+        const isShinyCaught = !!(caughtAttr & DexAttr.SHINY);
+        const isVariant1Caught = isShinyCaught && !!(caughtAttr & DexAttr.DEFAULT_VARIANT);
+        const isVariant2Caught = isShinyCaught && !!(caughtAttr & DexAttr.VARIANT_2);
+        const isVariant3Caught = isShinyCaught && !!(caughtAttr & DexAttr.VARIANT_3);
+
+        this.canCycleShiny = isNonShinyCaught && isShinyCaught;
+        this.canCycleVariant = !!shiny && [ isVariant1Caught, isVariant2Caught, isVariant3Caught].filter(v => v).length > 1;
+
+        const isMaleCaught = !!(caughtAttr & DexAttr.MALE);
+        const isFemaleCaught = !!(caughtAttr & DexAttr.FEMALE);
         this.canCycleGender = isMaleCaught && isFemaleCaught;
-        this.canCycleAbility = [ abilityAttr & AbilityAttr.ABILITY_1, (abilityAttr & AbilityAttr.ABILITY_2) && species.ability2, abilityAttr & AbilityAttr.ABILITY_HIDDEN ].filter(a => a).length > 1;
+
+        const hasAbility1 = abilityAttr & AbilityAttr.ABILITY_1;
+        let hasAbility2 = abilityAttr & AbilityAttr.ABILITY_2;
+        const hasHiddenAbility = abilityAttr & AbilityAttr.ABILITY_HIDDEN;
+
+        /*
+         * Check for Pokemon with a single ability (at some point it was possible to catch them with their ability 2 attribute)
+         * This prevents cycling between ability 1 and 2 if they are both unlocked and the same
+         * but we still need to account for the possibility ability 1 was never unlocked and fallback on ability 2 in this case
+         */
+        if (hasAbility1 && hasAbility2 && species.ability1 === species.ability2) {
+          hasAbility2 = 0;
+        }
+
+        this.canCycleAbility = [ hasAbility1, hasAbility2, hasHiddenAbility ].filter(a => a).length > 1;
+
         this.canCycleForm = species.forms.filter(f => f.isStarterSelectable || !pokemonFormChanges[species.speciesId]?.find(fc => fc.formKey))
           .map((_, f) => dexEntry.caughtAttr & this.scene.gameData.getFormAttr(f)).filter(f => f).length > 1;
         this.canCycleNature = this.scene.gameData.getNaturesForAttr(dexEntry.natureAttr).length > 1;
-        this.canCycleVariant = !!shiny && [ dexEntry.caughtAttr & DexAttr.DEFAULT_VARIANT, dexEntry.caughtAttr & DexAttr.VARIANT_2, dexEntry.caughtAttr & DexAttr.VARIANT_3].filter(v => v).length > 1;
+
       }
 
       if (dexEntry.caughtAttr && species.malePercent !== null) {
@@ -3419,39 +3420,55 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     return canStart;
   }
 
-  /* this creates a temporary dex attr props that we use to check whether a pokemon is valid for a challenge.
-  * when checking for certain challenges (i.e. mono type), we need to check for form changes AND evolutions
-  * However, since some pokemon can evolve based on their intial gender/form, we need a way to look for that
-  * This temporary dex attr will therefore ONLY look at gender and form, since there's no cases of shinies/variants
-  * having different evolutions to their non shiny/variant part, and so those can be ignored
-  * Since the current form and gender is stored in the starter preferences, this is where we get the values from
-  */
+  /**
+   * Creates a temporary dex attr props that will be used to check whether a pokemon is valid for a challenge
+   * and to display the correct shiny, variant, and form based on the StarterPreferences
+   *
+   * @param speciesId the id of the species to get props for
+   * @returns the dex props
+   */
   getCurrentDexProps(speciesId: number): bigint {
     let props = 0n;
+    const caughtAttr = this.scene.gameData.dexData[speciesId].caughtAttr;
 
-    if (this.starterPreferences[speciesId]?.female) { // this checks the gender of the pokemon
+    /*  this checks the gender of the pokemon; this works by checking a) that the starter preferences for the species exist, and if so, is it female. If so, it'll add DexAttr.FEMALE to our temp props
+     *  It then checks b) if the caughtAttr for the pokemon is female and NOT male - this means that the ONLY gender we've gotten is female, and we need to add DexAttr.FEMALE to our temp props
+     *  If neither of these pass, we add DexAttr.MALE to our temp props
+     */
+    if (this.starterPreferences[speciesId]?.female || ((caughtAttr & DexAttr.FEMALE) > 0n && (caughtAttr & DexAttr.MALE) === 0n)) {
       props += DexAttr.FEMALE;
     } else {
       props += DexAttr.MALE;
     }
-    if (this.starterPreferences[speciesId]?.shiny) {
+    /* This part is very similar to above, but instead of for gender, it checks for shiny within starter preferences.
+     * If they're not there, it checks the caughtAttr for shiny only (i.e. SHINY === true && NON_SHINY === false)
+     */
+    if (this.starterPreferences[speciesId]?.shiny || ((caughtAttr & DexAttr.SHINY) > 0n && (caughtAttr & DexAttr.NON_SHINY) === 0n)) {
       props += DexAttr.SHINY;
       if (this.starterPreferences[speciesId]?.variant) {
         props += BigInt(Math.pow(2, this.starterPreferences[speciesId]?.variant)) * DexAttr.DEFAULT_VARIANT;
       } else {
-        props += DexAttr.DEFAULT_VARIANT;
+        /*  This calculates the correct variant if there's no starter preferences for it.
+         *  This gets the lowest tier variant that you've caught (in line with other mechanics) and adds it to the temp props
+         */
+        if ((caughtAttr & DexAttr.DEFAULT_VARIANT) > 0) {
+          props += DexAttr.DEFAULT_VARIANT;
+        }
+        if ((caughtAttr & DexAttr.VARIANT_2) > 0) {
+          props += DexAttr.VARIANT_2;
+        } else if ((caughtAttr & DexAttr.VARIANT_3) > 0) {
+          props += DexAttr.VARIANT_3;
+        }
       }
     } else {
       props += DexAttr.NON_SHINY;
-      if (this.starterPreferences[speciesId]?.variant) {
-        delete this.starterPreferences[speciesId].variant;
-      }
       props += DexAttr.DEFAULT_VARIANT; // we add the default variant here because non shiny versions are listed as default variant
     }
     if (this.starterPreferences[speciesId]?.form) { // this checks for the form of the pokemon
       props += BigInt(Math.pow(2, this.starterPreferences[speciesId]?.form)) * DexAttr.DEFAULT_FORM;
     } else {
-      props += DexAttr.DEFAULT_FORM;
+      // Get the first unlocked form
+      props += this.scene.gameData.getFormAttr(this.scene.gameData.getFormIndex(caughtAttr));
     }
 
     return props;
diff --git a/src/ui/summary-ui-handler.ts b/src/ui/summary-ui-handler.ts
index 3b789954f66..ea7b798f2bf 100644
--- a/src/ui/summary-ui-handler.ts
+++ b/src/ui/summary-ui-handler.ts
@@ -716,7 +716,8 @@ export default class SummaryUiHandler extends UiHandler {
       const getTypeIcon = (index: integer, type: Type, tera: boolean = false) => {
         const xCoord = typeLabel.width * typeLabel.scale + 9 + 34 * index;
         const typeIcon = !tera
-          ? this.scene.add.sprite(xCoord, 42, `types${Utils.verifyLang(i18next.resolvedLanguage) ? `_${i18next.resolvedLanguage}` : ""}`, Type[type].toLowerCase())          : this.scene.add.sprite(xCoord, 42, "type_tera");
+          ? this.scene.add.sprite(xCoord, 42, Utils.getLocalizedSpriteKey("types"), Type[type].toLowerCase())
+          : this.scene.add.sprite(xCoord, 42, "type_tera");
         if (tera) {
           typeIcon.setScale(0.5);
           const typeRgb = getTypeRgb(type);
@@ -824,10 +825,7 @@ export default class SummaryUiHandler extends UiHandler {
           biome: `${getBBCodeFrag(getBiomeName(this.pokemon?.metBiome!), TextStyle.SUMMARY_RED)}${closeFragment}`, // TODO: is this bang correct?
           level: `${getBBCodeFrag(this.pokemon?.metLevel.toString()!, TextStyle.SUMMARY_RED)}${closeFragment}`, // TODO: is this bang correct?
         }),
-        natureFragment:
-          i18next.exists(`pokemonSummary:natureFragment.${rawNature}`) ?
-            i18next.t(`pokemonSummary:natureFragment.${rawNature}`, { nature: nature }) :
-            nature,
+        natureFragment: i18next.t(`pokemonSummary:natureFragment.${rawNature}`, { nature: nature })
       });
 
       const memoText = addBBCodeTextObject(this.scene, 7, 113, String(memoString), TextStyle.WINDOW_ALT);
@@ -934,10 +932,14 @@ export default class SummaryUiHandler extends UiHandler {
 
       if (this.summaryUiMode === SummaryUiMode.LEARN_MOVE) {
         this.extraMoveRowContainer.setVisible(true);
-        const newMoveTypeIcon = this.scene.add.sprite(0, 0, `types${Utils.verifyLang(i18next.resolvedLanguage) ? `_${i18next.resolvedLanguage}` : ""}`, Type[this.newMove?.type!].toLowerCase()); // TODO: is this bang correct?
-        newMoveTypeIcon.setOrigin(0, 1);
-        this.extraMoveRowContainer.add(newMoveTypeIcon);
 
+        if (this.newMove && this.pokemon) {
+          const spriteKey = Utils.getLocalizedSpriteKey("types");
+          const moveType = this.pokemon.getMoveType(this.newMove);
+          const newMoveTypeIcon = this.scene.add.sprite(0, 0, spriteKey, Type[moveType].toLowerCase());
+          newMoveTypeIcon.setOrigin(0, 1);
+          this.extraMoveRowContainer.add(newMoveTypeIcon);
+        }
         const ppOverlay = this.scene.add.image(163, -1, "summary_moves_overlay_pp");
         ppOverlay.setOrigin(0, 1);
         this.extraMoveRowContainer.add(ppOverlay);
@@ -956,8 +958,11 @@ export default class SummaryUiHandler extends UiHandler {
         const moveRowContainer = this.scene.add.container(0, 16 * m);
         this.moveRowsContainer.add(moveRowContainer);
 
-        if (move) {
-          const typeIcon = this.scene.add.sprite(0, 0, `types${Utils.verifyLang(i18next.resolvedLanguage) ? `_${i18next.resolvedLanguage}` : ""}`, Type[move.getMove().type].toLowerCase());          typeIcon.setOrigin(0, 1);
+        if (move && this.pokemon) {
+          const spriteKey = Utils.getLocalizedSpriteKey("types");
+          const moveType = this.pokemon.getMoveType(move.getMove());
+          const typeIcon = this.scene.add.sprite(0, 0, spriteKey, Type[moveType].toLowerCase());
+          typeIcon.setOrigin(0, 1);
           moveRowContainer.add(typeIcon);
         }
 
diff --git a/src/ui/text.ts b/src/ui/text.ts
index c1d7fe091c0..99a0436bba3 100644
--- a/src/ui/text.ts
+++ b/src/ui/text.ts
@@ -5,7 +5,7 @@ import BBCodeText from "phaser3-rex-plugins/plugins/gameobjects/tagtext/bbcodete
 import InputText from "phaser3-rex-plugins/plugins/inputtext";
 import BattleScene from "../battle-scene";
 import { ModifierTier } from "../modifier/modifier-tier";
-import i18next from "#app/plugins/i18n.js";
+import i18next from "#app/plugins/i18n";
 
 export enum TextStyle {
   MESSAGE,
@@ -227,6 +227,7 @@ export function getBBCodeFrag(content: string, textStyle: TextStyle, uiTheme: Ui
 }
 
 export function getTextColor(textStyle: TextStyle, shadow?: boolean, uiTheme: UiTheme = UiTheme.DEFAULT): string {
+  const isLegacyTheme = uiTheme === UiTheme.LEGACY;
   switch (textStyle) {
   case TextStyle.MESSAGE:
     return !shadow ? "#f8f8f8" : "#6b5a73";
@@ -235,29 +236,29 @@ export function getTextColor(textStyle: TextStyle, shadow?: boolean, uiTheme: Ui
   case TextStyle.MOVE_PP_FULL:
   case TextStyle.TOOLTIP_CONTENT:
   case TextStyle.SETTINGS_VALUE:
-    if (uiTheme) {
+    if (isLegacyTheme) {
       return !shadow ? "#484848" : "#d0d0c8";
     }
     return !shadow ? "#f8f8f8" : "#6b5a73";
   case TextStyle.MOVE_PP_HALF_FULL:
-    if (uiTheme) {
+    if (isLegacyTheme) {
       return !shadow ? "#a68e17" : "#ebd773";
     }
     return !shadow ? "#ccbe00" : "#6e672c";
   case TextStyle.MOVE_PP_NEAR_EMPTY:
-    if (uiTheme) {
+    if (isLegacyTheme) {
       return !shadow ? "#d64b00" : "#f7b18b";
     }
     return !shadow ? "#d64b00" : "#69402a";
   case TextStyle.MOVE_PP_EMPTY:
-    if (uiTheme) {
+    if (isLegacyTheme) {
       return !shadow ? "#e13d3d" : "#fca2a2";
     }
     return !shadow ? "#e13d3d" : "#632929";
   case TextStyle.WINDOW_ALT:
     return !shadow ? "#484848" : "#d0d0c8";
   case TextStyle.BATTLE_INFO:
-    if (uiTheme) {
+    if (isLegacyTheme) {
       return !shadow ? "#404040" : "#ded6b5";
     }
     return !shadow ? "#f8f8f8" : "#6b5a73";
@@ -268,7 +269,7 @@ export function getTextColor(textStyle: TextStyle, shadow?: boolean, uiTheme: Ui
   case TextStyle.SUMMARY:
     return !shadow ? "#f8f8f8" : "#636363";
   case TextStyle.SUMMARY_ALT:
-    if (uiTheme) {
+    if (isLegacyTheme) {
       return !shadow ? "#f8f8f8" : "#636363";
     }
     return !shadow ? "#484848" : "#d0d0c8";
@@ -288,6 +289,9 @@ export function getTextColor(textStyle: TextStyle, shadow?: boolean, uiTheme: Ui
   case TextStyle.STATS_LABEL:
     return !shadow ? "#f8b050" : "#c07800";
   case TextStyle.STATS_VALUE:
+    if (isLegacyTheme) {
+      return !shadow ? "#484848" : "#d0d0c8";
+    }
     return !shadow ? "#f8f8f8" : "#6b5a73";
   case TextStyle.SUMMARY_GREEN:
     return !shadow ? "#78c850" : "#306850";
diff --git a/src/ui/ui.ts b/src/ui/ui.ts
index 1f4a0b3a51e..dc12ac92be2 100644
--- a/src/ui/ui.ts
+++ b/src/ui/ui.ts
@@ -1,4 +1,4 @@
-import {default as BattleScene} from "../battle-scene";
+import { default as BattleScene } from "../battle-scene";
 import UiHandler from "./ui-handler";
 import BattleMessageUiHandler from "./battle-message-ui-handler";
 import CommandUiHandler from "./command-ui-handler";
@@ -23,8 +23,7 @@ import OptionSelectUiHandler from "./settings/option-select-ui-handler";
 import EggHatchSceneHandler from "./egg-hatch-scene-handler";
 import EggListUiHandler from "./egg-list-ui-handler";
 import EggGachaUiHandler from "./egg-gacha-ui-handler";
-import VouchersUiHandler from "./vouchers-ui-handler";
-import {addWindow} from "./ui-theme";
+import { addWindow } from "./ui-theme";
 import LoginFormUiHandler from "./login-form-ui-handler";
 import RegistrationFormUiHandler from "./registration-form-ui-handler";
 import LoadingModalUiHandler from "./loading-modal-ui-handler";
@@ -37,8 +36,8 @@ import SavingIconHandler from "./saving-icon-handler";
 import UnavailableModalUiHandler from "./unavailable-modal-ui-handler";
 import OutdatedModalUiHandler from "./outdated-modal-ui-handler";
 import SessionReloadModalUiHandler from "./session-reload-modal-ui-handler";
-import {Button} from "#enums/buttons";
-import i18next, {ParseKeys} from "i18next";
+import { Button } from "#enums/buttons";
+import i18next from "i18next";
 import GamepadBindingUiHandler from "./settings/gamepad-binding-ui-handler";
 import SettingsKeyboardUiHandler from "#app/ui/settings/settings-keyboard-ui-handler";
 import KeyboardBindingUiHandler from "#app/ui/settings/keyboard-binding-ui-handler";
@@ -47,6 +46,7 @@ import SettingsAudioUiHandler from "./settings/settings-audio-ui-handler";
 import { PlayerGender } from "#enums/player-gender";
 import BgmBar from "#app/ui/bgm-bar";
 import RenameFormUiHandler from "./rename-form-ui-handler";
+import AdminUiHandler from "./admin-ui-handler";
 import RunHistoryUiHandler from "./run-history-ui-handler";
 import RunInfoUiHandler from "./run-info-ui-handler";
 
@@ -77,7 +77,6 @@ export enum Mode {
   KEYBOARD_BINDING,
   ACHIEVEMENTS,
   GAME_STATS,
-  VOUCHERS,
   EGG_LIST,
   EGG_GACHA,
   LOGIN_FORM,
@@ -90,6 +89,7 @@ export enum Mode {
   RENAME_POKEMON,
   RUN_HISTORY,
   RUN_INFO,
+  ADMIN,
 }
 
 const transitionModes = [
@@ -120,14 +120,14 @@ const noTransitionModes = [
   Mode.SETTINGS_KEYBOARD,
   Mode.ACHIEVEMENTS,
   Mode.GAME_STATS,
-  Mode.VOUCHERS,
   Mode.LOGIN_FORM,
   Mode.REGISTRATION_FORM,
   Mode.LOADING,
   Mode.SESSION_RELOAD,
   Mode.UNAVAILABLE,
   Mode.OUTDATED,
-  Mode.RENAME_POKEMON
+  Mode.RENAME_POKEMON,
+  Mode.ADMIN,
 ];
 
 export default class UI extends Phaser.GameObjects.Container {
@@ -179,7 +179,6 @@ export default class UI extends Phaser.GameObjects.Container {
       new KeyboardBindingUiHandler(scene),
       new AchvsUiHandler(scene),
       new GameStatsUiHandler(scene),
-      new VouchersUiHandler(scene),
       new EggListUiHandler(scene),
       new EggGachaUiHandler(scene),
       new LoginFormUiHandler(scene),
@@ -192,6 +191,7 @@ export default class UI extends Phaser.GameObjects.Container {
       new RenameFormUiHandler(scene),
       new RunHistoryUiHandler(scene),
       new RunInfoUiHandler(scene),
+      new AdminUiHandler(scene),
     ];
   }
 
@@ -298,34 +298,30 @@ export default class UI extends Phaser.GameObjects.Container {
     }
   }
 
-  showDialogue(text: string, name: string | undefined, delay: integer | null = 0, callback: Function, callbackDelay?: integer, promptDelay?: integer): void {
-    // First get the gender of the player (default male) (also used if UNSET)
-    let playerGenderPrefix = "PGM";
-    if ((this.scene as BattleScene).gameData.gender === PlayerGender.FEMALE) {
-      playerGenderPrefix = "PGF";
-    }
-    // Add the prefix to the text
-    const localizationKey: string = playerGenderPrefix + text;
+  showDialogue(i18nKey: string, name: string | undefined, delay: integer | null = 0, callback: Function, callbackDelay?: integer, promptDelay?: integer): void {
+    const battleScene = this.scene as BattleScene;
 
     // Get localized dialogue (if available)
     let hasi18n = false;
-    if (i18next.exists(localizationKey) ) {
-      text = i18next.t(localizationKey as ParseKeys);
+    if (i18next.exists(i18nKey) ) {
+      const genderIndex = battleScene.gameData.gender ?? PlayerGender.UNSET;
+      const genderStr = PlayerGender[genderIndex].toLowerCase();
+      i18nKey = i18next.t(i18nKey, { context: genderStr });
       hasi18n = true;
 
       // Skip dialogue if the player has enabled the option and the dialogue has been already seen
-      if ((this.scene as BattleScene).skipSeenDialogues && (this.scene as BattleScene).gameData.getSeenDialogues()[localizationKey] === true) {
-        console.log(`Dialogue ${localizationKey} skipped`);
+      if (battleScene.skipSeenDialogues &&battleScene.gameData.getSeenDialogues()[i18nKey] === true) {
+        console.log(`Dialogue ${i18nKey} skipped`);
         callback();
         return;
       }
     }
     let showMessageAndCallback = () => {
-      hasi18n && (this.scene as BattleScene).gameData.saveSeenDialogue(localizationKey);
+      hasi18n && battleScene.gameData.saveSeenDialogue(i18nKey);
       callback();
     };
-    if (text.indexOf("$") > -1) {
-      const messagePages = text.split(/\$/g).map(m => m.trim());
+    if (i18nKey.indexOf("$") > -1) {
+      const messagePages = i18nKey.split(/\$/g).map(m => m.trim());
       for (let p = messagePages.length - 1; p >= 0; p--) {
         const originalFunc = showMessageAndCallback;
         showMessageAndCallback = () => this.showDialogue(messagePages[p], name, null, originalFunc);
@@ -334,23 +330,18 @@ export default class UI extends Phaser.GameObjects.Container {
     } else {
       const handler = this.getHandler();
       if (handler instanceof MessageUiHandler) {
-        (handler as MessageUiHandler).showDialogue(text, name, delay, showMessageAndCallback, callbackDelay, true, promptDelay);
+        (handler as MessageUiHandler).showDialogue(i18nKey, name, delay, showMessageAndCallback, callbackDelay, true, promptDelay);
       } else {
-        this.getMessageHandler().showDialogue(text, name, delay, showMessageAndCallback, callbackDelay, true, promptDelay);
+        this.getMessageHandler().showDialogue(i18nKey, name, delay, showMessageAndCallback, callbackDelay, true, promptDelay);
       }
     }
   }
 
-  shouldSkipDialogue(text): boolean {
-    let playerGenderPrefix = "PGM";
-    if ((this.scene as BattleScene).gameData.gender === PlayerGender.FEMALE) {
-      playerGenderPrefix = "PGF";
-    }
+  shouldSkipDialogue(i18nKey: string): boolean {
+    const battleScene = this.scene as BattleScene;
 
-    const key = playerGenderPrefix + text;
-
-    if (i18next.exists(key) ) {
-      if ((this.scene as BattleScene).skipSeenDialogues && (this.scene as BattleScene).gameData.getSeenDialogues()[key] === true) {
+    if (i18next.exists(i18nKey) ) {
+      if (battleScene.skipSeenDialogues && battleScene.gameData.getSeenDialogues()[i18nKey] === true) {
         return true;
       }
     }
@@ -403,11 +394,11 @@ export default class UI extends Phaser.GameObjects.Container {
   }
 
   playSelect(): void {
-    (this.scene as BattleScene).playSound("select");
+    (this.scene as BattleScene).playSound("ui/select");
   }
 
   playError(): void {
-    (this.scene as BattleScene).playSound("error");
+    (this.scene as BattleScene).playSound("ui/error");
   }
 
   fadeOut(duration: integer): Promise<void> {
@@ -460,6 +451,7 @@ export default class UI extends Phaser.GameObjects.Container {
           }
           if (chainMode && this.mode && !clear) {
             this.modeChain.push(this.mode);
+            (this.scene as BattleScene).updateGameInfo();
           }
           this.mode = mode;
           const touchControls = document?.getElementById("touchControls");
@@ -507,6 +499,7 @@ export default class UI extends Phaser.GameObjects.Container {
 
   resetModeChain(): void {
     this.modeChain = [];
+    (this.scene as BattleScene).updateGameInfo();
   }
 
   revertMode(): Promise<boolean> {
@@ -520,6 +513,7 @@ export default class UI extends Phaser.GameObjects.Container {
       const doRevertMode = () => {
         this.getHandler().clear();
         this.mode = this.modeChain.pop()!; // TODO: is this bang correct?
+        (this.scene as BattleScene).updateGameInfo();
         const touchControls = document.getElementById("touchControls");
         if (touchControls) {
           touchControls.dataset.uiMode = Mode[this.mode];
diff --git a/src/ui/unavailable-modal-ui-handler.ts b/src/ui/unavailable-modal-ui-handler.ts
index dab1a8c3be8..3375fb930e6 100644
--- a/src/ui/unavailable-modal-ui-handler.ts
+++ b/src/ui/unavailable-modal-ui-handler.ts
@@ -55,7 +55,7 @@ export default class UnavailableModalUiHandler extends ModalUiHandler {
       if (response[0] || [200, 400].includes(response[1])) {
         this.reconnectTimer = null;
         this.reconnectDuration = this.minTime;
-        this.scene.playSound("pb_bounce_1");
+        this.scene.playSound("se/pb_bounce_1");
         this.reconnectCallback();
       } else if (response[1] === 401) {
         Utils.removeCookie(Utils.sessionIdKey);
diff --git a/src/ui/vouchers-ui-handler.ts b/src/ui/vouchers-ui-handler.ts
deleted file mode 100644
index bb2dc2cd0be..00000000000
--- a/src/ui/vouchers-ui-handler.ts
+++ /dev/null
@@ -1,262 +0,0 @@
-import BattleScene from "../battle-scene";
-import { Button } from "#enums/buttons";
-import i18next from "i18next";
-import { Voucher, getVoucherTypeIcon, getVoucherTypeName, vouchers } from "../system/voucher";
-import MessageUiHandler from "./message-ui-handler";
-import { TextStyle, addTextObject } from "./text";
-import { Mode } from "./ui";
-import { addWindow } from "./ui-theme";
-
-const itemRows = 4;
-const itemCols = 17;
-
-export default class VouchersUiHandler extends MessageUiHandler {
-  private vouchersContainer: Phaser.GameObjects.Container;
-  private voucherIconsContainer: Phaser.GameObjects.Container;
-
-  private voucherIconsBg: Phaser.GameObjects.NineSlice;
-  private voucherIcons: Phaser.GameObjects.Sprite[];
-  private titleText: Phaser.GameObjects.Text;
-  private unlockText: Phaser.GameObjects.Text;
-
-  private itemsTotal: integer;
-  private scrollCursor: integer;
-
-  private cursorObj: Phaser.GameObjects.NineSlice | null;
-
-  constructor(scene: BattleScene, mode: Mode | null = null) {
-    super(scene, mode);
-
-    this.itemsTotal = Object.keys(vouchers).length;
-    this.scrollCursor = 0;
-  }
-
-  setup() {
-    const ui = this.getUi();
-
-    this.vouchersContainer = this.scene.add.container(1, -(this.scene.game.canvas.height / 6) + 1);
-
-    this.vouchersContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, this.scene.game.canvas.width / 6, this.scene.game.canvas.height / 6), Phaser.Geom.Rectangle.Contains);
-
-    const headerBg = addWindow(this.scene, 0, 0, (this.scene.game.canvas.width / 6) - 2, 24);
-    headerBg.setOrigin(0, 0);
-
-    const headerText = addTextObject(this.scene, 0, 0, i18next.t("voucher:vouchers"), TextStyle.SETTINGS_LABEL);
-    headerText.setOrigin(0, 0);
-    headerText.setPositionRelative(headerBg, 8, 4);
-
-    this.voucherIconsBg = addWindow(this.scene, 0, headerBg.height, (this.scene.game.canvas.width / 6) - 2, (this.scene.game.canvas.height / 6) - headerBg.height - 68);
-    this.voucherIconsBg.setOrigin(0, 0);
-
-    this.voucherIconsContainer = this.scene.add.container(6, headerBg.height + 6);
-
-    this.voucherIcons = [];
-
-    for (let a = 0; a < itemRows * itemCols; a++) {
-      const x = (a % itemCols) * 18;
-      const y = Math.floor(a / itemCols) * 18;
-
-      const icon = this.scene.add.sprite(x, y, "items", "unknown");
-      icon.setOrigin(0, 0);
-      icon.setScale(0.5);
-
-      this.voucherIcons.push(icon);
-      this.voucherIconsContainer.add(icon);
-    }
-
-    const titleBg = addWindow(this.scene, 0, headerBg.height + this.voucherIconsBg.height, 220, 24);
-    titleBg.setOrigin(0, 0);
-
-    this.titleText = addTextObject(this.scene, 0, 0, "", TextStyle.WINDOW);
-    this.titleText.setOrigin(0, 0);
-    this.titleText.setPositionRelative(titleBg, 8, 4);
-
-    const unlockBg = addWindow(this.scene, titleBg.x + titleBg.width, titleBg.y, 98, 24);
-    unlockBg.setOrigin(0, 0);
-
-    this.unlockText = addTextObject(this.scene, 0, 0, "", TextStyle.WINDOW);
-    this.unlockText.setOrigin(0, 0);
-    this.unlockText.setPositionRelative(unlockBg, 8, 4);
-
-    const descriptionBg = addWindow(this.scene, 0, titleBg.y + titleBg.height, (this.scene.game.canvas.width / 6) - 2, 42);
-    descriptionBg.setOrigin(0, 0);
-
-    const descriptionText = addTextObject(this.scene, 0, 0, "", TextStyle.WINDOW, { maxLines: 2 });
-    descriptionText.setWordWrapWidth(1870);
-    descriptionText.setOrigin(0, 0);
-    descriptionText.setPositionRelative(descriptionBg, 8, 4);
-
-    this.message = descriptionText;
-
-    this.vouchersContainer.add(headerBg);
-    this.vouchersContainer.add(headerText);
-    this.vouchersContainer.add(this.voucherIconsBg);
-    this.vouchersContainer.add(this.voucherIconsContainer);
-    this.vouchersContainer.add(titleBg);
-    this.vouchersContainer.add(this.titleText);
-    this.vouchersContainer.add(unlockBg);
-    this.vouchersContainer.add(this.unlockText);
-    this.vouchersContainer.add(descriptionBg);
-    this.vouchersContainer.add(descriptionText);
-
-    ui.add(this.vouchersContainer);
-
-    this.setCursor(0);
-
-    this.vouchersContainer.setVisible(false);
-  }
-
-  show(args: any[]): boolean {
-    super.show(args);
-
-    this.vouchersContainer.setVisible(true);
-    this.setCursor(0);
-    this.setScrollCursor(0);
-
-    this.updateVoucherIcons();
-
-    this.getUi().moveTo(this.vouchersContainer, this.getUi().length - 1);
-
-    this.getUi().hideTooltip();
-
-    return true;
-  }
-
-  protected showVoucher(voucher: Voucher) {
-    const voucherUnlocks = this.scene.gameData.voucherUnlocks;
-    const unlocked = voucherUnlocks.hasOwnProperty(voucher.id);
-
-    this.titleText.setText(getVoucherTypeName(voucher.voucherType));
-    this.showText(voucher.description);
-    this.unlockText.setText(unlocked ? new Date(voucherUnlocks[voucher.id]).toLocaleDateString() : i18next.t("voucher:locked"));
-  }
-
-  processInput(button: Button): boolean {
-    const ui = this.getUi();
-
-    let success = false;
-
-    if (button === Button.CANCEL) {
-      success = true;
-      this.scene.ui.revertMode();
-    } else {
-      const rowIndex = Math.floor(this.cursor / itemCols);
-      const itemOffset = (this.scrollCursor * itemCols);
-      switch (button) {
-      case Button.UP:
-        if (this.cursor < itemCols) {
-          if (this.scrollCursor) {
-            success = this.setScrollCursor(this.scrollCursor - 1);
-          }
-        } else {
-          success = this.setCursor(this.cursor - itemCols);
-        }
-        break;
-      case Button.DOWN:
-        const canMoveDown = (this.cursor + itemOffset) + itemCols < this.itemsTotal;
-        if (rowIndex >= itemRows - 1) {
-          if (this.scrollCursor < Math.ceil(this.itemsTotal / itemCols) - itemRows && canMoveDown) {
-            success = this.setScrollCursor(this.scrollCursor + 1);
-          }
-        } else if (canMoveDown) {
-          success = this.setCursor(this.cursor + itemCols);
-        }
-        break;
-      case Button.LEFT:
-        if (!this.cursor && this.scrollCursor) {
-          success = this.setScrollCursor(this.scrollCursor - 1) && this.setCursor(this.cursor + (itemCols - 1));
-        } else if (this.cursor) {
-          success = this.setCursor(this.cursor - 1);
-        }
-        break;
-      case Button.RIGHT:
-        if (this.cursor + 1 === itemRows * itemCols && this.scrollCursor < Math.ceil(this.itemsTotal / itemCols) - itemRows) {
-          success = this.setScrollCursor(this.scrollCursor + 1) && this.setCursor(this.cursor - (itemCols - 1));
-        } else if (this.cursor + itemOffset < Object.keys(vouchers).length - 1) {
-          success = this.setCursor(this.cursor + 1);
-        }
-        break;
-      }
-    }
-
-    if (success) {
-      ui.playSelect();
-    }
-
-    return success;
-  }
-
-  setCursor(cursor: integer): boolean {
-    const ret = super.setCursor(cursor);
-
-    let updateVoucher = ret;
-
-    if (!this.cursorObj) {
-      this.cursorObj = this.scene.add.nineslice(0, 0, "select_cursor_highlight", undefined, 16, 16, 1, 1, 1, 1);
-      this.cursorObj.setOrigin(0, 0);
-      this.voucherIconsContainer.add(this.cursorObj);
-      updateVoucher = true;
-    }
-
-    this.cursorObj.setPositionRelative(this.voucherIcons[this.cursor], 0, 0);
-
-    if (updateVoucher) {
-      this.showVoucher(vouchers[Object.keys(vouchers)[cursor + this.scrollCursor * itemCols]]);
-    }
-
-    return ret;
-  }
-
-  setScrollCursor(scrollCursor: integer): boolean {
-    if (scrollCursor === this.scrollCursor) {
-      return false;
-    }
-
-    this.scrollCursor = scrollCursor;
-
-    this.updateVoucherIcons();
-
-    this.showVoucher(vouchers[Object.keys(vouchers)[Math.min(this.cursor + this.scrollCursor * itemCols, Object.values(vouchers).length - 1)]]);
-
-    return true;
-  }
-
-  updateVoucherIcons(): void {
-    const voucherUnlocks = this.scene.gameData.voucherUnlocks;
-
-    const itemOffset = this.scrollCursor * itemCols;
-    const itemLimit = itemRows * itemCols;
-
-    const voucherRange = Object.values(vouchers).slice(itemOffset, itemLimit + itemOffset);
-
-    voucherRange.forEach((voucher: Voucher, i: integer) => {
-      const icon = this.voucherIcons[i];
-      const unlocked = voucherUnlocks.hasOwnProperty(voucher.id);
-
-      icon.setFrame(getVoucherTypeIcon(voucher.voucherType));
-      icon.setVisible(true);
-      if (!unlocked) {
-        icon.setTintFill(0);
-      } else {
-        icon.clearTint();
-      }
-    });
-
-    if (voucherRange.length < this.voucherIcons.length) {
-      this.voucherIcons.slice(voucherRange.length).map(i => i.setVisible(false));
-    }
-  }
-
-  clear() {
-    super.clear();
-    this.vouchersContainer.setVisible(false);
-    this.eraseCursor();
-  }
-
-  eraseCursor() {
-    if (this.cursorObj) {
-      this.cursorObj.destroy();
-    }
-    this.cursorObj = null;
-  }
-}
diff --git a/src/utils.ts b/src/utils.ts
index a9bbc93d684..173ea25b17c 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -574,3 +574,12 @@ export function isNullOrUndefined(object: any): boolean {
 export function toDmgValue(value: number, minValue: number = 1) {
   return Math.max(Math.floor(value), minValue);
 }
+
+/**
+ * Helper method to localize a sprite key (e.g. for types)
+ * @param baseKey the base key of the sprite (e.g. `type`)
+ * @returns the localized sprite key
+ */
+export function getLocalizedSpriteKey(baseKey: string) {
+  return `${baseKey}${verifyLang(i18next.resolvedLanguage) ? `_${i18next.resolvedLanguage}` : ""}`;
+}