From d127773a89a4a774c3c17d9a9f2e74f38aaefa89 Mon Sep 17 00:00:00 2001
From: Blitzy <118096277+Blitz425@users.noreply.github.com>
Date: Fri, 9 Aug 2024 12:48:10 -0500
Subject: [PATCH 01/30] [Balance] Change Some Mainline Starter's Early Learnset
 (#3445)

* Update pokemon-level-moves.ts

* Change Poipole's Early Move

* Add notes
---
 src/data/pokemon-level-moves.ts | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/data/pokemon-level-moves.ts b/src/data/pokemon-level-moves.ts
index ccf6ac022ae..bacb84930b4 100644
--- a/src/data/pokemon-level-moves.ts
+++ b/src/data/pokemon-level-moves.ts
@@ -2631,7 +2631,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
   [Species.CHIKORITA]: [
     [ 1, Moves.TACKLE ],
     [ 1, Moves.GROWL ],
-    [ 6, Moves.RAZOR_LEAF ],
+    [ 5, Moves.RAZOR_LEAF ], //Custom, moved from 6 to 5
     [ 9, Moves.POISON_POWDER ],
     [ 12, Moves.SYNTHESIS ],
     [ 17, Moves.REFLECT ],
@@ -2681,8 +2681,8 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
   [Species.CYNDAQUIL]: [
     [ 1, Moves.TACKLE ],
     [ 1, Moves.LEER ],
-    [ 6, Moves.SMOKESCREEN ],
-    [ 10, Moves.EMBER ],
+    [ 5, Moves.EMBER ], //Custom, moved to 5
+    [ 10, Moves.SMOKESCREEN ], //Custom, moved to 10
     [ 13, Moves.QUICK_ATTACK ],
     [ 19, Moves.FLAME_WHEEL ],
     [ 22, Moves.DEFENSE_CURL ],
@@ -2736,7 +2736,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
   [Species.TOTODILE]: [
     [ 1, Moves.SCRATCH ],
     [ 1, Moves.LEER ],
-    [ 6, Moves.WATER_GUN ],
+    [ 5, Moves.WATER_GUN ], //Custom, moved from 6 to 5
     [ 9, Moves.BITE ],
     [ 13, Moves.SCARY_FACE ],
     [ 19, Moves.ICE_FANG ],
@@ -6723,7 +6723,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
   [Species.TURTWIG]: [
     [ 1, Moves.TACKLE ],
     [ 5, Moves.WITHDRAW ],
-    [ 9, Moves.ABSORB ],
+    [ 5, Moves.ABSORB ], //Custom, moved from 9 to 5
     [ 13, Moves.RAZOR_LEAF ],
     [ 17, Moves.CURSE ],
     [ 21, Moves.BITE ],
@@ -6768,7 +6768,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
   [Species.CHIMCHAR]: [
     [ 1, Moves.SCRATCH ],
     [ 1, Moves.LEER ],
-    [ 7, Moves.EMBER ],
+    [ 5, Moves.EMBER ], //Custom, moved from 7 to 5
     [ 9, Moves.TAUNT ],
     [ 15, Moves.FURY_SWIPES ],
     [ 17, Moves.FLAME_WHEEL ],
@@ -6817,7 +6817,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
   [Species.PIPLUP]: [
     [ 1, Moves.POUND ],
     [ 4, Moves.GROWL ],
-    [ 8, Moves.WATER_GUN ],
+    [ 5, Moves.WATER_GUN ], //Custom, moved from 8 to 5
     [ 11, Moves.CHARM ],
     [ 15, Moves.PECK ],
     [ 18, Moves.BUBBLE_BEAM ],
@@ -8591,7 +8591,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
   [Species.SNIVY]: [
     [ 1, Moves.TACKLE ],
     [ 4, Moves.LEER ],
-    [ 7, Moves.VINE_WHIP ],
+    [ 5, Moves.VINE_WHIP ], //Custom, moved from 7 to 5
     [ 10, Moves.WRAP ],
     [ 13, Moves.GROWTH ],
     [ 16, Moves.MAGICAL_LEAF ],
@@ -8639,7 +8639,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
   [Species.TEPIG]: [
     [ 1, Moves.TACKLE ],
     [ 3, Moves.TAIL_WHIP ],
-    [ 7, Moves.EMBER ],
+    [ 5, Moves.EMBER ], //Custom, moved from 7 to 5
     [ 9, Moves.ENDURE ],
     [ 13, Moves.DEFENSE_CURL ],
     [ 15, Moves.FLAME_CHARGE ],
@@ -8693,7 +8693,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
   [Species.OSHAWOTT]: [
     [ 1, Moves.TACKLE ],
     [ 5, Moves.TAIL_WHIP ],
-    [ 7, Moves.WATER_GUN ],
+    [ 5, Moves.WATER_GUN ], //Custom, moved from 7 to 5
     [ 11, Moves.SOAK ],
     [ 13, Moves.FOCUS_ENERGY ],
     [ 17, Moves.RAZOR_SHELL ],
@@ -13850,11 +13850,11 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
     [ 99, Moves.CLOSE_COMBAT ],
   ],
   [Species.POIPOLE]: [
+    [ RELEARN_MOVE, Moves.DRAGON_PULSE ], //Custom, made relearn
     [ 1, Moves.GROWL ],
     [ 1, Moves.ACID ],
     [ 1, Moves.PECK ],
     [ 1, Moves.HELPING_HAND ],
-    [ 1, Moves.DRAGON_PULSE ],
     [ 7, Moves.FURY_ATTACK ],
     [ 14, Moves.FELL_STINGER ],
     [ 21, Moves.CHARM ],
@@ -13969,7 +13969,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
   [Species.GROOKEY]: [
     [ 1, Moves.SCRATCH ],
     [ 1, Moves.GROWL ],
-    [ 6, Moves.BRANCH_POKE ],
+    [ 5, Moves.BRANCH_POKE ], //Custom, moved from 6 to 5
     [ 8, Moves.TAUNT ],
     [ 12, Moves.RAZOR_LEAF ],
     [ 17, Moves.SCREECH ],
@@ -14014,7 +14014,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
   [Species.SCORBUNNY]: [
     [ 1, Moves.TACKLE ],
     [ 1, Moves.GROWL ],
-    [ 6, Moves.EMBER ],
+    [ 5, Moves.EMBER ], //Custom, moved from 6 to 5
     [ 8, Moves.QUICK_ATTACK ],
     [ 12, Moves.DOUBLE_KICK ],
     [ 17, Moves.FLAME_CHARGE ],
@@ -14056,7 +14056,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
   [Species.SOBBLE]: [
     [ 1, Moves.POUND ],
     [ 1, Moves.GROWL ],
-    [ 6, Moves.WATER_GUN ],
+    [ 5, Moves.WATER_GUN ], //Custom, moved from 6 to 5
     [ 8, Moves.BIND ],
     [ 12, Moves.WATER_PULSE ],
     [ 17, Moves.TEARFUL_LOOK ],

From e820163505dfc409570fb69cbdd3de45ee8e1b99 Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Fri, 9 Aug 2024 13:58:15 -0700
Subject: [PATCH 02/30] [Misc] Update Pull Request template (#3467)

---
 .github/pull_request_template.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index acfe341c075..a765ed4a114 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -2,10 +2,10 @@
 <!-- Make sure that this PR is not overlapping with someone else's work -->
 <!-- Please try to keep the PR self-contained (and small) -->
 
-## What are the changes?
+## What are the changes the user will see?
 <!-- Summarize what are the changes from a user perspective on the application -->
 
-## Why am I doing these changes the user will see?
+## Why am I making these changes?
 <!-- Explain why you decided to introduce these changes -->
 <!-- Does it come from an issue or another PR? Please link it -->
 <!-- Explain why you believe this can enhance user experience -->

From 638a0a66b57cb1d5bf331be4d4dfbab21c0f6155 Mon Sep 17 00:00:00 2001
From: DustinLin <39450497+DustinLin@users.noreply.github.com>
Date: Fri, 9 Aug 2024 22:27:22 -0700
Subject: [PATCH 03/30] [Bug] removing destroy() calls on enemy pokemon after
 BattleEndPhase and breaks endless %50 waves (#3461)

---
 src/phases.ts | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/phases.ts b/src/phases.ts
index 46d1f4b98db..fcd3cfb8801 100644
--- a/src/phases.ts
+++ b/src/phases.ts
@@ -2581,15 +2581,6 @@ export class BattleEndPhase extends BattlePhase {
 
     this.scene.updateModifiers().then(() => this.end());
   }
-
-  end() {
-    // removing pokemon at the end of a battle
-    for (const p of this.scene.getEnemyParty()) {
-      p.destroy();
-    }
-
-    super.end();
-  }
 }
 
 export class NewBattlePhase extends BattlePhase {

From 566cd80522943790cd5102747bd790b6cae246a6 Mon Sep 17 00:00:00 2001
From: Tim Perdok <43152351+TimPerdok@users.noreply.github.com>
Date: Sat, 10 Aug 2024 15:17:04 +0200
Subject: [PATCH 04/30] [Feature] Move touch controls configuration (Reopened)
 (#3256)

* [Hotfix] Fix interactions of some moves not changing types (#3183)

* [Hotfix] Fix wild spawns not having their HA (#3190)

* [Hotfix] Allow to hatch pokemon with Hidden Ability again (#3222)

* chore: Update TNC links layout and position in index.html

* chore: Update TNC links font size in index.css (#3230)

* Move Touch Controls

* ConfigToolbar alignment

* Insert config toolbar on open, camel-case classes, hidden setting

* Better toolbar styling, fixed double configToolbar bug

* Fixed typedocs

---------

Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
---
 index.css                                     | 301 +++++++++-----
 index.html                                    | 100 +++--
 src/inputs-controller.ts                      |   3 +
 src/locales/de/settings.ts                    |   1 +
 src/locales/en/settings.ts                    |   1 +
 src/locales/es/settings.ts                    |   1 +
 src/locales/fr/settings.ts                    |   1 +
 src/locales/it/settings.ts                    |   1 +
 src/locales/ko/settings.ts                    |   1 +
 src/locales/pt_BR/settings.ts                 |   1 +
 src/locales/zh_CN/settings.ts                 |   1 +
 src/locales/zh_TW/settings.ts                 |   1 +
 src/system/settings/settings.ts               |  21 +-
 src/test/utils/fakeMobile.html                |  97 +++--
 src/touch-controls.ts                         |  46 ++-
 .../settings/abstract-settings-ui-handler.ts  |  26 +-
 .../settings/move-touch-controls-handler.ts   | 380 ++++++++++++++++++
 src/ui/settings/settings-audio-ui-handler.ts  |   5 +-
 .../settings/settings-display-ui-handler.ts   |   5 +-
 src/ui/settings/settings-ui-handler.ts        |   5 +-
 20 files changed, 794 insertions(+), 204 deletions(-)
 create mode 100644 src/ui/settings/move-touch-controls-handler.ts

diff --git a/index.css b/index.css
index be480ab6c78..54eda86161d 100644
--- a/index.css
+++ b/index.css
@@ -1,16 +1,8 @@
+/* Global */
 :root {
   --color-base: hsl(0, 0%, 55%);
   --color-light: hsl(0, 0%, 90%);
   --color-dark: hsl(0, 0%, 10%);
-  --controls-size: 10vh;
-  --text-shadow-size: 0.65vh;
-}
-
-@media (orientation: landscape) {
-  :root {
-    --controls-size: 20vh;
-    --text-shadow-size: 1.3vh;
-  }
 }
 
 html {
@@ -43,33 +35,173 @@ body {
   transform-origin: top !important;
 }
 
+#layout:fullscreen #dpad, #layout:fullscreen {
+  bottom: 6rem;
+}
+
+input:-internal-autofill-selected {
+  -webkit-background-clip: text;
+  background-clip: text;
+}
+
 /* Need adjust input font-size */
 input {
   font-size: 3.2rem;
 }
 
+.hidden {
+  display: none !important;
+}
+
+
+input:-internal-autofill-selected {
+  -webkit-background-clip: text;
+  background-clip: text;
+}
+
+/* Touch Controls: */
+
+#touchControls {
+  --text-shadow-size: 0.65vh;
+  --controls-size: 10vh;
+  --touch-control-opacity: 0.6;
+
+  --controls-padding: 1rem;
+
+  --controls-size-with-padding: calc(var(--controls-size) + var(--controls-padding));
+  --control-group-extra-size: calc(var(--controls-size) * 0.8);
+
+  --control-group-extra-2-offset: calc(var(--controls-size-with-padding) + (var(--controls-size) - var(--control-group-extra-size)) / 2);
+  --control-group-extra-1-offset: calc(var(--controls-padding) + (var(--controls-size) - var(--control-group-extra-size)) / 2);
+
+  --small-control-size: calc(var(--controls-size) / 3);
+  --rect-control-size: calc(var(--controls-size) * 0.74);
+
+  font-family: 'emerald';
+  font-size: var(--controls-size);
+  text-shadow: var(--color-dark) var(--text-shadow-size) var(--text-shadow-size);
+  color: var(--color-light);
+}
+
+@media (orientation: landscape) {
+  #touchControls {
+    --controls-size: 20vh; 
+    --text-shadow-size: 1.3vh;
+    --small-button-offset: 4vh;
+  }
+}
+
 #touchControls:not(.visible) {
   display: none;
 }
 
-#dpad, #apad {
+#touchControls .active {
+  opacity: var(--touch-control-opacity);
+}
+
+.control-group {
   position: fixed;
-  bottom: 1rem;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-around;
+  align-items: center;
+  width: var(--controls-size);
+}
+
+.control-group-dpad {
+  width: calc(2 * var(--controls-size));
+  height: calc(2 * var(--controls-size));
+}
+
+.control-group-extra {
+  width: var(--control-group-extra-size);
+  height: var(--control-group-extra-size);
+}
+/* Hide buttons on specific UIs */
+
+/* Show #cycleForm and #cycleShiny only on STARTER_SELECT and SETTINGS */
+#touchControls:not([data-ui-mode='STARTER_SELECT']):not([data-ui-mode^='SETTINGS']) #apadCycleForm,
+#touchControls:not([data-ui-mode='STARTER_SELECT']):not([data-ui-mode^='SETTINGS']) #apadCycleShiny {
+  display: none;
+}
+
+/* Show #apadInfo only in battle */
+#touchControls:not([data-ui-mode='COMMAND']):not([data-ui-mode='FIGHT']):not([data-ui-mode='BALL']) #apadInfo {
+  display: none;
+}
+
+/* Show #apadInfo only in battle and target select */
+#touchControls:not([data-ui-mode='COMMAND']):not([data-ui-mode='FIGHT']):not([data-ui-mode='BALL']):not([data-ui-mode='TARGET_SELECT']):not([data-ui-mode='MODIFIER_SELECT']) #apadStats {
+  display: none;
+}
+
+/* Show cycle buttons only on STARTER_SELECT and on touch configuration panel */
+#touchControls:not(.config-mode):not([data-ui-mode='STARTER_SELECT']) #apadCycleNature,
+#touchControls:not(.config-mode):not([data-ui-mode='STARTER_SELECT']) #apadCycleAbility,
+#touchControls:not(.config-mode):not([data-ui-mode='STARTER_SELECT']) #apadCycleGender,
+#touchControls:not(.config-mode):not([data-ui-mode='STARTER_SELECT']) #apadCycleVariant {
+ display: none;
+}
+
+/* Configuration toolbar */
+
+#configToolbar {
+  width: 100%;
+  position: fixed;
+  top: 1rem;
+  left: 0;
+  z-index: 9;
+  user-select: none;
+}
+
+#configToolbar .column {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 10%;
+  padding: 0 var(--controls-padding);
+}
+
+#configToolbar .button-row {
+  display: flex;
+  justify-content: space-evenly;
+  width: 100%;
+}
+
+#configToolbar .info-row {
+  display: flex;
+  justify-content: flex-start;
+  width: 100%;
+}
+
+#configToolbar .button {
   z-index: 3;
+  background-color: var(--color-base);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  text-align: center;
+  border-radius: 10%;
+  height: var(--small-control-size);
+  font-size: var(--small-control-size);
+  border-radius: 8px;
+  padding: 2px 8px;
+  text-shadow: var(--color-dark) calc(var(--text-shadow-size) / 3) calc(var(--text-shadow-size) / 3);
 }
 
-@media (orientation: portrait) {
-  #dpad, #apad {
-    bottom: calc(1rem + env(safe-area-inset-bottom));
-  }
+#configToolbar .button:active {
+  opacity: var(--touch-control-opacity)
 }
 
+#configToolbar .orientation-label {
+  font-size: var(--small-control-size);
+  text-shadow: var(--color-dark) calc(var(--text-shadow-size) / 3) calc(var(--text-shadow-size) / 3);
+}
+
+/* dpad */
 #dpad {
-  left: 1rem;
-}
-
-#apad {
-  right: 1rem;
+  z-index: 3;
+  opacity: 0.8;
 }
 
 #dpad svg {
@@ -78,114 +210,83 @@ input {
   fill: var(--color-base);
 }
 
-#dpad svg rect {
-  opacity: 0.6;
-}
+/* apad buttons */
 
-#apad > * {
-  width: var(--controls-size);
-  height: var(--controls-size);
-}
-
-#apad .apadBtn {
-  width: var(--controls-size);
-  height: var(--controls-size);
+.apad-button {
   background-color: var(--color-base);
   border-radius: 50%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  right: 0;
+  bottom: 0;
+  width: var(--controls-size);
+  height: var(--controls-size);
+  opacity: 0.8;
+  border-radius: 8px;
 }
 
-#apad .apadLabel {
-  font-family: 'emerald';
-  font-size: var(--controls-size);
-  text-shadow: var(--color-dark) var(--text-shadow-size) var(--text-shadow-size);
-  color: var(--color-light);
+.apad-small {
+  width: var(--small-control-size);
+  height: var(--small-control-size);
+}
+
+.apad-label {
   user-select: none;
+  height: 100%;
+  margin-right: -2px;
 }
 
-#apad .apadLabelSmall {
-  font-size: calc(var(--controls-size) / 3);
+.apad-small > .apad-label {
+  font-size: var(--small-control-size);
   text-shadow: var(--color-dark) calc(var(--text-shadow-size) / 3) calc(var(--text-shadow-size) / 3);
 }
 
-#apad #apadLabelAction, #apad #apadLabelCancel {
-  margin-left: calc(var(--controls-size) / 3);
-  line-height: 0.9;
-}
-
-#apad > :nth-child(2) {
-  position: relative;
-  right: var(--controls-size);
-}
-
-#apad .apadRectBtn {
-  position: relative;
+.apad-rectangle {
   text-align: center;
-  padding-right: 10%;
-  border-radius: 10%;
-  bottom: calc(var(--controls-size) * 0.05);
-  width: calc(var(--controls-size) * 0.6);
-  height: calc(var(--controls-size) * 0.3);
+  width: var(--rect-control-size);
+  height: var(--small-control-size);
 }
 
-#apad .apadSqBtn {
-  border-radius: 10%;
-  width: calc(var(--controls-size) * 0.3);
-  height: calc(var(--controls-size) * 0.3);
+.apad-square {
+  width: var(--small-control-size);
+  height: var(--small-control-size);
 }
 
-#apad .apadBtnContainer {
-  position: relative;
-  display: flex;
+.apad-circle {
+  width: var(--controls-size);
+  height: var(--controls-size);
+  border-radius: 50%;
 }
 
-#apad .apadRectBtnContainer {
-  flex-wrap: wrap;
-  margin-top: calc(var(--controls-size) * -0.8);
-  left: calc(var(--controls-size) * 0.175);
-  height: calc(var(--controls-size) * 0.8);
+/* Defaults:*/
+
+#control-group-dpad {
+  left: var(--controls-padding);
+  bottom: var(--controls-padding);
 }
 
-#apad .apadSqBtnContainer {
-  flex-wrap: wrap;
-  justify-content: space-evenly;
-  align-items: center;
-  margin-bottom: calc(var(--controls-size) * -0.8);
-  top: calc(var(--controls-size) * -0.9);
-  width: calc(var(--controls-size) * 0.8);
-  height: calc(var(--controls-size) * 0.8);
+#control-group-action {
+  right: var(--controls-padding);
+  bottom: var(--controls-size-with-padding);
 }
 
-#apad .apadRectBtnContainer > #apadMenu {
-  align-self: flex-end;
+#control-group-cancel {
+  right: var(--controls-size-with-padding);
+  bottom: var(--controls-padding);;
 }
 
-#apad .apadRectBtnContainer > .apadSqBtn:not(:first-child) {
-  margin-left: 10%;
+#control-group-extra-1 {
+  right: var(--control-group-extra-1-offset);
+  bottom: var(--control-group-extra-1-offset);
 }
 
-#touchControls:not([data-ui-mode='STARTER_SELECT']):not([data-ui-mode='SETTINGS']):not([data-ui-mode='SETTINGS_DISPLAY']):not([data-ui-mode='SETTINGS_AUDIO']):not([data-ui-mode='SETTINGS_GAMEPAD']):not([data-ui-mode='SETTINGS_KEYBOARD']) #apad .apadRectBtnContainer > .apadSqBtn:not(.apadBattle),
-#touchControls:not([data-ui-mode='STARTER_SELECT']):not([data-ui-mode='SETTINGS']):not([data-ui-mode='SETTINGS_DISPLAY']):not([data-ui-mode='SETTINGS_AUDIO']):not([data-ui-mode='SETTINGS_GAMEPAD']):not([data-ui-mode='SETTINGS_KEYBOARD']) #apad .apadSqBtnContainer > .apadSqBtn:not(.apadBattle)
-{
-  display: none;
+#control-group-extra-2 {
+  right: var(--control-group-extra-2-offset);
+  bottom: var(--control-group-extra-2-offset);
 }
 
-#touchControls:not([data-ui-mode='COMMAND']):not([data-ui-mode='FIGHT']):not([data-ui-mode='BALL']):not([data-ui-mode='TARGET_SELECT']):not([data-ui-mode='MODIFIER_SELECT']) #apad .apadBattle {
-  display: none;
-}
-
-#apad .apadRectBtnContainer + .apadSqBtnContainer {
-  top: calc(var(--controls-size) * -1.9);
-  left: calc(var(--controls-size) * -0.9);
-}
-
-#apad .apadBtnContainer .apadLabel {
-  margin-left: calc(var(--controls-size) / 12);
-  line-height: 0.8;
-}
-
-#dpad path:not(.active), #apad .apadBtn:not(.active) {
-  opacity: 0.6;
-}
+/* Layout */
 
 #layout:fullscreen #dpad, #layout:fullscreen #apad {
   bottom: 6rem;
diff --git a/index.html b/index.html
index ebe5b063c52..5ebf822521e 100644
--- a/index.html
+++ b/index.html
@@ -64,54 +64,70 @@
 <body>
 	<div id="app"></div>
 	<div id="touchControls">
-		<div id="dpad" class="unselectable">
-			<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 72 72">
-				<path id="dpadUp" data-key="UP" d="M48,5.8C48,2.5,45.4,0,42,0H29.9C26.6,0,24,2.4,24,5.8V24h24V5.8z" />
-				<path id="dpadRight" data-key="RIGHT" d="M66.2,24H48v24h18.2c3.3,0,5.8-2.7,5.8-6V29.9C72,26.5,69.5,24,66.2,24z" />
-				<path id="dpadDown" data-key="DOWN" d="M24,66.3c0,3.3,2.6,5.7,5.9,5.7H42c3.3,0,6-2.4,6-5.7V48H24V66.3z" />
-				<path id="dpadLeft" data-key="LEFT" d="M5.7,24C2.4,24,0,26.5,0,29.9V42c0,3.3,2.3,6,5.7,6H24V24H5.7z" />
-				<rect id="dpadCenter" x="24" y="24" width="24" height="24" />
-			</svg>
+		<div class="left">
+			<div id="control-group-dpad" class="control-group control-group-dpad">
+				<div id="dpad" data-control-key="DPAD">
+					<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 72 72">
+						<path id="dpadUp" data-key="UP"
+							d="M48,5.8C48,2.5,45.4,0,42,0H29.9C26.6,0,24,2.4,24,5.8V24h24V5.8z" />
+						<path id="dpadRight" data-key="RIGHT"
+							d="M66.2,24H48v24h18.2c3.3,0,5.8-2.7,5.8-6V29.9C72,26.5,69.5,24,66.2,24z" />
+						<path id="dpadDown" data-key="DOWN"
+							d="M24,66.3c0,3.3,2.6,5.7,5.9,5.7H42c3.3,0,6-2.4,6-5.7V48H24V66.3z" />
+						<path id="dpadLeft" data-key="LEFT"
+							d="M5.7,24C2.4,24,0,26.5,0,29.9V42c0,3.3,2.3,6,5.7,6H24V24H5.7z" />
+						<rect id="dpadCenter" x="24" y="24" width="24" height="24" />
+					</svg>
+				</div>
+			</div>
 		</div>
 
-		<div id="apad" class="unselectable">
-			<div id="apadAction" class="apadCircBtn apadBtn" data-key="ACTION">
-				<text id="apadLabelAction" class="apadLabel">A</text>
-			</div>
-			<div id="apadCancel" class="apadCircBtn apadBtn" data-key="CANCEL">
-				<text id="apadLabelCancel" class="apadLabel">B</text>
-			</div>
-			<div class="apadBtnContainer apadRectBtnContainer">
-				<div id="apadCycleShiny" class="apadSqBtn apadBtn" data-key="CYCLE_SHINY">
-					<text class="apadLabel apadLabelSmall">R</text>
-				</div>
-				<div id="apadCycleVariant" class="apadSqBtn apadBtn" data-key="V">
-					<text class="apadLabel apadLabelSmall">V</text>
-				</div>
-				<div id="apadStats" class="apadRectBtn apadBtn apadBattle" data-key="STATS">
-					<text class="apadLabel apadLabelSmall">C</text>
-				</div>
-				<div id="apadMenu" class="apadRectBtn apadBtn" data-key="MENU">
-					<text class="apadLabel apadLabelSmall">Menu</text>
+		<div class="right">
+			<div id="control-group-action" class="control-group">
+				<div id="apadAction" class="apad-button apad-circle" data-key="ACTION">
+					<span class="apad-label">A</span>
 				</div>
 			</div>
-			<div class="apadBtnContainer apadSqBtnContainer">
-				<div id="apadCycleForm" class="apadSqBtn apadBtn" data-key="CYCLE_FORM">
-					<text class="apadLabel apadLabelSmall">F</text>
-				</div>
-				<div id="apadCycleGender" class="apadSqBtn apadBtn" data-key="CYCLE_GENDER">
-					<text class="apadLabel apadLabelSmall">G</text>
-				</div>
-				<div id="apadCycleAbility" class="apadSqBtn apadBtn" data-key="CYCLE_ABILITY">
-					<text class="apadLabel apadLabelSmall">E</text>
-				</div>
-				<div id="apadCycleNature" class="apadSqBtn apadBtn" data-key="CYCLE_NATURE">
-					<text class="apadLabel apadLabelSmall">N</text>
-				</div>
-				<div id="apadInfo" class="apadRectBtn apadBtn apadBattle" data-key="V">
-					<text class="apadLabel apadLabelSmall">V</text>
+
+			<div id="control-group-cancel" class="control-group">
+				<div id="apadCancel" class="apad-button apad-circle" data-key="CANCEL">
+					<span class="apad-label">B</span>
 				</div>
 			</div>
+
+			<div id="control-group-extra-1" class="control-group control-group-extra">
+				<div id="apadCycleShiny" class="apad-button apad-square apad-small" data-key="CYCLE_SHINY">
+					<span class="apad-label">R</span>
+				</div>
+				<div id="apadCycleVariant" class="apad-button apad-square apad-small" data-key="V">
+					<span class="apad-label">V</span>
+				</div>
+				<div id="apadStats" class="apad-button apad-rectangle apad-small" data-key="STATS">
+					<span class="apad-label">C</span>
+				</div>
+				<div id="apadMenu" class="apad-button apad-rectangle apad-small" data-key="MENU">
+					<span class="apad-label">Menu</span>
+				</div>
+			</div>
+
+			<div id="control-group-extra-2" class="control-group control-group-extra">
+				<div id="apadCycleForm" class="apad-button apad-square apad-small" data-key="CYCLE_FORM">
+					<span class="apad-label">F</span>
+				</div>
+				<div id="apadCycleGender" class="apad-button apad-square apad-small" data-key="CYCLE_GENDER">
+					<span class="apad-label">G</span>
+				</div>
+				<div id="apadCycleAbility" class="apad-button apad-square apad-small" data-key="CYCLE_ABILITY">
+					<span class="apad-label">E</span>
+				</div>
+				<div id="apadCycleNature" class="apad-button apad-square apad-small" data-key="CYCLE_NATURE">
+					<span class="apad-label">N</span>
+				</div>
+				<div id="apadInfo" class="apad-button apad-rectangle apad-small" data-key="V">
+					<span class="apad-label">V</span>
+				</div>
+			</div>
+
 		</div>
 	</div>
 	<div id="tnc-links">
diff --git a/src/inputs-controller.ts b/src/inputs-controller.ts
index 331d491b807..1af376ed6f4 100644
--- a/src/inputs-controller.ts
+++ b/src/inputs-controller.ts
@@ -21,6 +21,7 @@ import {SettingKeyboard} from "#app/system/settings/settings-keyboard";
 import TouchControl from "#app/touch-controls";
 import { Button } from "#enums/buttons";
 import { Device } from "#enums/devices";
+import MoveTouchControlsHandler from "./ui/settings/move-touch-controls-handler";
 
 export interface DeviceMapping {
     [key: string]: number;
@@ -105,6 +106,7 @@ export class InputsController {
   public lastSource: string = "keyboard";
   private inputInterval: NodeJS.Timeout[] = new Array();
   private touchControls: TouchControl;
+  public moveTouchControlsHandler: MoveTouchControlsHandler;
 
   /**
      * Initializes a new instance of the game control system, setting up initial state and configurations.
@@ -182,6 +184,7 @@ export class InputsController {
       this.scene.input.keyboard?.on("keyup", this.keyboardKeyUp, this);
     }
     this.touchControls = new TouchControl(this.scene);
+    this.moveTouchControlsHandler = new MoveTouchControlsHandler(this.touchControls);
   }
 
   /**
diff --git a/src/locales/de/settings.ts b/src/locales/de/settings.ts
index 4ac69868a7e..7d4523c8cbd 100644
--- a/src/locales/de/settings.ts
+++ b/src/locales/de/settings.ts
@@ -97,5 +97,6 @@ export const settings: SimpleTranslationEntries = {
   "controller": "Controller",
   "gamepadSupport": "Controllerunterstützung",
   "showBgmBar": "Musiknamen anzeigen",
+  "moveTouchControls": "Bewegung Touch Steuerung",
   "shopOverlayOpacity": "Shop Overlay Deckkraft",
 } as const;
diff --git a/src/locales/en/settings.ts b/src/locales/en/settings.ts
index 0b88f5e82c8..c63f9de6049 100644
--- a/src/locales/en/settings.ts
+++ b/src/locales/en/settings.ts
@@ -97,5 +97,6 @@ export const settings: SimpleTranslationEntries = {
   "controller": "Controller",
   "gamepadSupport": "Gamepad Support",
   "showBgmBar": "Show Music Names",
+  "moveTouchControls": "Move Touch Controls",
   "shopOverlayOpacity": "Shop Overlay Opacity"
 } as const;
diff --git a/src/locales/es/settings.ts b/src/locales/es/settings.ts
index cac4b25c689..c7f723fe80c 100644
--- a/src/locales/es/settings.ts
+++ b/src/locales/es/settings.ts
@@ -97,5 +97,6 @@ export const settings: SimpleTranslationEntries = {
   "controller": "Controller",
   "gamepadSupport": "Gamepad Support",
   "showBgmBar": "Show Music Names",
+  "moveTouchControls": "Move Touch Controls",
   "shopOverlayOpacity": "Opacidad de la fase de compra"
 } as const;
diff --git a/src/locales/fr/settings.ts b/src/locales/fr/settings.ts
index 2ed697c4e7f..19e9f57ead6 100644
--- a/src/locales/fr/settings.ts
+++ b/src/locales/fr/settings.ts
@@ -97,5 +97,6 @@ export const settings: SimpleTranslationEntries = {
   "controller": "Controller",
   "gamepadSupport": "Gamepad Support",
   "showBgmBar": "Titre de la musique",
+  "moveTouchControls": "Déplacer les contrôles tactiles",
   "shopOverlayOpacity": "Opacité boutique"
 } as const;
diff --git a/src/locales/it/settings.ts b/src/locales/it/settings.ts
index 2381987d387..0d05d01ba1c 100644
--- a/src/locales/it/settings.ts
+++ b/src/locales/it/settings.ts
@@ -97,5 +97,6 @@ export const settings: SimpleTranslationEntries = {
   "controller": "Controller",
   "gamepadSupport": "Supporto Gamepad",
   "showBgmBar": "Mostra Nomi Musica",
+  "moveTouchControls": "Move Touch Controls",
   "shopOverlayOpacity": "Opacità Finestra Negozio"
 } as const;
diff --git a/src/locales/ko/settings.ts b/src/locales/ko/settings.ts
index 3dcdc3b07c1..aa4adfc4e41 100644
--- a/src/locales/ko/settings.ts
+++ b/src/locales/ko/settings.ts
@@ -97,5 +97,6 @@ export const settings: SimpleTranslationEntries = {
   "controller": "컨트롤러",
   "gamepadSupport": "게임패드 지원",
   "showBgmBar": "BGM 제목 보여주기",
+  "moveTouchControls": "터치 컨트롤 이동",
   "shopOverlayOpacity": "상점 오버레이 투명도"
 } as const;
diff --git a/src/locales/pt_BR/settings.ts b/src/locales/pt_BR/settings.ts
index 316dacb8fc6..14646b59742 100644
--- a/src/locales/pt_BR/settings.ts
+++ b/src/locales/pt_BR/settings.ts
@@ -97,5 +97,6 @@ export const settings: SimpleTranslationEntries = {
   "controller": "Controle",
   "gamepadSupport": "Suporte para Controle",
   "showBgmBar": "Exibir Nomes das Músicas",
+  "moveTouchControls": "Move Touch Controls",
   "shopOverlayOpacity": "Opacidade da Loja"
 } as const;
diff --git a/src/locales/zh_CN/settings.ts b/src/locales/zh_CN/settings.ts
index a55fe3e8cd9..422b1bd591d 100644
--- a/src/locales/zh_CN/settings.ts
+++ b/src/locales/zh_CN/settings.ts
@@ -97,5 +97,6 @@ export const settings: SimpleTranslationEntries = {
   "controller": "控制器",
   "gamepadSupport": "手柄支持",
   "showBgmBar": "显示音乐名称",
+  "moveTouchControls": "移动触摸控制",
   "shopOverlayOpacity": "商店显示不透明度"
 } as const;
diff --git a/src/locales/zh_TW/settings.ts b/src/locales/zh_TW/settings.ts
index 133cce61fd3..35499f45d15 100644
--- a/src/locales/zh_TW/settings.ts
+++ b/src/locales/zh_TW/settings.ts
@@ -97,5 +97,6 @@ export const settings: SimpleTranslationEntries = {
   "controller": "控制器",
   "gamepadSupport": "手柄支持",
   "showBgmBar": "Show Music Names",
+  "moveTouchControls": "移動觸控控制",
   "shopOverlayOpacity": "Shop Overlay Opacity"
 } as const;
diff --git a/src/system/settings/settings.ts b/src/system/settings/settings.ts
index 3f9b906d1cf..4ea7526f51d 100644
--- a/src/system/settings/settings.ts
+++ b/src/system/settings/settings.ts
@@ -65,6 +65,10 @@ export interface Setting {
   default: number
   type: SettingType
   requireReload?: boolean
+  /** Whether the setting can be activated or not */
+  activatable?: boolean
+  /** Determines whether the setting should be hidden from the UI */
+  isHidden?: () => boolean
 }
 
 /**
@@ -106,6 +110,7 @@ export const SettingKeys = {
   SE_Volume: "SE_VOLUME",
   Music_Preference: "MUSIC_PREFERENCE",
   Show_BGM_Bar: "SHOW_BGM_BAR",
+  Move_Touch_Controls: "MOVE_TOUCH_CONTROLS",
   Shop_Overlay_Opacity: "SHOP_OVERLAY_OPACITY"
 };
 
@@ -550,6 +555,20 @@ export const Setting: Array<Setting> = [
     type: SettingType.AUDIO,
     requireReload: true
   },
+  {
+    key: SettingKeys.Move_Touch_Controls,
+    label: i18next.t("settings:moveTouchControls"),
+    options: [
+      {
+        value: "Configure",
+        label: i18next.t("settings:change")
+      }
+    ],
+    default: 0,
+    type: SettingType.GENERAL,
+    activatable: true,
+    isHidden: () => !hasTouchscreen()
+  },
   {
     key: SettingKeys.Shop_Overlay_Opacity,
     label: i18next.t("settings:shopOverlayOpacity"),
@@ -557,7 +576,7 @@ export const Setting: Array<Setting> = [
     default: 7,
     type: SettingType.DISPLAY,
     requireReload: false
-  },
+  }
 ];
 
 /**
diff --git a/src/test/utils/fakeMobile.html b/src/test/utils/fakeMobile.html
index 6fa0406f361..4b566d592d9 100644
--- a/src/test/utils/fakeMobile.html
+++ b/src/test/utils/fakeMobile.html
@@ -1,50 +1,69 @@
 <!DOCTYPE html><body>
 	<div id="touchControls">
-		<div id="dpad" class="unselectable">
-			<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 72 72">
-				<path id="dpadUp" data-key="UP" d="M48,5.8C48,2.5,45.4,0,42,0H29.9C26.6,0,24,2.4,24,5.8V24h24V5.8z" />
-				<path id="dpadRight" data-key="RIGHT" d="M66.2,24H48v24h18.2c3.3,0,5.8-2.7,5.8-6V29.9C72,26.5,69.5,24,66.2,24z" />
-				<path id="dpadDown" data-key="DOWN" d="M24,66.3c0,3.3,2.6,5.7,5.9,5.7H42c3.3,0,6-2.4,6-5.7V48H24V66.3z" />
-				<path id="dpadLeft" data-key="LEFT" d="M5.7,24C2.4,24,0,26.5,0,29.9V42c0,3.3,2.3,6,5.7,6H24V24H5.7z" />
-				<rect id="dpadCenter" x="24" y="24" width="24" height="24" />
-			</svg>
+		<div class="left">
+			<div id="control-group-dpad" class="control-group control-group-dpad">
+				<div id="dpad" data-control-key="DPAD">
+					<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 72 72">
+						<path id="dpadUp" data-key="UP"
+							d="M48,5.8C48,2.5,45.4,0,42,0H29.9C26.6,0,24,2.4,24,5.8V24h24V5.8z" />
+						<path id="dpadRight" data-key="RIGHT"
+							d="M66.2,24H48v24h18.2c3.3,0,5.8-2.7,5.8-6V29.9C72,26.5,69.5,24,66.2,24z" />
+						<path id="dpadDown" data-key="DOWN"
+							d="M24,66.3c0,3.3,2.6,5.7,5.9,5.7H42c3.3,0,6-2.4,6-5.7V48H24V66.3z" />
+						<path id="dpadLeft" data-key="LEFT"
+							d="M5.7,24C2.4,24,0,26.5,0,29.9V42c0,3.3,2.3,6,5.7,6H24V24H5.7z" />
+						<rect id="dpadCenter" x="24" y="24" width="24" height="24" />
+					</svg>
+				</div>
+			</div>
 		</div>
 
-		<div id="apad" class="unselectable">
-			<div id="apadAction" class="apadCircBtn apadBtn" data-key="ACTION">
-				<text id="apadLabelAction" class="apadLabel">A</text>
-			</div>
-			<div id="apadCancel" class="apadCircBtn apadBtn" data-key="CANCEL">
-				<text id="apadLabelCancel" class="apadLabel">B</text>
-			</div>
-			<div class="apadBtnContainer apadRectBtnContainer">
-				<div id="apadCycleShiny" class="apadSqBtn apadBtn" data-key="CYCLE_SHINY">
-					<text class="apadLabel apadLabelSmall">R</text>
-				</div>
-				<div id="apadCycleVariant" class="apadSqBtn apadBtn" data-key="CYCLE_VARIANT">
-					<text class="apadLabel apadLabelSmall">V</text>
-				</div>
-				<div id="apadStats" class="apadRectBtn apadBtn" data-key="STATS">
-					<text class="apadLabel apadLabelSmall">C</text>
-				</div>
-				<div id="apadMenu" class="apadRectBtn apadBtn" data-key="MENU">
-					<text class="apadLabel apadLabelSmall">Menu</text>
+		<div class="right">
+			<div id="control-group-action" class="control-group">
+				<div id="apadAction" class="apad-button apad-circle" data-key="ACTION">
+					<span class="apad-label">A</span>
 				</div>
 			</div>
-			<div class="apadBtnContainer apadSqBtnContainer">
-				<div id="apadCycleForm" class="apadSqBtn apadBtn" data-key="CYCLE_FORM">
-					<text class="apadLabel apadLabelSmall">F</text>
-				</div>
-				<div id="apadCycleGender" class="apadSqBtn apadBtn" data-key="CYCLE_GENDER">
-					<text class="apadLabel apadLabelSmall">G</text>
-				</div>
-				<div id="apadCycleAbility" class="apadSqBtn apadBtn" data-key="CYCLE_ABILITY">
-					<text class="apadLabel apadLabelSmall">E</text>
-				</div>
-				<div id="apadCycleNature" class="apadSqBtn apadBtn" data-key="CYCLE_NATURE">
-					<text class="apadLabel apadLabelSmall">N</text>
+
+			<div id="control-group-cancel" class="control-group">
+				<div id="apadCancel" class="apad-button apad-circle" data-key="CANCEL">
+					<span class="apad-label">B</span>
 				</div>
 			</div>
+
+			<div id="control-group-extra-1" class="control-group control-group-extra">
+				<div id="apadCycleShiny" class="apad-button apad-square apad-small" data-key="CYCLE_SHINY">
+					<span class="apad-label">R</span>
+				</div>
+				<div id="apadCycleVariant" class="apad-button apad-square apad-small" data-key="V">
+					<span class="apad-label">V</span>
+				</div>
+				<div id="apadStats" class="apad-button apad-rectangle apad-small" data-key="STATS">
+					<span class="apad-label">C</span>
+				</div>
+				<div id="apadMenu" class="apad-button apad-rectangle apad-small" data-key="MENU">
+					<span class="apad-label">Menu</span>
+				</div>
+			</div>
+
+			<div id="control-group-extra-2" class="control-group control-group-extra">
+				<div id="apadCycleForm" class="apad-button apad-square apad-small" data-key="CYCLE_FORM">
+					<span class="apad-label">F</span>
+				</div>
+				<div id="apadCycleGender" class="apad-button apad-square apad-small" data-key="CYCLE_GENDER">
+					<span class="apad-label">G</span>
+				</div>
+				<div id="apadCycleAbility" class="apad-button apad-square apad-small" data-key="CYCLE_ABILITY">
+					<span class="apad-label">E</span>
+				</div>
+				<div id="apadCycleNature" class="apad-button apad-square apad-small" data-key="CYCLE_NATURE">
+					<span class="apad-label">N</span>
+				</div>
+				<div id="apadInfo" class="apad-button apad-rectangle apad-small" data-key="V">
+					<span class="apad-label">V</span>
+				</div>
+			</div>
+
 		</div>
 	</div>
 </body>
\ No newline at end of file
diff --git a/src/touch-controls.ts b/src/touch-controls.ts
index 1726b47a4bd..53df545e27f 100644
--- a/src/touch-controls.ts
+++ b/src/touch-controls.ts
@@ -8,18 +8,38 @@ export default class TouchControl {
   events: EventEmitter;
   private buttonLock: string[] = new Array();
   private inputInterval: NodeJS.Timeout[] = new Array();
+  /** Whether touch controls are disabled */
+  private disabled: boolean = false;
+  /** Whether the last touch event has finished before disabling */
+  private finishedLastTouch: boolean = false;
 
   constructor(scene: BattleScene) {
     this.events = scene.game.events;
     this.init();
   }
 
+  /**
+   * Disable touch controls
+   */
+  disable() {
+    this.disabled = true;
+	  this.finishedLastTouch = false;
+  }
+
+  /**
+   * Enable touch controls
+	 */
+  enable() {
+    this.disabled = false;
+    this.finishedLastTouch = false;
+  }
+
   /**
    * Initialize touch controls by binding keys to buttons.
    */
   init() {
     this.preventElementZoom(document.querySelector("#dpad"));
-    this.preventElementZoom(document.querySelector("#apad"));
+    document.querySelectorAll(".apad-button").forEach((element) => this.preventElementZoom(element as HTMLElement));
     // Select all elements with the 'data-key' attribute and bind keys to them
     for (const button of document.querySelectorAll("[data-key]")) {
       // @ts-ignore - Bind the key to the button using the dataset key
@@ -56,10 +76,14 @@ export default class TouchControl {
     if (this.buttonLock.includes(key)) {
       return;
     }
-    this.simulateKeyboardEvent("keydown", key);
+    if (!this.simulateKeyboardEvent("keydown", key)) {
+      return;
+    }
     clearInterval(this.inputInterval[key]);
     this.inputInterval[key] = setInterval(() => {
-      this.simulateKeyboardEvent("keydown", key);
+      if (!this.simulateKeyboardEvent("keydown", key)) {
+        clearInterval(this.inputInterval[key]);
+      }
     }, repeatInputDelayMillis);
     this.buttonLock.push(key);
     node.classList.add("active");
@@ -67,11 +91,11 @@ export default class TouchControl {
   }
 
   touchButtonUp(node: HTMLElement, key: string, id: string) {
-    if (!this.buttonLock.includes(key)) {
+    if (!this.buttonLock.includes(key) || this.disabled && this.finishedLastTouch) {
       return;
     }
+    this.finishedLastTouch = true;
     this.simulateKeyboardEvent("keyup", key);
-
     node.classList.remove("active");
 
     document.getElementById(id)?.classList.remove("active");
@@ -81,18 +105,19 @@ export default class TouchControl {
   }
 
   /**
-   * Simulates a keyboard event on the canvas.
+   * Simulates a keyboard event on the canvas if the button is not disabled.
    *
    * @param eventType - The type of the keyboard event ('keydown' or 'keyup').
    * @param key - The key to simulate.
-   *
+   * @returns Whether the simulation was successful.
    * @remarks
    * This function checks if the key exists in the Button enum. If it does, it retrieves the corresponding button
    * and emits the appropriate event ('input_down' or 'input_up') based on the event type.
    */
-  simulateKeyboardEvent(eventType: string, key: string) {
-    if (!Button.hasOwnProperty(key)) {
-      return;
+  simulateKeyboardEvent(eventType: string, key: string): boolean {
+    console.log("simulateKeyboardEvent", eventType, key);
+    if (!Button.hasOwnProperty(key) || this.disabled) {
+      return false;
     }
     const button = Button[key];
 
@@ -112,6 +137,7 @@ export default class TouchControl {
       });
       break;
     }
+    return true;
   }
 
   /**
diff --git a/src/ui/settings/abstract-settings-ui-handler.ts b/src/ui/settings/abstract-settings-ui-handler.ts
index 6a074c83e90..f21f2ebcc9d 100644
--- a/src/ui/settings/abstract-settings-ui-handler.ts
+++ b/src/ui/settings/abstract-settings-ui-handler.ts
@@ -7,7 +7,7 @@ import { addWindow } from "../ui-theme";
 import {Button} from "#enums/buttons";
 import {InputsIcons} from "#app/ui/settings/abstract-control-settings-ui-handler.js";
 import NavigationMenu, {NavigationManager} from "#app/ui/settings/navigationMenu";
-import { Setting, SettingKeys } from "#app/system/settings/settings";
+import { Setting, SettingKeys, SettingType } from "#app/system/settings/settings";
 import i18next from "i18next";
 
 
@@ -40,9 +40,9 @@ export default class AbstractSettingsUiHandler extends UiHandler {
   protected settings: Array<Setting>;
   protected localStorageKey: string;
 
-  constructor(scene: BattleScene, mode: Mode | null = null) {
+  constructor(scene: BattleScene, type: SettingType, mode: Mode | null = null) {
     super(scene, mode);
-
+    this.settings = Setting.filter(s => s.type === type && !s?.isHidden?.());
     this.reloadRequired = false;
     this.rowsToDisplay = 8;
   }
@@ -264,6 +264,12 @@ export default class AbstractSettingsUiHandler extends UiHandler {
       case Button.CYCLE_SHINY:
         success = this.navigationContainer.navigate(button);
         break;
+      case Button.ACTION:
+        const setting: Setting = this.settings[cursor];
+        if (setting?.activatable) {
+          success = this.activateSetting(setting);
+        }
+        break;
       }
     }
 
@@ -275,6 +281,20 @@ export default class AbstractSettingsUiHandler extends UiHandler {
     return success;
   }
 
+  /**
+   * Activate the specified setting if it is activatable.
+   * @param setting The setting to activate.
+   * @returns Whether the setting was successfully activated.
+   */
+  activateSetting(setting: Setting): boolean {
+    switch (setting.key) {
+    case SettingKeys.Move_Touch_Controls:
+      this.scene.inputController.moveTouchControlsHandler.enableConfigurationMode(this.getUi(), this.scene);
+      return true;
+    }
+    return false;
+  }
+
   /**
    * Set the cursor to the specified position.
    *
diff --git a/src/ui/settings/move-touch-controls-handler.ts b/src/ui/settings/move-touch-controls-handler.ts
new file mode 100644
index 00000000000..cf56bf47d3b
--- /dev/null
+++ b/src/ui/settings/move-touch-controls-handler.ts
@@ -0,0 +1,380 @@
+import TouchControl from "#app/touch-controls.js";
+import UI from "#app/ui/ui.js";
+import { Scene } from "phaser";
+
+export const TOUCH_CONTROL_POSITIONS_LANDSCAPE = "touchControlPositionsLandscape";
+export const TOUCH_CONTROL_POSITIONS_PORTRAIT = "touchControlPositionsPortrait";
+
+
+
+type ControlPosition = { id: string, x: number, y: number };
+
+type ConfigurationEventListeners = {
+  "touchstart": EventListener[]
+  "touchmove": EventListener[]
+  "touchend": EventListener[]
+};
+
+type ToolbarRefs = {
+  toolbar: HTMLDivElement,
+  saveButton: HTMLDivElement
+  resetButton: HTMLDivElement
+  cancelButton: HTMLDivElement
+};
+
+/**
+ * Handles the dragging of touch controls around the screen.
+ */
+export default class MoveTouchControlsHandler {
+
+  /** The element that is currently being dragged */
+  private draggingElement: HTMLElement | null = null;
+
+  /**
+   * Whether the user is currently configuring the touch controls.
+   * When this is true, the touch controls can be dragged around the screen and the controls of the game are disabled.
+   */
+  public inConfigurationMode: boolean;
+
+  /**
+   * The event listeners for the configuration mode.
+   * These are used to remove the event listeners when the configuration mode is disabled.
+   */
+  private configurationEventListeners: ConfigurationEventListeners = {
+    "touchstart": [],
+    "touchmove": [],
+    "touchend": []
+  };
+
+  private overlay: Phaser.GameObjects.Container;
+
+  private isLandscapeMode: boolean = this.getScreenSize().width > this.getScreenSize().height;
+  private touchControls: TouchControl;
+
+  constructor(touchControls: TouchControl) {
+    this.touchControls = touchControls;
+    this.inConfigurationMode = false;
+    this.setPositions(this.getSavedPositionsOfCurrentOrientation() ?? []);
+    window.addEventListener("resize", (event) => {
+      const screenSize = this.getScreenSize();
+      if (screenSize.width > screenSize.height !== this.isLandscapeMode) {
+        this.changeOrientation(screenSize.width > screenSize.height);
+      }
+    });
+  }
+
+  /**
+   * Changes the state of the touch controls to the given orientation.
+   * @param isLandscapeMode Whether the screen is in landscape mode.
+   */
+  private async changeOrientation(isLandscapeMode: boolean) {
+    this.isLandscapeMode = isLandscapeMode;
+    if (this.inConfigurationMode) {
+      const orientation = document.querySelector("#touchControls #orientation");
+      if (orientation) {
+        orientation.textContent = this.isLandscapeMode? "Landscape" : "Portrait";
+      }
+    }
+    const positions = this.getSavedPositionsOfCurrentOrientation() ?? [];
+    this.setPositions(positions);
+  }
+
+  private getScreenSize() {
+    return { width: window.screen.width, height: window.screen.height };
+  }
+
+  /**
+   * Creates the toolbar element for the configuration mode.
+   * @returns A new div element that contains the toolbar for the configuration mode.
+   */
+  private createToolbarElement(): HTMLDivElement {
+    const toolbar = document.createElement("div");
+    toolbar.id = "configToolbar";
+    toolbar.innerHTML = `
+      <div class="column">
+        <div class="button-row">
+          <div id="resetButton" class="button">Reset</div>
+          <div id="saveButton" class="button">Save & close</div>
+          <div id="cancelButton" class="button">Cancel</div>
+        </div>
+        <div class="info-row">
+          <div class="orientation-label"> 
+            Orientation: <span id="orientation">${this.isLandscapeMode ? "Landscape" : "Portrait"}</span>
+          </div>
+        </div>
+      </div>
+    `;
+    return toolbar;
+  }
+
+  /**
+   * Initializes the toolbar of the configuration mode.
+   * Places its elements at the top of the touch controls and adds event listeners to them.
+   */
+  private createToolbar() {
+    document.querySelector("#touchControls")?.prepend(this.createToolbarElement());
+    const refs = this.getConfigToolbarRefs();
+    if (!refs) {
+      return;
+    }
+    const { saveButton, resetButton, cancelButton } = refs;
+
+    saveButton.addEventListener("click", () => {
+      this.saveCurrentPositions();
+      this.disableConfigurationMode();
+    });
+    resetButton.addEventListener("click", () => {
+      this.resetPositions();
+    });
+    cancelButton.addEventListener("click", () => {
+      const positions = this.getSavedPositionsOfCurrentOrientation();
+      this.setPositions(positions);
+      this.disableConfigurationMode();
+    });
+  }
+
+  /**
+   * Returns the references to the elements of the configuration toolbar.
+   * @returns The references to the elements of the configuration toolbar
+   *          or undefined if the elements can not be found (e.g. during tests)
+   */
+  private getConfigToolbarRefs(): ToolbarRefs | undefined {
+    const toolbar = document.querySelector("#touchControls #configToolbar") as HTMLDivElement;
+    if (!toolbar) {
+      return;
+    }
+    return {
+      toolbar,
+      saveButton: toolbar.querySelector("#saveButton")!,
+      resetButton: toolbar.querySelector("#resetButton")!,
+      cancelButton: toolbar.querySelector("#cancelButton")!
+    };
+  }
+
+  /**
+   * Elements that are inside the left div are anchored to the left boundary of the screen.
+   * The x value of the positions are considered offsets to their respective boundaries.
+   * @param element Either an element in the left div or the right div.
+   * @returns Whether the given element is inside the left div.
+   */
+  private isLeft = (element: HTMLElement) => document.querySelector("#touchControls .left")?.contains(element);
+
+  /**
+   * Start dragging the given button.
+   * @param controlGroup The button that is being dragged.
+   * @param touch The touch event that started the drag.
+   */
+  private startDrag = (controlGroup: HTMLElement): void => {
+    this.draggingElement = controlGroup;
+  };
+
+  /**
+   * Drags the currently dragged element to the given touch position.
+   * @param touch The touch event that is currently happening.
+   * @param isLeft Whether the dragged element is a left button.
+   */
+  private drag = (touch: Touch): void => {
+    if (!this.draggingElement) {
+      return;
+    }
+    const rect = this.draggingElement.getBoundingClientRect();
+    // Map the touch position to the center of the dragged element.
+    const xOffset = this.isLeft(this.draggingElement) ? touch.clientX - rect.width / 2 : window.innerWidth - touch.clientX - rect.width / 2;
+    const yOffset = window.innerHeight - touch.clientY - rect.height / 2;
+    this.setPosition(this.draggingElement, xOffset, yOffset);
+  };
+
+  /**
+   * Stops dragging the currently dragged element.
+   */
+  private stopDrag = () => {
+    this.draggingElement = null;
+  };
+
+  /**
+   * Returns the current positions of all touch controls that have moved from their default positions of this orientation.
+   * @returns {ControlPosition[]} The current positions of all touch controls that have moved from their default positions of this orientation
+   */
+  private getModifiedCurrentPositions(): ControlPosition[] {
+    return this.getControlGroupElements()
+      .filter((controlGroup: HTMLElement) => controlGroup.style.right || controlGroup.style.left)
+      .map((controlGroup: HTMLElement) => {
+        return {
+          id: controlGroup.id,
+          x: parseFloat(this.isLeft(controlGroup) ? controlGroup.style.left : controlGroup.style.right),
+          y: parseFloat(controlGroup.style.bottom),
+        };
+      });
+  }
+
+  /**
+   * Returns the key of the local storage for the control positions data of this orientation
+   */
+  private getLocalStorageKey(): string {
+    return this.isLandscapeMode ? TOUCH_CONTROL_POSITIONS_LANDSCAPE : TOUCH_CONTROL_POSITIONS_PORTRAIT;
+  }
+
+  /**
+   * Returns the saved positions of the touch controls.
+   * Filters result by the given orientation.
+   * @returns The saved positions of the touch controls of this orientation
+   */
+  private getSavedPositionsOfCurrentOrientation(): ControlPosition[] {
+    const positions = localStorage.getItem(this.getLocalStorageKey());
+    if (!positions) {
+      return [];
+    }
+    return JSON.parse(positions) as ControlPosition[];
+  }
+
+  /**
+   * Saves the current positions of the touch controls to the local storage.
+   */
+  private saveCurrentPositions() {
+    const pos = this.getModifiedCurrentPositions();
+    localStorage.setItem(this.getLocalStorageKey(), JSON.stringify(pos));
+  }
+
+  /**
+   * Updates the positions of the touch controls.
+   * @param positions The new positions of the touch controls.
+   */
+  private setPositions(positions: ControlPosition[]) {
+    this.resetPositions();
+    return positions.forEach((pos: ControlPosition) => {
+      const controlGroup = document.querySelector(`#${pos.id}`) as HTMLElement;
+      this.setPosition(controlGroup, pos.x, pos.y);
+    });
+  }
+
+  /**
+   * Sets a control element to the given position.
+   * The x values are either offsets to the left or right boundary of the screen, depending on the side of the element.
+   * E.g. For left elements, (0, 0) is the bottom left corner of the screen and
+   * for right elements, (0, 0) is the bottom right corner of the screen.
+   * @param controlElement
+   * @param x Either an offset to the left or right boundary of the screen.
+   * @param y An offset to the bottom boundary of the screen.
+   */
+  private setPosition(controlElement: HTMLElement, x: number, y: number) {
+    const rect = controlElement.getBoundingClientRect();
+    const checkBound = (value: number, min: number, max: number) => Math.min(Math.max(value, min), max);
+    const { height, width } = this.getScreenSize();
+    x = checkBound(x, 0, width - rect.width);
+    y = checkBound(y, 0, height - rect.height);
+    if (this.isLeft(controlElement)) {
+      controlElement.style.left = `${x}px`;
+    } else {
+      controlElement.style.right = `${x}px`;
+    }
+    controlElement.style.bottom = `${y}px`;
+  }
+
+  /**
+   * Resets the positions of the touch controls to their default positions and clears the saved positions.
+   * Does not save the changes.
+   */
+  private resetPositions() {
+    this.getControlGroupElements().forEach((controlGroup: HTMLDivElement) => {
+      controlGroup.style.removeProperty("left");
+      controlGroup.style.removeProperty("right");
+      controlGroup.style.removeProperty("bottom");
+    });
+  }
+
+  /**
+   * Returns all control groups of the touch controls.
+   * These are groups of buttons that can be dragged around the screen.
+   * @returns All control groups of the touch controls.
+   */
+  private getControlGroupElements(): HTMLDivElement[] {
+    return [...document.querySelectorAll("#touchControls .control-group")] as HTMLDivElement[];
+  }
+
+  /**
+   * Creates the event listeners for the configuration mode.
+   * @param controlGroups The elements that can be dragged around the screen.
+   * @returns The event listeners for the configuration mode.
+   */
+  private createConfigurationEventListeners(controlGroups: HTMLDivElement[]): ConfigurationEventListeners {
+    return {
+      "touchstart": controlGroups.map((element: HTMLDivElement) => {
+        const startDrag = () => this.startDrag(element);
+        element.addEventListener("touchstart", startDrag, { passive: true });
+        return startDrag;
+      }),
+      "touchmove": controlGroups.map(() => {
+        const drag = (event) => this.drag(event.touches[0]);
+        window.addEventListener("touchmove", drag, { passive: true });
+        return drag;
+      }),
+      "touchend": controlGroups.map(() => {
+        const stopDrag = () => this.stopDrag();
+        window.addEventListener("touchend", stopDrag, { passive: true });
+        return stopDrag;
+      })
+    };
+  }
+
+  /**
+   * Creates an overlay that covers the screen and allows the user to drag the touch controls around.
+   * Also enables the toolbar for saving, resetting, and canceling the changes.
+   * @param ui The UI of the game.
+   * @param scene The scene of the game.
+   */
+  private createOverlay(ui: UI, scene: Scene) {
+    const container = new Phaser.GameObjects.Container(scene, 0, 0);
+    const overlay = new Phaser.GameObjects.Rectangle(scene, 0, 0, scene.game.canvas.width, scene.game.canvas.height, 0x000000, 0.5);
+    overlay.setInteractive();
+    container.add(overlay);
+    ui.add(container);
+    this.overlay = container;
+
+    // Display toolbar
+    document.querySelector("#touchControls")?.classList.add("config-mode");
+  }
+
+  /**
+  * Allows the user to configure the touch controls by dragging buttons around the screen.
+  * @param ui The UI of the game.
+  * @param scene The scene of the game.
+  */
+  public enableConfigurationMode(ui: UI, scene: Scene) {
+    if (this.inConfigurationMode) {
+      return;
+    }
+    this.inConfigurationMode = true;
+    this.touchControls.disable();
+    this.createOverlay(ui, scene);
+    this.createToolbar();
+    // Create event listeners with a delay to prevent the touchstart event from being triggered immediately.
+    setTimeout(() => {
+      // Remember the event listeners so they can be removed later.
+      this.configurationEventListeners = this.createConfigurationEventListeners(this.getControlGroupElements());
+    }, 500);
+  }
+
+  /**
+   * Disables the configuration mode.
+   */
+  public disableConfigurationMode() {
+    this.inConfigurationMode = false;
+    this.draggingElement = null;
+
+    // Remove event listeners
+    const { touchstart, touchmove, touchend } = this.configurationEventListeners;
+    this.getControlGroupElements().forEach((element, index) => element.removeEventListener("touchstart", touchstart[index]));
+    touchmove.forEach((listener) => window.removeEventListener("touchmove", listener));
+    touchend.forEach((listener) => window.removeEventListener("touchend", listener));
+
+    // Remove configuration toolbar
+    const toolbar = document.querySelector("#touchControls #configToolbar");
+    toolbar?.remove();
+
+    // Remove overlay
+    this.overlay?.destroy();
+    document.querySelector("#touchControls")?.classList.remove("config-mode");
+    this.touchControls.enable();
+  }
+
+}
diff --git a/src/ui/settings/settings-audio-ui-handler.ts b/src/ui/settings/settings-audio-ui-handler.ts
index e86c0d26546..b834e37efe5 100644
--- a/src/ui/settings/settings-audio-ui-handler.ts
+++ b/src/ui/settings/settings-audio-ui-handler.ts
@@ -2,7 +2,7 @@ import BattleScene from "../../battle-scene";
 import { Mode } from "../ui";
 "#app/inputs-controller.js";
 import AbstractSettingsUiHandler from "./abstract-settings-ui-handler";
-import { Setting, SettingType } from "#app/system/settings/settings";
+import { SettingType } from "#app/system/settings/settings";
 
 export default class SettingsAudioUiHandler extends AbstractSettingsUiHandler {
   /**
@@ -12,9 +12,8 @@ export default class SettingsAudioUiHandler extends AbstractSettingsUiHandler {
    * @param mode - The UI mode, optional.
    */
   constructor(scene: BattleScene, mode: Mode | null = null) {
-    super(scene, mode);
+    super(scene, SettingType.AUDIO, mode);
     this.title = "Audio";
-    this.settings = Setting.filter(s => s.type === SettingType.AUDIO);
     this.localStorageKey = "settings";
     this.rowsToDisplay = 4;
   }
diff --git a/src/ui/settings/settings-display-ui-handler.ts b/src/ui/settings/settings-display-ui-handler.ts
index 3f0c9edd26f..25dda6e9bfb 100644
--- a/src/ui/settings/settings-display-ui-handler.ts
+++ b/src/ui/settings/settings-display-ui-handler.ts
@@ -2,7 +2,7 @@ import BattleScene from "../../battle-scene";
 import { Mode } from "../ui";
 "#app/inputs-controller.js";
 import AbstractSettingsUiHandler from "./abstract-settings-ui-handler";
-import { Setting, SettingKeys, SettingType } from "#app/system/settings/settings";
+import { SettingKeys, SettingType } from "#app/system/settings/settings";
 
 export default class SettingsDisplayUiHandler extends AbstractSettingsUiHandler {
   /**
@@ -12,9 +12,8 @@ export default class SettingsDisplayUiHandler extends AbstractSettingsUiHandler
    * @param mode - The UI mode, optional.
    */
   constructor(scene: BattleScene, mode: Mode | null = null) {
-    super(scene, mode);
+    super(scene, SettingType.DISPLAY, mode);
     this.title = "Display";
-    this.settings = Setting.filter(s => s.type === SettingType.DISPLAY);
 
     /**
      * Update to current language from default value.
diff --git a/src/ui/settings/settings-ui-handler.ts b/src/ui/settings/settings-ui-handler.ts
index b4a40eae1a5..3c5a7dd2c90 100644
--- a/src/ui/settings/settings-ui-handler.ts
+++ b/src/ui/settings/settings-ui-handler.ts
@@ -1,5 +1,5 @@
 import BattleScene from "../../battle-scene";
-import {Setting, SettingType} from "../../system/settings/settings";
+import { SettingType } from "../../system/settings/settings";
 import { Mode } from "../ui";
 import AbstractSettingsUiHandler from "./abstract-settings-ui-handler";
 
@@ -11,9 +11,8 @@ export default class SettingsUiHandler extends AbstractSettingsUiHandler {
    * @param mode - The UI mode, optional.
    */
   constructor(scene: BattleScene, mode: Mode | null = null) {
-    super(scene, mode);
+    super(scene, SettingType.GENERAL, mode);
     this.title = "General";
-    this.settings = Setting.filter(s => s.type === SettingType.GENERAL);
     this.localStorageKey = "settings";
   }
 }

From b20314b45f021dadc90d000e6bcfb9a140043730 Mon Sep 17 00:00:00 2001
From: Chapybara-jp <charlie.beer@hotmail.com>
Date: Sat, 10 Aug 2024 18:25:25 +0200
Subject: [PATCH 05/30] [Localization(jp)] Translate voucher.ts (#3476)

Need to be consistent with names of vouchers in modifiers.ts.
---
 src/locales/ja/voucher.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/locales/ja/voucher.ts b/src/locales/ja/voucher.ts
index 3d9730ece64..cc2fb7e2050 100644
--- a/src/locales/ja/voucher.ts
+++ b/src/locales/ja/voucher.ts
@@ -2,10 +2,10 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales";
 
 export const voucher: SimpleTranslationEntries = {
   "vouchers": "クーポン",
-  "eggVoucher": "たまごクーポン",
-  "eggVoucherPlus": "たまごクーポンプラス",
-  "eggVoucherPremium": "たまごクーポンプレミアム",
-  "eggVoucherGold": "たまごクーポンゴールド",
-  "locked": "Locked",
-  "defeatTrainer": "Defeat {{trainerName}}"
+  "eggVoucher": "タマゴクーポン",
+  "eggVoucherPlus": "タマゴクーポン・プラス",
+  "eggVoucherPremium": "タマゴクーポン・プレミアム",
+  "eggVoucherGold": "タマゴクーポン・ゴールド",
+  "locked": "なし",
+  "defeatTrainer": "{{trainerName}}を　倒す"
 } as const;

From 988ec664e94561adbba80c23e15d7b88d06b5918 Mon Sep 17 00:00:00 2001
From: ImperialSympathizer <110984302+ben-lear@users.noreply.github.com>
Date: Sun, 11 Aug 2024 14:40:47 -0400
Subject: [PATCH 06/30] Disable endless boss passives (#3451)

* fix strict null broken

* disable endless boss passives

* jsdocs on mock objects and move helper function to gameManager.ts

* Apply suggestions from flx's review

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>

* fix broken test

* fix lint

---------

Co-authored-by: ImperialSympathizer <imperialsympathizer@gmail.com>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
---
 src/field/pokemon.ts                          |  9 +-
 src/test/endless_boss.test.ts                 | 88 +++++++++++++++++++
 src/test/final_boss.test.ts                   | 42 ++-------
 src/test/utils/gameManager.ts                 | 32 +++++++
 src/test/utils/gameWrapper.ts                 |  4 +
 src/test/utils/mocks/mockTextureManager.ts    | 13 ++-
 .../utils/mocks/mocksContainer/mockTexture.ts | 42 +++++++++
 7 files changed, 190 insertions(+), 40 deletions(-)
 create mode 100644 src/test/endless_boss.test.ts
 create mode 100644 src/test/utils/mocks/mocksContainer/mockTexture.ts

diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index b4461c21354..618b4343950 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -1082,8 +1082,13 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       return true;
     }
 
-    // Final boss does not have passive
-    if (this.scene.currentBattle?.battleSpec === BattleSpec.FINAL_BOSS && this instanceof EnemyPokemon) {
+    // Classic Final boss and Endless Minor/Major bosses do not have passive
+    const { currentBattle, gameMode } = this.scene;
+    const waveIndex = currentBattle?.waveIndex;
+    if (this instanceof EnemyPokemon &&
+      (currentBattle?.battleSpec === BattleSpec.FINAL_BOSS ||
+      gameMode.isEndlessMinorBoss(waveIndex) ||
+      gameMode.isEndlessMajorBoss(waveIndex))) {
       return false;
     }
 
diff --git a/src/test/endless_boss.test.ts b/src/test/endless_boss.test.ts
new file mode 100644
index 00000000000..e983be245b6
--- /dev/null
+++ b/src/test/endless_boss.test.ts
@@ -0,0 +1,88 @@
+import { Biome } from "#app/enums/biome";
+import { Species } from "#app/enums/species";
+import { GameModes } from "#app/game-mode";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+import GameManager from "./utils/gameManager";
+
+const EndlessBossWave = {
+  Minor: 250,
+  Major: 1000
+};
+
+describe("Endless Boss", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .startingBiome(Biome.END)
+      .disableCrits();
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  it(`should spawn a minor boss every ${EndlessBossWave.Minor} waves in END biome in Endless`, async () => {
+    game.override.startingWave(EndlessBossWave.Minor);
+    await game.runToFinalBossEncounter(game, [Species.BIDOOF], GameModes.ENDLESS);
+
+    expect(game.scene.currentBattle.waveIndex).toBe(EndlessBossWave.Minor);
+    expect(game.scene.arena.biomeType).toBe(Biome.END);
+    const eternatus = game.scene.getEnemyPokemon();
+    expect(eternatus?.species.speciesId).toBe(Species.ETERNATUS);
+    expect(eternatus?.hasPassive()).toBe(false);
+    expect(eternatus?.formIndex).toBe(0);
+  });
+
+  it(`should spawn a major boss every ${EndlessBossWave.Major} waves in END biome in Endless`, async () => {
+    game.override.startingWave(EndlessBossWave.Major);
+    await game.runToFinalBossEncounter(game, [Species.BIDOOF], GameModes.ENDLESS);
+
+    expect(game.scene.currentBattle.waveIndex).toBe(EndlessBossWave.Major);
+    expect(game.scene.arena.biomeType).toBe(Biome.END);
+    const eternatus = game.scene.getEnemyPokemon();
+    expect(eternatus?.species.speciesId).toBe(Species.ETERNATUS);
+    expect(eternatus?.hasPassive()).toBe(false);
+    expect(eternatus?.formIndex).toBe(1);
+  });
+
+  it(`should spawn a minor boss every ${EndlessBossWave.Minor} waves in END biome in Spliced Endless`, async () => {
+    game.override.startingWave(EndlessBossWave.Minor);
+    await game.runToFinalBossEncounter(game, [Species.BIDOOF], GameModes.SPLICED_ENDLESS);
+
+    expect(game.scene.currentBattle.waveIndex).toBe(EndlessBossWave.Minor);
+    expect(game.scene.arena.biomeType).toBe(Biome.END);
+    const eternatus = game.scene.getEnemyPokemon();
+    expect(eternatus?.species.speciesId).toBe(Species.ETERNATUS);
+    expect(eternatus?.hasPassive()).toBe(false);
+    expect(eternatus?.formIndex).toBe(0);
+  });
+
+  it(`should spawn a major boss every ${EndlessBossWave.Major} waves in END biome in Spliced Endless`, async () => {
+    game.override.startingWave(EndlessBossWave.Major);
+    await game.runToFinalBossEncounter(game, [Species.BIDOOF], GameModes.SPLICED_ENDLESS);
+
+    expect(game.scene.currentBattle.waveIndex).toBe(EndlessBossWave.Major);
+    expect(game.scene.arena.biomeType).toBe(Biome.END);
+    const eternatus = game.scene.getEnemyPokemon();
+    expect(eternatus?.species.speciesId).toBe(Species.ETERNATUS);
+    expect(eternatus?.hasPassive()).toBe(false);
+    expect(eternatus?.formIndex).toBe(1);
+  });
+
+  it(`should NOT spawn major or minor boss outside wave ${EndlessBossWave.Minor}s in END biome`, async () => {
+    game.override.startingWave(EndlessBossWave.Minor - 1);
+    await game.runToFinalBossEncounter(game, [Species.BIDOOF], GameModes.ENDLESS);
+
+    expect(game.scene.currentBattle.waveIndex).not.toBe(EndlessBossWave.Minor);
+    expect(game.scene.getEnemyPokemon()!.species.speciesId).not.toBe(Species.ETERNATUS);
+  });
+});
diff --git a/src/test/final_boss.test.ts b/src/test/final_boss.test.ts
index 3e1225295e0..a57d71534a3 100644
--- a/src/test/final_boss.test.ts
+++ b/src/test/final_boss.test.ts
@@ -1,11 +1,8 @@
 import { Biome } from "#app/enums/biome.js";
 import { Species } from "#app/enums/species.js";
-import { GameModes, getGameMode } from "#app/game-mode.js";
-import { EncounterPhase, SelectStarterPhase } from "#app/phases.js";
-import { Mode } from "#app/ui/ui.js";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import GameManager from "./utils/gameManager";
-import { generateStarter } from "./utils/gameManagerUtils";
+import { GameModes } from "#app/game-mode";
 
 const FinalWave = {
   Classic: 200,
@@ -31,7 +28,7 @@ describe("Final Boss", () => {
   });
 
   it("should spawn Eternatus on wave 200 in END biome", async () => {
-    await runToFinalBossEncounter(game, [Species.BIDOOF]);
+    await game.runToFinalBossEncounter(game, [Species.BIDOOF], GameModes.CLASSIC);
 
     expect(game.scene.currentBattle.waveIndex).toBe(FinalWave.Classic);
     expect(game.scene.arena.biomeType).toBe(Biome.END);
@@ -40,7 +37,7 @@ describe("Final Boss", () => {
 
   it("should NOT spawn Eternatus before wave 200 in END biome", async () => {
     game.override.startingWave(FinalWave.Classic - 1);
-    await runToFinalBossEncounter(game, [Species.BIDOOF]);
+    await game.runToFinalBossEncounter(game, [Species.BIDOOF], GameModes.CLASSIC);
 
     expect(game.scene.currentBattle.waveIndex).not.toBe(FinalWave.Classic);
     expect(game.scene.arena.biomeType).toBe(Biome.END);
@@ -49,7 +46,7 @@ describe("Final Boss", () => {
 
   it("should NOT spawn Eternatus outside of END biome", async () => {
     game.override.startingBiome(Biome.FOREST);
-    await runToFinalBossEncounter(game, [Species.BIDOOF]);
+    await game.runToFinalBossEncounter(game, [Species.BIDOOF], GameModes.CLASSIC);
 
     expect(game.scene.currentBattle.waveIndex).toBe(FinalWave.Classic);
     expect(game.scene.arena.biomeType).not.toBe(Biome.END);
@@ -57,7 +54,7 @@ describe("Final Boss", () => {
   });
 
   it("should not have passive enabled on Eternatus", async () => {
-    await runToFinalBossEncounter(game, [Species.BIDOOF]);
+    await game.runToFinalBossEncounter(game, [Species.BIDOOF], GameModes.CLASSIC);
 
     const eternatus = game.scene.getEnemyPokemon();
     expect(eternatus?.species.speciesId).toBe(Species.ETERNATUS);
@@ -66,32 +63,3 @@ describe("Final Boss", () => {
 
   it.todo("should change form on direct hit down to last boss fragment", () => {});
 });
-
-/**
- * Helper function to run to the final boss encounter as it's a bit tricky due to extra dialogue
- * @param game - The game manager
- */
-async function runToFinalBossEncounter(game: GameManager, species: Species[]) {
-  console.log("===to final boss encounter===");
-  await game.runToTitle();
-
-  game.onNextPrompt("TitlePhase", Mode.TITLE, () => {
-    game.scene.gameMode = getGameMode(GameModes.CLASSIC);
-    const starters = generateStarter(game.scene, species);
-    const selectStarterPhase = new SelectStarterPhase(game.scene);
-    game.scene.pushPhase(new EncounterPhase(game.scene, false));
-    selectStarterPhase.initBattle(starters);
-  });
-
-  game.onNextPrompt("EncounterPhase", Mode.MESSAGE, async () => {
-    // This will skip all entry dialogue (I can't figure out a way to sequentially handle the 8 chained messages via 1 prompt handler)
-    game.setMode(Mode.MESSAGE);
-    const encounterPhase = game.scene.getCurrentPhase() as EncounterPhase;
-
-    // No need to end phase, this will do it for you
-    encounterPhase.doEncounterCommon(false);
-  });
-
-  await game.phaseInterceptor.to(EncounterPhase, true);
-  console.log("===finished run to final boss encounter===");
-}
diff --git a/src/test/utils/gameManager.ts b/src/test/utils/gameManager.ts
index c782c613bb0..8d9181352ac 100644
--- a/src/test/utils/gameManager.ts
+++ b/src/test/utils/gameManager.ts
@@ -141,6 +141,38 @@ export default class GameManager {
     }
   }
 
+  /**
+   * Helper function to run to the final boss encounter as it's a bit tricky due to extra dialogue
+   * Also handles Major/Minor bosses from endless modes
+   * @param game - The game manager
+   * @param species
+   * @param mode
+   */
+  async runToFinalBossEncounter(game: GameManager, species: Species[], mode: GameModes) {
+    console.log("===to final boss encounter===");
+    await game.runToTitle();
+
+    game.onNextPrompt("TitlePhase", Mode.TITLE, () => {
+      game.scene.gameMode = getGameMode(mode);
+      const starters = generateStarter(game.scene, species);
+      const selectStarterPhase = new SelectStarterPhase(game.scene);
+      game.scene.pushPhase(new EncounterPhase(game.scene, false));
+      selectStarterPhase.initBattle(starters);
+    });
+
+    game.onNextPrompt("EncounterPhase", Mode.MESSAGE, async () => {
+      // This will skip all entry dialogue (I can't figure out a way to sequentially handle the 8 chained messages via 1 prompt handler)
+      game.setMode(Mode.MESSAGE);
+      const encounterPhase = game.scene.getCurrentPhase() as EncounterPhase;
+
+      // No need to end phase, this will do it for you
+      encounterPhase.doEncounterCommon(false);
+    });
+
+    await game.phaseInterceptor.to(EncounterPhase, true);
+    console.log("===finished run to final boss encounter===");
+  }
+
   /**
    * Transitions to the start of a battle.
    * @param species - Optional array of species to start the battle with.
diff --git a/src/test/utils/gameWrapper.ts b/src/test/utils/gameWrapper.ts
index 80529e47194..49044c260fa 100644
--- a/src/test/utils/gameWrapper.ts
+++ b/src/test/utils/gameWrapper.ts
@@ -89,6 +89,7 @@ export default class GameWrapper {
       frames: {},
     });
     Pokemon.prototype.enableMask = () => null;
+    Pokemon.prototype.updateFusionPalette = () => null;
   }
 
   setScene(scene: BattleScene) {
@@ -128,7 +129,9 @@ export default class GameWrapper {
       manager: {
         game: this.game,
       },
+      destroy: () => null,
       setVolume: () => null,
+      stop: () => null,
       stopByKey: () => null,
       on: (evt, callback) => callback(),
       key: "",
@@ -202,6 +205,7 @@ export default class GameWrapper {
     };
     const mockTextureManager = new MockTextureManager(this.scene);
     this.scene.add = mockTextureManager.add;
+    this.scene.textures = mockTextureManager;
     this.scene.sys.displayList =  this.scene.add.displayList;
     this.scene.sys.updateList = new UpdateList(this.scene);
     this.scene.systems = this.scene.sys;
diff --git a/src/test/utils/mocks/mockTextureManager.ts b/src/test/utils/mocks/mockTextureManager.ts
index 95e8996836f..330409e9776 100644
--- a/src/test/utils/mocks/mockTextureManager.ts
+++ b/src/test/utils/mocks/mockTextureManager.ts
@@ -6,8 +6,11 @@ import MockImage from "#test/utils/mocks/mocksContainer/mockImage";
 import MockText from "#test/utils/mocks/mocksContainer/mockText";
 import MockPolygon from "#test/utils/mocks/mocksContainer/mockPolygon";
 import { MockGameObject } from "./mockGameObject";
+import MockTexture from "#test/utils/mocks/mocksContainer/mockTexture";
 
-
+/**
+ * Stub class for Phaser.Textures.TextureManager
+ */
 export default class MockTextureManager {
   private textures: Map<string, any>;
   private scene;
@@ -54,6 +57,14 @@ export default class MockTextureManager {
     // }
   }
 
+  /**
+   * Returns a mock texture
+   * @param key
+   */
+  get(key) {
+    return new MockTexture(this, key, null);
+  }
+
   rectangle(x, y, width, height, fillColor) {
     const rectangle = new MockRectangle(this, x, y, width, height, fillColor);
     this.list.push(rectangle);
diff --git a/src/test/utils/mocks/mocksContainer/mockTexture.ts b/src/test/utils/mocks/mocksContainer/mockTexture.ts
new file mode 100644
index 00000000000..03bedb4751b
--- /dev/null
+++ b/src/test/utils/mocks/mocksContainer/mockTexture.ts
@@ -0,0 +1,42 @@
+import { MockGameObject } from "../mockGameObject";
+import MockTextureManager from "#test/utils/mocks/mockTextureManager";
+
+
+/**
+ * Stub for Phaser.Textures.Texture object
+ * Just mocks the function calls and data required for use in tests
+ */
+export default class MockTexture implements MockGameObject {
+  public manager: MockTextureManager;
+  public key: string;
+  public source;
+  public frames: object;
+  public firstFrame: string;
+
+  constructor(manager, key: string, source) {
+    this.manager = manager;
+    this.key = key;
+    this.source = source;
+
+    const mockFrame = {
+      width: 100,
+      height: 100,
+      cutX: 0,
+      cutY: 0
+    };
+    this.frames = {
+      firstFrame: mockFrame,
+      0: mockFrame,
+      1: mockFrame,
+      2: mockFrame,
+      3: mockFrame,
+      4: mockFrame
+    };
+    this.firstFrame = "firstFrame";
+  }
+
+  /** Mocks the function call that gets an HTMLImageElement, see {@link Pokemon.updateFusionPalette} */
+  getSourceImage() {
+    return null;
+  }
+}

From 0f09893091240b8df50508bbebc1679604e7d972 Mon Sep 17 00:00:00 2001
From: Leo Kim <47556641+KimJeongSun@users.noreply.github.com>
Date: Mon, 12 Aug 2024 11:03:20 +0900
Subject: [PATCH 07/30] Immediately update the passive background upon
 unlocking (#3479)

---
 src/ui/starter-select-ui-handler.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts
index d65abf70134..36e00eed43a 100644
--- a/src/ui/starter-select-ui-handler.ts
+++ b/src/ui/starter-select-ui-handler.ts
@@ -1629,6 +1629,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
                       this.setUpgradeAnimation(starterContainer.icon, this.lastSpecies, true);
                     }
 
+                    starterContainer.starterPassiveBgs.setVisible(!!this.scene.gameData.starterData[this.lastSpecies.speciesId].passiveAttr);
+
                     return true;
                   }
                   return false;

From f8b9397d06b2d064bf6738900f48cfb2a3dcb327 Mon Sep 17 00:00:00 2001
From: MokaStitcher <54149968+MokaStitcher@users.noreply.github.com>
Date: Mon, 12 Aug 2024 06:44:00 +0200
Subject: [PATCH 08/30] [UI] add open filter button for mobile touch pad
 (#3480)

---
 index.css  | 23 ++++++++++++++++-------
 index.html | 24 +++++++++++++++++++-----
 2 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/index.css b/index.css
index 54eda86161d..3b74867be5f 100644
--- a/index.css
+++ b/index.css
@@ -69,7 +69,9 @@ input:-internal-autofill-selected {
   --controls-padding: 1rem;
 
   --controls-size-with-padding: calc(var(--controls-size) + var(--controls-padding));
+  --controls-size-with-wide-padding: calc(var(--controls-size) *1.2 + var(--controls-padding));
   --control-group-extra-size: calc(var(--controls-size) * 0.8);
+  --control-group-extra-wide-size: calc(var(--controls-size) * 1.2);
 
   --control-group-extra-2-offset: calc(var(--controls-size-with-padding) + (var(--controls-size) - var(--control-group-extra-size)) / 2);
   --control-group-extra-1-offset: calc(var(--controls-padding) + (var(--controls-size) - var(--control-group-extra-size)) / 2);
@@ -117,25 +119,31 @@ input:-internal-autofill-selected {
   width: var(--control-group-extra-size);
   height: var(--control-group-extra-size);
 }
+
 /* Hide buttons on specific UIs */
 
-/* Show #cycleForm and #cycleShiny only on STARTER_SELECT and SETTINGS */
-#touchControls:not([data-ui-mode='STARTER_SELECT']):not([data-ui-mode^='SETTINGS']) #apadCycleForm,
-#touchControls:not([data-ui-mode='STARTER_SELECT']):not([data-ui-mode^='SETTINGS']) #apadCycleShiny {
+/* Show #apadPreviousTab and #apadNextTab only in settings, except in touch configuration panel */
+#touchControls:not([data-ui-mode^='SETTINGS']) #apadPreviousTab,
+#touchControls:not([data-ui-mode^='SETTINGS']) #apadNextTab,
+#touchControls:is(.config-mode) #apadPreviousTab,
+#touchControls:is(.config-mode) #apadNextTab {
   display: none;
 }
 
 /* Show #apadInfo only in battle */
-#touchControls:not([data-ui-mode='COMMAND']):not([data-ui-mode='FIGHT']):not([data-ui-mode='BALL']) #apadInfo {
+#touchControls:not([data-ui-mode='COMMAND']):not([data-ui-mode='FIGHT']):not([data-ui-mode='BALL']):not([data-ui-mode='TARGET_SELECT']) #apadInfo {
   display: none;
 }
 
-/* Show #apadInfo only in battle and target select */
+/* Show #apadStats only in battle and shop */
 #touchControls:not([data-ui-mode='COMMAND']):not([data-ui-mode='FIGHT']):not([data-ui-mode='BALL']):not([data-ui-mode='TARGET_SELECT']):not([data-ui-mode='MODIFIER_SELECT']) #apadStats {
   display: none;
 }
 
 /* Show cycle buttons only on STARTER_SELECT and on touch configuration panel */
+#touchControls:not(.config-mode):not([data-ui-mode='STARTER_SELECT']) #apadOpenFilters,
+#touchControls:not(.config-mode):not([data-ui-mode='STARTER_SELECT']) #apadCycleForm,
+#touchControls:not(.config-mode):not([data-ui-mode='STARTER_SELECT']) #apadCycleShiny,
 #touchControls:not(.config-mode):not([data-ui-mode='STARTER_SELECT']) #apadCycleNature,
 #touchControls:not(.config-mode):not([data-ui-mode='STARTER_SELECT']) #apadCycleAbility,
 #touchControls:not(.config-mode):not([data-ui-mode='STARTER_SELECT']) #apadCycleGender,
@@ -272,8 +280,8 @@ input:-internal-autofill-selected {
 }
 
 #control-group-cancel {
-  right: var(--controls-size-with-padding);
-  bottom: var(--controls-padding);;
+  right: var(--controls-size-with-wide-padding);
+  bottom: var(--controls-padding);
 }
 
 #control-group-extra-1 {
@@ -282,6 +290,7 @@ input:-internal-autofill-selected {
 }
 
 #control-group-extra-2 {
+  width: var(--control-group-extra-wide-size);
   right: var(--control-group-extra-2-offset);
   bottom: var(--control-group-extra-2-offset);
 }
diff --git a/index.html b/index.html
index 5ebf822521e..29b4c0d1a6e 100644
--- a/index.html
+++ b/index.html
@@ -96,36 +96,50 @@
 			</div>
 
 			<div id="control-group-extra-1" class="control-group control-group-extra">
-				<div id="apadCycleShiny" class="apad-button apad-square apad-small" data-key="CYCLE_SHINY">
+				<!-- buttons to navigate settings tabs -->
+				<div id="apadPreviousTab" class="apad-button apad-square apad-small" data-key="CYCLE_FORM">
+					<span class="apad-label">F</span>
+				</div>
+				<div id="apadNextTab" class="apad-button apad-square apad-small" data-key="CYCLE_SHINY">
 					<span class="apad-label">R</span>
 				</div>
-				<div id="apadCycleVariant" class="apad-button apad-square apad-small" data-key="V">
-					<span class="apad-label">V</span>
-				</div>
-				<div id="apadStats" class="apad-button apad-rectangle apad-small" data-key="STATS">
+				<!-- buttons to open filter menu in starter select -->
+				<div id="apadOpenFilters" class="apad-button apad-rectangle apad-small" data-key="STATS">
 					<span class="apad-label">C</span>
 				</div>
+				<!-- main menu button -->
 				<div id="apadMenu" class="apad-button apad-rectangle apad-small" data-key="MENU">
 					<span class="apad-label">Menu</span>
 				</div>
 			</div>
 
 			<div id="control-group-extra-2" class="control-group control-group-extra">
+				<!-- buttons to cycle through pokemon characteristics in starter select -->
 				<div id="apadCycleForm" class="apad-button apad-square apad-small" data-key="CYCLE_FORM">
 					<span class="apad-label">F</span>
 				</div>
 				<div id="apadCycleGender" class="apad-button apad-square apad-small" data-key="CYCLE_GENDER">
 					<span class="apad-label">G</span>
 				</div>
+				<div id="apadCycleShiny" class="apad-button apad-square apad-small" data-key="CYCLE_SHINY">
+					<span class="apad-label">R</span>
+				</div>
 				<div id="apadCycleAbility" class="apad-button apad-square apad-small" data-key="CYCLE_ABILITY">
 					<span class="apad-label">E</span>
 				</div>
 				<div id="apadCycleNature" class="apad-button apad-square apad-small" data-key="CYCLE_NATURE">
 					<span class="apad-label">N</span>
 				</div>
+				<div id="apadCycleVariant" class="apad-button apad-square apad-small" data-key="V">
+					<span class="apad-label">V</span>
+				</div>
+				<!-- buttons to display battle-specific information -->
 				<div id="apadInfo" class="apad-button apad-rectangle apad-small" data-key="V">
 					<span class="apad-label">V</span>
 				</div>
+				<div id="apadStats" class="apad-button apad-rectangle apad-small" data-key="STATS">
+					<span class="apad-label">C</span>
+				</div>
 			</div>
 
 		</div>

From 53e54df9ee25ab0eae41dcada5733dbf5210047d Mon Sep 17 00:00:00 2001
From: Leo Kim <47556641+KimJeongSun@users.noreply.github.com>
Date: Mon, 12 Aug 2024 13:44:15 +0900
Subject: [PATCH 09/30] [Enhancement] Add Passive / Cost Reduction - Can Unlock
 option and Egg purchasable filter (#3478)

* add unlockable state in passive/cost reduction filter. add egg purchasable filter

* update placeholders

* update option order of UNLOCKABLE between ON and EXCLUDE

* remove egg restriction when buying eggs
---
 src/locales/ca_ES/filter-bar.ts     | 14 +++--
 src/locales/de/filter-bar.ts        |  4 ++
 src/locales/en/filter-bar.ts        | 12 +++--
 src/locales/es/filter-bar.ts        |  4 ++
 src/locales/fr/filter-bar.ts        |  4 ++
 src/locales/it/filter-bar.ts        |  4 ++
 src/locales/ja/filter-bar.ts        | 12 +++--
 src/locales/ko/filter-bar.ts        |  4 ++
 src/locales/pt_BR/filter-bar.ts     |  4 ++
 src/locales/zh_CN/filter-bar.ts     |  4 ++
 src/locales/zh_TW/filter-bar.ts     |  4 ++
 src/ui/dropdown.ts                  |  7 ++-
 src/ui/starter-select-ui-handler.ts | 84 ++++++++++++++++++-----------
 13 files changed, 116 insertions(+), 45 deletions(-)

diff --git a/src/locales/ca_ES/filter-bar.ts b/src/locales/ca_ES/filter-bar.ts
index 1c731d1deaa..ffd227f90ca 100644
--- a/src/locales/ca_ES/filter-bar.ts
+++ b/src/locales/ca_ES/filter-bar.ts
@@ -8,14 +8,16 @@ export const filterBar: SimpleTranslationEntries = {
   "miscFilter": "Misc",
   "sortFilter": "Sort",
   "all": "All",
-  "normal": "Normal",
+  "normal": "Not Shiny",
   "uncaught": "Uncaught",
   "passive": "Passive",
-  "passiveUnlocked": "Passive Unlocked",
-  "passiveLocked": "Passive Locked",
+  "passiveUnlocked": "Passive - Yes",
+  "passiveLocked": "Passive - No",
+  "passiveUnlockable": "Passive - Can Unlock",
   "costReduction": "Cost Reduction",
-  "costReductionUnlocked": "Cost Reduction Unlocked",
-  "costReductionLocked": "Cost Reduction Locked",
+  "costReductionUnlocked": "Cost Reduction - Yes",
+  "costReductionLocked": "Cost Reduction - No",
+  "costReductionUnlockable": "Cost Reduction - Can Unlock",
   "favorite": "Favorite",
   "isFavorite": "Favorite - Yes",
   "notFavorite": "Favorite - No",
@@ -25,6 +27,8 @@ export const filterBar: SimpleTranslationEntries = {
   "hiddenAbility": "Hidden Ability",
   "hasHiddenAbility": "Hidden Ability - Yes",
   "noHiddenAbility": "Hidden Ability - No",
+  "egg": "Egg",
+  "eggPurchasable": "Purchasable Egg",
   "pokerus": "Pokerus",
   "hasPokerus": "Pokerus - Yes",
   "noPokerus": "Pokerus - No",
diff --git a/src/locales/de/filter-bar.ts b/src/locales/de/filter-bar.ts
index 7ed7098820b..10736b226c5 100644
--- a/src/locales/de/filter-bar.ts
+++ b/src/locales/de/filter-bar.ts
@@ -13,9 +13,11 @@ export const filterBar: SimpleTranslationEntries = {
   "passive": "Passive",
   "passiveUnlocked": "Passive freigeschaltet",
   "passiveLocked": "Passive gesperrt",
+  "passiveUnlockable": "Passive - Can Unlock",
   "costReduction": "Cost Reduction",
   "costReductionUnlocked": "Cost Reduction Unlocked",
   "costReductionLocked": "Cost Reduction Locked",
+  "costReductionUnlockable": "Cost Reduction - Can Unlock",
   "favorite": "Favorite",
   "isFavorite": "Favorite - Yes",
   "notFavorite": "Favorite - No",
@@ -25,6 +27,8 @@ export const filterBar: SimpleTranslationEntries = {
   "hiddenAbility": "Hidden Ability",
   "hasHiddenAbility": "Hidden Ability - Yes",
   "noHiddenAbility": "Hidden Ability - No",
+  "egg": "Egg",
+  "eggPurchasable": "Purchasable Egg",
   "pokerus": "Pokerus",
   "hasPokerus": "Pokerus - Yes",
   "noPokerus": "Pokerus - No",
diff --git a/src/locales/en/filter-bar.ts b/src/locales/en/filter-bar.ts
index 1dd0c3b2b64..ffd227f90ca 100644
--- a/src/locales/en/filter-bar.ts
+++ b/src/locales/en/filter-bar.ts
@@ -11,11 +11,13 @@ export const filterBar: SimpleTranslationEntries = {
   "normal": "Not Shiny",
   "uncaught": "Uncaught",
   "passive": "Passive",
-  "passiveUnlocked": "Passive Unlocked",
-  "passiveLocked": "Passive Locked",
+  "passiveUnlocked": "Passive - Yes",
+  "passiveLocked": "Passive - No",
+  "passiveUnlockable": "Passive - Can Unlock",
   "costReduction": "Cost Reduction",
-  "costReductionUnlocked": "Cost Reduction Unlocked",
-  "costReductionLocked": "Cost Reduction Locked",
+  "costReductionUnlocked": "Cost Reduction - Yes",
+  "costReductionLocked": "Cost Reduction - No",
+  "costReductionUnlockable": "Cost Reduction - Can Unlock",
   "favorite": "Favorite",
   "isFavorite": "Favorite - Yes",
   "notFavorite": "Favorite - No",
@@ -25,6 +27,8 @@ export const filterBar: SimpleTranslationEntries = {
   "hiddenAbility": "Hidden Ability",
   "hasHiddenAbility": "Hidden Ability - Yes",
   "noHiddenAbility": "Hidden Ability - No",
+  "egg": "Egg",
+  "eggPurchasable": "Purchasable Egg",
   "pokerus": "Pokerus",
   "hasPokerus": "Pokerus - Yes",
   "noPokerus": "Pokerus - No",
diff --git a/src/locales/es/filter-bar.ts b/src/locales/es/filter-bar.ts
index b0eae7542ff..e713c10c21b 100644
--- a/src/locales/es/filter-bar.ts
+++ b/src/locales/es/filter-bar.ts
@@ -13,9 +13,11 @@ export const filterBar: SimpleTranslationEntries = {
   "passive": "Passive",
   "passiveUnlocked": "Pasiva Desbloq.",
   "passiveLocked": "Pasiva Bloq.",
+  "passiveUnlockable": "Passive - Can Unlock",
   "costReduction": "Cost Reduction",
   "costReductionUnlocked": "Cost Reduction Unlocked",
   "costReductionLocked": "Cost Reduction Locked",
+  "costReductionUnlockable": "Cost Reduction - Can Unlock",
   "favorite": "Favorite",
   "isFavorite": "Favorite - Yes",
   "notFavorite": "Favorite - No",
@@ -25,6 +27,8 @@ export const filterBar: SimpleTranslationEntries = {
   "hiddenAbility": "Hidden Ability",
   "hasHiddenAbility": "Hidden Ability - Yes",
   "noHiddenAbility": "Hidden Ability - No",
+  "egg": "Egg",
+  "eggPurchasable": "Purchasable Egg",
   "pokerus": "Pokerus",
   "hasPokerus": "Pokerus - Yes",
   "noPokerus": "Pokerus - No",
diff --git a/src/locales/fr/filter-bar.ts b/src/locales/fr/filter-bar.ts
index 0c086c8e52c..f3130808f40 100644
--- a/src/locales/fr/filter-bar.ts
+++ b/src/locales/fr/filter-bar.ts
@@ -13,9 +13,11 @@ export const filterBar: SimpleTranslationEntries = {
   "passive": "Passif",
   "passiveUnlocked": "Passif débloqué",
   "passiveLocked": "Passif verrouillé",
+  "passiveUnlockable": "Passive - Can Unlock",
   "costReduction": "Cost Reduction",
   "costReductionUnlocked": "Cost Reduction Unlocked",
   "costReductionLocked": "Cost Reduction Locked",
+  "costReductionUnlockable": "Cost Reduction - Can Unlock",
   "favorite": "Favorite",
   "isFavorite": "Favorite - Yes",
   "notFavorite": "Favorite - No",
@@ -25,6 +27,8 @@ export const filterBar: SimpleTranslationEntries = {
   "hiddenAbility": "Hidden Ability",
   "hasHiddenAbility": "Hidden Ability - Yes",
   "noHiddenAbility": "Hidden Ability - No",
+  "egg": "Egg",
+  "eggPurchasable": "Purchasable Egg",
   "pokerus": "Pokerus",
   "hasPokerus": "Pokerus - Yes",
   "noPokerus": "Pokerus - No",
diff --git a/src/locales/it/filter-bar.ts b/src/locales/it/filter-bar.ts
index fff93ad02d4..f956544291d 100644
--- a/src/locales/it/filter-bar.ts
+++ b/src/locales/it/filter-bar.ts
@@ -13,9 +13,11 @@ export const filterBar: SimpleTranslationEntries = {
   "passive": "Passive",
   "passiveUnlocked": "Passiva sbloccata",
   "passiveLocked": "Passiva bloccata",
+  "passiveUnlockable": "Passive - Can Unlock",
   "costReduction": "Cost Reduction",
   "costReductionUnlocked": "Cost Reduction Unlocked",
   "costReductionLocked": "Cost Reduction Locked",
+  "costReductionUnlockable": "Cost Reduction - Can Unlock",
   "favorite": "Favorite",
   "isFavorite": "Favorite - Yes",
   "notFavorite": "Favorite - No",
@@ -25,6 +27,8 @@ export const filterBar: SimpleTranslationEntries = {
   "hiddenAbility": "Hidden Ability",
   "hasHiddenAbility": "Hidden Ability - Yes",
   "noHiddenAbility": "Hidden Ability - No",
+  "egg": "Egg",
+  "eggPurchasable": "Purchasable Egg",
   "pokerus": "Pokerus",
   "hasPokerus": "Pokerus - Yes",
   "noPokerus": "Pokerus - No",
diff --git a/src/locales/ja/filter-bar.ts b/src/locales/ja/filter-bar.ts
index 1dd0c3b2b64..ffd227f90ca 100644
--- a/src/locales/ja/filter-bar.ts
+++ b/src/locales/ja/filter-bar.ts
@@ -11,11 +11,13 @@ export const filterBar: SimpleTranslationEntries = {
   "normal": "Not Shiny",
   "uncaught": "Uncaught",
   "passive": "Passive",
-  "passiveUnlocked": "Passive Unlocked",
-  "passiveLocked": "Passive Locked",
+  "passiveUnlocked": "Passive - Yes",
+  "passiveLocked": "Passive - No",
+  "passiveUnlockable": "Passive - Can Unlock",
   "costReduction": "Cost Reduction",
-  "costReductionUnlocked": "Cost Reduction Unlocked",
-  "costReductionLocked": "Cost Reduction Locked",
+  "costReductionUnlocked": "Cost Reduction - Yes",
+  "costReductionLocked": "Cost Reduction - No",
+  "costReductionUnlockable": "Cost Reduction - Can Unlock",
   "favorite": "Favorite",
   "isFavorite": "Favorite - Yes",
   "notFavorite": "Favorite - No",
@@ -25,6 +27,8 @@ export const filterBar: SimpleTranslationEntries = {
   "hiddenAbility": "Hidden Ability",
   "hasHiddenAbility": "Hidden Ability - Yes",
   "noHiddenAbility": "Hidden Ability - No",
+  "egg": "Egg",
+  "eggPurchasable": "Purchasable Egg",
   "pokerus": "Pokerus",
   "hasPokerus": "Pokerus - Yes",
   "noPokerus": "Pokerus - No",
diff --git a/src/locales/ko/filter-bar.ts b/src/locales/ko/filter-bar.ts
index 2724b1ea3ac..153f0c1539c 100644
--- a/src/locales/ko/filter-bar.ts
+++ b/src/locales/ko/filter-bar.ts
@@ -13,9 +13,11 @@ export const filterBar: SimpleTranslationEntries = {
   "passive": "패시브",
   "passiveUnlocked": "패시브 해금",
   "passiveLocked": "패시브 잠김",
+  "passiveUnlockable": "패시브 해금 가능",
   "costReduction": "코스트 감소",
   "costReductionUnlocked": "코스트 감소됨",
   "costReductionLocked": "코스트 감소 없음",
+  "costReductionUnlockable": "코스트 감소 가능",
   "favorite": "즐겨찾기",
   "isFavorite": "즐겨찾기 등록됨",
   "notFavorite": "즐겨찾기 제외됨",
@@ -25,6 +27,8 @@ export const filterBar: SimpleTranslationEntries = {
   "hiddenAbility": "숨겨진 특성",
   "hasHiddenAbility": "숨겨진 특성 보유",
   "noHiddenAbility": "숨겨진 특성 없음",
+  "egg": "알",
+  "eggPurchasable": "알 구매 가능",
   "pokerus": "포켓러스",
   "hasPokerus": "포켓러스 감염",
   "noPokerus": "포켓러스 없음",
diff --git a/src/locales/pt_BR/filter-bar.ts b/src/locales/pt_BR/filter-bar.ts
index 3ee41c6ead9..d85fa65a536 100644
--- a/src/locales/pt_BR/filter-bar.ts
+++ b/src/locales/pt_BR/filter-bar.ts
@@ -13,9 +13,11 @@ export const filterBar: SimpleTranslationEntries = {
   "passive": "Passiva",
   "passiveUnlocked": "Passiva Desbloqueada",
   "passiveLocked": "Passiva Bloqueada",
+  "passiveUnlockable": "Passive - Can Unlock",
   "costReduction": "Redução de Custo",
   "costReductionUnlocked": "Redução de Custo Desbloq.",
   "costReductionLocked": "Redução de Custo Bloq.",
+  "costReductionUnlockable": "Cost Reduction - Can Unlock",
   "favorite": "Favorite",
   "isFavorite": "Favorite - Yes",
   "notFavorite": "Favorite - No",
@@ -25,6 +27,8 @@ export const filterBar: SimpleTranslationEntries = {
   "hiddenAbility": "Habilidade Oculta",
   "hasHiddenAbility": "Habilidade Oculta - Sim",
   "noHiddenAbility": "Habilidade Oculta - Não",
+  "egg": "Egg",
+  "eggPurchasable": "Purchasable Egg",
   "pokerus": "Pokérus",
   "hasPokerus": "Pokérus - Sim",
   "noPokerus": "Pokérus - Não",
diff --git a/src/locales/zh_CN/filter-bar.ts b/src/locales/zh_CN/filter-bar.ts
index 820091af06c..48b56d15071 100644
--- a/src/locales/zh_CN/filter-bar.ts
+++ b/src/locales/zh_CN/filter-bar.ts
@@ -13,9 +13,11 @@ export const filterBar: SimpleTranslationEntries = {
   "passive": "被动",
   "passiveUnlocked": "被动解锁",
   "passiveLocked": "被动未解锁",
+  "passiveUnlockable": "Passive - Can Unlock",
   "costReduction": "费用降低",
   "costReductionUnlocked": "已降费",
   "costReductionLocked": "未降费",
+  "costReductionUnlockable": "Cost Reduction - Can Unlock",
   "favorite": "Favorite",
   "isFavorite": "Favorite - Yes",
   "notFavorite": "Favorite - No",
@@ -25,6 +27,8 @@ export const filterBar: SimpleTranslationEntries = {
   "hiddenAbility": "梦特",
   "hasHiddenAbility": "有梦特",
   "noHiddenAbility": "无梦特",
+  "egg": "Egg",
+  "eggPurchasable": "Purchasable Egg",
   "pokerus": "病毒",
   "hasPokerus": "有病毒",
   "noPokerus": "无病毒",
diff --git a/src/locales/zh_TW/filter-bar.ts b/src/locales/zh_TW/filter-bar.ts
index 18c09b629b0..d784b0a6b6a 100644
--- a/src/locales/zh_TW/filter-bar.ts
+++ b/src/locales/zh_TW/filter-bar.ts
@@ -13,9 +13,11 @@ export const filterBar: SimpleTranslationEntries = {
   "passive": "被動",
   "passiveUnlocked": "被動解鎖",
   "passiveLocked": "被動未解鎖",
+  "passiveUnlockable": "Passive - Can Unlock",
   "costReduction": "Cost Reduction",
   "costReductionUnlocked": "Cost Reduction Unlocked",
   "costReductionLocked": "Cost Reduction Locked",
+  "costReductionUnlockable": "Cost Reduction - Can Unlock",
   "favorite": "Favorite",
   "isFavorite": "Favorite - Yes",
   "notFavorite": "Favorite - No",
@@ -25,6 +27,8 @@ export const filterBar: SimpleTranslationEntries = {
   "hiddenAbility": "Hidden Ability",
   "hasHiddenAbility": "Hidden Ability - Yes",
   "noHiddenAbility": "Hidden Ability - No",
+  "egg": "Egg",
+  "eggPurchasable": "Purchasable Egg",
   "pokerus": "Pokerus",
   "hasPokerus": "Pokerus - Yes",
   "noPokerus": "Pokerus - No",
diff --git a/src/ui/dropdown.ts b/src/ui/dropdown.ts
index f1723559b57..cfe26570856 100644
--- a/src/ui/dropdown.ts
+++ b/src/ui/dropdown.ts
@@ -7,7 +7,8 @@ import i18next from "i18next";
 export enum DropDownState {
     ON = 0,
     OFF = 1,
-    EXCLUDE = 2
+    EXCLUDE = 2,
+    UNLOCKABLE = 3
 }
 
 export enum DropDownType {
@@ -46,6 +47,7 @@ export class DropDownOption extends Phaser.GameObjects.Container {
   private onColor = 0x33bbff;
   private offColor = 0x272727;
   private excludeColor = 0xff5555;
+  private unlockableColor = 0xffff00;
 
   constructor(scene: SceneBase, val: any, labels: DropDownLabel | DropDownLabel[]) {
     super(scene);
@@ -114,6 +116,9 @@ export class DropDownOption extends Phaser.GameObjects.Container {
     case DropDownState.EXCLUDE:
       this.toggle.setTint(this.excludeColor);
       break;
+    case DropDownState.UNLOCKABLE:
+      this.toggle.setTint(this.unlockableColor);
+      break;
     }
   }
 
diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts
index 36e00eed43a..f7ef4b47353 100644
--- a/src/ui/starter-select-ui-handler.ts
+++ b/src/ui/starter-select-ui-handler.ts
@@ -445,12 +445,14 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     const passiveLabels = [
       new DropDownLabel(i18next.t("filterBar:passive"), undefined, DropDownState.OFF),
       new DropDownLabel(i18next.t("filterBar:passiveUnlocked"), undefined, DropDownState.ON),
+      new DropDownLabel(i18next.t("filterBar:passiveUnlockable"), undefined, DropDownState.UNLOCKABLE),
       new DropDownLabel(i18next.t("filterBar:passiveLocked"), undefined, DropDownState.EXCLUDE),
     ];
 
     const costReductionLabels = [
       new DropDownLabel(i18next.t("filterBar:costReduction"), undefined, DropDownState.OFF),
       new DropDownLabel(i18next.t("filterBar:costReductionUnlocked"), undefined, DropDownState.ON),
+      new DropDownLabel(i18next.t("filterBar:costReductionUnlockable"), undefined, DropDownState.UNLOCKABLE),
       new DropDownLabel(i18next.t("filterBar:costReductionLocked"), undefined, DropDownState.EXCLUDE),
     ];
 
@@ -477,6 +479,10 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       new DropDownLabel(i18next.t("filterBar:hasHiddenAbility"), undefined, DropDownState.ON),
       new DropDownLabel(i18next.t("filterBar:noHiddenAbility"), undefined, DropDownState.EXCLUDE),
     ];
+    const eggLabels = [
+      new DropDownLabel(i18next.t("filterBar:egg"), undefined, DropDownState.OFF),
+      new DropDownLabel(i18next.t("filterBar:eggPurchasable"), undefined, DropDownState.ON),
+    ];
     const pokerusLabels = [
       new DropDownLabel(i18next.t("filterBar:pokerus"), undefined, DropDownState.OFF),
       new DropDownLabel(i18next.t("filterBar:hasPokerus"), undefined, DropDownState.ON),
@@ -485,6 +491,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       new DropDownOption(this.scene, "FAVORITE", favoriteLabels),
       new DropDownOption(this.scene, "WIN", winLabels),
       new DropDownOption(this.scene, "HIDDEN_ABILITY", hiddenAbilityLabels),
+      new DropDownOption(this.scene, "EGG", eggLabels),
       new DropDownOption(this.scene, "POKERUS", pokerusLabels),
     ];
     this.filterBar.addFilter(DropDownColumn.MISC, i18next.t("filterBar:miscFilter"), new DropDown(this.scene, 0, 0, miscOptions, this.updateStarters, DropDownType.RADIAL));
@@ -1680,37 +1687,35 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
               });
             }
 
-            // Same species egg menu option. Only visible if passive is bought
-            if (passiveAttr & PassiveAttr.UNLOCKED) {
-              const sameSpeciesEggCost = getSameSpeciesEggCandyCounts(speciesStarters[this.lastSpecies.speciesId]);
-              options.push({
-                label: `x${sameSpeciesEggCost} ${i18next.t("starterSelectUiHandler:sameSpeciesEgg")}`,
-                handler: () => {
-                  if (this.scene.gameData.eggs.length < 99 && (Overrides.FREE_CANDY_UPGRADE_OVERRIDE || candyCount >= sameSpeciesEggCost)) {
-                    if (!Overrides.FREE_CANDY_UPGRADE_OVERRIDE) {
-                      starterData.candyCount -= sameSpeciesEggCost;
-                    }
-                    this.pokemonCandyCountText.setText(`x${starterData.candyCount}`);
-
-                    const egg = new Egg({scene: this.scene, species: this.lastSpecies.speciesId, sourceType: EggSourceType.SAME_SPECIES_EGG});
-                    egg.addEggToGameData(this.scene);
-
-                    this.scene.gameData.saveSystem().then(success => {
-                      if (!success) {
-                        return this.scene.reset(true);
-                      }
-                    });
-                    ui.setMode(Mode.STARTER_SELECT);
-                    this.scene.playSound("buy");
-
-                    return true;
+            // Same species egg menu option.
+            const sameSpeciesEggCost = getSameSpeciesEggCandyCounts(speciesStarters[this.lastSpecies.speciesId]);
+            options.push({
+              label: `x${sameSpeciesEggCost} ${i18next.t("starterSelectUiHandler:sameSpeciesEgg")}`,
+              handler: () => {
+                if (this.scene.gameData.eggs.length < 99 && (Overrides.FREE_CANDY_UPGRADE_OVERRIDE || candyCount >= sameSpeciesEggCost)) {
+                  if (!Overrides.FREE_CANDY_UPGRADE_OVERRIDE) {
+                    starterData.candyCount -= sameSpeciesEggCost;
                   }
-                  return false;
-                },
-                item: "candy",
-                itemArgs: starterColors[this.lastSpecies.speciesId]
-              });
-            }
+                  this.pokemonCandyCountText.setText(`x${starterData.candyCount}`);
+
+                  const egg = new Egg({scene: this.scene, species: this.lastSpecies.speciesId, sourceType: EggSourceType.SAME_SPECIES_EGG});
+                  egg.addEggToGameData(this.scene);
+
+                  this.scene.gameData.saveSystem().then(success => {
+                    if (!success) {
+                      return this.scene.reset(true);
+                    }
+                  });
+                  ui.setMode(Mode.STARTER_SELECT);
+                  this.scene.playSound("buy");
+
+                  return true;
+                }
+                return false;
+              },
+              item: "candy",
+              itemArgs: starterColors[this.lastSpecies.speciesId]
+            });
             options.push({
               label: i18next.t("menu:cancel"),
               handler: () => {
@@ -2289,13 +2294,16 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       const isCaught = !!(caughtVariants & DexAttr.NON_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 fitsGen =   this.filterBar.getVals(DropDownColumn.GEN).includes(container.species.generation);
 
@@ -2320,6 +2328,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
           return isPassiveUnlocked;
         } else if (unlocks.val === "PASSIVE" && unlocks.state === DropDownState.EXCLUDE) {
           return !isPassiveUnlocked;
+        } else if (unlocks.val === "PASSIVE" && unlocks.state === DropDownState.UNLOCKABLE) {
+          return isPassiveUnlockable;
         } else if (unlocks.val === "PASSIVE" && unlocks.state === DropDownState.OFF) {
           return true;
         }
@@ -2330,6 +2340,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
           return isCostReduced;
         } else if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.EXCLUDE) {
           return !isCostReduced;
+        } else if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.UNLOCKABLE) {
+          return isCostReductionUnlockable;
         } else if (unlocks.val === "COST_REDUCTION" && unlocks.state === DropDownState.OFF) {
           return true;
         }
@@ -2369,6 +2381,16 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
         }
       });
 
+      const fitsEgg = this.filterBar.getVals(DropDownColumn.MISC).some(misc => {
+        if (misc.val === "EGG" && misc.state === DropDownState.ON) {
+          return isEggPurchasable;
+        } else if (misc.val === "EGG" && misc.state === DropDownState.EXCLUDE) {
+          return !isEggPurchasable;
+        } else if (misc.val === "EGG" && misc.state === DropDownState.OFF) {
+          return true;
+        }
+      });
+
       const fitsPokerus = this.filterBar.getVals(DropDownColumn.MISC).some(misc => {
         if (misc.val === "POKERUS" && misc.state === DropDownState.ON) {
           return this.pokerusSpecies.includes(container.species);
@@ -2379,7 +2401,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
         }
       });
 
-      if (fitsGen && fitsType && fitsCaught && fitsPassive && fitsCostReduction && fitsFavorite && fitsWin && fitsHA && fitsPokerus) {
+      if (fitsGen && fitsType && fitsCaught && fitsPassive && fitsCostReduction && fitsFavorite && fitsWin && fitsHA && fitsEgg && fitsPokerus) {
         this.filteredStarterContainers.push(container);
       }
     });

From 0e0ed10ce06cd78f8889156b79f3641098d25c50 Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Sun, 11 Aug 2024 21:54:42 -0700
Subject: [PATCH 10/30] [Test] Fix test names that weren't changed from
 copy/pasting (#3502)

---
 src/test/abilities/libero.test.ts      | 2 +-
 src/test/abilities/sand_spit.test.ts   | 2 +-
 src/test/battle/double_battle.test.ts  | 2 +-
 src/test/battle/error-handling.test.ts | 2 +-
 src/test/moves/foresight.test.ts       | 2 +-
 src/test/moves/miracle_eye.test.ts     | 2 +-
 src/test/moves/tailwind.test.ts        | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/test/abilities/libero.test.ts b/src/test/abilities/libero.test.ts
index 58b4ac639cb..2581eac068d 100644
--- a/src/test/abilities/libero.test.ts
+++ b/src/test/abilities/libero.test.ts
@@ -16,7 +16,7 @@ import { SPLASH_ONLY } from "#test/utils/testUtils";
 
 const TIMEOUT = 20 * 1000;
 
-describe("Abilities - Protean", () => {
+describe("Abilities - Libero", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
 
diff --git a/src/test/abilities/sand_spit.test.ts b/src/test/abilities/sand_spit.test.ts
index d3d1a8e0028..59d311adb80 100644
--- a/src/test/abilities/sand_spit.test.ts
+++ b/src/test/abilities/sand_spit.test.ts
@@ -8,7 +8,7 @@ import { getMovePosition } from "#test/utils/gameManagerUtils";
 import { WeatherType } from "#app/enums/weather-type.js";
 
 
-describe("Ability Timing", () => {
+describe("Abilities - Sand Spit", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
 
diff --git a/src/test/battle/double_battle.test.ts b/src/test/battle/double_battle.test.ts
index fb73fd70099..76b7defe33d 100644
--- a/src/test/battle/double_battle.test.ts
+++ b/src/test/battle/double_battle.test.ts
@@ -8,7 +8,7 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import { SPLASH_ONLY } from "#test/utils/testUtils";
 import { Status, StatusEffect } from "#app/data/status-effect.js";
 
-describe("Test Battle Phase", () => {
+describe("Double Battles", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
 
diff --git a/src/test/battle/error-handling.test.ts b/src/test/battle/error-handling.test.ts
index f244b57ce1b..a88d7cd8c18 100644
--- a/src/test/battle/error-handling.test.ts
+++ b/src/test/battle/error-handling.test.ts
@@ -5,7 +5,7 @@ import { Species } from "#enums/species";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
-describe("Test Battle Phase", () => {
+describe("Error Handling", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
 
diff --git a/src/test/moves/foresight.test.ts b/src/test/moves/foresight.test.ts
index 5d847ca1bc4..3fef1569eba 100644
--- a/src/test/moves/foresight.test.ts
+++ b/src/test/moves/foresight.test.ts
@@ -7,7 +7,7 @@ import { Moves } from "#app/enums/moves.js";
 import { getMovePosition } from "../utils/gameManagerUtils";
 import { MoveEffectPhase } from "#app/phases.js";
 
-describe("Internals", () => {
+describe("Moves - Foresight", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
 
diff --git a/src/test/moves/miracle_eye.test.ts b/src/test/moves/miracle_eye.test.ts
index 67d4d695b62..45de8b7e4fb 100644
--- a/src/test/moves/miracle_eye.test.ts
+++ b/src/test/moves/miracle_eye.test.ts
@@ -8,7 +8,7 @@ import { getMovePosition } from "../utils/gameManagerUtils";
 import { MoveEffectPhase } from "#app/phases.js";
 import { BattlerIndex } from "#app/battle.js";
 
-describe("Internals", () => {
+describe("Moves - Miracle Eye", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
 
diff --git a/src/test/moves/tailwind.test.ts b/src/test/moves/tailwind.test.ts
index b2643dc68f3..e32e10a4290 100644
--- a/src/test/moves/tailwind.test.ts
+++ b/src/test/moves/tailwind.test.ts
@@ -10,7 +10,7 @@ import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import { SPLASH_ONLY } from "#test/utils/testUtils";
 
-describe("Abilities - Wind Rider", () => {
+describe("Moves - Tailwind", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
 

From 4b16b64eedbed7f05644bfa498a145315cf48daf Mon Sep 17 00:00:00 2001
From: "Adrian T." <68144167+torranx@users.noreply.github.com>
Date: Mon, 12 Aug 2024 12:56:31 +0800
Subject: [PATCH 11/30] [Test] move util func to gameManager.ts (#3494)

---
 src/test/utils/gameManager.ts | 12 ++++++++++--
 src/test/utils/testUtils.ts   | 11 -----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/test/utils/gameManager.ts b/src/test/utils/gameManager.ts
index 8d9181352ac..935d40324a2 100644
--- a/src/test/utils/gameManager.ts
+++ b/src/test/utils/gameManager.ts
@@ -26,7 +26,6 @@ import TargetSelectUiHandler from "#app/ui/target-select-ui-handler.js";
 import { OverridesHelper } from "./overridesHelper";
 import { ModifierTypeOption, modifierTypes } from "#app/modifier/modifier-type.js";
 import overrides from "#app/overrides.js";
-import { removeEnemyHeldItems } from "./testUtils";
 import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler.js";
 import { MoveHelper } from "./moveHelper";
 import { vi } from "vitest";
@@ -137,7 +136,7 @@ export default class GameManager {
 
     await this.phaseInterceptor.run(EncounterPhase);
     if (overrides.OPP_HELD_ITEMS_OVERRIDE.length === 0) {
-      removeEnemyHeldItems(this);
+      this.removeEnemyHeldItems();
     }
   }
 
@@ -405,4 +404,13 @@ export default class GameManager {
 
     vi.spyOn(this.scene.getCurrentPhase() as TurnStartPhase, "getOrder").mockReturnValue(order);
   }
+
+  /**
+   * Removes all held items from enemy pokemon
+   */
+  removeEnemyHeldItems(): void {
+    this.scene.clearEnemyHeldItemModifiers();
+    this.scene.clearEnemyModifiers();
+    console.log("Enemy held items removed");
+  }
 }
diff --git a/src/test/utils/testUtils.ts b/src/test/utils/testUtils.ts
index d40efbbf016..378c3d23fde 100644
--- a/src/test/utils/testUtils.ts
+++ b/src/test/utils/testUtils.ts
@@ -1,7 +1,6 @@
 import { Moves } from "#app/enums/moves.js";
 import i18next, { type ParseKeys } from "i18next";
 import { vi } from "vitest";
-import GameManager from "./gameManager";
 
 /** Ready to use array of Moves.SPLASH x4 */
 export const SPLASH_ONLY = [Moves.SPLASH, Moves.SPLASH, Moves.SPLASH, Moves.SPLASH];
@@ -26,13 +25,3 @@ export function mockI18next() {
 export function arrayOfRange(start: integer, end: integer) {
   return Array.from({ length: end - start }, (_v, k) => k + start);
 }
-
-/**
- * Removes all held items from enemy pokemon
- * @param game The {@link GameManager} instance
- */
-export function removeEnemyHeldItems(game: GameManager): void {
-  game.scene.clearEnemyHeldItemModifiers();
-  game.scene.clearEnemyModifiers();
-  console.log("Enemy held items removed");
-}

From 77a9a2306b90d1deede23ec6e33adfe9643af18b Mon Sep 17 00:00:00 2001
From: AJ Fontaine <36677462+Fontbane@users.noreply.github.com>
Date: Mon, 12 Aug 2024 00:57:19 -0400
Subject: [PATCH 12/30] [Item] Skip Ability Charm reward after wave 189 in
 classic (#3477)

---
 src/modifier/modifier-type.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts
index 07a9b74b9ff..330132b55fc 100644
--- a/src/modifier/modifier-type.ts
+++ b/src/modifier/modifier-type.ts
@@ -1604,7 +1604,7 @@ const modifierPool: ModifierPool = {
     new WeightedModifierType(modifierTypes.SOUL_DEW, 7),
     //new WeightedModifierType(modifierTypes.OVAL_CHARM, 6),
     new WeightedModifierType(modifierTypes.SOOTHE_BELL, 4),
-    new WeightedModifierType(modifierTypes.ABILITY_CHARM, 6),
+    new WeightedModifierType(modifierTypes.ABILITY_CHARM, skipInClassicAfterWave(189, 6)),
     new WeightedModifierType(modifierTypes.FOCUS_BAND, 5),
     new WeightedModifierType(modifierTypes.KINGS_ROCK, 3),
     new WeightedModifierType(modifierTypes.LOCK_CAPSULE, 3),

From d19caf665043b3e377a5954bdb1d3f7406028a56 Mon Sep 17 00:00:00 2001
From: Chapybara-jp <charlie.beer@hotmail.com>
Date: Mon, 12 Aug 2024 06:57:47 +0200
Subject: [PATCH 13/30] [Localisation(ja)] Translated
 save-slot-select-ui-handler.ts (#3475)

* Translated save-slot-select-ui-handler.ts

"Wave" needs special coding to look correct.

* Update save-slot-select-ui-handler.ts

missed a space, punctuation

* Update save-slot-select-ui-handler.ts

* Update save-slot-select-ui-handler.ts
---
 src/locales/ja/save-slot-select-ui-handler.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/locales/ja/save-slot-select-ui-handler.ts b/src/locales/ja/save-slot-select-ui-handler.ts
index 115cd9987b8..0b02eb7365a 100644
--- a/src/locales/ja/save-slot-select-ui-handler.ts
+++ b/src/locales/ja/save-slot-select-ui-handler.ts
@@ -1,9 +1,9 @@
 import { SimpleTranslationEntries } from "#app/interfaces/locales";
 
 export const saveSlotSelectUiHandler: SimpleTranslationEntries = {
-  "overwriteData": "せんたくしたスロットにデータをうわがきしますか？",
-  "loading": "ローディング...",
-  "wave": "Wave",
+  "overwriteData": "選択した　スロットに　データを　上書きします？",
+  "loading": "読込中…",
+  "wave": "波",//This needs to be preceded by 第[x],e.g.第１波、第２４８波
   "lv": "Lv",
   "empty": "なし",
 } as const;

From 097d43feaf5a322366d7dc88682aa1cfb41ec7fe Mon Sep 17 00:00:00 2001
From: protimita <protimitajp@gmail.com>
Date: Mon, 12 Aug 2024 10:30:54 +0530
Subject: [PATCH 14/30] [Localization(ja)] Translated modifier.ts, arena-tag.ts
 (#3487)

* [Localization][JA] translated modifier.ts

translation for modifier.ts

* Update src/locales/ja/modifier.ts

Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>

* Update src/locales/ja/modifier.ts

Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>

* [Localization][JA] Translated arena-tag.ts

Translation for arena-tag.ts

---------

Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
---
 src/locales/ja/arena-tag.ts | 98 ++++++++++++++++++-------------------
 src/locales/ja/modifier.ts  | 20 ++++----
 2 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/src/locales/ja/arena-tag.ts b/src/locales/ja/arena-tag.ts
index 22612795308..54df26fa44f 100644
--- a/src/locales/ja/arena-tag.ts
+++ b/src/locales/ja/arena-tag.ts
@@ -1,53 +1,53 @@
 import { SimpleTranslationEntries } from "#app/interfaces/locales";
 
 export const arenaTag: SimpleTranslationEntries = {
-  "yourTeam": "your team",
-  "opposingTeam": "the opposing team",
-  "arenaOnRemove": "{{moveName}}'s effect wore off.",
-  "arenaOnRemovePlayer": "{{moveName}}'s effect wore off\non your side.",
-  "arenaOnRemoveEnemy": "{{moveName}}'s effect wore off\non the foe's side.",
-  "mistOnAdd": "{{pokemonNameWithAffix}}'s team became\nshrouded in mist!",
-  "mistApply": "The mist prevented\nthe lowering of stats!",
-  "reflectOnAdd": "Reflect reduced the damage of physical moves.",
-  "reflectOnAddPlayer": "Reflect reduced the damage of physical moves on your side.",
-  "reflectOnAddEnemy": "Reflect reduced the damage of physical moves on the foe's side.",
-  "lightScreenOnAdd": "Light Screen reduced the damage of special moves.",
-  "lightScreenOnAddPlayer": "Light Screen reduced the damage of special moves on your side.",
-  "lightScreenOnAddEnemy": "Light Screen reduced the damage of special moves on the foe's side.",
-  "auroraVeilOnAdd": "Aurora Veil reduced the damage of moves.",
-  "auroraVeilOnAddPlayer": "Aurora Veil reduced the damage of moves on your side.",
-  "auroraVeilOnAddEnemy": "Aurora Veil reduced the damage of moves on the foe's side.",
-  "conditionalProtectOnAdd": "{{moveName}} protected team!",
-  "conditionalProtectOnAddPlayer": "{{moveName}} protected your team!",
-  "conditionalProtectOnAddEnemy": "{{moveName}} protected the\nopposing team!",
-  "conditionalProtectApply": "{{moveName}} protected {{pokemonNameWithAffix}}!",
-  "matBlockOnAdd": "{{pokemonNameWithAffix}} intends to flip up a mat\nand block incoming attacks!",
-  "noCritOnAddPlayer": "The {{moveName}} shielded your\nteam from critical hits!",
-  "noCritOnAddEnemy": "The {{moveName}} shielded the opposing\nteam from critical hits!",
-  "noCritOnRemove": "{{pokemonNameWithAffix}}'s {{moveName}}\nwore off!",
-  "wishTagOnAdd": "{{pokemonNameWithAffix}}'s wish\ncame true!",
-  "mudSportOnAdd": "Electricity's power was weakened!",
-  "mudSportOnRemove": "The effects of Mud Sport\nhave faded.",
-  "waterSportOnAdd": "Fire's power was weakened!",
-  "waterSportOnRemove": "The effects of Water Sport\nhave faded.",
-  "spikesOnAdd": "{{moveName}} were scattered\nall around {{opponentDesc}}'s feet!",
-  "spikesActivateTrap": "{{pokemonNameWithAffix}} is hurt\nby the spikes!",
-  "toxicSpikesOnAdd": "{{moveName}} were scattered\nall around {{opponentDesc}}'s feet!",
-  "toxicSpikesActivateTrapPoison": "{{pokemonNameWithAffix}} absorbed the {{moveName}}!",
-  "stealthRockOnAdd": "Pointed stones float in the air\naround {{opponentDesc}}!",
-  "stealthRockActivateTrap": "Pointed stones dug into\n{{pokemonNameWithAffix}}!",
-  "stickyWebOnAdd": "A {{moveName}} has been laid out on the ground around the opposing team!",
-  "stickyWebActivateTrap": "The opposing {{pokemonName}} was caught in a sticky web!",
-  "trickRoomOnAdd": "{{pokemonNameWithAffix}} twisted\nthe dimensions!",
-  "trickRoomOnRemove": "The twisted dimensions\nreturned to normal!",
-  "gravityOnAdd": "Gravity intensified!",
-  "gravityOnRemove": "Gravity returned to normal!",
-  "tailwindOnAdd": "The Tailwind blew from behind team!",
-  "tailwindOnAddPlayer": "The Tailwind blew from behind\nyour team!",
-  "tailwindOnAddEnemy": "The Tailwind blew from behind\nthe opposing team!",
-  "tailwindOnRemove": "Team's Tailwind petered out!",
-  "tailwindOnRemovePlayer": "Your team's Tailwind petered out!",
-  "tailwindOnRemoveEnemy": "The opposing team's Tailwind petered out!",
-  "happyHourOnAdd": "Everyone is caught up in the happy atmosphere!",
-  "happyHourOnRemove": "The atmosphere returned to normal.",
+  "yourTeam": "味方",
+  "opposingTeam": "相手",
+  "arenaOnRemove": "{{moveName}}の 効果が　切れた",
+  "arenaOnRemovePlayer": "{{moveName}}の　効果が\n味方から　切れた",
+  "arenaOnRemoveEnemy": "{{moveName}}の　効果が\n相手から　切れた",
+  "mistOnAdd": "{{pokemonNameWithAffix}}の　味方は\n白い霧に　包まれた！",
+  "mistApply": "白い霧が\n能力変化の　削減から　守った！",
+  "reflectOnAdd": "リフレクターで　物理ダメージを　さげた",
+  "reflectOnAddPlayer": "味方の　リフレクターで\n物理ダメージを　さげた",
+  "reflectOnAddEnemy": "相手の　リフレクターで\n物理ダメージを　さげた",
+  "lightScreenOnAdd": "ひかりのかべで\n物理ダメージを　さげた",
+  "lightScreenOnAddPlayer": "味方の　ひかりのかべで\n物理ダメージを　さげた",
+  "lightScreenOnAddEnemy": "相手の　ひかりのかべで\n物理ダメージを　さげた",
+  "auroraVeilOnAdd": "オーロラベールで\n攻撃の　ダメージを　さげた",
+  "auroraVeilOnAddPlayer": "味方の　オーロラベールで\n攻撃ダメージを　さげた",
+  "auroraVeilOnAddEnemy": "相手の　オーロラベールで\n攻撃ダメージを　さげた",
+  "conditionalProtectOnAdd": "{{moveName}}に　守られた！",
+  "conditionalProtectOnAddPlayer": "見方が　{{moveName}}に　守られた！",
+  "conditionalProtectOnAddEnemy": "相手が　{{moveName}}に　守られた！",
+  "conditionalProtectApply": "{{pokemonNameWithAffix}}が\n{{moveName}}に 守られた！",
+  "matBlockOnAdd": "{{pokemonNameWithAffix}}は\nたたみがえしを　ねらっている！",
+  "noCritOnAddPlayer": "{{moveName}}の　力で　味方の急所が　隠れた！",
+  "noCritOnAddEnemy": "{{moveName}}の　力で　相手の急所が　隠れた！",
+  "noCritOnRemove": "{{pokemonNameWithAffix}}の {{moveName}}の\n効果が　なくなった！",
+  "wishTagOnAdd": "{{pokemonNameWithAffix}}の\nねがいごとが　かなった！",
+  "mudSportOnAdd": "電気の威力が　弱まった！",
+  "mudSportOnRemove": "どろあそびの　効果が　なくなった！",
+  "waterSportOnAdd": "炎の威力が　弱まった！",
+  "waterSportOnRemove": "みずあそびの　効果が　なくなった！",
+  "spikesOnAdd": "{{opponentDesc}}の　足下に\n{{moveName}}が　散らばった！",
+  "spikesActivateTrap": "{{pokemonNameWithAffix}}は\nまきびしの　ダメージを　受けた！",
+  "toxicSpikesOnAdd": "{{opponentDesc}}の　足下に\n{{moveName}}が　散らばった！",
+  "toxicSpikesActivateTrapPoison": "{{pokemonNameWithAffix}}は {{moveName}}を　吸収した！",
+  "stealthRockOnAdd": "{{opponentDesc}}の　周りに\nとがった岩が　ただよい始めた！",
+  "stealthRockActivateTrap": "{{pokemonNameWithAffix}}に\nとがった岩が　食い込んだ！",
+  "stickyWebOnAdd": "相手の　足下に\n{{moveName}}が　広がった！",
+  "stickyWebActivateTrap": "相手の　{{pokemonName}}は\nねばねばネットに　ひっかかった！",
+  "trickRoomOnAdd": "{{pokemonNameWithAffix}}は\n時空を　ゆがめた！",
+  "trickRoomOnRemove": "ゆがんだ　時空が　元に戻った！",
+  "gravityOnAdd": "じゅうりょくが　強くなった！",
+  "gravityOnRemove": "じゅうりょくが　元に戻った！",
+  "tailwindOnAdd": "追い風が　吹き始めた！",
+  "tailwindOnAddPlayer": "味方に\n追い風が　吹き始めた！",
+  "tailwindOnAddEnemy": "相手に\n追い風が　吹き始めた！",
+  "tailwindOnRemove": "追い風が　止んだ！",
+  "tailwindOnRemovePlayer": "味方の　追い風が　止んだ！",
+  "tailwindOnRemoveEnemy": "相手の　追い風が　止んだ！",
+  "happyHourOnAdd": "みんなが　ハッピーな気分に\n包まれた！",
+  "happyHourOnRemove": "みんなの　気分が　元に戻った",
 } as const;
diff --git a/src/locales/ja/modifier.ts b/src/locales/ja/modifier.ts
index 26a6a9c18ae..00fc9845770 100644
--- a/src/locales/ja/modifier.ts
+++ b/src/locales/ja/modifier.ts
@@ -1,14 +1,14 @@
 import { SimpleTranslationEntries } from "#app/interfaces/locales";
 
 export const modifier: SimpleTranslationEntries = {
-  "surviveDamageApply": "{{pokemonNameWithAffix}} hung on\nusing its {{typeName}}!",
-  "turnHealApply": "{{pokemonNameWithAffix}} restored a little HP using\nits {{typeName}}!",
-  "hitHealApply": "{{pokemonNameWithAffix}} restored a little HP using\nits {{typeName}}!",
-  "pokemonInstantReviveApply": "{{pokemonNameWithAffix}} was revived\nby its {{typeName}}!",
-  "pokemonResetNegativeStatStageApply": "{{pokemonNameWithAffix}}'s lowered stats were restored\nby its {{typeName}}!",
-  "moneyInterestApply": "You received interest of ₽{{moneyAmount}}\nfrom the {{typeName}}!",
-  "turnHeldItemTransferApply": "{{pokemonNameWithAffix}}'s {{itemName}} was absorbed\nby {{pokemonName}}'s {{typeName}}!",
-  "contactHeldItemTransferApply": "{{pokemonNameWithAffix}}'s {{itemName}} was snatched\nby {{pokemonName}}'s {{typeName}}!",
-  "enemyTurnHealApply": "{{pokemonNameWithAffix}}\nrestored some HP!",
-  "bypassSpeedChanceApply": "{{pokemonName}} can act faster than normal, thanks to its {{itemName}}!",
+  "surviveDamageApply": "{{pokemonNameWithAffix}}は\n{{typeName}}で　もちこたえた！",
+  "turnHealApply": "{{pokemonNameWithAffix}}は\n{{typeName}}で　少し　回復！",
+  "hitHealApply": "{{pokemonNameWithAffix}}は\n{{typeName}}で　少し　回復！",
+  "pokemonInstantReviveApply": "{{pokemonNameWithAffix}}は\n{{typeName}}で　復活した！",
+  "pokemonResetNegativeStatStageApply": "{{pokemonNameWithAffix}}は　{{typeName}}で\n下がった能力が　元に戻った！",
+  "moneyInterestApply": "{{typeName}}から　{{moneyAmount}}円　取得した！",
+  "turnHeldItemTransferApply": "{{pokemonName}}の {{typeName}}が\n{{pokemonNameWithAffix}}の {{itemName}}を 吸い取った！",
+  "contactHeldItemTransferApply": "{{pokemonName}}の {{typeName}}が\n{{pokemonNameWithAffix}}の {{itemName}}を うばい取った！",
+  "enemyTurnHealApply": "{{pokemonNameWithAffix}}は\n体力を　回復！",
+  "bypassSpeedChanceApply": "{{pokemonName}}は　{{itemName}}で\n行動が　はやくなった！",
 } as const;

From 0028ae8a6d96aa035307a424a829f7f73905c467 Mon Sep 17 00:00:00 2001
From: Chapybara-jp <charlie.beer@hotmail.com>
Date: Mon, 12 Aug 2024 07:02:06 +0200
Subject: [PATCH 15/30] [Localization(ja)] Translate
 starter-select-ui-handler.ts (#3481)

* [JA] [Localization] Translate starter-select-ui-handler.ts

Unsure about "Enable/Disbale Passive", need some advice.

* Update starter-select-ui-handler.ts
---
 src/locales/ja/starter-select-ui-handler.ts | 68 ++++++++++-----------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/locales/ja/starter-select-ui-handler.ts b/src/locales/ja/starter-select-ui-handler.ts
index fe4495a3a2f..d33f8b6f97e 100644
--- a/src/locales/ja/starter-select-ui-handler.ts
+++ b/src/locales/ja/starter-select-ui-handler.ts
@@ -6,46 +6,46 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales";
  * account interactions, descriptive text, etc.
  */
 export const starterSelectUiHandler: SimpleTranslationEntries = {
-  "confirmStartTeam": "この じょうけんで チャレンジを しんこうしますか?",
-  "confirmExit": "しゅうりょう しますか？",
-  "invalidParty": "This is not a valid starting party!",
-  "gen1": "1せだい",
-  "gen2": "2せだい",
-  "gen3": "3せだい",
-  "gen4": "4せだい",
-  "gen5": "5せだい",
-  "gen6": "6せだい",
-  "gen7": "7せだい",
-  "gen8": "8せだい",
-  "gen9": "9せだい",
-  "growthRate": "EXPタイプ:",
-  "ability": "とくせい:",
+  "confirmStartTeam": "この条件で　チャレンジを　始めますか？",
+  "confirmExit": "終了しますか？",
+  "invalidParty": "手持ちは　チャレンジの　条件で　認められない！",
+  "gen1": "1世代",
+  "gen2": "2世代",
+  "gen3": "3世代",
+  "gen4": "4世代",
+  "gen5": "5世代",
+  "gen6": "6世代",
+  "gen7": "7世代",
+  "gen8": "8世代",
+  "gen9": "9世代",
+  "growthRate": "経験値タイプ:",
+  "ability": "特性:",
   "passive": "パッシブ:",
-  "nature": "せいかく:",
-  "eggMoves": "タマゴわざ",
+  "nature": "性格:",
+  "eggMoves": "タマゴ技",
   "start": "始める",
-  "addToParty": "えらぶ",
-  "toggleIVs": "個体値を ひょうじ",
-  "manageMoves": "わざを ならびかえ",
-  "manageNature": "せいかくを ならびかえ",
-  "addToFavorites": "Add to Favorites",
-  "removeFromFavorites": "Remove from Favorites",
-  "useCandies": "アメを つかう",
-  "selectNature": "せいかくをえらんでください",
-  "selectMoveSwapOut": "交換する技を選択してください",
-  "selectMoveSwapWith": "交換先の技を選択してください",
-  "unlockPassive": "パッシブを かいほうする",
-  "reduceCost": "ポケモンの 必要ポイントを へらす",
-  "sameSpeciesEgg": "Buy an Egg",
+  "addToParty": "手持ちに入れる",
+  "toggleIVs": "個体値を表示",
+  "manageMoves": "技を並び替える",
+  "manageNature": "性格を変える",
+  "addToFavorites": "お気に入りにする",
+  "removeFromFavorites": "お気に入りから除く",
+  "useCandies": "飴を使う",
+  "selectNature": "性格を選んでください。",
+  "selectMoveSwapOut": "入れ替えたい技を選んでください。",
+  "selectMoveSwapWith": "他の技と交換してください。",
+  "unlockPassive": "パッシブを開放",
+  "reduceCost": "ポイントを減らす",
+  "sameSpeciesEgg": "タマゴを買う",
   "cycleShiny": ": 色違い変更",
   "cycleForm": ": フォルム変更",
   "cycleGender": ": 性別変更",
   "cycleAbility": ": 特性変更",
   "cycleNature": ": 性格変更",
   "cycleVariant": ": 色変更",
-  "enablePassive": "パッシブ ゆうこう",
-  "disablePassive": "パッシブ むこう",
-  "locked": "Locked",
-  "disabled": "Disabled",
-  "uncaught": "Uncaught"
+  "enablePassive": "パッシブ - オン",
+  "disablePassive": "パッシブ - オフ",
+  "locked": "開放されていない",
+  "disabled": "無効",
+  "uncaught": "捕まっていない"
 };

From 0c64b01f3f03d591ceab74b54fad220361b64308 Mon Sep 17 00:00:00 2001
From: Enoch <enoch.jwsong@gmail.com>
Date: Mon, 12 Aug 2024 14:02:44 +0900
Subject: [PATCH 16/30] [Refactor] move and change localization key of
 battler-tags (#3498)

* move locale messages of battler tags : battle.ts -> battler-tags.ts

* Change message key name to simple

* Apply suggestions from code review

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
---
 src/data/battler-tags.ts          | 118 +++++++++++++++---------------
 src/data/move.ts                  |   2 +-
 src/locales/ca_ES/battle.ts       |  61 ---------------
 src/locales/ca_ES/battler-tags.ts |  61 +++++++++++++++
 src/locales/de/battle.ts          |  61 ---------------
 src/locales/de/battler-tags.ts    |  61 +++++++++++++++
 src/locales/en/battle.ts          |  61 ---------------
 src/locales/en/battler-tags.ts    |  61 +++++++++++++++
 src/locales/es/battle.ts          |  61 ---------------
 src/locales/es/battler-tags.ts    |  61 +++++++++++++++
 src/locales/fr/battle.ts          |  61 ---------------
 src/locales/fr/battler-tags.ts    |  61 +++++++++++++++
 src/locales/it/battle.ts          |  61 ---------------
 src/locales/it/battler-tags.ts    |  61 +++++++++++++++
 src/locales/ja/battle.ts          |  61 ---------------
 src/locales/ja/battler-tags.ts    |  61 +++++++++++++++
 src/locales/ko/battle.ts          |  61 ---------------
 src/locales/ko/battler-tags.ts    |  61 +++++++++++++++
 src/locales/pt_BR/battle.ts       |  61 ---------------
 src/locales/pt_BR/battler-tags.ts |  61 +++++++++++++++
 src/locales/zh_CN/battle.ts       |  61 ---------------
 src/locales/zh_CN/battler-tags.ts |  61 +++++++++++++++
 src/locales/zh_TW/battle.ts       |  61 ---------------
 src/locales/zh_TW/battler-tags.ts |  61 +++++++++++++++
 24 files changed, 731 insertions(+), 731 deletions(-)

diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts
index 16dd4914ed4..3b6e005d7e8 100644
--- a/src/data/battler-tags.ts
+++ b/src/data/battler-tags.ts
@@ -110,7 +110,7 @@ export class RechargingTag extends BattlerTag {
   /** Cancels the source's move this turn and queues a "__ must recharge!" message */
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
     if (lapseType === BattlerTagLapseType.PRE_MOVE) {
-      pokemon.scene.queueMessage(i18next.t("battle:battlerTagsRechargingLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+      pokemon.scene.queueMessage(i18next.t("battlerTags:rechargingLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
       (pokemon.scene.getCurrentPhase() as MovePhase).cancel();
       pokemon.getMoveQueue().shift();
     }
@@ -177,7 +177,7 @@ export class TrappedTag extends BattlerTag {
   onRemove(pokemon: Pokemon): void {
     super.onRemove(pokemon);
 
-    pokemon.scene.queueMessage(i18next.t("battle:battlerTagsTrappedOnRemove", {
+    pokemon.scene.queueMessage(i18next.t("battlerTags:trappedOnRemove", {
       pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
       moveName: this.getMoveName()
     }));
@@ -192,7 +192,7 @@ export class TrappedTag extends BattlerTag {
   }
 
   getTrapMessage(pokemon: Pokemon): string {
-    return i18next.t("battle:battlerTagsTrappedOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) });
+    return i18next.t("battlerTags:trappedOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) });
   }
 }
 
@@ -223,7 +223,7 @@ export class FlinchedTag extends BattlerTag {
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
     if (lapseType === BattlerTagLapseType.PRE_MOVE) {
       (pokemon.scene.getCurrentPhase() as MovePhase).cancel();
-      pokemon.scene.queueMessage(i18next.t("battle:battlerTagsFlinchedLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+      pokemon.scene.queueMessage(i18next.t("battlerTags:flinchedLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
     }
 
     return super.lapse(pokemon, lapseType);
@@ -272,26 +272,26 @@ export class ConfusedTag extends BattlerTag {
     super.onAdd(pokemon);
 
     pokemon.scene.unshiftPhase(new CommonAnimPhase(pokemon.scene, pokemon.getBattlerIndex(), undefined, CommonAnim.CONFUSION));
-    pokemon.scene.queueMessage(i18next.t("battle:battlerTagsConfusedOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    pokemon.scene.queueMessage(i18next.t("battlerTags:confusedOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
   }
 
   onRemove(pokemon: Pokemon): void {
     super.onRemove(pokemon);
 
-    pokemon.scene.queueMessage(i18next.t("battle:battlerTagsConfusedOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    pokemon.scene.queueMessage(i18next.t("battlerTags:confusedOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
   }
 
   onOverlap(pokemon: Pokemon): void {
     super.onOverlap(pokemon);
 
-    pokemon.scene.queueMessage(i18next.t("battle:battlerTagsConfusedOnOverlap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    pokemon.scene.queueMessage(i18next.t("battlerTags:confusedOnOverlap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
   }
 
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
     const ret = lapseType !== BattlerTagLapseType.CUSTOM && super.lapse(pokemon, lapseType);
 
     if (ret) {
-      pokemon.scene.queueMessage(i18next.t("battle:battlerTagsConfusedLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+      pokemon.scene.queueMessage(i18next.t("battlerTags:confusedLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
       pokemon.scene.unshiftPhase(new CommonAnimPhase(pokemon.scene, pokemon.getBattlerIndex(), undefined, CommonAnim.CONFUSION));
 
       // 1/3 chance of hitting self with a 40 base power move
@@ -299,7 +299,7 @@ export class ConfusedTag extends BattlerTag {
         const atk = pokemon.getBattleStat(Stat.ATK);
         const def = pokemon.getBattleStat(Stat.DEF);
         const damage = Math.ceil(((((2 * pokemon.level / 5 + 2) * 40 * atk / def) / 50) + 2) * (pokemon.randSeedInt(15, 85) / 100));
-        pokemon.scene.queueMessage(i18next.t("battle:battlerTagsConfusedLapseHurtItself"));
+        pokemon.scene.queueMessage(i18next.t("battlerTags:confusedLapseHurtItself"));
         pokemon.damageAndUpdate(damage);
         pokemon.battleData.hitCount++;
         (pokemon.scene.getCurrentPhase() as MovePhase).cancel();
@@ -347,12 +347,12 @@ export class DestinyBondTag extends BattlerTag {
     }
 
     if (pokemon.isBossImmune()) {
-      pokemon.scene.queueMessage(i18next.t("battle:battlerTagsDestinyBondLapseIsBoss", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+      pokemon.scene.queueMessage(i18next.t("battlerTags:destinyBondLapseIsBoss", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
       return false;
     }
 
     pokemon.scene.queueMessage(
-      i18next.t("battle:battlerTagsDestinyBondLapse", {
+      i18next.t("battlerTags:destinyBondLapse", {
         pokemonNameWithAffix: getPokemonNameWithAffix(source),
         pokemonNameWithAffix2: getPokemonNameWithAffix(pokemon)
       })
@@ -387,7 +387,7 @@ export class InfatuatedTag extends BattlerTag {
     super.onAdd(pokemon);
 
     pokemon.scene.queueMessage(
-      i18next.t("battle:battlerTagsInfatuatedOnAdd", {
+      i18next.t("battlerTags:infatuatedOnAdd", {
         pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
         sourcePokemonName: getPokemonNameWithAffix(pokemon.scene.getPokemonById(this.sourceId!) ?? undefined) // TODO: is that bang correct?
       })
@@ -397,7 +397,7 @@ export class InfatuatedTag extends BattlerTag {
   onOverlap(pokemon: Pokemon): void {
     super.onOverlap(pokemon);
 
-    pokemon.scene.queueMessage(i18next.t("battle:battlerTagsInfatuatedOnOverlap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    pokemon.scene.queueMessage(i18next.t("battlerTags:infatuatedOnOverlap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
   }
 
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
@@ -405,7 +405,7 @@ export class InfatuatedTag extends BattlerTag {
 
     if (ret) {
       pokemon.scene.queueMessage(
-        i18next.t("battle:battlerTagsInfatuatedLapse", {
+        i18next.t("battlerTags:infatuatedLapse", {
           pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
           sourcePokemonName: getPokemonNameWithAffix(pokemon.scene.getPokemonById(this.sourceId!) ?? undefined) // TODO: is that bang correct?
         })
@@ -413,7 +413,7 @@ export class InfatuatedTag extends BattlerTag {
       pokemon.scene.unshiftPhase(new CommonAnimPhase(pokemon.scene, pokemon.getBattlerIndex(), undefined, CommonAnim.ATTRACT));
 
       if (pokemon.randSeedInt(2)) {
-        pokemon.scene.queueMessage(i18next.t("battle:battlerTagsInfatuatedLapseImmobilize", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+        pokemon.scene.queueMessage(i18next.t("battlerTags:infatuatedLapseImmobilize", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
         (pokemon.scene.getCurrentPhase() as MovePhase).cancel();
       }
     }
@@ -424,7 +424,7 @@ export class InfatuatedTag extends BattlerTag {
   onRemove(pokemon: Pokemon): void {
     super.onRemove(pokemon);
 
-    pokemon.scene.queueMessage(i18next.t("battle:battlerTagsInfatuatedOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    pokemon.scene.queueMessage(i18next.t("battlerTags:infatuatedOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
   }
 
   isSourceLinked(): boolean {
@@ -459,7 +459,7 @@ export class SeedTag extends BattlerTag {
   onAdd(pokemon: Pokemon): void {
     super.onAdd(pokemon);
 
-    pokemon.scene.queueMessage(i18next.t("battle:battlerTagsSeededOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    pokemon.scene.queueMessage(i18next.t("battlerTags:seededOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
     this.sourceIndex = pokemon.scene.getPokemonById(this.sourceId!)!.getBattlerIndex(); // TODO: are those bangs correct?
   }
 
@@ -479,7 +479,7 @@ export class SeedTag extends BattlerTag {
           const reverseDrain = pokemon.hasAbilityWithAttr(ReverseDrainAbAttr, false);
           pokemon.scene.unshiftPhase(new PokemonHealPhase(pokemon.scene, source.getBattlerIndex(),
             !reverseDrain ? damage : damage * -1,
-            !reverseDrain ? i18next.t("battle:battlerTagsSeededLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }) : i18next.t("battle:battlerTagsSeededLapseShed", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }),
+            !reverseDrain ? i18next.t("battlerTags:seededLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }) : i18next.t("battlerTags:seededLapseShed", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }),
             false, true));
         }
       }
@@ -501,20 +501,20 @@ export class NightmareTag extends BattlerTag {
   onAdd(pokemon: Pokemon): void {
     super.onAdd(pokemon);
 
-    pokemon.scene.queueMessage(i18next.t("battle:battlerTagsNightmareOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    pokemon.scene.queueMessage(i18next.t("battlerTags:nightmareOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
   }
 
   onOverlap(pokemon: Pokemon): void {
     super.onOverlap(pokemon);
 
-    pokemon.scene.queueMessage(i18next.t("battle:battlerTagsNightmareOnOverlap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    pokemon.scene.queueMessage(i18next.t("battlerTags:nightmareOnOverlap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
   }
 
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
     const ret = lapseType !== BattlerTagLapseType.CUSTOM || super.lapse(pokemon, lapseType);
 
     if (ret) {
-      pokemon.scene.queueMessage(i18next.t("battle:battlerTagsNightmareLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+      pokemon.scene.queueMessage(i18next.t("battlerTags:nightmareLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
       pokemon.scene.unshiftPhase(new CommonAnimPhase(pokemon.scene, pokemon.getBattlerIndex(), undefined, CommonAnim.CURSE)); // TODO: Update animation type
 
       const cancelled = new Utils.BooleanHolder(false);
@@ -602,7 +602,7 @@ export class EncoreTag extends BattlerTag {
   onAdd(pokemon: Pokemon): void {
     super.onRemove(pokemon);
 
-    pokemon.scene.queueMessage(i18next.t("battle:battlerTagsEncoreOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    pokemon.scene.queueMessage(i18next.t("battlerTags:encoreOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
 
     const movePhase = pokemon.scene.findPhase(m => m instanceof MovePhase && m.pokemon === pokemon);
     if (movePhase) {
@@ -618,7 +618,7 @@ export class EncoreTag extends BattlerTag {
   onRemove(pokemon: Pokemon): void {
     super.onRemove(pokemon);
 
-    pokemon.scene.queueMessage(i18next.t("battle:battlerTagsEncoreOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    pokemon.scene.queueMessage(i18next.t("battlerTags:encoreOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
   }
 }
 
@@ -629,7 +629,7 @@ export class HelpingHandTag extends BattlerTag {
 
   onAdd(pokemon: Pokemon): void {
     pokemon.scene.queueMessage(
-      i18next.t("battle:battlerTagsHelpingHandOnAdd", {
+      i18next.t("battlerTags:helpingHandOnAdd", {
         pokemonNameWithAffix: getPokemonNameWithAffix(pokemon.scene.getPokemonById(this.sourceId!) ?? undefined), // TODO: is that bang correct?
         pokemonName: getPokemonNameWithAffix(pokemon)
       })
@@ -666,7 +666,7 @@ export class IngrainTag extends TrappedTag {
           pokemon.scene,
           pokemon.getBattlerIndex(),
           Math.floor(pokemon.getMaxHp() / 16),
-          i18next.t("battle:battlerTagsIngrainLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }),
+          i18next.t("battlerTags:ingrainLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }),
           true
         )
       );
@@ -676,7 +676,7 @@ export class IngrainTag extends TrappedTag {
   }
 
   getTrapMessage(pokemon: Pokemon): string {
-    return i18next.t("battle:battlerTagsIngrainOnTrap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) });
+    return i18next.t("battlerTags:ingrainOnTrap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) });
   }
 
   getDescriptor(): string {
@@ -717,7 +717,7 @@ export class AquaRingTag extends BattlerTag {
   onAdd(pokemon: Pokemon): void {
     super.onAdd(pokemon);
 
-    pokemon.scene.queueMessage(i18next.t("battle:battlerTagsAquaRingOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    pokemon.scene.queueMessage(i18next.t("battlerTags:aquaRingOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
   }
 
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
@@ -729,7 +729,7 @@ export class AquaRingTag extends BattlerTag {
           pokemon.scene,
           pokemon.getBattlerIndex(),
           Math.floor(pokemon.getMaxHp() / 16),
-          i18next.t("battle:battlerTagsAquaRingLapse", {
+          i18next.t("battlerTags:aquaRingLapse", {
             moveName: this.getMoveName(),
             pokemonName: getPokemonNameWithAffix(pokemon)
           }),
@@ -779,7 +779,7 @@ export class DrowsyTag extends BattlerTag {
   onAdd(pokemon: Pokemon): void {
     super.onAdd(pokemon);
 
-    pokemon.scene.queueMessage(i18next.t("battle:battlerTagsDrowsyOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    pokemon.scene.queueMessage(i18next.t("battlerTags:drowsyOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
   }
 
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
@@ -823,7 +823,7 @@ export abstract class DamagingTrapTag extends TrappedTag {
 
     if (ret) {
       pokemon.scene.queueMessage(
-        i18next.t("battle:battlerTagsDamagingTrapLapse", {
+        i18next.t("battlerTags:damagingTrapLapse", {
           pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
           moveName: this.getMoveName()
         })
@@ -848,7 +848,7 @@ export class BindTag extends DamagingTrapTag {
   }
 
   getTrapMessage(pokemon: Pokemon): string {
-    return i18next.t("battle:battlerTagsBindOnTrap", {
+    return i18next.t("battlerTags:bindOnTrap", {
       pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
       sourcePokemonName: getPokemonNameWithAffix(pokemon.scene.getPokemonById(this.sourceId!) ?? undefined), // TODO: is that bang correct?
       moveName: this.getMoveName()
@@ -862,7 +862,7 @@ export class WrapTag extends DamagingTrapTag {
   }
 
   getTrapMessage(pokemon: Pokemon): string {
-    return i18next.t("battle:battlerTagsWrapOnTrap", {
+    return i18next.t("battlerTags:wrapOnTrap", {
       pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
       sourcePokemonName: getPokemonNameWithAffix(pokemon.scene.getPokemonById(this.sourceId!) ?? undefined), // TODO: is that bang correct?
     });
@@ -875,7 +875,7 @@ export abstract class VortexTrapTag extends DamagingTrapTag {
   }
 
   getTrapMessage(pokemon: Pokemon): string {
-    return i18next.t("battle:battlerTagsVortexOnTrap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) });
+    return i18next.t("battlerTags:vortexOnTrap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) });
   }
 }
 
@@ -897,7 +897,7 @@ export class ClampTag extends DamagingTrapTag {
   }
 
   getTrapMessage(pokemon: Pokemon): string {
-    return i18next.t("battle:battlerTagsClampOnTrap", {
+    return i18next.t("battlerTags:clampOnTrap", {
       sourcePokemonNameWithAffix: getPokemonNameWithAffix(pokemon.scene.getPokemonById(this.sourceId!) ?? undefined), // TODO: is that bang correct?
       pokemonName: getPokemonNameWithAffix(pokemon),
     });
@@ -910,7 +910,7 @@ export class SandTombTag extends DamagingTrapTag {
   }
 
   getTrapMessage(pokemon: Pokemon): string {
-    return i18next.t("battle:battlerTagsSandTombOnTrap", {
+    return i18next.t("battlerTags:sandTombOnTrap", {
       pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
       moveName: this.getMoveName()
     });
@@ -923,7 +923,7 @@ export class MagmaStormTag extends DamagingTrapTag {
   }
 
   getTrapMessage(pokemon: Pokemon): string {
-    return i18next.t("battle:battlerTagsMagmaStormOnTrap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) });
+    return i18next.t("battlerTags:magmaStormOnTrap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) });
   }
 }
 
@@ -933,7 +933,7 @@ export class SnapTrapTag extends DamagingTrapTag {
   }
 
   getTrapMessage(pokemon: Pokemon): string {
-    return i18next.t("battle:battlerTagsSnapTrapOnTrap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) });
+    return i18next.t("battlerTags:snapTrapOnTrap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) });
   }
 }
 
@@ -943,7 +943,7 @@ export class ThunderCageTag extends DamagingTrapTag {
   }
 
   getTrapMessage(pokemon: Pokemon): string {
-    return i18next.t("battle:battlerTagsThunderCageOnTrap", {
+    return i18next.t("battlerTags:thunderCageOnTrap", {
       pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
       sourcePokemonNameWithAffix: getPokemonNameWithAffix(pokemon.scene.getPokemonById(this.sourceId!) ?? undefined), // TODO: is that bang correct?
     });
@@ -956,7 +956,7 @@ export class InfestationTag extends DamagingTrapTag {
   }
 
   getTrapMessage(pokemon: Pokemon): string {
-    return i18next.t("battle:battlerTagsInfestationOnTrap", {
+    return i18next.t("battlerTags:infestationOnTrap", {
       pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
       sourcePokemonNameWithAffix: getPokemonNameWithAffix(pokemon.scene.getPokemonById(this.sourceId!) ?? undefined), // TODO: is that bang correct?
     });
@@ -972,13 +972,13 @@ export class ProtectedTag extends BattlerTag {
   onAdd(pokemon: Pokemon): void {
     super.onAdd(pokemon);
 
-    pokemon.scene.queueMessage(i18next.t("battle:battlerTagsProtectedOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    pokemon.scene.queueMessage(i18next.t("battlerTags:protectedOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
   }
 
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
     if (lapseType === BattlerTagLapseType.CUSTOM) {
       new CommonBattleAnim(CommonAnim.PROTECT, pokemon).play(pokemon.scene);
-      pokemon.scene.queueMessage(i18next.t("battle:battlerTagsProtectedLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+      pokemon.scene.queueMessage(i18next.t("battlerTags:protectedLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
 
       // Stop multi-hit moves early
       const effectPhase = pokemon.scene.getCurrentPhase();
@@ -1111,12 +1111,12 @@ export class EnduringTag extends BattlerTag {
   onAdd(pokemon: Pokemon): void {
     super.onAdd(pokemon);
 
-    pokemon.scene.queueMessage(i18next.t("battle:battlerTagsEnduringOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    pokemon.scene.queueMessage(i18next.t("battlerTags:enduringOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
   }
 
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
     if (lapseType === BattlerTagLapseType.CUSTOM) {
-      pokemon.scene.queueMessage(i18next.t("battle:battlerTagsEnduringLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+      pokemon.scene.queueMessage(i18next.t("battlerTags:enduringLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
       return true;
     }
 
@@ -1131,7 +1131,7 @@ export class SturdyTag extends BattlerTag {
 
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
     if (lapseType === BattlerTagLapseType.CUSTOM) {
-      pokemon.scene.queueMessage(i18next.t("battle:battlerTagsSturdyLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+      pokemon.scene.queueMessage(i18next.t("battlerTags:sturdyLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
       return true;
     }
 
@@ -1153,7 +1153,7 @@ export class PerishSongTag extends BattlerTag {
 
     if (ret) {
       pokemon.scene.queueMessage(
-        i18next.t("battle:battlerTagsPerishSongLapse", {
+        i18next.t("battlerTags:perishSongLapse", {
           pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
           turnCount: this.turnCount
         })
@@ -1189,7 +1189,7 @@ export class CenterOfAttentionTag extends BattlerTag {
   onAdd(pokemon: Pokemon): void {
     super.onAdd(pokemon);
 
-    pokemon.scene.queueMessage(i18next.t("battle:battlerTagsCenterOfAttentionOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    pokemon.scene.queueMessage(i18next.t("battlerTags:centerOfAttentionOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
   }
 }
 
@@ -1228,7 +1228,7 @@ export class TruantTag extends AbilityBattlerTag {
     if (lastMove && lastMove.move !== Moves.NONE) {
       (pokemon.scene.getCurrentPhase() as MovePhase).cancel();
       pokemon.scene.unshiftPhase(new ShowAbilityPhase(pokemon.scene, pokemon.id, passive));
-      pokemon.scene.queueMessage(i18next.t("battle:battlerTagsTruantLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+      pokemon.scene.queueMessage(i18next.t("battlerTags:truantLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
     }
 
     return true;
@@ -1243,7 +1243,7 @@ export class SlowStartTag extends AbilityBattlerTag {
   onAdd(pokemon: Pokemon): void {
     super.onAdd(pokemon);
 
-    pokemon.scene.queueMessage(i18next.t("battle:battlerTagsSlowStartOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }), null, false, null, true);
+    pokemon.scene.queueMessage(i18next.t("battlerTags:slowStartOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }), null, false, null, true);
   }
 
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
@@ -1257,7 +1257,7 @@ export class SlowStartTag extends AbilityBattlerTag {
   onRemove(pokemon: Pokemon): void {
     super.onRemove(pokemon);
 
-    pokemon.scene.queueMessage(i18next.t("battle:battlerTagsSlowStartOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }), null, false, null);
+    pokemon.scene.queueMessage(i18next.t("battlerTags:slowStartOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }), null, false, null);
   }
 }
 
@@ -1304,13 +1304,13 @@ export class HighestStatBoostTag extends AbilityBattlerTag {
       break;
     }
 
-    pokemon.scene.queueMessage(i18next.t("battle:battlerTagsHighestStatBoostOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), statName: getStatName(highestStat) }), null, false, null, true);
+    pokemon.scene.queueMessage(i18next.t("battlerTags:highestStatBoostOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), statName: getStatName(highestStat) }), null, false, null, true);
   }
 
   onRemove(pokemon: Pokemon): void {
     super.onRemove(pokemon);
 
-    pokemon.scene.queueMessage(i18next.t("battle:battlerTagsHighestStatBoostOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName: allAbilities[this.ability].name }));
+    pokemon.scene.queueMessage(i18next.t("battlerTags:highestStatBoostOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName: allAbilities[this.ability].name }));
   }
 }
 
@@ -1397,13 +1397,13 @@ export class MagnetRisenTag extends TypeImmuneTag {
   onAdd(pokemon: Pokemon): void {
     super.onAdd(pokemon);
 
-    pokemon.scene.queueMessage(i18next.t("battle:battlerTagsMagnetRisenOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    pokemon.scene.queueMessage(i18next.t("battlerTags:magnetRisenOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
   }
 
   onRemove(pokemon: Pokemon): void {
     super.onRemove(pokemon);
 
-    pokemon.scene.queueMessage(i18next.t("battle:battlerTagsMagnetRisenOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    pokemon.scene.queueMessage(i18next.t("battlerTags:magnetRisenOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
   }
 }
 
@@ -1444,7 +1444,7 @@ export class CritBoostTag extends BattlerTag {
   onAdd(pokemon: Pokemon): void {
     super.onAdd(pokemon);
 
-    pokemon.scene.queueMessage(i18next.t("battle:battlerTagsCritBoostOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    pokemon.scene.queueMessage(i18next.t("battlerTags:critBoostOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
   }
 
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
@@ -1454,7 +1454,7 @@ export class CritBoostTag extends BattlerTag {
   onRemove(pokemon: Pokemon): void {
     super.onRemove(pokemon);
 
-    pokemon.scene.queueMessage(i18next.t("battle:battlerTagsCritBoostOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    pokemon.scene.queueMessage(i18next.t("battlerTags:critBoostOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
   }
 }
 
@@ -1477,7 +1477,7 @@ export class SaltCuredTag extends BattlerTag {
   onAdd(pokemon: Pokemon): void {
     super.onAdd(pokemon);
 
-    pokemon.scene.queueMessage(i18next.t("battle:battlerTagsSaltCuredOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    pokemon.scene.queueMessage(i18next.t("battlerTags:saltCuredOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
     this.sourceIndex = pokemon.scene.getPokemonById(this.sourceId!)!.getBattlerIndex(); // TODO: are those bangs correct?
   }
 
@@ -1495,7 +1495,7 @@ export class SaltCuredTag extends BattlerTag {
         pokemon.damageAndUpdate(Math.max(Math.floor(pokemonSteelOrWater ? pokemon.getMaxHp() / 4 : pokemon.getMaxHp() / 8), 1));
 
         pokemon.scene.queueMessage(
-          i18next.t("battle:battlerTagsSaltCuredLapse", {
+          i18next.t("battlerTags:saltCuredLapse", {
             pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
             moveName: this.getMoveName()
           })
@@ -1539,7 +1539,7 @@ export class CursedTag extends BattlerTag {
 
       if (!cancelled.value) {
         pokemon.damageAndUpdate(Math.max(Math.floor(pokemon.getMaxHp() / 4), 1));
-        pokemon.scene.queueMessage(i18next.t("battle:battlerTagsCursedLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+        pokemon.scene.queueMessage(i18next.t("battlerTags:cursedLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
       }
     }
 
@@ -1663,7 +1663,7 @@ export class StockpilingTag extends BattlerTag {
     if (this.stockpiledCount < 3) {
       this.stockpiledCount++;
 
-      pokemon.scene.queueMessage(i18next.t("battle:battlerTagsStockpilingOnAdd", {
+      pokemon.scene.queueMessage(i18next.t("battlerTags:stockpilingOnAdd", {
         pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
         stockpiledCount: this.stockpiledCount
       }));
diff --git a/src/data/move.ts b/src/data/move.ts
index 26652d182ca..0b0af00a370 100644
--- a/src/data/move.ts
+++ b/src/data/move.ts
@@ -4414,7 +4414,7 @@ export class CurseAttr extends MoveEffectAttr {
       const curseRecoilDamage = Math.max(1, Math.floor(user.getMaxHp() / 2));
       user.damageAndUpdate(curseRecoilDamage, HitResult.OTHER, false, true, true);
       user.scene.queueMessage(
-        i18next.t("battle:battlerTagsCursedOnAdd", {
+        i18next.t("battle:cursedOnAdd", {
           pokemonNameWithAffix: getPokemonNameWithAffix(user),
           pokemonName: getPokemonNameWithAffix(target)
         })
diff --git a/src/locales/ca_ES/battle.ts b/src/locales/ca_ES/battle.ts
index 12a0f2c99c6..9513e010579 100644
--- a/src/locales/ca_ES/battle.ts
+++ b/src/locales/ca_ES/battle.ts
@@ -95,65 +95,4 @@ export const battle: SimpleTranslationEntries = {
   "congratulations": "Congratulations!",
   "beatModeFirstTime": "{{speciesName}} beat {{gameMode}} Mode for the first time!\nYou received {{newModifier}}!",
   "ppReduced": "It reduced the PP of {{targetName}}'s\n{{moveName}} by {{reduction}}!",
-  "battlerTagsRechargingLapse": "{{pokemonNameWithAffix}} must\nrecharge!",
-  "battlerTagsTrappedOnAdd": "{{pokemonNameWithAffix}} can no\nlonger escape!",
-  "battlerTagsTrappedOnRemove": "{{pokemonNameWithAffix}} was freed\nfrom {{moveName}}!",
-  "battlerTagsFlinchedLapse": "{{pokemonNameWithAffix}} flinched!",
-  "battlerTagsConfusedOnAdd": "{{pokemonNameWithAffix}} became\nconfused!",
-  "battlerTagsConfusedOnRemove": "{{pokemonNameWithAffix}} snapped\nout of confusion!",
-  "battlerTagsConfusedOnOverlap": "{{pokemonNameWithAffix}} is\nalready confused!",
-  "battlerTagsConfusedLapse": "{{pokemonNameWithAffix}} is\nconfused!",
-  "battlerTagsConfusedLapseHurtItself": "It hurt itself in its\nconfusion!",
-  "battlerTagsDestinyBondLapseIsBoss": "{{pokemonNameWithAffix}} is unaffected\nby the effects of Destiny Bond.",
-  "battlerTagsDestinyBondLapse": "{{pokemonNameWithAffix}} took\n{{pokemonNameWithAffix2}} down with it!",
-  "battlerTagsInfatuatedOnAdd": "{{pokemonNameWithAffix}} fell in love\nwith {{sourcePokemonName}}!",
-  "battlerTagsInfatuatedOnOverlap": "{{pokemonNameWithAffix}} is\nalready in love!",
-  "battlerTagsInfatuatedLapse": "{{pokemonNameWithAffix}} is in love\nwith {{sourcePokemonName}}!",
-  "battlerTagsInfatuatedLapseImmobilize": "{{pokemonNameWithAffix}} is\nimmobilized by love!",
-  "battlerTagsInfatuatedOnRemove": "{{pokemonNameWithAffix}} got over\nits infatuation.",
-  "battlerTagsSeededOnAdd": "{{pokemonNameWithAffix}} was seeded!",
-  "battlerTagsSeededLapse": "{{pokemonNameWithAffix}}'s health is\nsapped by Leech Seed!",
-  "battlerTagsSeededLapseShed": "{{pokemonNameWithAffix}}'s Leech Seed\nsucked up the liquid ooze!",
-  "battlerTagsNightmareOnAdd": "{{pokemonNameWithAffix}} began\nhaving a Nightmare!",
-  "battlerTagsNightmareOnOverlap": "{{pokemonNameWithAffix}} is\nalready locked in a Nightmare!",
-  "battlerTagsNightmareLapse": "{{pokemonNameWithAffix}} is locked\nin a Nightmare!",
-  "battlerTagsEncoreOnAdd": "{{pokemonNameWithAffix}} got\nan Encore!",
-  "battlerTagsEncoreOnRemove": "{{pokemonNameWithAffix}}'s Encore\nended!",
-  "battlerTagsHelpingHandOnAdd": "{{pokemonNameWithAffix}} is ready to\nhelp {{pokemonName}}!",
-  "battlerTagsIngrainLapse": "{{pokemonNameWithAffix}} absorbed\nnutrients with its roots!",
-  "battlerTagsIngrainOnTrap": "{{pokemonNameWithAffix}} planted its roots!",
-  "battlerTagsAquaRingOnAdd": "{{pokemonNameWithAffix}} surrounded\nitself with a veil of water!",
-  "battlerTagsAquaRingLapse": "{{moveName}} restored\n{{pokemonName}}'s HP!",
-  "battlerTagsDrowsyOnAdd": "{{pokemonNameWithAffix}} grew drowsy!",
-  "battlerTagsDamagingTrapLapse": "{{pokemonNameWithAffix}} is hurt\nby {{moveName}}!",
-  "battlerTagsBindOnTrap": "{{pokemonNameWithAffix}} was squeezed by\n{{sourcePokemonName}}'s {{moveName}}!",
-  "battlerTagsWrapOnTrap": "{{pokemonNameWithAffix}} was Wrapped\nby {{sourcePokemonName}}!",
-  "battlerTagsVortexOnTrap": "{{pokemonNameWithAffix}} was trapped\nin the vortex!",
-  "battlerTagsClampOnTrap": "{{sourcePokemonNameWithAffix}} Clamped\n{{pokemonName}}!",
-  "battlerTagsSandTombOnTrap": "{{pokemonNameWithAffix}} became trapped\nby {{moveName}}!",
-  "battlerTagsMagmaStormOnTrap": "{{pokemonNameWithAffix}} became trapped\nby swirling magma!",
-  "battlerTagsSnapTrapOnTrap": "{{pokemonNameWithAffix}} got trapped\nby a snap trap!",
-  "battlerTagsThunderCageOnTrap": "{{sourcePokemonNameWithAffix}} trapped\n{{pokemonNameWithAffix}}!",
-  "battlerTagsInfestationOnTrap": "{{pokemonNameWithAffix}} has been afflicted \nwith an infestation by {{sourcePokemonNameWithAffix}}!",
-  "battlerTagsProtectedOnAdd": "{{pokemonNameWithAffix}}\nprotected itself!",
-  "battlerTagsProtectedLapse": "{{pokemonNameWithAffix}}\nprotected itself!",
-  "battlerTagsEnduringOnAdd": "{{pokemonNameWithAffix}} braced\nitself!",
-  "battlerTagsEnduringLapse": "{{pokemonNameWithAffix}} endured\nthe hit!",
-  "battlerTagsSturdyLapse": "{{pokemonNameWithAffix}} endured\nthe hit!",
-  "battlerTagsPerishSongLapse": "{{pokemonNameWithAffix}}'s perish count fell to {{turnCount}}.",
-  "battlerTagsCenterOfAttentionOnAdd": "{{pokemonNameWithAffix}} became the center\nof attention!",
-  "battlerTagsTruantLapse": "{{pokemonNameWithAffix}} is\nloafing around!",
-  "battlerTagsSlowStartOnAdd": "{{pokemonNameWithAffix}} can't\nget it going!",
-  "battlerTagsSlowStartOnRemove": "{{pokemonNameWithAffix}} finally\ngot its act together!",
-  "battlerTagsHighestStatBoostOnAdd": "{{pokemonNameWithAffix}}'s {{statName}}\nwas heightened!",
-  "battlerTagsHighestStatBoostOnRemove": "The effects of {{pokemonNameWithAffix}}'s\n{{abilityName}} wore off!",
-  "battlerTagsMagnetRisenOnAdd": "{{pokemonNameWithAffix}} levitated with electromagnetism!",
-  "battlerTagsMagnetRisenOnRemove": "{{pokemonNameWithAffix}}'s electromagnetism wore off!",
-  "battlerTagsCritBoostOnAdd": "{{pokemonNameWithAffix}} is getting\npumped!",
-  "battlerTagsCritBoostOnRemove": "{{pokemonNameWithAffix}} relaxed.",
-  "battlerTagsSaltCuredOnAdd": "{{pokemonNameWithAffix}} is being salt cured!",
-  "battlerTagsSaltCuredLapse": "{{pokemonNameWithAffix}} is hurt by {{moveName}}!",
-  "battlerTagsCursedOnAdd": "{{pokemonNameWithAffix}} cut its own HP and put a curse on the {{pokemonName}}!",
-  "battlerTagsCursedLapse": "{{pokemonNameWithAffix}} is afflicted by the Curse!",
-  "battlerTagsStockpilingOnAdd": "{{pokemonNameWithAffix}} stockpiled {{stockpiledCount}}!"
 } as const;
diff --git a/src/locales/ca_ES/battler-tags.ts b/src/locales/ca_ES/battler-tags.ts
index 1d897c70f3d..d0775efda08 100644
--- a/src/locales/ca_ES/battler-tags.ts
+++ b/src/locales/ca_ES/battler-tags.ts
@@ -9,4 +9,65 @@ export const battlerTags: SimpleTranslationEntries = {
   "nightmareDesc": "nightmares",
   "ingrainDesc": "roots",
   "drowsyDesc": "drowsiness",
+  "rechargingLapse": "{{pokemonNameWithAffix}} must\nrecharge!",
+  "trappedOnAdd": "{{pokemonNameWithAffix}} can no\nlonger escape!",
+  "trappedOnRemove": "{{pokemonNameWithAffix}} was freed\nfrom {{moveName}}!",
+  "flinchedLapse": "{{pokemonNameWithAffix}} flinched!",
+  "confusedOnAdd": "{{pokemonNameWithAffix}} became\nconfused!",
+  "confusedOnRemove": "{{pokemonNameWithAffix}} snapped\nout of confusion!",
+  "confusedOnOverlap": "{{pokemonNameWithAffix}} is\nalready confused!",
+  "confusedLapse": "{{pokemonNameWithAffix}} is\nconfused!",
+  "confusedLapseHurtItself": "It hurt itself in its\nconfusion!",
+  "destinyBondLapseIsBoss": "{{pokemonNameWithAffix}} is unaffected\nby the effects of Destiny Bond.",
+  "destinyBondLapse": "{{pokemonNameWithAffix}} took\n{{pokemonNameWithAffix2}} down with it!",
+  "infatuatedOnAdd": "{{pokemonNameWithAffix}} fell in love\nwith {{sourcePokemonName}}!",
+  "infatuatedOnOverlap": "{{pokemonNameWithAffix}} is\nalready in love!",
+  "infatuatedLapse": "{{pokemonNameWithAffix}} is in love\nwith {{sourcePokemonName}}!",
+  "infatuatedLapseImmobilize": "{{pokemonNameWithAffix}} is\nimmobilized by love!",
+  "infatuatedOnRemove": "{{pokemonNameWithAffix}} got over\nits infatuation.",
+  "seededOnAdd": "{{pokemonNameWithAffix}} was seeded!",
+  "seededLapse": "{{pokemonNameWithAffix}}'s health is\nsapped by Leech Seed!",
+  "seededLapseShed": "{{pokemonNameWithAffix}}'s Leech Seed\nsucked up the liquid ooze!",
+  "nightmareOnAdd": "{{pokemonNameWithAffix}} began\nhaving a Nightmare!",
+  "nightmareOnOverlap": "{{pokemonNameWithAffix}} is\nalready locked in a Nightmare!",
+  "nightmareLapse": "{{pokemonNameWithAffix}} is locked\nin a Nightmare!",
+  "encoreOnAdd": "{{pokemonNameWithAffix}} got\nan Encore!",
+  "encoreOnRemove": "{{pokemonNameWithAffix}}'s Encore\nended!",
+  "helpingHandOnAdd": "{{pokemonNameWithAffix}} is ready to\nhelp {{pokemonName}}!",
+  "ingrainLapse": "{{pokemonNameWithAffix}} absorbed\nnutrients with its roots!",
+  "ingrainOnTrap": "{{pokemonNameWithAffix}} planted its roots!",
+  "aquaRingOnAdd": "{{pokemonNameWithAffix}} surrounded\nitself with a veil of water!",
+  "aquaRingLapse": "{{moveName}} restored\n{{pokemonName}}'s HP!",
+  "drowsyOnAdd": "{{pokemonNameWithAffix}} grew drowsy!",
+  "damagingTrapLapse": "{{pokemonNameWithAffix}} is hurt\nby {{moveName}}!",
+  "bindOnTrap": "{{pokemonNameWithAffix}} was squeezed by\n{{sourcePokemonName}}'s {{moveName}}!",
+  "wrapOnTrap": "{{pokemonNameWithAffix}} was Wrapped\nby {{sourcePokemonName}}!",
+  "vortexOnTrap": "{{pokemonNameWithAffix}} was trapped\nin the vortex!",
+  "clampOnTrap": "{{sourcePokemonNameWithAffix}} Clamped\n{{pokemonName}}!",
+  "sandTombOnTrap": "{{pokemonNameWithAffix}} became trapped\nby {{moveName}}!",
+  "magmaStormOnTrap": "{{pokemonNameWithAffix}} became trapped\nby swirling magma!",
+  "snapTrapOnTrap": "{{pokemonNameWithAffix}} got trapped\nby a snap trap!",
+  "thunderCageOnTrap": "{{sourcePokemonNameWithAffix}} trapped\n{{pokemonNameWithAffix}}!",
+  "infestationOnTrap": "{{pokemonNameWithAffix}} has been afflicted \nwith an infestation by {{sourcePokemonNameWithAffix}}!",
+  "protectedOnAdd": "{{pokemonNameWithAffix}}\nprotected itself!",
+  "protectedLapse": "{{pokemonNameWithAffix}}\nprotected itself!",
+  "enduringOnAdd": "{{pokemonNameWithAffix}} braced\nitself!",
+  "enduringLapse": "{{pokemonNameWithAffix}} endured\nthe hit!",
+  "sturdyLapse": "{{pokemonNameWithAffix}} endured\nthe hit!",
+  "perishSongLapse": "{{pokemonNameWithAffix}}'s perish count fell to {{turnCount}}.",
+  "centerOfAttentionOnAdd": "{{pokemonNameWithAffix}} became the center\nof attention!",
+  "truantLapse": "{{pokemonNameWithAffix}} is\nloafing around!",
+  "slowStartOnAdd": "{{pokemonNameWithAffix}} can't\nget it going!",
+  "slowStartOnRemove": "{{pokemonNameWithAffix}} finally\ngot its act together!",
+  "highestStatBoostOnAdd": "{{pokemonNameWithAffix}}'s {{statName}}\nwas heightened!",
+  "highestStatBoostOnRemove": "The effects of {{pokemonNameWithAffix}}'s\n{{abilityName}} wore off!",
+  "magnetRisenOnAdd": "{{pokemonNameWithAffix}} levitated with electromagnetism!",
+  "magnetRisenOnRemove": "{{pokemonNameWithAffix}}'s electromagnetism wore off!",
+  "critBoostOnAdd": "{{pokemonNameWithAffix}} is getting\npumped!",
+  "critBoostOnRemove": "{{pokemonNameWithAffix}} relaxed.",
+  "saltCuredOnAdd": "{{pokemonNameWithAffix}} is being salt cured!",
+  "saltCuredLapse": "{{pokemonNameWithAffix}} is hurt by {{moveName}}!",
+  "cursedOnAdd": "{{pokemonNameWithAffix}} cut its own HP and put a curse on the {{pokemonName}}!",
+  "cursedLapse": "{{pokemonNameWithAffix}} is afflicted by the Curse!",
+  "stockpilingOnAdd": "{{pokemonNameWithAffix}} stockpiled {{stockpiledCount}}!",
 } as const;
diff --git a/src/locales/de/battle.ts b/src/locales/de/battle.ts
index a9686da7524..778411aad9b 100644
--- a/src/locales/de/battle.ts
+++ b/src/locales/de/battle.ts
@@ -95,65 +95,4 @@ export const battle: SimpleTranslationEntries = {
   "unlockedSomething": "{{unlockedThing}} wurde freigeschaltet.",
   "congratulations": "Glückwunsch!",
   "beatModeFirstTime": "{{speciesName}} hat den {{gameMode}} Modus zum ersten Mal beendet! Du erhältst {{newModifier}}!",
-  "battlerTagsRechargingLapse": "{{pokemonNameWithAffix}} kann sich wegen des Rückstoßes durch den Angriff nicht bewegen!",
-  "battlerTagsTrappedOnAdd": "{{pokemonNameWithAffix}} kann nicht mehr fliehen!",
-  "battlerTagsTrappedOnRemove": "{{pokemonNameWithAffix}} wurde von {{moveName}} befreit.",
-  "battlerTagsFlinchedLapse": "{{pokemonNameWithAffix}} ist zurückgeschreckt und kann nicht handeln!",
-  "battlerTagsConfusedOnAdd": "{{pokemonNameWithAffix}} wurde verwirrt!",
-  "battlerTagsConfusedOnRemove": "{{pokemonNameWithAffix}} ist nicht mehr verwirrt!",
-  "battlerTagsConfusedOnOverlap": "{{pokemonNameWithAffix}} ist bereits verwirrt!",
-  "battlerTagsConfusedLapse": "{{pokemonNameWithAffix}} ist verwirrt!",
-  "battlerTagsConfusedLapseHurtItself": "Es hat sich vor Verwirrung selbst verletzt!",
-  "battlerTagsDestinyBondLapseIsBoss": "{{pokemonNameWithAffix}} ist immun gegen den Effekt von Abgangsbund!",
-  "battlerTagsDestinyBondLapse": "{{pokemonNameWithAffix}} nimmt {{pokemonNameWithAffix2}} mit sich!",
-  "battlerTagsInfatuatedOnAdd": "{{pokemonNameWithAffix}} hat sich in {{sourcePokemonName}} verliebt!",
-  "battlerTagsInfatuatedOnOverlap": "{{pokemonNameWithAffix}} ist bereits verliebt.",
-  "battlerTagsInfatuatedLapse": "{{pokemonNameWithAffix}} ist in {{sourcePokemonName}} verliebt!",
-  "battlerTagsInfatuatedLapseImmobilize": "{{pokemonNameWithAffix}} ist starr vor Liebe!",
-  "battlerTagsInfatuatedOnRemove": "{{pokemonNameWithAffix}} ist nicht mehr verliebt!",
-  "battlerTagsSeededOnAdd": "{{pokemonNameWithAffix}} wurde bepflanzt!",
-  "battlerTagsSeededLapse": "{{pokemonNameWithAffix}} wurden durch Egelsamen KP geraubt!",
-  "battlerTagsSeededLapseShed": "Egelsamen von {{pokemonNameWithAffix}} saugt Kloakensoße auf!",
-  "battlerTagsNightmareOnAdd": "Nachtmahr sucht {{pokemonNameWithAffix}} heim!",
-  "battlerTagsNightmareOnOverlap": "{{pokemonNameWithAffix}} wird bereits von Nachtmahr heimgesucht!",
-  "battlerTagsNightmareLapse": "Nachtmahr schadet {{pokemonNameWithAffix}}!",
-  "battlerTagsEncoreOnAdd": "{{pokemonNameWithAffix}} gibt eine Zugabe",
-  "battlerTagsEncoreOnRemove": "Die Zugabe von {{pokemonNameWithAffix}} ist beendet!",
-  "battlerTagsHelpingHandOnAdd": "{{pokemonNameWithAffix}} will {{pokemonName}} helfen!",
-  "battlerTagsIngrainLapse": "{{pokemonNameWithAffix}} nimmt über seine Wurzeln Nährstoffe auf!",
-  "battlerTagsIngrainOnTrap": "{{pokemonNameWithAffix}} pflanzt seine Wurzeln!",
-  "battlerTagsAquaRingOnAdd": "{{pokemonNameWithAffix}} umgibt sich mit einem Wasserring!",
-  "battlerTagsAquaRingLapse": "{{moveName}} füllt KP von {{pokemonName}} wieder auf!",
-  "battlerTagsDrowsyOnAdd": "{{pokemonNameWithAffix}} wurde schläfrig gemacht!",
-  "battlerTagsDamagingTrapLapse": "{{pokemonNameWithAffix}} wurde durch {{moveName}} verletzt!",
-  "battlerTagsBindOnTrap": "{{pokemonNameWithAffix}} wurde durch {{moveName}} von {{sourcePokemonName}} gequetscht!",
-  "battlerTagsWrapOnTrap": "{{pokemonNameWithAffix}} wurde von {{sourcePokemonName}} umwickelt!",
-  "battlerTagsVortexOnTrap": "{{pokemonNameWithAffix}} wird in dem Strudel gefangen!",
-  "battlerTagsClampOnTrap": "{{sourcePokemonNameWithAffix}} wurde von {{pokemonName}} geschnappt!",
-  "battlerTagsSandTombOnTrap": "{{pokemonNameWithAffix}} wurde von {{moveName}} gefangen!",
-  "battlerTagsMagmaStormOnTrap": "{{pokemonNameWithAffix}} wurde in wirbelndem Magma eingeschlossen!",
-  "battlerTagsSnapTrapOnTrap": "{{pokemonNameWithAffix}} wurde durch Sandgrab gefangen!",
-  "battlerTagsThunderCageOnTrap": "{{sourcePokemonNameWithAffix}} hat {{pokemonNameWithAffix}} gefangen!",
-  "battlerTagsInfestationOnTrap": "{{sourcePokemonNameWithAffix}} plagt {{pokemonNameWithAffix}}!",
-  "battlerTagsProtectedOnAdd": "{{pokemonNameWithAffix}} schützt sich selbst!",
-  "battlerTagsProtectedLapse": "{{pokemonNameWithAffix}} schützt sich selbst!",
-  "battlerTagsEnduringOnAdd": "{{pokemonNameWithAffix}} sammelt sich, um die nächste Attacke zu überstehen!",
-  "battlerTagsEnduringLapse": "{{pokemonNameWithAffix}} übersteht die Attacke!",
-  "battlerTagsSturdyLapse": "{{pokemonNameWithAffix}} übersteht die Attacke!",
-  "battlerTagsPerishSongLapse": "Abgesang von {{pokemonNameWithAffix}} steht bei {{turnCount}}.",
-  "battlerTagsCenterOfAttentionOnAdd": "{{pokemonNameWithAffix}} zieht alle Aufmerksamkeit auf sich!",
-  "battlerTagsTruantLapse": "{{pokemonNameWithAffix}} faulenzt!",
-  "battlerTagsSlowStartOnAdd": "{{pokemonNameWithAffix}} kommt nicht in Fahrt!",
-  "battlerTagsSlowStartOnRemove": "{{pokemonNameWithAffix}} kriegt schließlich doch noch die Kurve!",
-  "battlerTagsHighestStatBoostOnAdd": "{{statName}} von {{pokemonNameWithAffix}} wird verstärkt!",
-  "battlerTagsHighestStatBoostOnRemove": "Der Effekt von {{abilityName}} von {{pokemonNameWithAffix}} lässt nach!",
-  "battlerTagsMagnetRisenOnAdd": "{{pokemonNameWithAffix}} schwebt aufgrund von Elektromagnetismus!",
-  "battlerTagsMagnetRisenOnRemove": "Der Elektromagnetismus von {{pokemonNameWithAffix}} hört auf zu wirken!",
-  "battlerTagsCritBoostOnAdd": "{{pokemonNameWithAffix}} läuft zu Hochtouren auf!",
-  "battlerTagsCritBoostOnRemove": "{{pokemonNameWithAffix}} entspannt.",
-  "battlerTagsSaltCuredOnAdd": "{{pokemonNameWithAffix}} wurde eingepökelt!",
-  "battlerTagsSaltCuredLapse": "{{pokemonNameWithAffix}} wurde durch {{moveName}} verletzt!",
-  "battlerTagsCursedOnAdd": "{{pokemonNameWithAffix}} nimmt einen Teil seiner KP und legt einen Fluch auf {{pokemonName}}!",
-  "battlerTagsCursedLapse": "{{pokemonNameWithAffix}} wurde durch den Fluch verletzt!",
-  "battlerTagsStockpilingOnAdd": "{{pokemonNameWithAffix}} stockpiled {{stockpiledCount}}!"
 } as const;
diff --git a/src/locales/de/battler-tags.ts b/src/locales/de/battler-tags.ts
index 2858d163dac..27d5f14c597 100644
--- a/src/locales/de/battler-tags.ts
+++ b/src/locales/de/battler-tags.ts
@@ -9,4 +9,65 @@ export const battlerTags: SimpleTranslationEntries = {
   "nightmareDesc": "Nachtmahr",
   "ingrainDesc": "Verwurzlung",
   "drowsyDesc": "Schläfrigkeit",
+  "rechargingLapse": "{{pokemonNameWithAffix}} kann sich wegen des Rückstoßes durch den Angriff nicht bewegen!",
+  "trappedOnAdd": "{{pokemonNameWithAffix}} kann nicht mehr fliehen!",
+  "trappedOnRemove": "{{pokemonNameWithAffix}} wurde von {{moveName}} befreit.",
+  "flinchedLapse": "{{pokemonNameWithAffix}} ist zurückgeschreckt und kann nicht handeln!",
+  "confusedOnAdd": "{{pokemonNameWithAffix}} wurde verwirrt!",
+  "confusedOnRemove": "{{pokemonNameWithAffix}} ist nicht mehr verwirrt!",
+  "confusedOnOverlap": "{{pokemonNameWithAffix}} ist bereits verwirrt!",
+  "confusedLapse": "{{pokemonNameWithAffix}} ist verwirrt!",
+  "confusedLapseHurtItself": "Es hat sich vor Verwirrung selbst verletzt!",
+  "destinyBondLapseIsBoss": "{{pokemonNameWithAffix}} ist immun gegen den Effekt von Abgangsbund!",
+  "destinyBondLapse": "{{pokemonNameWithAffix}} nimmt {{pokemonNameWithAffix2}} mit sich!",
+  "infatuatedOnAdd": "{{pokemonNameWithAffix}} hat sich in {{sourcePokemonName}} verliebt!",
+  "infatuatedOnOverlap": "{{pokemonNameWithAffix}} ist bereits verliebt.",
+  "infatuatedLapse": "{{pokemonNameWithAffix}} ist in {{sourcePokemonName}} verliebt!",
+  "infatuatedLapseImmobilize": "{{pokemonNameWithAffix}} ist starr vor Liebe!",
+  "infatuatedOnRemove": "{{pokemonNameWithAffix}} ist nicht mehr verliebt!",
+  "seededOnAdd": "{{pokemonNameWithAffix}} wurde bepflanzt!",
+  "seededLapse": "{{pokemonNameWithAffix}} wurden durch Egelsamen KP geraubt!",
+  "seededLapseShed": "Egelsamen von {{pokemonNameWithAffix}} saugt Kloakensoße auf!",
+  "nightmareOnAdd": "Nachtmahr sucht {{pokemonNameWithAffix}} heim!",
+  "nightmareOnOverlap": "{{pokemonNameWithAffix}} wird bereits von Nachtmahr heimgesucht!",
+  "nightmareLapse": "Nachtmahr schadet {{pokemonNameWithAffix}}!",
+  "encoreOnAdd": "{{pokemonNameWithAffix}} gibt eine Zugabe",
+  "encoreOnRemove": "Die Zugabe von {{pokemonNameWithAffix}} ist beendet!",
+  "helpingHandOnAdd": "{{pokemonNameWithAffix}} will {{pokemonName}} helfen!",
+  "ingrainLapse": "{{pokemonNameWithAffix}} nimmt über seine Wurzeln Nährstoffe auf!",
+  "ingrainOnTrap": "{{pokemonNameWithAffix}} pflanzt seine Wurzeln!",
+  "aquaRingOnAdd": "{{pokemonNameWithAffix}} umgibt sich mit einem Wasserring!",
+  "aquaRingLapse": "{{moveName}} füllt KP von {{pokemonName}} wieder auf!",
+  "drowsyOnAdd": "{{pokemonNameWithAffix}} wurde schläfrig gemacht!",
+  "damagingTrapLapse": "{{pokemonNameWithAffix}} wurde durch {{moveName}} verletzt!",
+  "bindOnTrap": "{{pokemonNameWithAffix}} wurde durch {{moveName}} von {{sourcePokemonName}} gequetscht!",
+  "wrapOnTrap": "{{pokemonNameWithAffix}} wurde von {{sourcePokemonName}} umwickelt!",
+  "vortexOnTrap": "{{pokemonNameWithAffix}} wird in dem Strudel gefangen!",
+  "clampOnTrap": "{{sourcePokemonNameWithAffix}} wurde von {{pokemonName}} geschnappt!",
+  "sandTombOnTrap": "{{pokemonNameWithAffix}} wurde von {{moveName}} gefangen!",
+  "magmaStormOnTrap": "{{pokemonNameWithAffix}} wurde in wirbelndem Magma eingeschlossen!",
+  "snapTrapOnTrap": "{{pokemonNameWithAffix}} wurde durch Sandgrab gefangen!",
+  "thunderCageOnTrap": "{{sourcePokemonNameWithAffix}} hat {{pokemonNameWithAffix}} gefangen!",
+  "infestationOnTrap": "{{sourcePokemonNameWithAffix}} plagt {{pokemonNameWithAffix}}!",
+  "protectedOnAdd": "{{pokemonNameWithAffix}} schützt sich selbst!",
+  "protectedLapse": "{{pokemonNameWithAffix}} schützt sich selbst!",
+  "enduringOnAdd": "{{pokemonNameWithAffix}} sammelt sich, um die nächste Attacke zu überstehen!",
+  "enduringLapse": "{{pokemonNameWithAffix}} übersteht die Attacke!",
+  "sturdyLapse": "{{pokemonNameWithAffix}} übersteht die Attacke!",
+  "perishSongLapse": "Abgesang von {{pokemonNameWithAffix}} steht bei {{turnCount}}.",
+  "centerOfAttentionOnAdd": "{{pokemonNameWithAffix}} zieht alle Aufmerksamkeit auf sich!",
+  "truantLapse": "{{pokemonNameWithAffix}} faulenzt!",
+  "slowStartOnAdd": "{{pokemonNameWithAffix}} kommt nicht in Fahrt!",
+  "slowStartOnRemove": "{{pokemonNameWithAffix}} kriegt schließlich doch noch die Kurve!",
+  "highestStatBoostOnAdd": "{{statName}} von {{pokemonNameWithAffix}} wird verstärkt!",
+  "highestStatBoostOnRemove": "Der Effekt von {{abilityName}} von {{pokemonNameWithAffix}} lässt nach!",
+  "magnetRisenOnAdd": "{{pokemonNameWithAffix}} schwebt aufgrund von Elektromagnetismus!",
+  "magnetRisenOnRemove": "Der Elektromagnetismus von {{pokemonNameWithAffix}} hört auf zu wirken!",
+  "critBoostOnAdd": "{{pokemonNameWithAffix}} läuft zu Hochtouren auf!",
+  "critBoostOnRemove": "{{pokemonNameWithAffix}} entspannt.",
+  "saltCuredOnAdd": "{{pokemonNameWithAffix}} wurde eingepökelt!",
+  "saltCuredLapse": "{{pokemonNameWithAffix}} wurde durch {{moveName}} verletzt!",
+  "cursedOnAdd": "{{pokemonNameWithAffix}} nimmt einen Teil seiner KP und legt einen Fluch auf {{pokemonName}}!",
+  "cursedLapse": "{{pokemonNameWithAffix}} wurde durch den Fluch verletzt!",
+  "stockpilingOnAdd": "{{pokemonNameWithAffix}} stockpiled {{stockpiledCount}}!",
 } as const;
diff --git a/src/locales/en/battle.ts b/src/locales/en/battle.ts
index 12a0f2c99c6..9513e010579 100644
--- a/src/locales/en/battle.ts
+++ b/src/locales/en/battle.ts
@@ -95,65 +95,4 @@ export const battle: SimpleTranslationEntries = {
   "congratulations": "Congratulations!",
   "beatModeFirstTime": "{{speciesName}} beat {{gameMode}} Mode for the first time!\nYou received {{newModifier}}!",
   "ppReduced": "It reduced the PP of {{targetName}}'s\n{{moveName}} by {{reduction}}!",
-  "battlerTagsRechargingLapse": "{{pokemonNameWithAffix}} must\nrecharge!",
-  "battlerTagsTrappedOnAdd": "{{pokemonNameWithAffix}} can no\nlonger escape!",
-  "battlerTagsTrappedOnRemove": "{{pokemonNameWithAffix}} was freed\nfrom {{moveName}}!",
-  "battlerTagsFlinchedLapse": "{{pokemonNameWithAffix}} flinched!",
-  "battlerTagsConfusedOnAdd": "{{pokemonNameWithAffix}} became\nconfused!",
-  "battlerTagsConfusedOnRemove": "{{pokemonNameWithAffix}} snapped\nout of confusion!",
-  "battlerTagsConfusedOnOverlap": "{{pokemonNameWithAffix}} is\nalready confused!",
-  "battlerTagsConfusedLapse": "{{pokemonNameWithAffix}} is\nconfused!",
-  "battlerTagsConfusedLapseHurtItself": "It hurt itself in its\nconfusion!",
-  "battlerTagsDestinyBondLapseIsBoss": "{{pokemonNameWithAffix}} is unaffected\nby the effects of Destiny Bond.",
-  "battlerTagsDestinyBondLapse": "{{pokemonNameWithAffix}} took\n{{pokemonNameWithAffix2}} down with it!",
-  "battlerTagsInfatuatedOnAdd": "{{pokemonNameWithAffix}} fell in love\nwith {{sourcePokemonName}}!",
-  "battlerTagsInfatuatedOnOverlap": "{{pokemonNameWithAffix}} is\nalready in love!",
-  "battlerTagsInfatuatedLapse": "{{pokemonNameWithAffix}} is in love\nwith {{sourcePokemonName}}!",
-  "battlerTagsInfatuatedLapseImmobilize": "{{pokemonNameWithAffix}} is\nimmobilized by love!",
-  "battlerTagsInfatuatedOnRemove": "{{pokemonNameWithAffix}} got over\nits infatuation.",
-  "battlerTagsSeededOnAdd": "{{pokemonNameWithAffix}} was seeded!",
-  "battlerTagsSeededLapse": "{{pokemonNameWithAffix}}'s health is\nsapped by Leech Seed!",
-  "battlerTagsSeededLapseShed": "{{pokemonNameWithAffix}}'s Leech Seed\nsucked up the liquid ooze!",
-  "battlerTagsNightmareOnAdd": "{{pokemonNameWithAffix}} began\nhaving a Nightmare!",
-  "battlerTagsNightmareOnOverlap": "{{pokemonNameWithAffix}} is\nalready locked in a Nightmare!",
-  "battlerTagsNightmareLapse": "{{pokemonNameWithAffix}} is locked\nin a Nightmare!",
-  "battlerTagsEncoreOnAdd": "{{pokemonNameWithAffix}} got\nan Encore!",
-  "battlerTagsEncoreOnRemove": "{{pokemonNameWithAffix}}'s Encore\nended!",
-  "battlerTagsHelpingHandOnAdd": "{{pokemonNameWithAffix}} is ready to\nhelp {{pokemonName}}!",
-  "battlerTagsIngrainLapse": "{{pokemonNameWithAffix}} absorbed\nnutrients with its roots!",
-  "battlerTagsIngrainOnTrap": "{{pokemonNameWithAffix}} planted its roots!",
-  "battlerTagsAquaRingOnAdd": "{{pokemonNameWithAffix}} surrounded\nitself with a veil of water!",
-  "battlerTagsAquaRingLapse": "{{moveName}} restored\n{{pokemonName}}'s HP!",
-  "battlerTagsDrowsyOnAdd": "{{pokemonNameWithAffix}} grew drowsy!",
-  "battlerTagsDamagingTrapLapse": "{{pokemonNameWithAffix}} is hurt\nby {{moveName}}!",
-  "battlerTagsBindOnTrap": "{{pokemonNameWithAffix}} was squeezed by\n{{sourcePokemonName}}'s {{moveName}}!",
-  "battlerTagsWrapOnTrap": "{{pokemonNameWithAffix}} was Wrapped\nby {{sourcePokemonName}}!",
-  "battlerTagsVortexOnTrap": "{{pokemonNameWithAffix}} was trapped\nin the vortex!",
-  "battlerTagsClampOnTrap": "{{sourcePokemonNameWithAffix}} Clamped\n{{pokemonName}}!",
-  "battlerTagsSandTombOnTrap": "{{pokemonNameWithAffix}} became trapped\nby {{moveName}}!",
-  "battlerTagsMagmaStormOnTrap": "{{pokemonNameWithAffix}} became trapped\nby swirling magma!",
-  "battlerTagsSnapTrapOnTrap": "{{pokemonNameWithAffix}} got trapped\nby a snap trap!",
-  "battlerTagsThunderCageOnTrap": "{{sourcePokemonNameWithAffix}} trapped\n{{pokemonNameWithAffix}}!",
-  "battlerTagsInfestationOnTrap": "{{pokemonNameWithAffix}} has been afflicted \nwith an infestation by {{sourcePokemonNameWithAffix}}!",
-  "battlerTagsProtectedOnAdd": "{{pokemonNameWithAffix}}\nprotected itself!",
-  "battlerTagsProtectedLapse": "{{pokemonNameWithAffix}}\nprotected itself!",
-  "battlerTagsEnduringOnAdd": "{{pokemonNameWithAffix}} braced\nitself!",
-  "battlerTagsEnduringLapse": "{{pokemonNameWithAffix}} endured\nthe hit!",
-  "battlerTagsSturdyLapse": "{{pokemonNameWithAffix}} endured\nthe hit!",
-  "battlerTagsPerishSongLapse": "{{pokemonNameWithAffix}}'s perish count fell to {{turnCount}}.",
-  "battlerTagsCenterOfAttentionOnAdd": "{{pokemonNameWithAffix}} became the center\nof attention!",
-  "battlerTagsTruantLapse": "{{pokemonNameWithAffix}} is\nloafing around!",
-  "battlerTagsSlowStartOnAdd": "{{pokemonNameWithAffix}} can't\nget it going!",
-  "battlerTagsSlowStartOnRemove": "{{pokemonNameWithAffix}} finally\ngot its act together!",
-  "battlerTagsHighestStatBoostOnAdd": "{{pokemonNameWithAffix}}'s {{statName}}\nwas heightened!",
-  "battlerTagsHighestStatBoostOnRemove": "The effects of {{pokemonNameWithAffix}}'s\n{{abilityName}} wore off!",
-  "battlerTagsMagnetRisenOnAdd": "{{pokemonNameWithAffix}} levitated with electromagnetism!",
-  "battlerTagsMagnetRisenOnRemove": "{{pokemonNameWithAffix}}'s electromagnetism wore off!",
-  "battlerTagsCritBoostOnAdd": "{{pokemonNameWithAffix}} is getting\npumped!",
-  "battlerTagsCritBoostOnRemove": "{{pokemonNameWithAffix}} relaxed.",
-  "battlerTagsSaltCuredOnAdd": "{{pokemonNameWithAffix}} is being salt cured!",
-  "battlerTagsSaltCuredLapse": "{{pokemonNameWithAffix}} is hurt by {{moveName}}!",
-  "battlerTagsCursedOnAdd": "{{pokemonNameWithAffix}} cut its own HP and put a curse on the {{pokemonName}}!",
-  "battlerTagsCursedLapse": "{{pokemonNameWithAffix}} is afflicted by the Curse!",
-  "battlerTagsStockpilingOnAdd": "{{pokemonNameWithAffix}} stockpiled {{stockpiledCount}}!"
 } as const;
diff --git a/src/locales/en/battler-tags.ts b/src/locales/en/battler-tags.ts
index 1d897c70f3d..d0775efda08 100644
--- a/src/locales/en/battler-tags.ts
+++ b/src/locales/en/battler-tags.ts
@@ -9,4 +9,65 @@ export const battlerTags: SimpleTranslationEntries = {
   "nightmareDesc": "nightmares",
   "ingrainDesc": "roots",
   "drowsyDesc": "drowsiness",
+  "rechargingLapse": "{{pokemonNameWithAffix}} must\nrecharge!",
+  "trappedOnAdd": "{{pokemonNameWithAffix}} can no\nlonger escape!",
+  "trappedOnRemove": "{{pokemonNameWithAffix}} was freed\nfrom {{moveName}}!",
+  "flinchedLapse": "{{pokemonNameWithAffix}} flinched!",
+  "confusedOnAdd": "{{pokemonNameWithAffix}} became\nconfused!",
+  "confusedOnRemove": "{{pokemonNameWithAffix}} snapped\nout of confusion!",
+  "confusedOnOverlap": "{{pokemonNameWithAffix}} is\nalready confused!",
+  "confusedLapse": "{{pokemonNameWithAffix}} is\nconfused!",
+  "confusedLapseHurtItself": "It hurt itself in its\nconfusion!",
+  "destinyBondLapseIsBoss": "{{pokemonNameWithAffix}} is unaffected\nby the effects of Destiny Bond.",
+  "destinyBondLapse": "{{pokemonNameWithAffix}} took\n{{pokemonNameWithAffix2}} down with it!",
+  "infatuatedOnAdd": "{{pokemonNameWithAffix}} fell in love\nwith {{sourcePokemonName}}!",
+  "infatuatedOnOverlap": "{{pokemonNameWithAffix}} is\nalready in love!",
+  "infatuatedLapse": "{{pokemonNameWithAffix}} is in love\nwith {{sourcePokemonName}}!",
+  "infatuatedLapseImmobilize": "{{pokemonNameWithAffix}} is\nimmobilized by love!",
+  "infatuatedOnRemove": "{{pokemonNameWithAffix}} got over\nits infatuation.",
+  "seededOnAdd": "{{pokemonNameWithAffix}} was seeded!",
+  "seededLapse": "{{pokemonNameWithAffix}}'s health is\nsapped by Leech Seed!",
+  "seededLapseShed": "{{pokemonNameWithAffix}}'s Leech Seed\nsucked up the liquid ooze!",
+  "nightmareOnAdd": "{{pokemonNameWithAffix}} began\nhaving a Nightmare!",
+  "nightmareOnOverlap": "{{pokemonNameWithAffix}} is\nalready locked in a Nightmare!",
+  "nightmareLapse": "{{pokemonNameWithAffix}} is locked\nin a Nightmare!",
+  "encoreOnAdd": "{{pokemonNameWithAffix}} got\nan Encore!",
+  "encoreOnRemove": "{{pokemonNameWithAffix}}'s Encore\nended!",
+  "helpingHandOnAdd": "{{pokemonNameWithAffix}} is ready to\nhelp {{pokemonName}}!",
+  "ingrainLapse": "{{pokemonNameWithAffix}} absorbed\nnutrients with its roots!",
+  "ingrainOnTrap": "{{pokemonNameWithAffix}} planted its roots!",
+  "aquaRingOnAdd": "{{pokemonNameWithAffix}} surrounded\nitself with a veil of water!",
+  "aquaRingLapse": "{{moveName}} restored\n{{pokemonName}}'s HP!",
+  "drowsyOnAdd": "{{pokemonNameWithAffix}} grew drowsy!",
+  "damagingTrapLapse": "{{pokemonNameWithAffix}} is hurt\nby {{moveName}}!",
+  "bindOnTrap": "{{pokemonNameWithAffix}} was squeezed by\n{{sourcePokemonName}}'s {{moveName}}!",
+  "wrapOnTrap": "{{pokemonNameWithAffix}} was Wrapped\nby {{sourcePokemonName}}!",
+  "vortexOnTrap": "{{pokemonNameWithAffix}} was trapped\nin the vortex!",
+  "clampOnTrap": "{{sourcePokemonNameWithAffix}} Clamped\n{{pokemonName}}!",
+  "sandTombOnTrap": "{{pokemonNameWithAffix}} became trapped\nby {{moveName}}!",
+  "magmaStormOnTrap": "{{pokemonNameWithAffix}} became trapped\nby swirling magma!",
+  "snapTrapOnTrap": "{{pokemonNameWithAffix}} got trapped\nby a snap trap!",
+  "thunderCageOnTrap": "{{sourcePokemonNameWithAffix}} trapped\n{{pokemonNameWithAffix}}!",
+  "infestationOnTrap": "{{pokemonNameWithAffix}} has been afflicted \nwith an infestation by {{sourcePokemonNameWithAffix}}!",
+  "protectedOnAdd": "{{pokemonNameWithAffix}}\nprotected itself!",
+  "protectedLapse": "{{pokemonNameWithAffix}}\nprotected itself!",
+  "enduringOnAdd": "{{pokemonNameWithAffix}} braced\nitself!",
+  "enduringLapse": "{{pokemonNameWithAffix}} endured\nthe hit!",
+  "sturdyLapse": "{{pokemonNameWithAffix}} endured\nthe hit!",
+  "perishSongLapse": "{{pokemonNameWithAffix}}'s perish count fell to {{turnCount}}.",
+  "centerOfAttentionOnAdd": "{{pokemonNameWithAffix}} became the center\nof attention!",
+  "truantLapse": "{{pokemonNameWithAffix}} is\nloafing around!",
+  "slowStartOnAdd": "{{pokemonNameWithAffix}} can't\nget it going!",
+  "slowStartOnRemove": "{{pokemonNameWithAffix}} finally\ngot its act together!",
+  "highestStatBoostOnAdd": "{{pokemonNameWithAffix}}'s {{statName}}\nwas heightened!",
+  "highestStatBoostOnRemove": "The effects of {{pokemonNameWithAffix}}'s\n{{abilityName}} wore off!",
+  "magnetRisenOnAdd": "{{pokemonNameWithAffix}} levitated with electromagnetism!",
+  "magnetRisenOnRemove": "{{pokemonNameWithAffix}}'s electromagnetism wore off!",
+  "critBoostOnAdd": "{{pokemonNameWithAffix}} is getting\npumped!",
+  "critBoostOnRemove": "{{pokemonNameWithAffix}} relaxed.",
+  "saltCuredOnAdd": "{{pokemonNameWithAffix}} is being salt cured!",
+  "saltCuredLapse": "{{pokemonNameWithAffix}} is hurt by {{moveName}}!",
+  "cursedOnAdd": "{{pokemonNameWithAffix}} cut its own HP and put a curse on the {{pokemonName}}!",
+  "cursedLapse": "{{pokemonNameWithAffix}} is afflicted by the Curse!",
+  "stockpilingOnAdd": "{{pokemonNameWithAffix}} stockpiled {{stockpiledCount}}!",
 } as const;
diff --git a/src/locales/es/battle.ts b/src/locales/es/battle.ts
index 7f29060c5d3..582766ec5b6 100644
--- a/src/locales/es/battle.ts
+++ b/src/locales/es/battle.ts
@@ -95,65 +95,4 @@ export const battle: SimpleTranslationEntries = {
   "congratulations": "Congratulations!",
   "beatModeFirstTime": "{{speciesName}} beat {{gameMode}} Mode for the first time!\nYou received {{newModifier}}!",
   "ppReduced": "It reduced the PP of {{targetName}}'s\n{{moveName}} by {{reduction}}!",
-  "battlerTagsRechargingLapse": "{{pokemonNameWithAffix}} must\nrecharge!",
-  "battlerTagsTrappedOnAdd": "{{pokemonNameWithAffix}} can no\nlonger escape!",
-  "battlerTagsTrappedOnRemove": "{{pokemonNameWithAffix}} was freed\nfrom {{moveName}}!",
-  "battlerTagsFlinchedLapse": "{{pokemonNameWithAffix}} flinched!",
-  "battlerTagsConfusedOnAdd": "{{pokemonNameWithAffix}} became\nconfused!",
-  "battlerTagsConfusedOnRemove": "{{pokemonNameWithAffix}} snapped\nout of confusion!",
-  "battlerTagsConfusedOnOverlap": "{{pokemonNameWithAffix}} is\nalready confused!",
-  "battlerTagsConfusedLapse": "{{pokemonNameWithAffix}} is\nconfused!",
-  "battlerTagsConfusedLapseHurtItself": "It hurt itself in its\nconfusion!",
-  "battlerTagsDestinyBondLapseIsBoss": "{{pokemonNameWithAffix}} is unaffected\nby the effects of Destiny Bond.",
-  "battlerTagsDestinyBondLapse": "{{pokemonNameWithAffix}} took\n{{pokemonNameWithAffix2}} down with it!",
-  "battlerTagsInfatuatedOnAdd": "{{pokemonNameWithAffix}} fell in love\nwith {{sourcePokemonName}}!",
-  "battlerTagsInfatuatedOnOverlap": "{{pokemonNameWithAffix}} is\nalready in love!",
-  "battlerTagsInfatuatedLapse": "{{pokemonNameWithAffix}} is in love\nwith {{sourcePokemonName}}!",
-  "battlerTagsInfatuatedLapseImmobilize": "{{pokemonNameWithAffix}} is\nimmobilized by love!",
-  "battlerTagsInfatuatedOnRemove": "{{pokemonNameWithAffix}} got over\nits infatuation.",
-  "battlerTagsSeededOnAdd": "{{pokemonNameWithAffix}} was seeded!",
-  "battlerTagsSeededLapse": "{{pokemonNameWithAffix}}'s health is\nsapped by Leech Seed!",
-  "battlerTagsSeededLapseShed": "{{pokemonNameWithAffix}}'s Leech Seed\nsucked up the liquid ooze!",
-  "battlerTagsNightmareOnAdd": "{{pokemonNameWithAffix}} began\nhaving a Nightmare!",
-  "battlerTagsNightmareOnOverlap": "{{pokemonNameWithAffix}} is\nalready locked in a Nightmare!",
-  "battlerTagsNightmareLapse": "{{pokemonNameWithAffix}} is locked\nin a Nightmare!",
-  "battlerTagsEncoreOnAdd": "{{pokemonNameWithAffix}} got\nan Encore!",
-  "battlerTagsEncoreOnRemove": "{{pokemonNameWithAffix}}'s Encore\nended!",
-  "battlerTagsHelpingHandOnAdd": "{{pokemonNameWithAffix}} is ready to\nhelp {{pokemonName}}!",
-  "battlerTagsIngrainLapse": "{{pokemonNameWithAffix}} absorbed\nnutrients with its roots!",
-  "battlerTagsIngrainOnTrap": "{{pokemonNameWithAffix}} planted its roots!",
-  "battlerTagsAquaRingOnAdd": "{{pokemonNameWithAffix}} surrounded\nitself with a veil of water!",
-  "battlerTagsAquaRingLapse": "{{moveName}} restored\n{{pokemonName}}'s HP!",
-  "battlerTagsDrowsyOnAdd": "{{pokemonNameWithAffix}} grew drowsy!",
-  "battlerTagsDamagingTrapLapse": "{{pokemonNameWithAffix}} is hurt\nby {{moveName}}!",
-  "battlerTagsBindOnTrap": "{{pokemonNameWithAffix}} was squeezed by\n{{sourcePokemonName}}'s {{moveName}}!",
-  "battlerTagsWrapOnTrap": "{{pokemonNameWithAffix}} was Wrapped\nby {{sourcePokemonName}}!",
-  "battlerTagsVortexOnTrap": "{{pokemonNameWithAffix}} was trapped\nin the vortex!",
-  "battlerTagsClampOnTrap": "{{sourcePokemonNameWithAffix}} Clamped\n{{pokemonName}}!",
-  "battlerTagsSandTombOnTrap": "{{pokemonNameWithAffix}} became trapped\nby {{moveName}}!",
-  "battlerTagsMagmaStormOnTrap": "{{pokemonNameWithAffix}} became trapped\nby swirling magma!",
-  "battlerTagsSnapTrapOnTrap": "{{pokemonNameWithAffix}} got trapped\nby a snap trap!",
-  "battlerTagsThunderCageOnTrap": "{{sourcePokemonNameWithAffix}} trapped\n{{pokemonNameWithAffix}}!",
-  "battlerTagsInfestationOnTrap": "{{pokemonNameWithAffix}} has been afflicted \nwith an infestation by {{sourcePokemonNameWithAffix}}!",
-  "battlerTagsProtectedOnAdd": "{{pokemonNameWithAffix}}\nprotected itself!",
-  "battlerTagsProtectedLapse": "{{pokemonNameWithAffix}}\nprotected itself!",
-  "battlerTagsEnduringOnAdd": "{{pokemonNameWithAffix}} braced\nitself!",
-  "battlerTagsEnduringLapse": "{{pokemonNameWithAffix}} endured\nthe hit!",
-  "battlerTagsSturdyLapse": "{{pokemonNameWithAffix}} endured\nthe hit!",
-  "battlerTagsPerishSongLapse": "{{pokemonNameWithAffix}}'s perish count fell to {{turnCount}}.",
-  "battlerTagsCenterOfAttentionOnAdd": "{{pokemonNameWithAffix}} became the center\nof attention!",
-  "battlerTagsTruantLapse": "{{pokemonNameWithAffix}} is\nloafing around!",
-  "battlerTagsSlowStartOnAdd": "{{pokemonNameWithAffix}} can't\nget it going!",
-  "battlerTagsSlowStartOnRemove": "{{pokemonNameWithAffix}} finally\ngot its act together!",
-  "battlerTagsHighestStatBoostOnAdd": "{{pokemonNameWithAffix}}'s {{statName}}\nwas heightened!",
-  "battlerTagsHighestStatBoostOnRemove": "The effects of {{pokemonNameWithAffix}}'s\n{{abilityName}} wore off!",
-  "battlerTagsMagnetRisenOnAdd": "{{pokemonNameWithAffix}} levitated with electromagnetism!",
-  "battlerTagsMagnetRisenOnRemove": "{{pokemonNameWithAffix}}'s electromagnetism wore off!",
-  "battlerTagsCritBoostOnAdd": "{{pokemonNameWithAffix}} is getting\npumped!",
-  "battlerTagsCritBoostOnRemove": "{{pokemonNameWithAffix}} relaxed.",
-  "battlerTagsSaltCuredOnAdd": "{{pokemonNameWithAffix}} is being salt cured!",
-  "battlerTagsSaltCuredLapse": "{{pokemonNameWithAffix}} is hurt by {{moveName}}!",
-  "battlerTagsCursedOnAdd": "{{pokemonNameWithAffix}} cut its own HP and put a curse on the {{pokemonName}}!",
-  "battlerTagsCursedLapse": "{{pokemonNameWithAffix}} is afflicted by the Curse!",
-  "battlerTagsStockpilingOnAdd": "{{pokemonNameWithAffix}} stockpiled {{stockpiledCount}}!"
 } as const;
diff --git a/src/locales/es/battler-tags.ts b/src/locales/es/battler-tags.ts
index 1d897c70f3d..d0775efda08 100644
--- a/src/locales/es/battler-tags.ts
+++ b/src/locales/es/battler-tags.ts
@@ -9,4 +9,65 @@ export const battlerTags: SimpleTranslationEntries = {
   "nightmareDesc": "nightmares",
   "ingrainDesc": "roots",
   "drowsyDesc": "drowsiness",
+  "rechargingLapse": "{{pokemonNameWithAffix}} must\nrecharge!",
+  "trappedOnAdd": "{{pokemonNameWithAffix}} can no\nlonger escape!",
+  "trappedOnRemove": "{{pokemonNameWithAffix}} was freed\nfrom {{moveName}}!",
+  "flinchedLapse": "{{pokemonNameWithAffix}} flinched!",
+  "confusedOnAdd": "{{pokemonNameWithAffix}} became\nconfused!",
+  "confusedOnRemove": "{{pokemonNameWithAffix}} snapped\nout of confusion!",
+  "confusedOnOverlap": "{{pokemonNameWithAffix}} is\nalready confused!",
+  "confusedLapse": "{{pokemonNameWithAffix}} is\nconfused!",
+  "confusedLapseHurtItself": "It hurt itself in its\nconfusion!",
+  "destinyBondLapseIsBoss": "{{pokemonNameWithAffix}} is unaffected\nby the effects of Destiny Bond.",
+  "destinyBondLapse": "{{pokemonNameWithAffix}} took\n{{pokemonNameWithAffix2}} down with it!",
+  "infatuatedOnAdd": "{{pokemonNameWithAffix}} fell in love\nwith {{sourcePokemonName}}!",
+  "infatuatedOnOverlap": "{{pokemonNameWithAffix}} is\nalready in love!",
+  "infatuatedLapse": "{{pokemonNameWithAffix}} is in love\nwith {{sourcePokemonName}}!",
+  "infatuatedLapseImmobilize": "{{pokemonNameWithAffix}} is\nimmobilized by love!",
+  "infatuatedOnRemove": "{{pokemonNameWithAffix}} got over\nits infatuation.",
+  "seededOnAdd": "{{pokemonNameWithAffix}} was seeded!",
+  "seededLapse": "{{pokemonNameWithAffix}}'s health is\nsapped by Leech Seed!",
+  "seededLapseShed": "{{pokemonNameWithAffix}}'s Leech Seed\nsucked up the liquid ooze!",
+  "nightmareOnAdd": "{{pokemonNameWithAffix}} began\nhaving a Nightmare!",
+  "nightmareOnOverlap": "{{pokemonNameWithAffix}} is\nalready locked in a Nightmare!",
+  "nightmareLapse": "{{pokemonNameWithAffix}} is locked\nin a Nightmare!",
+  "encoreOnAdd": "{{pokemonNameWithAffix}} got\nan Encore!",
+  "encoreOnRemove": "{{pokemonNameWithAffix}}'s Encore\nended!",
+  "helpingHandOnAdd": "{{pokemonNameWithAffix}} is ready to\nhelp {{pokemonName}}!",
+  "ingrainLapse": "{{pokemonNameWithAffix}} absorbed\nnutrients with its roots!",
+  "ingrainOnTrap": "{{pokemonNameWithAffix}} planted its roots!",
+  "aquaRingOnAdd": "{{pokemonNameWithAffix}} surrounded\nitself with a veil of water!",
+  "aquaRingLapse": "{{moveName}} restored\n{{pokemonName}}'s HP!",
+  "drowsyOnAdd": "{{pokemonNameWithAffix}} grew drowsy!",
+  "damagingTrapLapse": "{{pokemonNameWithAffix}} is hurt\nby {{moveName}}!",
+  "bindOnTrap": "{{pokemonNameWithAffix}} was squeezed by\n{{sourcePokemonName}}'s {{moveName}}!",
+  "wrapOnTrap": "{{pokemonNameWithAffix}} was Wrapped\nby {{sourcePokemonName}}!",
+  "vortexOnTrap": "{{pokemonNameWithAffix}} was trapped\nin the vortex!",
+  "clampOnTrap": "{{sourcePokemonNameWithAffix}} Clamped\n{{pokemonName}}!",
+  "sandTombOnTrap": "{{pokemonNameWithAffix}} became trapped\nby {{moveName}}!",
+  "magmaStormOnTrap": "{{pokemonNameWithAffix}} became trapped\nby swirling magma!",
+  "snapTrapOnTrap": "{{pokemonNameWithAffix}} got trapped\nby a snap trap!",
+  "thunderCageOnTrap": "{{sourcePokemonNameWithAffix}} trapped\n{{pokemonNameWithAffix}}!",
+  "infestationOnTrap": "{{pokemonNameWithAffix}} has been afflicted \nwith an infestation by {{sourcePokemonNameWithAffix}}!",
+  "protectedOnAdd": "{{pokemonNameWithAffix}}\nprotected itself!",
+  "protectedLapse": "{{pokemonNameWithAffix}}\nprotected itself!",
+  "enduringOnAdd": "{{pokemonNameWithAffix}} braced\nitself!",
+  "enduringLapse": "{{pokemonNameWithAffix}} endured\nthe hit!",
+  "sturdyLapse": "{{pokemonNameWithAffix}} endured\nthe hit!",
+  "perishSongLapse": "{{pokemonNameWithAffix}}'s perish count fell to {{turnCount}}.",
+  "centerOfAttentionOnAdd": "{{pokemonNameWithAffix}} became the center\nof attention!",
+  "truantLapse": "{{pokemonNameWithAffix}} is\nloafing around!",
+  "slowStartOnAdd": "{{pokemonNameWithAffix}} can't\nget it going!",
+  "slowStartOnRemove": "{{pokemonNameWithAffix}} finally\ngot its act together!",
+  "highestStatBoostOnAdd": "{{pokemonNameWithAffix}}'s {{statName}}\nwas heightened!",
+  "highestStatBoostOnRemove": "The effects of {{pokemonNameWithAffix}}'s\n{{abilityName}} wore off!",
+  "magnetRisenOnAdd": "{{pokemonNameWithAffix}} levitated with electromagnetism!",
+  "magnetRisenOnRemove": "{{pokemonNameWithAffix}}'s electromagnetism wore off!",
+  "critBoostOnAdd": "{{pokemonNameWithAffix}} is getting\npumped!",
+  "critBoostOnRemove": "{{pokemonNameWithAffix}} relaxed.",
+  "saltCuredOnAdd": "{{pokemonNameWithAffix}} is being salt cured!",
+  "saltCuredLapse": "{{pokemonNameWithAffix}} is hurt by {{moveName}}!",
+  "cursedOnAdd": "{{pokemonNameWithAffix}} cut its own HP and put a curse on the {{pokemonName}}!",
+  "cursedLapse": "{{pokemonNameWithAffix}} is afflicted by the Curse!",
+  "stockpilingOnAdd": "{{pokemonNameWithAffix}} stockpiled {{stockpiledCount}}!",
 } as const;
diff --git a/src/locales/fr/battle.ts b/src/locales/fr/battle.ts
index 6a209eb9f08..4a775bc89dc 100644
--- a/src/locales/fr/battle.ts
+++ b/src/locales/fr/battle.ts
@@ -95,65 +95,4 @@ export const battle: SimpleTranslationEntries = {
   "unlockedSomething": "{{unlockedThing}}\na été débloqué.",
   "congratulations": "Félicitations !",
   "beatModeFirstTime": "{{speciesName}} a battu le mode {{gameMode}} pour la première fois !\nVous avez reçu {{newModifier}} !",
-  "battlerTagsRechargingLapse": "Le contrecoup empêche {{pokemonNameWithAffix}}\n de bouger !",
-  "battlerTagsTrappedOnAdd": "{{pokemonNameWithAffix}}\nne peut plus s’échapper !",
-  "battlerTagsTrappedOnRemove": "{{pokemonNameWithAffix}} est libéré\nde la capacité {{moveName}} !",
-  "battlerTagsFlinchedLapse": "{{pokemonNameWithAffix}} a la trouille !\nIl ne peut plus attaquer !",
-  "battlerTagsConfusedOnAdd": "Ça rend {{pokemonNameWithAffix}}\nconfus !",
-  "battlerTagsConfusedOnRemove": "{{pokemonNameWithAffix}}\nn’est plus confus !",
-  "battlerTagsConfusedOnOverlap": "{{pokemonNameWithAffix}}\nest déjà confus !",
-  "battlerTagsConfusedLapse": "{{pokemonNameWithAffix}}\nest confus !",
-  "battlerTagsConfusedLapseHurtItself": "Il se blesse dans sa confusion.",
-  "battlerTagsDestinyBondLapseIsBoss": "{{pokemonNameWithAffix}} n’est pas affecté\nle Lien du Destin !",
-  "battlerTagsDestinyBondLapse": "{{pokemonNameWithAffix}} entraine\n{{pokemonNameWithAffix2}} dans sa chute !",
-  "battlerTagsInfatuatedOnAdd": "{{pokemonNameWithAffix}} est amoureux\nde {{sourcePokemonName}} !",
-  "battlerTagsInfatuatedOnOverlap": "{{pokemonNameWithAffix}} est\ndéjà amoureux !",
-  "battlerTagsInfatuatedLapse": "{{pokemonNameWithAffix}} est amoureux\nde {{sourcePokemonName}} !",
-  "battlerTagsInfatuatedLapseImmobilize": "L’amour empêche {{pokemonNameWithAffix}}\nd’agir !",
-  "battlerTagsInfatuatedOnRemove": "{{pokemonNameWithAffix}}\nn’est plus amoureux !",
-  "battlerTagsSeededOnAdd": "{{pokemonNameWithAffix}} est infecté !",
-  "battlerTagsSeededLapse": "Vampigraine draine l’énergie\nde {{pokemonNameWithAffix}} !",
-  "battlerTagsSeededLapseShed": "La Vampigraine de {{pokemonNameWithAffix}}\naspire le suintement !",
-  "battlerTagsNightmareOnAdd": "{{pokemonNameWithAffix}} commence à cauchemarder !",
-  "battlerTagsNightmareOnOverlap": "{{pokemonNameWithAffix}} est\ndéjà prisonnier d’un cauchemar !",
-  "battlerTagsNightmareLapse": "{{pokemonNameWithAffix}}est\nprisonnier d’un cauchemar !",
-  "battlerTagsEncoreOnAdd": "{{pokemonNameWithAffix}} !\nEncore une fois !",
-  "battlerTagsEncoreOnRemove": "{{pokemonNameWithAffix}} n’est\nplus obligé d’utiliser la même capacité !",
-  "battlerTagsHelpingHandOnAdd": "{{pokemonNameWithAffix}} est prêt\nà aider {{pokemonName}} !",
-  "battlerTagsIngrainLapse": "{{pokemonNameWithAffix}} absorbe\ndes nutriments avec ses racines !",
-  "battlerTagsIngrainOnTrap": "{{pokemonNameWithAffix}}\nplante ses racines !",
-  "battlerTagsAquaRingOnAdd": "{{pokemonNameWithAffix}} s’entoure\nd’un voile d’eau !",
-  "battlerTagsAquaRingLapse": "{{moveName}} restaure\nles PV de {{pokemonName}} !",
-  "battlerTagsDrowsyOnAdd": "Ça rend {{pokemonNameWithAffix}} somnolent !",
-  "battlerTagsDamagingTrapLapse": "{{pokemonNameWithAffix}} est blessé\npar la capacité {{moveName}} !",
-  "battlerTagsBindOnTrap": "{{pokemonNameWithAffix}} est pris dans\nl’étreinte de {{sourcePokemonName}} !",
-  "battlerTagsWrapOnTrap": "{{pokemonNameWithAffix}} est ligoté\npar {{sourcePokemonName}} !",
-  "battlerTagsVortexOnTrap": "{{pokemonNameWithAffix}} est piégé\ndans le tourbillon !",
-  "battlerTagsClampOnTrap": "{{sourcePokemonNameWithAffix}} est pris dans le Claquoir\nde {{pokemonName}} !",
-  "battlerTagsSandTombOnTrap": "{{pokemonNameWithAffix}} est piégé\npar {{moveName}} !",
-  "battlerTagsMagmaStormOnTrap": "{{pokemonNameWithAffix}} est piégé\ndans un tourbillon de magma !",
-  "battlerTagsSnapTrapOnTrap": "{{pokemonNameWithAffix}} est tombé\ndans un Troquenard !",
-  "battlerTagsThunderCageOnTrap": "{{pokemonNameWithAffix}} se fait emprisonner\npar {{sourcePokemonNameWithAffix}} !",
-  "battlerTagsInfestationOnTrap": "{{pokemonNameWithAffix}} est harcelé\npar {{sourcePokemonNameWithAffix}} !",
-  "battlerTagsProtectedOnAdd": "{{pokemonNameWithAffix}}\nest prêt à se protéger !",
-  "battlerTagsProtectedLapse": "{{pokemonNameWithAffix}}\nse protège !",
-  "battlerTagsEnduringOnAdd": "{{pokemonNameWithAffix}} se prépare\nà encaisser les coups !",
-  "battlerTagsEnduringLapse": "{{pokemonNameWithAffix}}\nencaisse les coups !",
-  "battlerTagsSturdyLapse": "{{pokemonNameWithAffix}}\nencaisse les coups !",
-  "battlerTagsPerishSongLapse": "Le compte à rebours de Requiem\nde {{pokemonNameWithAffix}} descend à {{turnCount}} !",
-  "battlerTagsCenterOfAttentionOnAdd": "{{pokemonNameWithAffix}} devient\nle centre de l’attention !",
-  "battlerTagsTruantLapse": "{{pokemonNameWithAffix}} paresse !",
-  "battlerTagsSlowStartOnAdd": "{{pokemonNameWithAffix}}\nn’arrive pas à se motiver !",
-  "battlerTagsSlowStartOnRemove": "{{pokemonNameWithAffix}}\narrive enfin à s’y mettre sérieusement !",
-  "battlerTagsHighestStatBoostOnAdd": "{{statName}} de {{pokemonNameWithAffix}}\nest renforcée !",
-  "battlerTagsHighestStatBoostOnRemove": "L’effet du talent {{abilityName}}\nde {{pokemonNameWithAffix}} se dissipe !",
-  "battlerTagsMagnetRisenOnAdd": "{{pokemonNameWithAffix}} lévite\nsur un champ magnétique !",
-  "battlerTagsMagnetRisenOnRemove": "Le magnétisme de{{pokemonNameWithAffix}}\nse dissipe !",
-  "battlerTagsCritBoostOnAdd": "{{pokemonNameWithAffix}}\nest prêt à tout donner !",
-  "battlerTagsCritBoostOnRemove": "{{pokemonNameWithAffix}} se détend.",
-  "battlerTagsSaltCuredOnAdd": "{{pokemonNameWithAffix}}\nest couvert de sel !",
-  "battlerTagsSaltCuredLapse": "{{pokemonNameWithAffix}} est blessé\npar la capacité {{moveName}} !",
-  "battlerTagsCursedOnAdd": "{{pokemonNameWithAffix}} sacrifie des PV\net lance une malédiction sur {{pokemonName}} !",
-  "battlerTagsCursedLapse": "{{pokemonNameWithAffix}} est touché par la malédiction !",
-  "battlerTagsStockpilingOnAdd": "{{pokemonNameWithAffix}} stockpiled {{stockpiledCount}}!"
 } as const;
diff --git a/src/locales/fr/battler-tags.ts b/src/locales/fr/battler-tags.ts
index 971fe4e00d1..6d3dca19264 100644
--- a/src/locales/fr/battler-tags.ts
+++ b/src/locales/fr/battler-tags.ts
@@ -9,4 +9,65 @@ export const battlerTags: SimpleTranslationEntries = {
   "nightmareDesc": "les cauchemars",
   "ingrainDesc": "l’enracinement",
   "drowsyDesc": "la somnolence",
+  "rechargingLapse": "Le contrecoup empêche {{pokemonNameWithAffix}}\n de bouger !",
+  "trappedOnAdd": "{{pokemonNameWithAffix}}\nne peut plus s’échapper !",
+  "trappedOnRemove": "{{pokemonNameWithAffix}} est libéré\nde la capacité {{moveName}} !",
+  "flinchedLapse": "{{pokemonNameWithAffix}} a la trouille !\nIl ne peut plus attaquer !",
+  "confusedOnAdd": "Ça rend {{pokemonNameWithAffix}}\nconfus !",
+  "confusedOnRemove": "{{pokemonNameWithAffix}}\nn’est plus confus !",
+  "confusedOnOverlap": "{{pokemonNameWithAffix}}\nest déjà confus !",
+  "confusedLapse": "{{pokemonNameWithAffix}}\nest confus !",
+  "confusedLapseHurtItself": "Il se blesse dans sa confusion.",
+  "destinyBondLapseIsBoss": "{{pokemonNameWithAffix}} n’est pas affecté\nle Lien du Destin !",
+  "destinyBondLapse": "{{pokemonNameWithAffix}} entraine\n{{pokemonNameWithAffix2}} dans sa chute !",
+  "infatuatedOnAdd": "{{pokemonNameWithAffix}} est amoureux\nde {{sourcePokemonName}} !",
+  "infatuatedOnOverlap": "{{pokemonNameWithAffix}} est\ndéjà amoureux !",
+  "infatuatedLapse": "{{pokemonNameWithAffix}} est amoureux\nde {{sourcePokemonName}} !",
+  "infatuatedLapseImmobilize": "L’amour empêche {{pokemonNameWithAffix}}\nd’agir !",
+  "infatuatedOnRemove": "{{pokemonNameWithAffix}}\nn’est plus amoureux !",
+  "seededOnAdd": "{{pokemonNameWithAffix}} est infecté !",
+  "seededLapse": "Vampigraine draine l’énergie\nde {{pokemonNameWithAffix}} !",
+  "seededLapseShed": "La Vampigraine de {{pokemonNameWithAffix}}\naspire le suintement !",
+  "nightmareOnAdd": "{{pokemonNameWithAffix}} commence à cauchemarder !",
+  "nightmareOnOverlap": "{{pokemonNameWithAffix}} est\ndéjà prisonnier d’un cauchemar !",
+  "nightmareLapse": "{{pokemonNameWithAffix}}est\nprisonnier d’un cauchemar !",
+  "encoreOnAdd": "{{pokemonNameWithAffix}} !\nEncore une fois !",
+  "encoreOnRemove": "{{pokemonNameWithAffix}} n’est\nplus obligé d’utiliser la même capacité !",
+  "helpingHandOnAdd": "{{pokemonNameWithAffix}} est prêt\nà aider {{pokemonName}} !",
+  "ingrainLapse": "{{pokemonNameWithAffix}} absorbe\ndes nutriments avec ses racines !",
+  "ingrainOnTrap": "{{pokemonNameWithAffix}}\nplante ses racines !",
+  "aquaRingOnAdd": "{{pokemonNameWithAffix}} s’entoure\nd’un voile d’eau !",
+  "aquaRingLapse": "{{moveName}} restaure\nles PV de {{pokemonName}} !",
+  "drowsyOnAdd": "Ça rend {{pokemonNameWithAffix}} somnolent !",
+  "damagingTrapLapse": "{{pokemonNameWithAffix}} est blessé\npar la capacité {{moveName}} !",
+  "bindOnTrap": "{{pokemonNameWithAffix}} est pris dans\nl’étreinte de {{sourcePokemonName}} !",
+  "wrapOnTrap": "{{pokemonNameWithAffix}} est ligoté\npar {{sourcePokemonName}} !",
+  "vortexOnTrap": "{{pokemonNameWithAffix}} est piégé\ndans le tourbillon !",
+  "clampOnTrap": "{{sourcePokemonNameWithAffix}} est pris dans le Claquoir\nde {{pokemonName}} !",
+  "sandTombOnTrap": "{{pokemonNameWithAffix}} est piégé\npar {{moveName}} !",
+  "magmaStormOnTrap": "{{pokemonNameWithAffix}} est piégé\ndans un tourbillon de magma !",
+  "snapTrapOnTrap": "{{pokemonNameWithAffix}} est tombé\ndans un Troquenard !",
+  "thunderCageOnTrap": "{{pokemonNameWithAffix}} se fait emprisonner\npar {{sourcePokemonNameWithAffix}} !",
+  "infestationOnTrap": "{{pokemonNameWithAffix}} est harcelé\npar {{sourcePokemonNameWithAffix}} !",
+  "protectedOnAdd": "{{pokemonNameWithAffix}}\nest prêt à se protéger !",
+  "protectedLapse": "{{pokemonNameWithAffix}}\nse protège !",
+  "enduringOnAdd": "{{pokemonNameWithAffix}} se prépare\nà encaisser les coups !",
+  "enduringLapse": "{{pokemonNameWithAffix}}\nencaisse les coups !",
+  "sturdyLapse": "{{pokemonNameWithAffix}}\nencaisse les coups !",
+  "perishSongLapse": "Le compte à rebours de Requiem\nde {{pokemonNameWithAffix}} descend à {{turnCount}} !",
+  "centerOfAttentionOnAdd": "{{pokemonNameWithAffix}} devient\nle centre de l’attention !",
+  "truantLapse": "{{pokemonNameWithAffix}} paresse !",
+  "slowStartOnAdd": "{{pokemonNameWithAffix}}\nn’arrive pas à se motiver !",
+  "slowStartOnRemove": "{{pokemonNameWithAffix}}\narrive enfin à s’y mettre sérieusement !",
+  "highestStatBoostOnAdd": "{{statName}} de {{pokemonNameWithAffix}}\nest renforcée !",
+  "highestStatBoostOnRemove": "L’effet du talent {{abilityName}}\nde {{pokemonNameWithAffix}} se dissipe !",
+  "magnetRisenOnAdd": "{{pokemonNameWithAffix}} lévite\nsur un champ magnétique !",
+  "magnetRisenOnRemove": "Le magnétisme de{{pokemonNameWithAffix}}\nse dissipe !",
+  "critBoostOnAdd": "{{pokemonNameWithAffix}}\nest prêt à tout donner !",
+  "critBoostOnRemove": "{{pokemonNameWithAffix}} se détend.",
+  "saltCuredOnAdd": "{{pokemonNameWithAffix}}\nest couvert de sel !",
+  "saltCuredLapse": "{{pokemonNameWithAffix}} est blessé\npar la capacité {{moveName}} !",
+  "cursedOnAdd": "{{pokemonNameWithAffix}} sacrifie des PV\net lance une malédiction sur {{pokemonName}} !",
+  "cursedLapse": "{{pokemonNameWithAffix}} est touché par la malédiction !",
+  "stockpilingOnAdd": "{{pokemonNameWithAffix}} stockpiled {{stockpiledCount}}!",
 } as const;
diff --git a/src/locales/it/battle.ts b/src/locales/it/battle.ts
index 954f52e4a7f..16cb1f58642 100644
--- a/src/locales/it/battle.ts
+++ b/src/locales/it/battle.ts
@@ -95,65 +95,4 @@ export const battle: SimpleTranslationEntries = {
   "congratulations": "Congratulazioni!",
   "beatModeFirstTime": "{{speciesName}} ha completato la modalità {{gameMode}} per la prima volta!\nHai ricevuto {{newModifier}}!",
   "ppReduced": "I PP della mossa {{moveName}} di\n{{targetName}} sono stati ridotti di {{reduction}}!",
-  "battlerTagsRechargingLapse": "{{pokemonNameWithAffix}} deve\nricaricarsi!",
-  "battlerTagsTrappedOnAdd": "{{pokemonNameWithAffix}} non può\npiù fuggire!",
-  "battlerTagsTrappedOnRemove": "{{pokemonNameWithAffix}} è stato liberato\nda {{moveName}}",
-  "battlerTagsFlinchedLapse": "{{pokemonNameWithAffix}} tentenna!",
-  "battlerTagsConfusedOnAdd": "{{pokemonNameWithAffix}} è\nconfuso!",
-  "battlerTagsConfusedOnRemove": "{{pokemonNameWithAffix}} non\nè più confuso!",
-  "battlerTagsConfusedOnOverlap": "{{pokemonNameWithAffix}} è\ngià confuso!",
-  "battlerTagsConfusedLapse": "{{pokemonNameWithAffix}} è\nconfuso!",
-  "battlerTagsConfusedLapseHurtItself": "Si colpisce da solo per via della\nconfusione!",
-  "battlerTagsDestinyBondLapseIsBoss": "{{pokemonNameWithAffix}} è immune\na Destinobbligato.",
-  "battlerTagsDestinyBondLapse": "{{pokemonNameWithAffix}} trascina\ncon sé{{pokemonNameWithAffix2}}!",
-  "battlerTagsInfatuatedOnAdd": "{{pokemonNameWithAffix}} si è infatuato\ndi {{sourcePokemonName}}!",
-  "battlerTagsInfatuatedOnOverlap": "{{pokemonNameWithAffix}} è\ngià infatuato!",
-  "battlerTagsInfatuatedLapse": "{{pokemonNameWithAffix}} è infatuato\ndi {{sourcePokemonName}}!",
-  "battlerTagsInfatuatedLapseImmobilize": "{{pokemonNameWithAffix}} è\nimmobilizzato dall'infatuazione!",
-  "battlerTagsInfatuatedOnRemove": "{{pokemonNameWithAffix}} non è\npiù infatuato.",
-  "battlerTagsSeededOnAdd": "{{pokemonNameWithAffix}} è pieno di semi!",
-  "battlerTagsSeededLapse": "La salute di {{pokemonNameWithAffix}}\nviene prelevata da Parassiseme!",
-  "battlerTagsSeededLapseShed": "Parassiseme di {{pokemonNameWithAffix}}\nha risucchiato la melma!",
-  "battlerTagsNightmareOnAdd": "{{pokemonNameWithAffix}} sta\navendo un Incubo!",
-  "battlerTagsNightmareOnOverlap": "{{pokemonNameWithAffix}} sta\ngià avendo un Incubo!",
-  "battlerTagsNightmareLapse": "{{pokemonNameWithAffix}} è bloccato\nin un Incubo!",
-  "battlerTagsEncoreOnAdd": "{{pokemonNameWithAffix}} ha\nsubito Ripeti!",
-  "battlerTagsEncoreOnRemove": "L'effetto di Ripeti su {{pokemonNameWithAffix}}\n è terminato!",
-  "battlerTagsHelpingHandOnAdd": "{{pokemonNameWithAffix}} è pronto ad\naiutare {{pokemonName}}!",
-  "battlerTagsIngrainLapse": "{{pokemonNameWithAffix}} assorbe\nnutrienti dalle sue radici!",
-  "battlerTagsIngrainOnTrap": "{{pokemonNameWithAffix}} ha messo le radici!",
-  "battlerTagsAquaRingOnAdd": "{{pokemonNameWithAffix}} si è circondato\ncon un velo d'acqua!",
-  "battlerTagsAquaRingLapse": "{{moveName}} ha ripristinato\ni PS di {{pokemonName}}!",
-  "battlerTagsDrowsyOnAdd": "{{pokemonNameWithAffix}} sta per addormentarsi!",
-  "battlerTagsDamagingTrapLapse": "{{pokemonNameWithAffix}} subisce danni\nper via di {{moveName}}!",
-  "battlerTagsBindOnTrap": "{{pokemonNameWithAffix}} viene schiacciato da\n{{moveName}} di {{sourcePokemonName}}!",
-  "battlerTagsWrapOnTrap": "{{pokemonNameWithAffix}} è stato avvinghiato\nda {{sourcePokemonName}}!",
-  "battlerTagsVortexOnTrap": "{{pokemonNameWithAffix}} è intrappolato\nnel vortice!",
-  "battlerTagsClampOnTrap": "{{sourcePokemonNameWithAffix}} sta intenagliando\n{{pokemonName}}!",
-  "battlerTagsSandTombOnTrap": "{{pokemonNameWithAffix}} è intrappolato\nda {{moveName}}!",
-  "battlerTagsMagmaStormOnTrap": "{{pokemonNameWithAffix}} è intrappolato\nnel magma vorticoso!",
-  "battlerTagsSnapTrapOnTrap": "{{pokemonNameWithAffix}} è intrappolato\nin una tagliola!",
-  "battlerTagsThunderCageOnTrap": "{{sourcePokemonNameWithAffix}} ha intrappolato\n{{pokemonNameWithAffix}}!",
-  "battlerTagsInfestationOnTrap": "{{pokemonNameWithAffix}} ha subito un\ninfestazione da parte di {{sourcePokemonNameWithAffix}}!",
-  "battlerTagsProtectedOnAdd": "{{pokemonNameWithAffix}}\nsi è protetto!",
-  "battlerTagsProtectedLapse": "{{pokemonNameWithAffix}}\nsi è protetto!",
-  "battlerTagsEnduringOnAdd": "{{pokemonNameWithAffix}} si prepara a\nsubire il colpo!",
-  "battlerTagsEnduringLapse": "{{pokemonNameWithAffix}} resiste\nal colpo!",
-  "battlerTagsSturdyLapse": "{{pokemonNameWithAffix}} ha resistito\ngrazie a Vigore!",
-  "battlerTagsPerishSongLapse": "Il conto alla rovescia di Ultimocanto per {{pokemonNameWithAffix}} scende a {{turnCount}}.",
-  "battlerTagsCenterOfAttentionOnAdd": "{{pokemonNameWithAffix}} è al centro\ndell’attenzione!",
-  "battlerTagsTruantLapse": "{{pokemonNameWithAffix}} sta\nciondolando!",
-  "battlerTagsSlowStartOnAdd": "{{pokemonNameWithAffix}} non\ningrana!",
-  "battlerTagsSlowStartOnRemove": "{{pokemonNameWithAffix}} ritrova\nlo slancio!",
-  "battlerTagsHighestStatBoostOnAdd": "{{statName}} di {{pokemonNameWithAffix}}\nviene aumentato/a!",
-  "battlerTagsHighestStatBoostOnRemove": "Gli effetti di {{abilityName}}\ndi {{pokemonNameWithAffix}} sono cessati!",
-  "battlerTagsMagnetRisenOnAdd": "{{pokemonNameWithAffix}} si solleva in aria\na causa dell’elettromagnetismo!",
-  "battlerTagsMagnetRisenOnRemove": "L’effetto dell’elettromagnetismo di {{pokemonNameWithAffix}}\nè terminato!",
-  "battlerTagsCritBoostOnAdd": "{{pokemonNameWithAffix}} si prepara\nalla lotta!",
-  "battlerTagsCritBoostOnRemove": "{{pokemonNameWithAffix}} si è rilassato.",
-  "battlerTagsSaltCuredOnAdd": "{{pokemonNameWithAffix}} è stato messo sotto sale!",
-  "battlerTagsSaltCuredLapse": "{{pokemonNameWithAffix}} viene colpito da {{moveName}}!",
-  "battlerTagsCursedOnAdd": "{{pokemonNameWithAffix}} ha sacrificato metà dei suoi PS per\nlanciare una maledizione su {{pokemonName}}!",
-  "battlerTagsCursedLapse": "{{pokemonNameWithAffix}} subisce la maledizione!",
-  "battlerTagsStockpilingOnAdd": "{{pokemonNameWithAffix}} ha usato Accumulo per la\n{{stockpiledCount}}ª volta!"
 } as const;
diff --git a/src/locales/it/battler-tags.ts b/src/locales/it/battler-tags.ts
index 1d897c70f3d..7dd3ebc6fb1 100644
--- a/src/locales/it/battler-tags.ts
+++ b/src/locales/it/battler-tags.ts
@@ -9,4 +9,65 @@ export const battlerTags: SimpleTranslationEntries = {
   "nightmareDesc": "nightmares",
   "ingrainDesc": "roots",
   "drowsyDesc": "drowsiness",
+  "rechargingLapse": "{{pokemonNameWithAffix}} deve\nricaricarsi!",
+  "trappedOnAdd": "{{pokemonNameWithAffix}} non può\npiù fuggire!",
+  "trappedOnRemove": "{{pokemonNameWithAffix}} è stato liberato\nda {{moveName}}",
+  "flinchedLapse": "{{pokemonNameWithAffix}} tentenna!",
+  "confusedOnAdd": "{{pokemonNameWithAffix}} è\nconfuso!",
+  "confusedOnRemove": "{{pokemonNameWithAffix}} non\nè più confuso!",
+  "confusedOnOverlap": "{{pokemonNameWithAffix}} è\ngià confuso!",
+  "confusedLapse": "{{pokemonNameWithAffix}} è\nconfuso!",
+  "confusedLapseHurtItself": "Si colpisce da solo per via della\nconfusione!",
+  "destinyBondLapseIsBoss": "{{pokemonNameWithAffix}} è immune\na Destinobbligato.",
+  "destinyBondLapse": "{{pokemonNameWithAffix}} trascina\ncon sé{{pokemonNameWithAffix2}}!",
+  "infatuatedOnAdd": "{{pokemonNameWithAffix}} si è infatuato\ndi {{sourcePokemonName}}!",
+  "infatuatedOnOverlap": "{{pokemonNameWithAffix}} è\ngià infatuato!",
+  "infatuatedLapse": "{{pokemonNameWithAffix}} è infatuato\ndi {{sourcePokemonName}}!",
+  "infatuatedLapseImmobilize": "{{pokemonNameWithAffix}} è\nimmobilizzato dall'infatuazione!",
+  "infatuatedOnRemove": "{{pokemonNameWithAffix}} non è\npiù infatuato.",
+  "seededOnAdd": "{{pokemonNameWithAffix}} è pieno di semi!",
+  "seededLapse": "La salute di {{pokemonNameWithAffix}}\nviene prelevata da Parassiseme!",
+  "seededLapseShed": "Parassiseme di {{pokemonNameWithAffix}}\nha risucchiato la melma!",
+  "nightmareOnAdd": "{{pokemonNameWithAffix}} sta\navendo un Incubo!",
+  "nightmareOnOverlap": "{{pokemonNameWithAffix}} sta\ngià avendo un Incubo!",
+  "nightmareLapse": "{{pokemonNameWithAffix}} è bloccato\nin un Incubo!",
+  "encoreOnAdd": "{{pokemonNameWithAffix}} ha\nsubito Ripeti!",
+  "encoreOnRemove": "L'effetto di Ripeti su {{pokemonNameWithAffix}}\n è terminato!",
+  "helpingHandOnAdd": "{{pokemonNameWithAffix}} è pronto ad\naiutare {{pokemonName}}!",
+  "ingrainLapse": "{{pokemonNameWithAffix}} assorbe\nnutrienti dalle sue radici!",
+  "ingrainOnTrap": "{{pokemonNameWithAffix}} ha messo le radici!",
+  "aquaRingOnAdd": "{{pokemonNameWithAffix}} si è circondato\ncon un velo d'acqua!",
+  "aquaRingLapse": "{{moveName}} ha ripristinato\ni PS di {{pokemonName}}!",
+  "drowsyOnAdd": "{{pokemonNameWithAffix}} sta per addormentarsi!",
+  "damagingTrapLapse": "{{pokemonNameWithAffix}} subisce danni\nper via di {{moveName}}!",
+  "bindOnTrap": "{{pokemonNameWithAffix}} viene schiacciato da\n{{moveName}} di {{sourcePokemonName}}!",
+  "wrapOnTrap": "{{pokemonNameWithAffix}} è stato avvinghiato\nda {{sourcePokemonName}}!",
+  "vortexOnTrap": "{{pokemonNameWithAffix}} è intrappolato\nnel vortice!",
+  "clampOnTrap": "{{sourcePokemonNameWithAffix}} sta intenagliando\n{{pokemonName}}!",
+  "sandTombOnTrap": "{{pokemonNameWithAffix}} è intrappolato\nda {{moveName}}!",
+  "magmaStormOnTrap": "{{pokemonNameWithAffix}} è intrappolato\nnel magma vorticoso!",
+  "snapTrapOnTrap": "{{pokemonNameWithAffix}} è intrappolato\nin una tagliola!",
+  "thunderCageOnTrap": "{{sourcePokemonNameWithAffix}} ha intrappolato\n{{pokemonNameWithAffix}}!",
+  "infestationOnTrap": "{{pokemonNameWithAffix}} ha subito un\ninfestazione da parte di {{sourcePokemonNameWithAffix}}!",
+  "protectedOnAdd": "{{pokemonNameWithAffix}}\nsi è protetto!",
+  "protectedLapse": "{{pokemonNameWithAffix}}\nsi è protetto!",
+  "enduringOnAdd": "{{pokemonNameWithAffix}} si prepara a\nsubire il colpo!",
+  "enduringLapse": "{{pokemonNameWithAffix}} resiste\nal colpo!",
+  "sturdyLapse": "{{pokemonNameWithAffix}} ha resistito\ngrazie a Vigore!",
+  "perishSongLapse": "Il conto alla rovescia di Ultimocanto per {{pokemonNameWithAffix}} scende a {{turnCount}}.",
+  "centerOfAttentionOnAdd": "{{pokemonNameWithAffix}} è al centro\ndell’attenzione!",
+  "truantLapse": "{{pokemonNameWithAffix}} sta\nciondolando!",
+  "slowStartOnAdd": "{{pokemonNameWithAffix}} non\ningrana!",
+  "slowStartOnRemove": "{{pokemonNameWithAffix}} ritrova\nlo slancio!",
+  "highestStatBoostOnAdd": "{{statName}} di {{pokemonNameWithAffix}}\nviene aumentato/a!",
+  "highestStatBoostOnRemove": "Gli effetti di {{abilityName}}\ndi {{pokemonNameWithAffix}} sono cessati!",
+  "magnetRisenOnAdd": "{{pokemonNameWithAffix}} si solleva in aria\na causa dell’elettromagnetismo!",
+  "magnetRisenOnRemove": "L’effetto dell’elettromagnetismo di {{pokemonNameWithAffix}}\nè terminato!",
+  "critBoostOnAdd": "{{pokemonNameWithAffix}} si prepara\nalla lotta!",
+  "critBoostOnRemove": "{{pokemonNameWithAffix}} si è rilassato.",
+  "saltCuredOnAdd": "{{pokemonNameWithAffix}} è stato messo sotto sale!",
+  "saltCuredLapse": "{{pokemonNameWithAffix}} viene colpito da {{moveName}}!",
+  "cursedOnAdd": "{{pokemonNameWithAffix}} ha sacrificato metà dei suoi PS per\nlanciare una maledizione su {{pokemonName}}!",
+  "cursedLapse": "{{pokemonNameWithAffix}} subisce la maledizione!",
+  "stockpilingOnAdd": "{{pokemonNameWithAffix}} ha usato Accumulo per la\n{{stockpiledCount}}ª volta!",
 } as const;
diff --git a/src/locales/ja/battle.ts b/src/locales/ja/battle.ts
index 7e9313ebaf8..116dff28c0a 100644
--- a/src/locales/ja/battle.ts
+++ b/src/locales/ja/battle.ts
@@ -95,65 +95,4 @@ export const battle: SimpleTranslationEntries = {
   "congratulations": "おめでとうございます！！",
   "beatModeFirstTime": "初めて　{{speciesName}}が　{{gameMode}}モードを　クリアした!\n{{newModifier}}を　手に入れた!",
   "ppReduced": "{{targetName}}の　{{moveName}}を　{{reduction}}削った!",
-  "battlerTagsRechargingLapse": "{{pokemonNameWithAffix}}は　攻撃の　反動で　動けない！",
-  "battlerTagsTrappedOnAdd": "{{pokemonNameWithAffix}}は　もう　逃げられない！",
-  "battlerTagsTrappedOnRemove": "{{pokemonNameWithAffix}}は\n{{moveName}}の　効果が　解けた!",
-  "battlerTagsFlinchedLapse": "{{pokemonNameWithAffix}}は　ひるんで　技が出せない!",
-  "battlerTagsConfusedOnAdd": "{{pokemonNameWithAffix}}は　混乱　した！",
-  "battlerTagsConfusedOnRemove": "{{pokemonNameWithAffix}}の　混乱が　解けた！",
-  "battlerTagsConfusedOnOverlap": "{{pokemonNameWithAffix}}は　すでに　混乱している！",
-  "battlerTagsConfusedLapse": "{{pokemonNameWithAffix}}は　混乱している！",
-  "battlerTagsConfusedLapseHurtItself": "わけも　わからず　自分を　攻撃した！",
-  "battlerTagsDestinyBondLapseIsBoss": "{{pokemonNameWithAffix}}を　みちづれに　できない！",
-  "battlerTagsDestinyBondLapse": "{{pokemonNameWithAffix}}は　相手を　みちづれに　した！",
-  "battlerTagsInfatuatedOnAdd": "{{pokemonNameWithAffix}}は　{{sourcePokemonName}}に　メロメロに　なった!",
-  "battlerTagsInfatuatedOnOverlap": "{{pokemonNameWithAffix}}は　すでに　メロメロだ!",
-  "battlerTagsInfatuatedLapse": "{{pokemonNameWithAffix}}は　{{sourcePokemonName}}に　メロメロだ!",
-  "battlerTagsInfatuatedLapseImmobilize": "{{pokemonNameWithAffix}}は\nメロメロで　わざが　出せなかった！",
-  "battlerTagsInfatuatedOnRemove": "{{pokemonNameWithAffix}}は　メロメロ状態が　治った！",
-  "battlerTagsSeededOnAdd": "{{pokemonNameWithAffix}}に　種を　植（う）えつけた！",
-  "battlerTagsSeededLapse": "やどりぎが　{{pokemonNameWithAffix}}の　体力を　うばう！",
-  "battlerTagsSeededLapseShed": "{{pokemonNameWithAffix}}は　ヘドロえきを　吸い取った！",
-  "battlerTagsNightmareOnAdd": "{{pokemonNameWithAffix}}は　あくむを　見始めた！",
-  "battlerTagsNightmareOnOverlap": "{{pokemonNameWithAffix}}は　すでに　うなされている！",
-  "battlerTagsNightmareLapse": "{{pokemonNameWithAffix}}は　あくむに　うなされている！",
-  "battlerTagsEncoreOnAdd": "{{pokemonNameWithAffix}}は　アンコールを　受けた！",
-  "battlerTagsEncoreOnRemove": "{{pokemonNameWithAffix}}の　アンコール状態が　解けた！",
-  "battlerTagsHelpingHandOnAdd": "{{pokemonNameWithAffix}}は　{{pokemonName}}を\nてだすけする　体制に　入った!",
-  "battlerTagsIngrainLapse": "{{pokemonNameWithAffix}}は　根から\n養分（ようぶん）を　吸い取った！",
-  "battlerTagsIngrainOnTrap": "{{pokemonNameWithAffix}}は　根を　張った！",
-  "battlerTagsAquaRingOnAdd": "{{pokemonNameWithAffix}}は　水のリングを　まとった！",
-  "battlerTagsAquaRingLapse": "{{pokemonName}}は　{{moveName}}で\n体力を　回復した！",
-  "battlerTagsDrowsyOnAdd": "{{pokemonNameWithAffix}} の　ねむけを　誘（さそ）った！",
-  "battlerTagsDamagingTrapLapse": "{{pokemonNameWithAffix}}は　{{moveName}}の　ダメージを　受けた!",
-  "battlerTagsBindOnTrap": "{{pokemonNameWithAffix}}は　{{sourcePokemonName}}に　締め付けられた!",
-  "battlerTagsWrapOnTrap": "{{pokemonNameWithAffix}}は　{{sourcePokemonName}}に　巻き付かれた！",
-  "battlerTagsVortexOnTrap": "{{pokemonNameWithAffix}}は　渦（うず）の中に　閉じ込められた！",
-  "battlerTagsClampOnTrap": "{{pokemonName}}は　{{sourcePokemonNameWithAffix}}の\nからに　挟まれた！",
-  "battlerTagsSandTombOnTrap": "{{pokemonNameWithAffix}}は　{{moveName}}に　捕らわれた！",
-  "battlerTagsMagmaStormOnTrap": "{{pokemonNameWithAffix}}は　マグマの\n　渦（うず）に　閉じ込められた！",
-  "battlerTagsSnapTrapOnTrap": "{{pokemonNameWithAffix}}は　トラバサミに　捕らわれた！",
-  "battlerTagsThunderCageOnTrap": "{{sourcePokemonNameWithAffix}}は　{{pokemonNameWithAffix}}に　閉じ込められた!",
-  "battlerTagsInfestationOnTrap": "{{pokemonNameWithAffix}}は　{{sourcePokemonNameWithAffix}}に　まとわりつかれた!",
-  "battlerTagsProtectedOnAdd": "{{pokemonNameWithAffix}}は\nまもりの　体制に　入った！",
-  "battlerTagsProtectedLapse": "{{pokemonNameWithAffix}}は\n攻撃から　身を守った！",
-  "battlerTagsEnduringOnAdd": "{{pokemonNameWithAffix}}は\nこらえる　体制に　入った！",
-  "battlerTagsEnduringLapse": "{{pokemonNameWithAffix}}は\n攻撃を　こらえた！",
-  "battlerTagsSturdyLapse": "{{pokemonNameWithAffix}}は\n攻撃を　こらえた！",
-  "battlerTagsPerishSongLapse": "{{pokemonNameWithAffix}}の　ほろびのカウントが　{{turnCount}}になった！",
-  "battlerTagsCenterOfAttentionOnAdd": "{{pokemonNameWithAffix}}は　注目の　的になった！",
-  "battlerTagsTruantLapse": "{{pokemonNameWithAffix}}は　怠（なま）けている！",
-  "battlerTagsSlowStartOnAdd": "{{pokemonNameWithAffix}}は　調子が　上がらない！",
-  "battlerTagsSlowStartOnRemove": "{{pokemonNameWithAffix}}は　調子を　取り戻した！",
-  "battlerTagsHighestStatBoostOnAdd": "{{pokemonNameWithAffix}}の　{{statName}}が\n上がっている　状態に　なった！",
-  "battlerTagsHighestStatBoostOnRemove": "{{pokemonNameWithAffix}}の　{{abilityName}}の　効果が　なくなった！",
-  "battlerTagsMagnetRisenOnAdd": "{{pokemonNameWithAffix}}は　電磁力（でんじりょく）で　浮かび上がった!",
-  "battlerTagsMagnetRisenOnRemove": "{{pokemonNameWithAffix}}は　電磁力（でんじりょく）が　なくなった!",
-  "battlerTagsCritBoostOnAdd": "{{pokemonNameWithAffix}}は　張り切っている！",
-  "battlerTagsCritBoostOnRemove": "{{pokemonNameWithAffix}}は　落ち着いた。",
-  "battlerTagsSaltCuredOnAdd": "{{pokemonNameWithAffix}}は　しおづけに　なった!",
-  "battlerTagsSaltCuredLapse": "{{pokemonNameWithAffix}}は　{{moveName}}の\n　ダメージを　受けている",
-  "battlerTagsCursedOnAdd": "{{pokemonNameWithAffix}}は　自分の　体力を　削って\n{{pokemonName}}に　のろいを　かけた!",
-  "battlerTagsCursedLapse": "{{pokemonNameWithAffix}}は　のろわれている！",
-  "battlerTagsStockpilingOnAdd": "{{pokemonNameWithAffix}}は　{{stockpiledCount}}つ　たくわえた!"
 } as const;
diff --git a/src/locales/ja/battler-tags.ts b/src/locales/ja/battler-tags.ts
index 1d897c70f3d..38a37f0f715 100644
--- a/src/locales/ja/battler-tags.ts
+++ b/src/locales/ja/battler-tags.ts
@@ -9,4 +9,65 @@ export const battlerTags: SimpleTranslationEntries = {
   "nightmareDesc": "nightmares",
   "ingrainDesc": "roots",
   "drowsyDesc": "drowsiness",
+  "rechargingLapse": "{{pokemonNameWithAffix}}は　攻撃の　反動で　動けない！",
+  "trappedOnAdd": "{{pokemonNameWithAffix}}は　もう　逃げられない！",
+  "trappedOnRemove": "{{pokemonNameWithAffix}}は\n{{moveName}}の　効果が　解けた!",
+  "flinchedLapse": "{{pokemonNameWithAffix}}は　ひるんで　技が出せない!",
+  "confusedOnAdd": "{{pokemonNameWithAffix}}は　混乱　した！",
+  "confusedOnRemove": "{{pokemonNameWithAffix}}の　混乱が　解けた！",
+  "confusedOnOverlap": "{{pokemonNameWithAffix}}は　すでに　混乱している！",
+  "confusedLapse": "{{pokemonNameWithAffix}}は　混乱している！",
+  "confusedLapseHurtItself": "わけも　わからず　自分を　攻撃した！",
+  "destinyBondLapseIsBoss": "{{pokemonNameWithAffix}}を　みちづれに　できない！",
+  "destinyBondLapse": "{{pokemonNameWithAffix}}は　相手を　みちづれに　した！",
+  "infatuatedOnAdd": "{{pokemonNameWithAffix}}は　{{sourcePokemonName}}に　メロメロに　なった!",
+  "infatuatedOnOverlap": "{{pokemonNameWithAffix}}は　すでに　メロメロだ!",
+  "infatuatedLapse": "{{pokemonNameWithAffix}}は　{{sourcePokemonName}}に　メロメロだ!",
+  "infatuatedLapseImmobilize": "{{pokemonNameWithAffix}}は\nメロメロで　わざが　出せなかった！",
+  "infatuatedOnRemove": "{{pokemonNameWithAffix}}は　メロメロ状態が　治った！",
+  "seededOnAdd": "{{pokemonNameWithAffix}}に　種を　植（う）えつけた！",
+  "seededLapse": "やどりぎが　{{pokemonNameWithAffix}}の　体力を　うばう！",
+  "seededLapseShed": "{{pokemonNameWithAffix}}は　ヘドロえきを　吸い取った！",
+  "nightmareOnAdd": "{{pokemonNameWithAffix}}は　あくむを　見始めた！",
+  "nightmareOnOverlap": "{{pokemonNameWithAffix}}は　すでに　うなされている！",
+  "nightmareLapse": "{{pokemonNameWithAffix}}は　あくむに　うなされている！",
+  "encoreOnAdd": "{{pokemonNameWithAffix}}は　アンコールを　受けた！",
+  "encoreOnRemove": "{{pokemonNameWithAffix}}の　アンコール状態が　解けた！",
+  "helpingHandOnAdd": "{{pokemonNameWithAffix}}は　{{pokemonName}}を\nてだすけする　体制に　入った!",
+  "ingrainLapse": "{{pokemonNameWithAffix}}は　根から\n養分（ようぶん）を　吸い取った！",
+  "ingrainOnTrap": "{{pokemonNameWithAffix}}は　根を　張った！",
+  "aquaRingOnAdd": "{{pokemonNameWithAffix}}は　水のリングを　まとった！",
+  "aquaRingLapse": "{{pokemonName}}は　{{moveName}}で\n体力を　回復した！",
+  "drowsyOnAdd": "{{pokemonNameWithAffix}} の　ねむけを　誘（さそ）った！",
+  "damagingTrapLapse": "{{pokemonNameWithAffix}}は　{{moveName}}の　ダメージを　受けた!",
+  "bindOnTrap": "{{pokemonNameWithAffix}}は　{{sourcePokemonName}}に　締め付けられた!",
+  "wrapOnTrap": "{{pokemonNameWithAffix}}は　{{sourcePokemonName}}に　巻き付かれた！",
+  "vortexOnTrap": "{{pokemonNameWithAffix}}は　渦（うず）の中に　閉じ込められた！",
+  "clampOnTrap": "{{pokemonName}}は　{{sourcePokemonNameWithAffix}}の\nからに　挟まれた！",
+  "sandTombOnTrap": "{{pokemonNameWithAffix}}は　{{moveName}}に　捕らわれた！",
+  "magmaStormOnTrap": "{{pokemonNameWithAffix}}は　マグマの\n　渦（うず）に　閉じ込められた！",
+  "snapTrapOnTrap": "{{pokemonNameWithAffix}}は　トラバサミに　捕らわれた！",
+  "thunderCageOnTrap": "{{sourcePokemonNameWithAffix}}は　{{pokemonNameWithAffix}}に　閉じ込められた!",
+  "infestationOnTrap": "{{pokemonNameWithAffix}}は　{{sourcePokemonNameWithAffix}}に　まとわりつかれた!",
+  "protectedOnAdd": "{{pokemonNameWithAffix}}は\nまもりの　体制に　入った！",
+  "protectedLapse": "{{pokemonNameWithAffix}}は\n攻撃から　身を守った！",
+  "enduringOnAdd": "{{pokemonNameWithAffix}}は\nこらえる　体制に　入った！",
+  "enduringLapse": "{{pokemonNameWithAffix}}は\n攻撃を　こらえた！",
+  "sturdyLapse": "{{pokemonNameWithAffix}}は\n攻撃を　こらえた！",
+  "perishSongLapse": "{{pokemonNameWithAffix}}の　ほろびのカウントが　{{turnCount}}になった！",
+  "centerOfAttentionOnAdd": "{{pokemonNameWithAffix}}は　注目の　的になった！",
+  "truantLapse": "{{pokemonNameWithAffix}}は　怠（なま）けている！",
+  "slowStartOnAdd": "{{pokemonNameWithAffix}}は　調子が　上がらない！",
+  "slowStartOnRemove": "{{pokemonNameWithAffix}}は　調子を　取り戻した！",
+  "highestStatBoostOnAdd": "{{pokemonNameWithAffix}}の　{{statName}}が\n上がっている　状態に　なった！",
+  "highestStatBoostOnRemove": "{{pokemonNameWithAffix}}の　{{abilityName}}の　効果が　なくなった！",
+  "magnetRisenOnAdd": "{{pokemonNameWithAffix}}は　電磁力（でんじりょく）で　浮かび上がった!",
+  "magnetRisenOnRemove": "{{pokemonNameWithAffix}}は　電磁力（でんじりょく）が　なくなった!",
+  "critBoostOnAdd": "{{pokemonNameWithAffix}}は　張り切っている！",
+  "critBoostOnRemove": "{{pokemonNameWithAffix}}は　落ち着いた。",
+  "saltCuredOnAdd": "{{pokemonNameWithAffix}}は　しおづけに　なった!",
+  "saltCuredLapse": "{{pokemonNameWithAffix}}は　{{moveName}}の\n　ダメージを　受けている",
+  "cursedOnAdd": "{{pokemonNameWithAffix}}は　自分の　体力を　削って\n{{pokemonName}}に　のろいを　かけた!",
+  "cursedLapse": "{{pokemonNameWithAffix}}は　のろわれている！",
+  "stockpilingOnAdd": "{{pokemonNameWithAffix}}は　{{stockpiledCount}}つ　たくわえた!",
 } as const;
diff --git a/src/locales/ko/battle.ts b/src/locales/ko/battle.ts
index 10f3e1b5853..c1149c8efcd 100644
--- a/src/locales/ko/battle.ts
+++ b/src/locales/ko/battle.ts
@@ -95,65 +95,4 @@ export const battle: SimpleTranslationEntries = {
   "congratulations": "축하합니다!",
   "beatModeFirstTime": "{{speciesName}}[[가]] {{gameMode}} 모드를 처음으로 클리어했다!\n{{newModifier}}[[를]] 손에 넣었다!",
   "ppReduced": "{{targetName}}의\n{{moveName}}[[를]] {{reduction}} 깎았다!",
-  "battlerTagsRechargingLapse": "공격의 반동으로\n{{pokemonNameWithAffix}}[[는]] 움직일 수 없다!",
-  "battlerTagsTrappedOnAdd": "{{pokemonNameWithAffix}}[[는]]\n이제 도망칠 수 없다!",
-  "battlerTagsTrappedOnRemove": "{{pokemonNameWithAffix}}[[는]]\n{{moveName}}로부터 풀려났다!",
-  "battlerTagsFlinchedLapse": "{{pokemonNameWithAffix}}[[는]] 풀이 죽어\n움직일 수 없었다!",
-  "battlerTagsConfusedOnAdd": "{{pokemonNameWithAffix}}[[는]]\n혼란에 빠졌다!",
-  "battlerTagsConfusedOnRemove": "{{pokemonNameWithAffix}}의\n혼란이 풀렸다!",
-  "battlerTagsConfusedOnOverlap": "{{pokemonNameWithAffix}}[[는]]\n이미 혼란에 빠져 있다",
-  "battlerTagsConfusedLapse": "{{pokemonNameWithAffix}}[[는]]\n혼란에 빠져 있다!",
-  "battlerTagsConfusedLapseHurtItself": "영문도 모른채\n자신을 공격했다!",
-  "battlerTagsDestinyBondLapseIsBoss": "{{pokemonNameWithAffix}}[[는]]\n길동무의 영향을 받지 않는다.",
-  "battlerTagsDestinyBondLapse": "{{pokemonNameWithAffix}}[[는]] {{pokemonNameWithAffix2}}[[를]]\n길동무로 삼았다!",
-  "battlerTagsInfatuatedOnAdd": "{{pokemonNameWithAffix}}[[는]]\n헤롱헤롱해졌다!",
-  "battlerTagsInfatuatedOnOverlap": "{{pokemonNameWithAffix}}[[는]]\n이미 헤롱헤롱해있다!",
-  "battlerTagsInfatuatedLapse": "{{pokemonNameWithAffix}}[[는]]\n{{sourcePokemonName}}에게 헤롱헤롱해 있다!",
-  "battlerTagsInfatuatedLapseImmobilize": "{{pokemonNameWithAffix}}[[는]] 헤롱헤롱해서\n기술을 쓸 수 없었다!",
-  "battlerTagsInfatuatedOnRemove": "{{pokemonNameWithAffix}}[[는]]\n헤롱헤롱 상태에서 벗어났다.",
-  "battlerTagsSeededOnAdd": "{{pokemonNameWithAffix}}에게\n씨앗을 심었다!",
-  "battlerTagsSeededLapse": "씨뿌리기가 {{pokemonNameWithAffix}}의\n체력을 빼앗는다!",
-  "battlerTagsSeededLapseShed": "{{pokemonNameWithAffix}}[[는]]\n씨앗을 날려버렸다!",
-  "battlerTagsNightmareOnAdd": "{{pokemonNameWithAffix}}[[는]]\n악몽을 꾸기 시작했다!",
-  "battlerTagsNightmareOnOverlap": "{{pokemonNameWithAffix}}[[는]]\n이미 악몽을 꾸고 있다!",
-  "battlerTagsNightmareLapse": "{{pokemonNameWithAffix}}[[는]]\n악몽에 시달리고 있다!",
-  "battlerTagsEncoreOnAdd": "{{pokemonNameWithAffix}}[[는]]\n앙코르를 받았다!",
-  "battlerTagsEncoreOnRemove": "{{pokemonNameWithAffix}}의\n앙코르 상태가 풀렸다!",
-  "battlerTagsHelpingHandOnAdd": "{{pokemonNameWithAffix}}[[는]] {{pokemonName}}에게\n도우미가 되어주려 한다!",
-  "battlerTagsIngrainLapse": "{{pokemonNameWithAffix}}[[는]] 뿌리로부터\n양분을 흡수했다!",
-  "battlerTagsIngrainOnTrap": "{{pokemonNameWithAffix}}[[는]] 뿌리를 뻗었다!",
-  "battlerTagsAquaRingOnAdd": "{{pokemonNameWithAffix}}[[는]]\n물의 베일을 둘러썼다!",
-  "battlerTagsAquaRingLapse": "{{moveName}} 효과로\n{{pokemonName}}[[는]] HP를 회복했다!",
-  "battlerTagsDrowsyOnAdd": "{{pokemonNameWithAffix}}의\n졸음을 유도했다!",
-  "battlerTagsDamagingTrapLapse": "{{pokemonNameWithAffix}}[[는]] {{moveName}}의\n데미지를 입고 있다!",
-  "battlerTagsBindOnTrap": "{{pokemonNameWithAffix}}[[는]] {{sourcePokemonName}}에게\n{{moveName}}[[를]] 당했다!",
-  "battlerTagsWrapOnTrap": "{{pokemonNameWithAffix}}[[는]] {{sourcePokemonName}}에게\n휘감겼다!",
-  "battlerTagsVortexOnTrap": "{{pokemonNameWithAffix}}[[는]]\n소용돌이 속에 갇혔다!",
-  "battlerTagsClampOnTrap": "{{sourcePokemonNameWithAffix}}[[는]] {{pokemonName}}의\n껍질에 꼈다!",
-  "battlerTagsSandTombOnTrap": "{{pokemonNameWithAffix}}[[는]]\n{{moveName}}에 붙잡혔다!",
-  "battlerTagsMagmaStormOnTrap": "{{pokemonNameWithAffix}}[[는]]\n마그마의 소용돌이에 갇혔다!",
-  "battlerTagsSnapTrapOnTrap": "{{pokemonNameWithAffix}}[[는]]\n집게덫에 붙잡혔다!",
-  "battlerTagsThunderCageOnTrap": "{{sourcePokemonNameWithAffix}}[[는]]\n{{pokemonNameWithAffix}}를 가두었다!",
-  "battlerTagsInfestationOnTrap": "{{pokemonNameWithAffix}}[[는]]\n{{sourcePokemonNameWithAffix}}에게 엉겨 붙었다!",
-  "battlerTagsProtectedOnAdd": "{{pokemonNameWithAffix}}[[는]]\n방어 태세에 들어갔다!",
-  "battlerTagsProtectedLapse": "{{pokemonNameWithAffix}}[[는]]\n공격으로부터 몸을 지켰다!",
-  "battlerTagsEnduringOnAdd": "{{pokemonNameWithAffix}}[[는]]\n버티기 태세에 들어갔다!",
-  "battlerTagsEnduringLapse": "{{pokemonNameWithAffix}}[[는]]\n공격을 버텼다!",
-  "battlerTagsSturdyLapse": "{{pokemonNameWithAffix}}[[는]]\n공격을 버텼다!",
-  "battlerTagsPerishSongLapse": "{{pokemonNameWithAffix}}의 멸망의\n카운트가 {{turnCount}}[[가]] 되었다!",
-  "battlerTagsCenterOfAttentionOnAdd": "{{pokemonNameWithAffix}}[[는]]\n주목의 대상이 되었다!",
-  "battlerTagsTruantLapse": "{{pokemonNameWithAffix}}[[는]] 게으름을 피우고 있다!",
-  "battlerTagsSlowStartOnAdd": "{{pokemonNameWithAffix}}[[는]] 컨디션이\n좋아지지 않는다!",
-  "battlerTagsSlowStartOnRemove": "{{pokemonNameWithAffix}} 는 마침내\n컨디션을 회복했다!",
-  "battlerTagsHighestStatBoostOnAdd": "{{pokemonNameWithAffix}}의\n{{statName}}[[가]] 올라갔다!",
-  "battlerTagsHighestStatBoostOnRemove": "{{pokemonNameWithAffix}}의\n{{abilityName}} 효과가 사라졌다!",
-  "battlerTagsMagnetRisenOnAdd": "{{pokemonNameWithAffix}}[[는]]\n전자력으로 떠올랐다!",
-  "battlerTagsMagnetRisenOnRemove": "{{pokemonNameWithAffix}}의\n전자력이 없어졌다!",
-  "battlerTagsCritBoostOnAdd": "{{pokemonNameWithAffix}}[[는]]\n의욕이 넘치고 있다!",
-  "battlerTagsCritBoostOnRemove": "{{pokemonNameWithAffix}}[[는]] 평소로 돌아왔다.",
-  "battlerTagsSaltCuredOnAdd": "{{pokemonNameWithAffix}}[[는]]\n소금에 절여졌다!",
-  "battlerTagsSaltCuredLapse": "{{pokemonNameWithAffix}}[[는]] 소금절이의\n데미지를 입고 있다.",
-  "battlerTagsCursedOnAdd": "{{pokemonNameWithAffix}}[[는]] 자신의 체력을 깎아서\n{{pokemonName}}에게 저주를 걸었다!",
-  "battlerTagsCursedLapse": "{{pokemonNameWithAffix}}[[는]]\n저주받고 있다!",
-  "battlerTagsStockpilingOnAdd": "{{pokemonNameWithAffix}}[[는]]\n{{stockpiledCount}}개 비축했다!",
 } as const;
diff --git a/src/locales/ko/battler-tags.ts b/src/locales/ko/battler-tags.ts
index 93a9106a8ce..39647466ada 100644
--- a/src/locales/ko/battler-tags.ts
+++ b/src/locales/ko/battler-tags.ts
@@ -9,4 +9,65 @@ export const battlerTags: SimpleTranslationEntries = {
   "nightmareDesc": "악몽",
   "ingrainDesc": "뿌리",
   "drowsyDesc": "졸음",
+  "rechargingLapse": "공격의 반동으로\n{{pokemonNameWithAffix}}[[는]] 움직일 수 없다!",
+  "trappedOnAdd": "{{pokemonNameWithAffix}}[[는]]\n이제 도망칠 수 없다!",
+  "trappedOnRemove": "{{pokemonNameWithAffix}}[[는]]\n{{moveName}}로부터 풀려났다!",
+  "flinchedLapse": "{{pokemonNameWithAffix}}[[는]] 풀이 죽어\n움직일 수 없었다!",
+  "confusedOnAdd": "{{pokemonNameWithAffix}}[[는]]\n혼란에 빠졌다!",
+  "confusedOnRemove": "{{pokemonNameWithAffix}}의\n혼란이 풀렸다!",
+  "confusedOnOverlap": "{{pokemonNameWithAffix}}[[는]]\n이미 혼란에 빠져 있다",
+  "confusedLapse": "{{pokemonNameWithAffix}}[[는]]\n혼란에 빠져 있다!",
+  "confusedLapseHurtItself": "영문도 모른채\n자신을 공격했다!",
+  "destinyBondLapseIsBoss": "{{pokemonNameWithAffix}}[[는]]\n길동무의 영향을 받지 않는다.",
+  "destinyBondLapse": "{{pokemonNameWithAffix}}[[는]] {{pokemonNameWithAffix2}}[[를]]\n길동무로 삼았다!",
+  "infatuatedOnAdd": "{{pokemonNameWithAffix}}[[는]]\n헤롱헤롱해졌다!",
+  "infatuatedOnOverlap": "{{pokemonNameWithAffix}}[[는]]\n이미 헤롱헤롱해있다!",
+  "infatuatedLapse": "{{pokemonNameWithAffix}}[[는]]\n{{sourcePokemonName}}에게 헤롱헤롱해 있다!",
+  "infatuatedLapseImmobilize": "{{pokemonNameWithAffix}}[[는]] 헤롱헤롱해서\n기술을 쓸 수 없었다!",
+  "infatuatedOnRemove": "{{pokemonNameWithAffix}}[[는]]\n헤롱헤롱 상태에서 벗어났다.",
+  "seededOnAdd": "{{pokemonNameWithAffix}}에게\n씨앗을 심었다!",
+  "seededLapse": "씨뿌리기가 {{pokemonNameWithAffix}}의\n체력을 빼앗는다!",
+  "seededLapseShed": "{{pokemonNameWithAffix}}[[는]]\n씨앗을 날려버렸다!",
+  "nightmareOnAdd": "{{pokemonNameWithAffix}}[[는]]\n악몽을 꾸기 시작했다!",
+  "nightmareOnOverlap": "{{pokemonNameWithAffix}}[[는]]\n이미 악몽을 꾸고 있다!",
+  "nightmareLapse": "{{pokemonNameWithAffix}}[[는]]\n악몽에 시달리고 있다!",
+  "encoreOnAdd": "{{pokemonNameWithAffix}}[[는]]\n앙코르를 받았다!",
+  "encoreOnRemove": "{{pokemonNameWithAffix}}의\n앙코르 상태가 풀렸다!",
+  "helpingHandOnAdd": "{{pokemonNameWithAffix}}[[는]] {{pokemonName}}에게\n도우미가 되어주려 한다!",
+  "ingrainLapse": "{{pokemonNameWithAffix}}[[는]] 뿌리로부터\n양분을 흡수했다!",
+  "ingrainOnTrap": "{{pokemonNameWithAffix}}[[는]] 뿌리를 뻗었다!",
+  "aquaRingOnAdd": "{{pokemonNameWithAffix}}[[는]]\n물의 베일을 둘러썼다!",
+  "aquaRingLapse": "{{moveName}} 효과로\n{{pokemonName}}[[는]] HP를 회복했다!",
+  "drowsyOnAdd": "{{pokemonNameWithAffix}}의\n졸음을 유도했다!",
+  "damagingTrapLapse": "{{pokemonNameWithAffix}}[[는]] {{moveName}}의\n데미지를 입고 있다!",
+  "bindOnTrap": "{{pokemonNameWithAffix}}[[는]] {{sourcePokemonName}}에게\n{{moveName}}[[를]] 당했다!",
+  "wrapOnTrap": "{{pokemonNameWithAffix}}[[는]] {{sourcePokemonName}}에게\n휘감겼다!",
+  "vortexOnTrap": "{{pokemonNameWithAffix}}[[는]]\n소용돌이 속에 갇혔다!",
+  "clampOnTrap": "{{sourcePokemonNameWithAffix}}[[는]] {{pokemonName}}의\n껍질에 꼈다!",
+  "sandTombOnTrap": "{{pokemonNameWithAffix}}[[는]]\n{{moveName}}에 붙잡혔다!",
+  "magmaStormOnTrap": "{{pokemonNameWithAffix}}[[는]]\n마그마의 소용돌이에 갇혔다!",
+  "snapTrapOnTrap": "{{pokemonNameWithAffix}}[[는]]\n집게덫에 붙잡혔다!",
+  "thunderCageOnTrap": "{{sourcePokemonNameWithAffix}}[[는]]\n{{pokemonNameWithAffix}}를 가두었다!",
+  "infestationOnTrap": "{{pokemonNameWithAffix}}[[는]]\n{{sourcePokemonNameWithAffix}}에게 엉겨 붙었다!",
+  "protectedOnAdd": "{{pokemonNameWithAffix}}[[는]]\n방어 태세에 들어갔다!",
+  "protectedLapse": "{{pokemonNameWithAffix}}[[는]]\n공격으로부터 몸을 지켰다!",
+  "enduringOnAdd": "{{pokemonNameWithAffix}}[[는]]\n버티기 태세에 들어갔다!",
+  "enduringLapse": "{{pokemonNameWithAffix}}[[는]]\n공격을 버텼다!",
+  "sturdyLapse": "{{pokemonNameWithAffix}}[[는]]\n공격을 버텼다!",
+  "perishSongLapse": "{{pokemonNameWithAffix}}의 멸망의\n카운트가 {{turnCount}}[[가]] 되었다!",
+  "centerOfAttentionOnAdd": "{{pokemonNameWithAffix}}[[는]]\n주목의 대상이 되었다!",
+  "truantLapse": "{{pokemonNameWithAffix}}[[는]] 게으름을 피우고 있다!",
+  "slowStartOnAdd": "{{pokemonNameWithAffix}}[[는]] 컨디션이\n좋아지지 않는다!",
+  "slowStartOnRemove": "{{pokemonNameWithAffix}} 는 마침내\n컨디션을 회복했다!",
+  "highestStatBoostOnAdd": "{{pokemonNameWithAffix}}의\n{{statName}}[[가]] 올라갔다!",
+  "highestStatBoostOnRemove": "{{pokemonNameWithAffix}}의\n{{abilityName}} 효과가 사라졌다!",
+  "magnetRisenOnAdd": "{{pokemonNameWithAffix}}[[는]]\n전자력으로 떠올랐다!",
+  "magnetRisenOnRemove": "{{pokemonNameWithAffix}}의\n전자력이 없어졌다!",
+  "critBoostOnAdd": "{{pokemonNameWithAffix}}[[는]]\n의욕이 넘치고 있다!",
+  "critBoostOnRemove": "{{pokemonNameWithAffix}}[[는]] 평소로 돌아왔다.",
+  "saltCuredOnAdd": "{{pokemonNameWithAffix}}[[는]]\n소금에 절여졌다!",
+  "saltCuredLapse": "{{pokemonNameWithAffix}}[[는]] 소금절이의\n데미지를 입고 있다.",
+  "cursedOnAdd": "{{pokemonNameWithAffix}}[[는]] 자신의 체력을 깎아서\n{{pokemonName}}에게 저주를 걸었다!",
+  "cursedLapse": "{{pokemonNameWithAffix}}[[는]]\n저주받고 있다!",
+  "stockpilingOnAdd": "{{pokemonNameWithAffix}}[[는]]\n{{stockpiledCount}}개 비축했다!",
 } as const;
diff --git a/src/locales/pt_BR/battle.ts b/src/locales/pt_BR/battle.ts
index 824b069f0a4..daa8d56ccb3 100644
--- a/src/locales/pt_BR/battle.ts
+++ b/src/locales/pt_BR/battle.ts
@@ -95,65 +95,4 @@ export const battle: SimpleTranslationEntries = {
   "unlockedSomething": "{{unlockedThing}}\nfoi desbloqueado.",
   "congratulations": "Parabéns!",
   "beatModeFirstTime": "{{speciesName}} venceu o Modo {{gameMode}} pela primeira vez!\nVocê recebeu {{newModifier}}!",
-  "battlerTagsRechargingLapse": "{{pokemonNameWithAffix}} precisa\nrecarregar!",
-  "battlerTagsTrappedOnAdd": "{{pokemonNameWithAffix}} não pode\nmais escapar!",
-  "battlerTagsTrappedOnRemove": "{{pokemonNameWithAffix}} foi liberto\nde {{moveName}}!",
-  "battlerTagsFlinchedLapse": "{{pokemonNameWithAffix}} hesitou!",
-  "battlerTagsConfusedOnAdd": "{{pokemonNameWithAffix}} ficou\nconfuso!",
-  "battlerTagsConfusedOnRemove": "{{pokemonNameWithAffix}} saiu\nde sua confusão!",
-  "battlerTagsConfusedOnOverlap": "{{pokemonNameWithAffix}} já\nestá confuso!",
-  "battlerTagsConfusedLapse": "{{pokemonNameWithAffix}} está\nconfuso!",
-  "battlerTagsConfusedLapseHurtItself": "Se machucou em sua\nconfusão!",
-  "battlerTagsDestinyBondLapseIsBoss": "{{pokemonNameWithAffix}} não é afetado\npelos efeitos de Destiny Bond.",
-  "battlerTagsDestinyBondLapse": "{{pokemonNameWithAffix}} levou\n{{pokemonNameWithAffix2}} junto com ele!",
-  "battlerTagsInfatuatedOnAdd": "{{pokemonNameWithAffix}} se apaixonou\npor {{sourcePokemonName}}!",
-  "battlerTagsInfatuatedOnOverlap": "{{pokemonNameWithAffix}} já\nestá apaixonado!",
-  "battlerTagsInfatuatedLapse": "{{pokemonNameWithAffix}} está apaixonado\npor {{sourcePokemonName}}!",
-  "battlerTagsInfatuatedLapseImmobilize": "{{pokemonNameWithAffix}} está\nimobilizado pelo amor!",
-  "battlerTagsInfatuatedOnRemove": "{{pokemonNameWithAffix}} superou\nsua paixão.",
-  "battlerTagsSeededOnAdd": "{{pokemonNameWithAffix}} foi semeado!",
-  "battlerTagsSeededLapse": "A saúde de {{pokemonNameWithAffix}}\nfoi sugada pelo Leech Seed!",
-  "battlerTagsSeededLapseShed": "O Leech Seed de{{pokemonNameWithAffix}}\nsugou todo o gotejamento!",
-  "battlerTagsNightmareOnAdd": "{{pokemonNameWithAffix}} começou\na ter um Nightmare!",
-  "battlerTagsNightmareOnOverlap": "{{pokemonNameWithAffix}} já\nestá preso em um Nightmare!",
-  "battlerTagsNightmareLapse": "{{pokemonNameWithAffix}} está preso\nem um Nightmare!",
-  "battlerTagsEncoreOnAdd": "{{pokemonNameWithAffix}} ganhou\num Encore!",
-  "battlerTagsEncoreOnRemove": "O Encore de {{pokemonNameWithAffix}}\nacabou!",
-  "battlerTagsHelpingHandOnAdd": "{{pokemonNameWithAffix}} está pronto para\najudar {{pokemonName}}!",
-  "battlerTagsIngrainLapse": "{{pokemonNameWithAffix}} absorveu\nnutrientes com suas raízes!",
-  "battlerTagsIngrainOnTrap": "{{pokemonNameWithAffix}} plantou suas raízes!",
-  "battlerTagsAquaRingOnAdd": "{{pokemonNameWithAffix}} se cercou\ncom um véu de água!",
-  "battlerTagsAquaRingLapse": "{{moveName}} restaurou\nPS de {{pokemonName}}!",
-  "battlerTagsDrowsyOnAdd": "{{pokemonNameWithAffix}} ficou com sono!",
-  "battlerTagsDamagingTrapLapse": "{{pokemonNameWithAffix}} foi ferido\npelo {{moveName}}!",
-  "battlerTagsBindOnTrap": "{{pokemonNameWithAffix}} foi espremido\npelo {{moveName}} de {{sourcePokemonName}}!",
-  "battlerTagsWrapOnTrap": "{{pokemonNameWithAffix}} foi enrolado\npor {{sourcePokemonName}}!",
-  "battlerTagsVortexOnTrap": "{{pokemonNameWithAffix}} ficou preso\nno vórtice!",
-  "battlerTagsClampOnTrap": "{{sourcePokemonNameWithAffix}} prendeu\n{{pokemonName}}!",
-  "battlerTagsSandTombOnTrap": "{{pokemonNameWithAffix}} foi preso\npor {{moveName}}!",
-  "battlerTagsMagmaStormOnTrap": "{{pokemonNameWithAffix}} foi preso\npor um redemoinho de magma!",
-  "battlerTagsSnapTrapOnTrap": "{{pokemonNameWithAffix}} foi preso\npor uma armadilha!",
-  "battlerTagsThunderCageOnTrap": "{{sourcePokemonNameWithAffix}} prendeu\n{{pokemonNameWithAffix}}!",
-  "battlerTagsInfestationOnTrap": "{{pokemonNameWithAffix}} foi ferido por \numa infestação de {{sourcePokemonNameWithAffix}}!",
-  "battlerTagsProtectedOnAdd": "{{pokemonNameWithAffix}}\nse protegeu!",
-  "battlerTagsProtectedLapse": "{{pokemonNameWithAffix}}\nse protegeu!",
-  "battlerTagsEnduringOnAdd": "{{pokemonNameWithAffix}} está\npreparado!",
-  "battlerTagsEnduringLapse": "{{pokemonNameWithAffix}} suportou\no golpe!",
-  "battlerTagsSturdyLapse": "{{pokemonNameWithAffix}} suportou\no golpe!",
-  "battlerTagsPerishSongLapse": "O tempo restante de {{pokemonNameWithAffix}} diminuiu para {{turnCount}}.",
-  "battlerTagsCenterOfAttentionOnAdd": "{{pokemonNameWithAffix}} virou o centro\ndas atenções!",
-  "battlerTagsTruantLapse": "{{pokemonNameWithAffix}} está\nviajando na maionese!",
-  "battlerTagsSlowStartOnAdd": "{{pokemonNameWithAffix}} não\nestá preparado!",
-  "battlerTagsSlowStartOnRemove": "{{pokemonNameWithAffix}} finalmente\nconseguiu se recompor!",
-  "battlerTagsHighestStatBoostOnAdd": "O atributo de {{statName}} de\n{{pokemonNameWithAffix}} aumentou!",
-  "battlerTagsHighestStatBoostOnRemove": "Os efeitos do {{abilityName}} de\n{{pokemonNameWithAffix}} acabaram!",
-  "battlerTagsMagnetRisenOnAdd": "{{pokemonNameWithAffix}} levitou com eletromagnetismo!",
-  "battlerTagsMagnetRisenOnRemove": "O eletromagnetismo de {{pokemonNameWithAffix}} sumiu!",
-  "battlerTagsCritBoostOnAdd": "{{pokemonNameWithAffix}} está ficando\nbombado!",
-  "battlerTagsCritBoostOnRemove": "{{pokemonNameWithAffix}} relaxou.",
-  "battlerTagsSaltCuredOnAdd": "{{pokemonNameWithAffix}} está sendo curado com sal!",
-  "battlerTagsSaltCuredLapse": "{{pokemonNameWithAffix}} foi ferido pelo {{moveName}}!",
-  "battlerTagsCursedOnAdd": "{{pokemonNameWithAffix}} cortou seus PS pela metade e amaldiçoou {{pokemonName}}!",
-  "battlerTagsCursedLapse": "{{pokemonNameWithAffix}} foi ferido pelo Curse!",
-  "battlerTagsStockpilingOnAdd": "{{pokemonNameWithAffix}} estocou {{stockpiledCount}}!",
 } as const;
diff --git a/src/locales/pt_BR/battler-tags.ts b/src/locales/pt_BR/battler-tags.ts
index de8be35f1aa..1758fed38d6 100644
--- a/src/locales/pt_BR/battler-tags.ts
+++ b/src/locales/pt_BR/battler-tags.ts
@@ -9,4 +9,65 @@ export const battlerTags: SimpleTranslationEntries = {
   "nightmareDesc": "os pesadelos",
   "ingrainDesc": "o enraizamento",
   "drowsyDesc": "a sonolência",
+  "rechargingLapse": "{{pokemonNameWithAffix}} precisa\nrecarregar!",
+  "trappedOnAdd": "{{pokemonNameWithAffix}} não pode\nmais escapar!",
+  "trappedOnRemove": "{{pokemonNameWithAffix}} foi liberto\nde {{moveName}}!",
+  "flinchedLapse": "{{pokemonNameWithAffix}} hesitou!",
+  "confusedOnAdd": "{{pokemonNameWithAffix}} ficou\nconfuso!",
+  "confusedOnRemove": "{{pokemonNameWithAffix}} saiu\nde sua confusão!",
+  "confusedOnOverlap": "{{pokemonNameWithAffix}} já\nestá confuso!",
+  "confusedLapse": "{{pokemonNameWithAffix}} está\nconfuso!",
+  "confusedLapseHurtItself": "Se machucou em sua\nconfusão!",
+  "destinyBondLapseIsBoss": "{{pokemonNameWithAffix}} não é afetado\npelos efeitos de Destiny Bond.",
+  "destinyBondLapse": "{{pokemonNameWithAffix}} levou\n{{pokemonNameWithAffix2}} junto com ele!",
+  "infatuatedOnAdd": "{{pokemonNameWithAffix}} se apaixonou\npor {{sourcePokemonName}}!",
+  "infatuatedOnOverlap": "{{pokemonNameWithAffix}} já\nestá apaixonado!",
+  "infatuatedLapse": "{{pokemonNameWithAffix}} está apaixonado\npor {{sourcePokemonName}}!",
+  "infatuatedLapseImmobilize": "{{pokemonNameWithAffix}} está\nimobilizado pelo amor!",
+  "infatuatedOnRemove": "{{pokemonNameWithAffix}} superou\nsua paixão.",
+  "seededOnAdd": "{{pokemonNameWithAffix}} foi semeado!",
+  "seededLapse": "A saúde de {{pokemonNameWithAffix}}\nfoi sugada pelo Leech Seed!",
+  "seededLapseShed": "O Leech Seed de{{pokemonNameWithAffix}}\nsugou todo o gotejamento!",
+  "nightmareOnAdd": "{{pokemonNameWithAffix}} começou\na ter um Nightmare!",
+  "nightmareOnOverlap": "{{pokemonNameWithAffix}} já\nestá preso em um Nightmare!",
+  "nightmareLapse": "{{pokemonNameWithAffix}} está preso\nem um Nightmare!",
+  "encoreOnAdd": "{{pokemonNameWithAffix}} ganhou\num Encore!",
+  "encoreOnRemove": "O Encore de {{pokemonNameWithAffix}}\nacabou!",
+  "helpingHandOnAdd": "{{pokemonNameWithAffix}} está pronto para\najudar {{pokemonName}}!",
+  "ingrainLapse": "{{pokemonNameWithAffix}} absorveu\nnutrientes com suas raízes!",
+  "ingrainOnTrap": "{{pokemonNameWithAffix}} plantou suas raízes!",
+  "aquaRingOnAdd": "{{pokemonNameWithAffix}} se cercou\ncom um véu de água!",
+  "aquaRingLapse": "{{moveName}} restaurou\nPS de {{pokemonName}}!",
+  "drowsyOnAdd": "{{pokemonNameWithAffix}} ficou com sono!",
+  "damagingTrapLapse": "{{pokemonNameWithAffix}} foi ferido\npelo {{moveName}}!",
+  "bindOnTrap": "{{pokemonNameWithAffix}} foi espremido\npelo {{moveName}} de {{sourcePokemonName}}!",
+  "wrapOnTrap": "{{pokemonNameWithAffix}} foi enrolado\npor {{sourcePokemonName}}!",
+  "vortexOnTrap": "{{pokemonNameWithAffix}} ficou preso\nno vórtice!",
+  "clampOnTrap": "{{sourcePokemonNameWithAffix}} prendeu\n{{pokemonName}}!",
+  "sandTombOnTrap": "{{pokemonNameWithAffix}} foi preso\npor {{moveName}}!",
+  "magmaStormOnTrap": "{{pokemonNameWithAffix}} foi preso\npor um redemoinho de magma!",
+  "snapTrapOnTrap": "{{pokemonNameWithAffix}} foi preso\npor uma armadilha!",
+  "thunderCageOnTrap": "{{sourcePokemonNameWithAffix}} prendeu\n{{pokemonNameWithAffix}}!",
+  "infestationOnTrap": "{{pokemonNameWithAffix}} foi ferido por \numa infestação de {{sourcePokemonNameWithAffix}}!",
+  "protectedOnAdd": "{{pokemonNameWithAffix}}\nse protegeu!",
+  "protectedLapse": "{{pokemonNameWithAffix}}\nse protegeu!",
+  "enduringOnAdd": "{{pokemonNameWithAffix}} está\npreparado!",
+  "enduringLapse": "{{pokemonNameWithAffix}} suportou\no golpe!",
+  "sturdyLapse": "{{pokemonNameWithAffix}} suportou\no golpe!",
+  "perishSongLapse": "O tempo restante de {{pokemonNameWithAffix}} diminuiu para {{turnCount}}.",
+  "centerOfAttentionOnAdd": "{{pokemonNameWithAffix}} virou o centro\ndas atenções!",
+  "truantLapse": "{{pokemonNameWithAffix}} está\nviajando na maionese!",
+  "slowStartOnAdd": "{{pokemonNameWithAffix}} não\nestá preparado!",
+  "slowStartOnRemove": "{{pokemonNameWithAffix}} finalmente\nconseguiu se recompor!",
+  "highestStatBoostOnAdd": "O atributo de {{statName}} de\n{{pokemonNameWithAffix}} aumentou!",
+  "highestStatBoostOnRemove": "Os efeitos do {{abilityName}} de\n{{pokemonNameWithAffix}} acabaram!",
+  "magnetRisenOnAdd": "{{pokemonNameWithAffix}} levitou com eletromagnetismo!",
+  "magnetRisenOnRemove": "O eletromagnetismo de {{pokemonNameWithAffix}} sumiu!",
+  "critBoostOnAdd": "{{pokemonNameWithAffix}} está ficando\nbombado!",
+  "critBoostOnRemove": "{{pokemonNameWithAffix}} relaxou.",
+  "saltCuredOnAdd": "{{pokemonNameWithAffix}} está sendo curado com sal!",
+  "saltCuredLapse": "{{pokemonNameWithAffix}} foi ferido pelo {{moveName}}!",
+  "cursedOnAdd": "{{pokemonNameWithAffix}} cortou seus PS pela metade e amaldiçoou {{pokemonName}}!",
+  "cursedLapse": "{{pokemonNameWithAffix}} foi ferido pelo Curse!",
+  "stockpilingOnAdd": "{{pokemonNameWithAffix}} estocou {{stockpiledCount}}!",
 } as const;
diff --git a/src/locales/zh_CN/battle.ts b/src/locales/zh_CN/battle.ts
index b07cb79e258..c018faa0b01 100644
--- a/src/locales/zh_CN/battle.ts
+++ b/src/locales/zh_CN/battle.ts
@@ -87,65 +87,4 @@ export const battle: SimpleTranslationEntries = {
   "unlockedSomething": "{{unlockedThing}}\n已解锁。",
   "congratulations": "恭喜！",
   "beatModeFirstTime": "{{speciesName}}首次击败了{{gameMode}}！\n你获得了{{newModifier}}！",
-  "battlerTagsRechargingLapse": "{{pokemonNameWithAffix}}\n因攻击的反作用力而无法动弹！",
-  "battlerTagsTrappedOnAdd": "{{pokemonNameWithAffix}}不能逃跑！",
-  "battlerTagsTrappedOnRemove": "{{pokemonNameWithAffix}}\n摆脱了{{moveName}}！",
-  "battlerTagsFlinchedLapse": "{{pokemonNameWithAffix}}\n畏缩了，无法使出招式！",
-  "battlerTagsConfusedOnAdd": "{{pokemonNameWithAffix}}\n混乱了！",
-  "battlerTagsConfusedOnRemove": "{{pokemonNameWithAffix}}\n的混乱解除了！",
-  "battlerTagsConfusedOnOverlap": "{{pokemonNameWithAffix}}\n已经混乱了。",
-  "battlerTagsConfusedLapse": "{{pokemonNameWithAffix}}\n正在混乱中！",
-  "battlerTagsConfusedLapseHurtItself": "不知所以地攻击了自己！",
-  "battlerTagsDestinyBondLapseIsBoss": "{{pokemonNameWithAffix}}\n不再受到同命的影响",
-  "battlerTagsDestinyBondLapse": "{{pokemonNameWithAffix}}\n和{{pokemonNameWithAffix2}}同归于尽了！",
-  "battlerTagsInfatuatedOnAdd": "{{pokemonNameWithAffix}}\n对{{sourcePokemonName}}着迷了！",
-  "battlerTagsInfatuatedOnOverlap": "{{pokemonNameWithAffix}}\n已经着迷了！",
-  "battlerTagsInfatuatedLapse": "{{pokemonNameWithAffix}}\n对{{sourcePokemonName}}着迷中！",
-  "battlerTagsInfatuatedLapseImmobilize": "{{pokemonNameWithAffix}}\n不会着迷！",
-  "battlerTagsInfatuatedOnRemove": "{{pokemonNameWithAffix}}\n治愈了着迷状态！",
-  "battlerTagsSeededOnAdd": "将种子种植在了\n{{pokemonNameWithAffix}}的身上！",
-  "battlerTagsSeededLapse": "{{pokemonNameWithAffix}}\n被寄生种子吸取了体力！",
-  "battlerTagsSeededLapseShed": "{{pokemonNameWithAffix}}\n吸到了污泥浆！",
-  "battlerTagsNightmareOnAdd": "{{pokemonNameWithAffix}}\n开始做恶梦了！",
-  "battlerTagsNightmareOnOverlap": "{{pokemonNameWithAffix}}\n已经被恶梦缠身！",
-  "battlerTagsNightmareLapse": "{{pokemonNameWithAffix}}\n正被恶梦缠身！",
-  "battlerTagsEncoreOnAdd": "{{pokemonNameWithAffix}}\n接受了再来一次！",
-  "battlerTagsEncoreOnRemove": "{{pokemonNameWithAffix}}\n的再来一次状态解除了！",
-  "battlerTagsHelpingHandOnAdd": "{{pokemonNameWithAffix}}\n摆出了帮助{{pokemonName}}的架势！",
-  "battlerTagsIngrainLapse": "{{pokemonNameWithAffix}}\n用扎根回复了体力！",
-  "battlerTagsIngrainOnTrap": "{{pokemonNameWithAffix}}\n扎根了！",
-  "battlerTagsAquaRingOnAdd": "{{pokemonNameWithAffix}}\n用水流环包裹了自己！",
-  "battlerTagsAquaRingLapse": "{{moveName}}回复了\n{{pokemonName}}的体力！",
-  "battlerTagsDrowsyOnAdd": "{{pokemonNameWithAffix}}\n产生睡意了！",
-  "battlerTagsDamagingTrapLapse": "{{pokemonNameWithAffix}}受到了\n{{moveName}}的伤害！",
-  "battlerTagsBindOnTrap": "{{pokemonNameWithAffix}}被\n{{sourcePokemonName}}的{{moveName}}紧紧束缚住了！",
-  "battlerTagsWrapOnTrap": "{{pokemonNameWithAffix}}被\n{{sourcePokemonName}}绑紧了！",
-  "battlerTagsVortexOnTrap": "{{pokemonNameWithAffix}}\n被困在了旋涡之中！",
-  "battlerTagsClampOnTrap": "{{sourcePokemonNameWithAffix}}用贝壳\n夹住了{{pokemonName}}！",
-  "battlerTagsSandTombOnTrap": "{{pokemonNameWithAffix}}\n被{{moveName}}困住了！",
-  "battlerTagsMagmaStormOnTrap": "{{pokemonNameWithAffix}}\n被困在了熔岩风暴之中！",
-  "battlerTagsSnapTrapOnTrap": "{{pokemonNameWithAffix}}\n被捕兽夹困住了！",
-  "battlerTagsThunderCageOnTrap": "{{sourcePokemonNameWithAffix}}困住了\n{{pokemonNameWithAffix}}！",
-  "battlerTagsInfestationOnTrap": "{{pokemonNameWithAffix}}受到了\n{{sourcePokemonNameWithAffix}}的死缠烂打！",
-  "battlerTagsProtectedOnAdd": "{{pokemonNameWithAffix}}\n摆出了防守的架势！",
-  "battlerTagsProtectedLapse": "{{pokemonNameWithAffix}}\n在攻击中保护了自己！",
-  "battlerTagsEnduringOnAdd": "{{pokemonNameWithAffix}}\n摆出了挺住攻击的架势！",
-  "battlerTagsEnduringLapse": "{{pokemonNameWithAffix}}\n挺住了攻击！",
-  "battlerTagsSturdyLapse": "{{pokemonNameWithAffix}}\n挺住了攻击！",
-  "battlerTagsPerishSongLapse": "{{pokemonNameWithAffix}}\n的灭亡计时变成{{turnCount}}了！",
-  "battlerTagsCenterOfAttentionOnAdd": "{{pokemonNameWithAffix}}\n变得万众瞩目了！",
-  "battlerTagsTruantLapse": "{{pokemonNameWithAffix}}\n正在偷懒！",
-  "battlerTagsSlowStartOnAdd": "{{pokemonNameWithAffix}}\n无法拿出平时的水平！",
-  "battlerTagsSlowStartOnRemove": "{{pokemonNameWithAffix}}\n恢复了平时的水平！",
-  "battlerTagsHighestStatBoostOnAdd": "{{pokemonNameWithAffix}}的\n{{statName}}提高了！",
-  "battlerTagsHighestStatBoostOnRemove": "{{pokemonNameWithAffix}}的\n{{abilityName}}效果解除了！",
-  "battlerTagsMagnetRisenOnAdd": "{{pokemonNameWithAffix}}\n因电磁力浮了起来！",
-  "battlerTagsMagnetRisenOnRemove": "{{pokemonNameWithAffix}}的\n电磁力消失了！",
-  "battlerTagsCritBoostOnAdd": "{{pokemonNameWithAffix}}\n现在干劲十足！",
-  "battlerTagsCritBoostOnRemove": "{{pokemonNameWithAffix}}\n如释重负似地放松了下来。",
-  "battlerTagsSaltCuredOnAdd": "{{pokemonNameWithAffix}}\n陷入了盐腌状态！",
-  "battlerTagsSaltCuredLapse": "{{pokemonNameWithAffix}}\n受到了{{moveName}}的伤害！",
-  "battlerTagsCursedOnAdd": "{{pokemonNameWithAffix}}削减了自己的体力，\n并诅咒了{{pokemonName}}！",
-  "battlerTagsCursedLapse": "{{pokemonNameWithAffix}}\n正受到诅咒！",
-  "battlerTagsStockpilingOnAdd": "{{pokemonNameWithAffix}}蓄力了{{stockpiledCount}}次！"
 } as const;
diff --git a/src/locales/zh_CN/battler-tags.ts b/src/locales/zh_CN/battler-tags.ts
index 2a945809282..7af764cf117 100644
--- a/src/locales/zh_CN/battler-tags.ts
+++ b/src/locales/zh_CN/battler-tags.ts
@@ -9,4 +9,65 @@ export const battlerTags: SimpleTranslationEntries = {
   "nightmareDesc": "恶梦",
   "ingrainDesc": "扎根",
   "drowsyDesc": "瞌睡",
+  "rechargingLapse": "{{pokemonNameWithAffix}}\n因攻击的反作用力而无法动弹！",
+  "trappedOnAdd": "{{pokemonNameWithAffix}}不能逃跑！",
+  "trappedOnRemove": "{{pokemonNameWithAffix}}\n摆脱了{{moveName}}！",
+  "flinchedLapse": "{{pokemonNameWithAffix}}\n畏缩了，无法使出招式！",
+  "confusedOnAdd": "{{pokemonNameWithAffix}}\n混乱了！",
+  "confusedOnRemove": "{{pokemonNameWithAffix}}\n的混乱解除了！",
+  "confusedOnOverlap": "{{pokemonNameWithAffix}}\n已经混乱了。",
+  "confusedLapse": "{{pokemonNameWithAffix}}\n正在混乱中！",
+  "confusedLapseHurtItself": "不知所以地攻击了自己！",
+  "destinyBondLapseIsBoss": "{{pokemonNameWithAffix}}\n不再受到同命的影响",
+  "destinyBondLapse": "{{pokemonNameWithAffix}}\n和{{pokemonNameWithAffix2}}同归于尽了！",
+  "infatuatedOnAdd": "{{pokemonNameWithAffix}}\n对{{sourcePokemonName}}着迷了！",
+  "infatuatedOnOverlap": "{{pokemonNameWithAffix}}\n已经着迷了！",
+  "infatuatedLapse": "{{pokemonNameWithAffix}}\n对{{sourcePokemonName}}着迷中！",
+  "infatuatedLapseImmobilize": "{{pokemonNameWithAffix}}\n不会着迷！",
+  "infatuatedOnRemove": "{{pokemonNameWithAffix}}\n治愈了着迷状态！",
+  "seededOnAdd": "将种子种植在了\n{{pokemonNameWithAffix}}的身上！",
+  "seededLapse": "{{pokemonNameWithAffix}}\n被寄生种子吸取了体力！",
+  "seededLapseShed": "{{pokemonNameWithAffix}}\n吸到了污泥浆！",
+  "nightmareOnAdd": "{{pokemonNameWithAffix}}\n开始做恶梦了！",
+  "nightmareOnOverlap": "{{pokemonNameWithAffix}}\n已经被恶梦缠身！",
+  "nightmareLapse": "{{pokemonNameWithAffix}}\n正被恶梦缠身！",
+  "encoreOnAdd": "{{pokemonNameWithAffix}}\n接受了再来一次！",
+  "encoreOnRemove": "{{pokemonNameWithAffix}}\n的再来一次状态解除了！",
+  "helpingHandOnAdd": "{{pokemonNameWithAffix}}\n摆出了帮助{{pokemonName}}的架势！",
+  "ingrainLapse": "{{pokemonNameWithAffix}}\n用扎根回复了体力！",
+  "ingrainOnTrap": "{{pokemonNameWithAffix}}\n扎根了！",
+  "aquaRingOnAdd": "{{pokemonNameWithAffix}}\n用水流环包裹了自己！",
+  "aquaRingLapse": "{{moveName}}回复了\n{{pokemonName}}的体力！",
+  "drowsyOnAdd": "{{pokemonNameWithAffix}}\n产生睡意了！",
+  "damagingTrapLapse": "{{pokemonNameWithAffix}}受到了\n{{moveName}}的伤害！",
+  "bindOnTrap": "{{pokemonNameWithAffix}}被\n{{sourcePokemonName}}的{{moveName}}紧紧束缚住了！",
+  "wrapOnTrap": "{{pokemonNameWithAffix}}被\n{{sourcePokemonName}}绑紧了！",
+  "vortexOnTrap": "{{pokemonNameWithAffix}}\n被困在了旋涡之中！",
+  "clampOnTrap": "{{sourcePokemonNameWithAffix}}用贝壳\n夹住了{{pokemonName}}！",
+  "sandTombOnTrap": "{{pokemonNameWithAffix}}\n被{{moveName}}困住了！",
+  "magmaStormOnTrap": "{{pokemonNameWithAffix}}\n被困在了熔岩风暴之中！",
+  "snapTrapOnTrap": "{{pokemonNameWithAffix}}\n被捕兽夹困住了！",
+  "thunderCageOnTrap": "{{sourcePokemonNameWithAffix}}困住了\n{{pokemonNameWithAffix}}！",
+  "infestationOnTrap": "{{pokemonNameWithAffix}}受到了\n{{sourcePokemonNameWithAffix}}的死缠烂打！",
+  "protectedOnAdd": "{{pokemonNameWithAffix}}\n摆出了防守的架势！",
+  "protectedLapse": "{{pokemonNameWithAffix}}\n在攻击中保护了自己！",
+  "enduringOnAdd": "{{pokemonNameWithAffix}}\n摆出了挺住攻击的架势！",
+  "enduringLapse": "{{pokemonNameWithAffix}}\n挺住了攻击！",
+  "sturdyLapse": "{{pokemonNameWithAffix}}\n挺住了攻击！",
+  "perishSongLapse": "{{pokemonNameWithAffix}}\n的灭亡计时变成{{turnCount}}了！",
+  "centerOfAttentionOnAdd": "{{pokemonNameWithAffix}}\n变得万众瞩目了！",
+  "truantLapse": "{{pokemonNameWithAffix}}\n正在偷懒！",
+  "slowStartOnAdd": "{{pokemonNameWithAffix}}\n无法拿出平时的水平！",
+  "slowStartOnRemove": "{{pokemonNameWithAffix}}\n恢复了平时的水平！",
+  "highestStatBoostOnAdd": "{{pokemonNameWithAffix}}的\n{{statName}}提高了！",
+  "highestStatBoostOnRemove": "{{pokemonNameWithAffix}}的\n{{abilityName}}效果解除了！",
+  "magnetRisenOnAdd": "{{pokemonNameWithAffix}}\n因电磁力浮了起来！",
+  "magnetRisenOnRemove": "{{pokemonNameWithAffix}}的\n电磁力消失了！",
+  "critBoostOnAdd": "{{pokemonNameWithAffix}}\n现在干劲十足！",
+  "critBoostOnRemove": "{{pokemonNameWithAffix}}\n如释重负似地放松了下来。",
+  "saltCuredOnAdd": "{{pokemonNameWithAffix}}\n陷入了盐腌状态！",
+  "saltCuredLapse": "{{pokemonNameWithAffix}}\n受到了{{moveName}}的伤害！",
+  "cursedOnAdd": "{{pokemonNameWithAffix}}削减了自己的体力，\n并诅咒了{{pokemonName}}！",
+  "cursedLapse": "{{pokemonNameWithAffix}}\n正受到诅咒！",
+  "stockpilingOnAdd": "{{pokemonNameWithAffix}}蓄力了{{stockpiledCount}}次！",
 } as const;
diff --git a/src/locales/zh_TW/battle.ts b/src/locales/zh_TW/battle.ts
index 4673474d313..e8ecd5228f5 100644
--- a/src/locales/zh_TW/battle.ts
+++ b/src/locales/zh_TW/battle.ts
@@ -84,65 +84,4 @@ export const battle: SimpleTranslationEntries = {
   "unlockedSomething": "{{unlockedThing}}\nhas been unlocked.",
   "congratulations": "Congratulations!",
   "beatModeFirstTime": "{{speciesName}} beat {{gameMode}} Mode for the first time!\nYou received {{newModifier}}!",
-  "battlerTagsRechargingLapse": "{{pokemonNameWithAffix}}因攻擊的反作用力而無法動彈！",
-  "battlerTagsTrappedOnAdd": "{{pokemonNameWithAffix}}不能逃跑！",
-  "battlerTagsTrappedOnRemove": "{{pokemonNameWithAffix}}擺脫了{{moveName}}！",
-  "battlerTagsFlinchedLapse": "{{pokemonNameWithAffix}}畏縮了！",
-  "battlerTagsConfusedOnAdd": "{{pokemonNameWithAffix}}混亂了！",
-  "battlerTagsConfusedOnRemove": "{{pokemonNameWithAffix}}的混亂解除了！",
-  "battlerTagsConfusedOnOverlap": "{{pokemonNameWithAffix}}已經混亂了。",
-  "battlerTagsConfusedLapse": "{{pokemonNameWithAffix}}正在混亂中！",
-  "battlerTagsConfusedLapseHurtItself": "不知所以地攻擊了自己！",
-  "battlerTagsDestinyBondLapseIsBoss": "{{pokemonNameWithAffix}}不再受到同命的影響",
-  "battlerTagsDestinyBondLapse": "{{pokemonNameWithAffix}} 和{{pokemonNameWithAffix2}} 同歸於盡了！",
-  "battlerTagsInfatuatedOnAdd": "{{pokemonNameWithAffix}}對{{sourcePokemonName}}著迷了！",
-  "battlerTagsInfatuatedOnOverlap": "{{pokemonNameWithAffix}}已經著迷了！",
-  "battlerTagsInfatuatedLapse": "{{pokemonNameWithAffix}}對{{sourcePokemonName}}著迷中！",
-  "battlerTagsInfatuatedLapseImmobilize": "{{pokemonNameWithAffix}} 不會著迷！",
-  "battlerTagsInfatuatedOnRemove": "{{pokemonNameWithAffix}} 治癒了著迷狀態！",
-  "battlerTagsSeededOnAdd": "將種子種植在了{{pokemonNameWithAffix}}身上！",
-  "battlerTagsSeededLapse": "{{pokemonNameWithAffix}}被寄生種子吸取了體力！",
-  "battlerTagsSeededLapseShed": "{{pokemonNameWithAffix}}吸到了污泥漿！",
-  "battlerTagsNightmareOnAdd": "{{pokemonNameWithAffix}}開始做惡夢了！",
-  "battlerTagsNightmareOnOverlap": "{{pokemonNameWithAffix}}已經被惡夢纏身！",
-  "battlerTagsNightmareLapse": "{{pokemonNameWithAffix}}正被惡夢纏身！",
-  "battlerTagsEncoreOnAdd": "{{pokemonNameWithAffix}}接受了再來一次！",
-  "battlerTagsEncoreOnRemove": "{{pokemonNameWithAffix}}的再來一次狀態解除了！",
-  "battlerTagsHelpingHandOnAdd": "{{pokemonNameWithAffix}}擺出了幫助{{pokemonName}} 的架勢！",
-  "battlerTagsIngrainLapse": "{{pokemonNameWithAffix}}用扎根回復了體力！",
-  "battlerTagsIngrainOnTrap": "{{pokemonNameWithAffix}}扎根了！",
-  "battlerTagsAquaRingOnAdd": "{{pokemonNameWithAffix}}用水流環包裹了自己！",
-  "battlerTagsAquaRingLapse": "{{moveName}}回復了{{pokemonName}}的體力！",
-  "battlerTagsDrowsyOnAdd": "{{pokemonNameWithAffix}}產生睡意了！",
-  "battlerTagsDamagingTrapLapse": "{{pokemonNameWithAffix}}受到了{{moveName}}的傷害！",
-  "battlerTagsBindOnTrap": "{{pokemonNameWithAffix}}被{{sourcePokemonName}}的 {{moveName}}緊緊束縛住了！",
-  "battlerTagsWrapOnTrap": "{{pokemonNameWithAffix}}被{{sourcePokemonName}}綁緊了！",
-  "battlerTagsVortexOnTrap": "{{pokemonNameWithAffix}}被困在了旋渦之中！",
-  "battlerTagsClampOnTrap": "{{sourcePokemonNameWithAffix}}用貝殼夾住了{{pokemonName}}！",
-  "battlerTagsSandTombOnTrap": "{{pokemonNameWithAffix}}被{{moveName}}困住了！",
-  "battlerTagsMagmaStormOnTrap": "{{pokemonNameWithAffix}}被困在了熔岩風暴之中！",
-  "battlerTagsSnapTrapOnTrap": "{{pokemonNameWithAffix}}被捕獸夾困住了！",
-  "battlerTagsThunderCageOnTrap": "{{sourcePokemonNameWithAffix}}困住了{{pokemonNameWithAffix}}！",
-  "battlerTagsInfestationOnTrap": "{{pokemonNameWithAffix}}受到了{{sourcePokemonNameWithAffix}}的死纏爛打！",
-  "battlerTagsProtectedOnAdd": "{{pokemonNameWithAffix}}擺出了防守的架勢！",
-  "battlerTagsProtectedLapse": "{{pokemonNameWithAffix}}在攻擊中保護了自己！",
-  "battlerTagsEnduringOnAdd": "{{pokemonNameWithAffix}}擺出了挺住攻擊的架勢！",
-  "battlerTagsEnduringLapse": "{{pokemonNameWithAffix}}挺住了攻擊！",
-  "battlerTagsSturdyLapse": "{{pokemonNameWithAffix}}挺住了攻擊！",
-  "battlerTagsPerishSongLapse": "{{pokemonNameWithAffix}} 的滅亡計時變成{{turnCount}}了！",
-  "battlerTagsCenterOfAttentionOnAdd": "{{pokemonNameWithAffix}}\n變得萬眾矚目了！",
-  "battlerTagsTruantLapse": "{{pokemonNameWithAffix}}正在偷懶！",
-  "battlerTagsSlowStartOnAdd": "{{pokemonNameWithAffix}}無法拿出平時的水平！",
-  "battlerTagsSlowStartOnRemove": "{{pokemonNameWithAffix}}恢復了平時的水平！",
-  "battlerTagsHighestStatBoostOnAdd": "{{pokemonNameWithAffix}}的{{statName}}升高了！",
-  "battlerTagsHighestStatBoostOnRemove": "{{pokemonNameWithAffix}}的{{abilityName}}效果解除了！",
-  "battlerTagsMagnetRisenOnAdd": "{{pokemonNameWithAffix}}\n因電磁力浮了起來！",
-  "battlerTagsMagnetRisenOnRemove": "{{pokemonNameWithAffix}}的\n電磁力消失了！",
-  "battlerTagsCritBoostOnAdd": "{{pokemonNameWithAffix}}現在幹勁十足！",
-  "battlerTagsCritBoostOnRemove": "{{pokemonNameWithAffix}}如釋重負似地放鬆了下來。",
-  "battlerTagsSaltCuredOnAdd": "{{pokemonNameWithAffix}} 陷入了鹽腌狀態！",
-  "battlerTagsSaltCuredLapse": "{{pokemonNameWithAffix}} 受到了{{moveName}}的傷害！",
-  "battlerTagsCursedOnAdd": "{{pokemonNameWithAffix}}削減了自己的體力，並詛咒了{{pokemonName}}！",
-  "battlerTagsCursedLapse": "{{pokemonNameWithAffix}}正受到詛咒！",
-  "battlerTagsStockpilingOnAdd": "{{pokemonNameWithAffix}} stockpiled {{stockpiledCount}}!"
 } as const;
diff --git a/src/locales/zh_TW/battler-tags.ts b/src/locales/zh_TW/battler-tags.ts
index 73747e51f61..9e933336387 100644
--- a/src/locales/zh_TW/battler-tags.ts
+++ b/src/locales/zh_TW/battler-tags.ts
@@ -9,4 +9,65 @@ export const battlerTags: SimpleTranslationEntries = {
   "nightmareDesc": "惡夢",
   "ingrainDesc": "扎根",
   "drowsyDesc": "瞌睡",
+  "rechargingLapse": "{{pokemonNameWithAffix}}因攻擊的反作用力而無法動彈！",
+  "trappedOnAdd": "{{pokemonNameWithAffix}}不能逃跑！",
+  "trappedOnRemove": "{{pokemonNameWithAffix}}擺脫了{{moveName}}！",
+  "flinchedLapse": "{{pokemonNameWithAffix}}畏縮了！",
+  "confusedOnAdd": "{{pokemonNameWithAffix}}混亂了！",
+  "confusedOnRemove": "{{pokemonNameWithAffix}}的混亂解除了！",
+  "confusedOnOverlap": "{{pokemonNameWithAffix}}已經混亂了。",
+  "confusedLapse": "{{pokemonNameWithAffix}}正在混亂中！",
+  "confusedLapseHurtItself": "不知所以地攻擊了自己！",
+  "destinyBondLapseIsBoss": "{{pokemonNameWithAffix}}不再受到同命的影響",
+  "destinyBondLapse": "{{pokemonNameWithAffix}} 和{{pokemonNameWithAffix2}} 同歸於盡了！",
+  "infatuatedOnAdd": "{{pokemonNameWithAffix}}對{{sourcePokemonName}}著迷了！",
+  "infatuatedOnOverlap": "{{pokemonNameWithAffix}}已經著迷了！",
+  "infatuatedLapse": "{{pokemonNameWithAffix}}對{{sourcePokemonName}}著迷中！",
+  "infatuatedLapseImmobilize": "{{pokemonNameWithAffix}} 不會著迷！",
+  "infatuatedOnRemove": "{{pokemonNameWithAffix}} 治癒了著迷狀態！",
+  "seededOnAdd": "將種子種植在了{{pokemonNameWithAffix}}身上！",
+  "seededLapse": "{{pokemonNameWithAffix}}被寄生種子吸取了體力！",
+  "seededLapseShed": "{{pokemonNameWithAffix}}吸到了污泥漿！",
+  "nightmareOnAdd": "{{pokemonNameWithAffix}}開始做惡夢了！",
+  "nightmareOnOverlap": "{{pokemonNameWithAffix}}已經被惡夢纏身！",
+  "nightmareLapse": "{{pokemonNameWithAffix}}正被惡夢纏身！",
+  "encoreOnAdd": "{{pokemonNameWithAffix}}接受了再來一次！",
+  "encoreOnRemove": "{{pokemonNameWithAffix}}的再來一次狀態解除了！",
+  "helpingHandOnAdd": "{{pokemonNameWithAffix}}擺出了幫助{{pokemonName}} 的架勢！",
+  "ingrainLapse": "{{pokemonNameWithAffix}}用扎根回復了體力！",
+  "ingrainOnTrap": "{{pokemonNameWithAffix}}扎根了！",
+  "aquaRingOnAdd": "{{pokemonNameWithAffix}}用水流環包裹了自己！",
+  "aquaRingLapse": "{{moveName}}回復了{{pokemonName}}的體力！",
+  "drowsyOnAdd": "{{pokemonNameWithAffix}}產生睡意了！",
+  "damagingTrapLapse": "{{pokemonNameWithAffix}}受到了{{moveName}}的傷害！",
+  "bindOnTrap": "{{pokemonNameWithAffix}}被{{sourcePokemonName}}的 {{moveName}}緊緊束縛住了！",
+  "wrapOnTrap": "{{pokemonNameWithAffix}}被{{sourcePokemonName}}綁緊了！",
+  "vortexOnTrap": "{{pokemonNameWithAffix}}被困在了旋渦之中！",
+  "clampOnTrap": "{{sourcePokemonNameWithAffix}}用貝殼夾住了{{pokemonName}}！",
+  "sandTombOnTrap": "{{pokemonNameWithAffix}}被{{moveName}}困住了！",
+  "magmaStormOnTrap": "{{pokemonNameWithAffix}}被困在了熔岩風暴之中！",
+  "snapTrapOnTrap": "{{pokemonNameWithAffix}}被捕獸夾困住了！",
+  "thunderCageOnTrap": "{{sourcePokemonNameWithAffix}}困住了{{pokemonNameWithAffix}}！",
+  "infestationOnTrap": "{{pokemonNameWithAffix}}受到了{{sourcePokemonNameWithAffix}}的死纏爛打！",
+  "protectedOnAdd": "{{pokemonNameWithAffix}}擺出了防守的架勢！",
+  "protectedLapse": "{{pokemonNameWithAffix}}在攻擊中保護了自己！",
+  "enduringOnAdd": "{{pokemonNameWithAffix}}擺出了挺住攻擊的架勢！",
+  "enduringLapse": "{{pokemonNameWithAffix}}挺住了攻擊！",
+  "sturdyLapse": "{{pokemonNameWithAffix}}挺住了攻擊！",
+  "perishSongLapse": "{{pokemonNameWithAffix}} 的滅亡計時變成{{turnCount}}了！",
+  "centerOfAttentionOnAdd": "{{pokemonNameWithAffix}}\n變得萬眾矚目了！",
+  "truantLapse": "{{pokemonNameWithAffix}}正在偷懶！",
+  "slowStartOnAdd": "{{pokemonNameWithAffix}}無法拿出平時的水平！",
+  "slowStartOnRemove": "{{pokemonNameWithAffix}}恢復了平時的水平！",
+  "highestStatBoostOnAdd": "{{pokemonNameWithAffix}}的{{statName}}升高了！",
+  "highestStatBoostOnRemove": "{{pokemonNameWithAffix}}的{{abilityName}}效果解除了！",
+  "magnetRisenOnAdd": "{{pokemonNameWithAffix}}\n因電磁力浮了起來！",
+  "magnetRisenOnRemove": "{{pokemonNameWithAffix}}的\n電磁力消失了！",
+  "critBoostOnAdd": "{{pokemonNameWithAffix}}現在幹勁十足！",
+  "critBoostOnRemove": "{{pokemonNameWithAffix}}如釋重負似地放鬆了下來。",
+  "saltCuredOnAdd": "{{pokemonNameWithAffix}} 陷入了鹽腌狀態！",
+  "saltCuredLapse": "{{pokemonNameWithAffix}} 受到了{{moveName}}的傷害！",
+  "cursedOnAdd": "{{pokemonNameWithAffix}}削減了自己的體力，並詛咒了{{pokemonName}}！",
+  "cursedLapse": "{{pokemonNameWithAffix}}正受到詛咒！",
+  "stockpilingOnAdd": "{{pokemonNameWithAffix}} stockpiled {{stockpiledCount}}!",
 } as const;

From ec26e751f85768bdc13b1d3487dc83d14c500875 Mon Sep 17 00:00:00 2001
From: DustinLin <39450497+DustinLin@users.noreply.github.com>
Date: Sun, 11 Aug 2024 22:13:56 -0700
Subject: [PATCH 17/30] [TEST] - adding parting shot move test (#3412)

* adding parting shot test

* improve tests

* updating test

* fixing existing tests

* more tests

* adding more tests
---
 src/test/moves/parting_shot.test.ts | 206 ++++++++++++++++++++++++++++
 1 file changed, 206 insertions(+)
 create mode 100644 src/test/moves/parting_shot.test.ts

diff --git a/src/test/moves/parting_shot.test.ts b/src/test/moves/parting_shot.test.ts
new file mode 100644
index 00000000000..b8b0faba4ce
--- /dev/null
+++ b/src/test/moves/parting_shot.test.ts
@@ -0,0 +1,206 @@
+import { SPLASH_ONLY } from "../utils/testUtils";
+import { BerryPhase,  MessagePhase, TurnInitPhase, FaintPhase } from "#app/phases";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, test, it } from "vitest";
+import GameManager from "../utils/gameManager";
+import { getMovePosition } from "../utils/gameManagerUtils";
+import { BattleStat } from "#app/data/battle-stat";
+
+const TIMEOUT = 20 * 1000;
+
+describe("Moves - Parting Shot", () => {
+  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");
+    game.override.moveset([Moves.PARTING_SHOT, Moves.SPLASH]);
+    game.override.enemyMoveset(SPLASH_ONLY);
+    game.override.startingLevel(5);
+    game.override.enemyLevel(5);
+
+  });
+
+  test(
+    "Parting Shot when buffed by prankster should fail against dark types",
+    async () => {
+      game.override
+        .enemySpecies(Species.POOCHYENA)
+        .ability(Abilities.PRANKSTER);
+      await game.startBattle([Species.MURKROW, Species.MEOWTH]);
+
+      const enemyPokemon = game.scene.getEnemyPokemon()!;
+      expect(enemyPokemon).toBeDefined();
+
+      game.doAttack(getMovePosition(game.scene, 0, Moves.PARTING_SHOT));
+
+      await game.phaseInterceptor.to(BerryPhase, false);
+      const battleStatsOpponent = enemyPokemon.summonData.battleStats;
+      expect(battleStatsOpponent[BattleStat.ATK]).toBe(0);
+      expect(battleStatsOpponent[BattleStat.SPATK]).toBe(0);
+      expect(game.scene.getPlayerField()[0].species.speciesId).toBe(Species.MURKROW);
+    }, TIMEOUT
+  );
+
+  test(
+    "Parting shot should fail against good as gold ability",
+    async () => {
+      game.override
+        .enemySpecies(Species.GHOLDENGO)
+        .enemyAbility(Abilities.GOOD_AS_GOLD);
+      await game.startBattle([Species.MURKROW, Species.MEOWTH]);
+
+      const enemyPokemon = game.scene.getEnemyPokemon()!;
+      expect(enemyPokemon).toBeDefined();
+
+      game.doAttack(getMovePosition(game.scene, 0, Moves.PARTING_SHOT));
+
+      await game.phaseInterceptor.to(BerryPhase, false);
+      const battleStatsOpponent = enemyPokemon.summonData.battleStats;
+      expect(battleStatsOpponent[BattleStat.ATK]).toBe(0);
+      expect(battleStatsOpponent[BattleStat.SPATK]).toBe(0);
+      expect(game.scene.getPlayerField()[0].species.speciesId).toBe(Species.MURKROW);
+    }, TIMEOUT
+  );
+
+  it.skip( // TODO: fix this bug to pass the test!
+    "Parting shot should fail if target is -6/-6 de-buffed",
+    async () => {
+      game.override.moveset([Moves.PARTING_SHOT, Moves.MEMENTO, Moves.SPLASH]);
+      await game.startBattle([Species.MEOWTH, Species.MEOWTH, Species.MEOWTH, Species.MURKROW, Species.ABRA]);
+
+      // use Memento 3 times to debuff enemy
+      game.doAttack(getMovePosition(game.scene, 0, Moves.MEMENTO));
+      await game.phaseInterceptor.to(FaintPhase);
+      expect(game.scene.getParty()[0].isFainted()).toBe(true);
+      game.doSelectPartyPokemon(1);
+
+      await game.phaseInterceptor.to(TurnInitPhase, false);
+      game.doAttack(getMovePosition(game.scene, 0, Moves.MEMENTO));
+      await game.phaseInterceptor.to(FaintPhase);
+      expect(game.scene.getParty()[0].isFainted()).toBe(true);
+      game.doSelectPartyPokemon(2);
+
+      await game.phaseInterceptor.to(TurnInitPhase, false);
+      game.doAttack(getMovePosition(game.scene, 0, Moves.MEMENTO));
+      await game.phaseInterceptor.to(FaintPhase);
+      expect(game.scene.getParty()[0].isFainted()).toBe(true);
+      game.doSelectPartyPokemon(3);
+
+      // set up done
+      await game.phaseInterceptor.to(TurnInitPhase, false);
+      const enemyPokemon = game.scene.getEnemyPokemon()!;
+      expect(enemyPokemon).toBeDefined();
+
+      const battleStatsOpponent = enemyPokemon.summonData.battleStats;
+      expect(battleStatsOpponent[BattleStat.ATK]).toBe(-6);
+      expect(battleStatsOpponent[BattleStat.SPATK]).toBe(-6);
+
+      // now parting shot should fail
+      game.doAttack(getMovePosition(game.scene, 0, Moves.PARTING_SHOT));
+
+      await game.phaseInterceptor.to(BerryPhase, false);
+      expect(battleStatsOpponent[BattleStat.ATK]).toBe(-6);
+      expect(battleStatsOpponent[BattleStat.SPATK]).toBe(-6);
+      expect(game.scene.getPlayerField()[0].species.speciesId).toBe(Species.MURKROW);
+    }, TIMEOUT
+  );
+
+  it.skip( // TODO: fix this bug to pass the test!
+    "Parting shot shouldn't allow switch out when mist is active",
+    async () => {
+      game.override
+        .enemySpecies(Species.ALTARIA)
+        .enemyAbility(Abilities.NONE)
+        .enemyMoveset(Array(4).fill(Moves.MIST));
+      await game.startBattle([Species.SNORLAX, Species.MEOWTH]);
+
+      const enemyPokemon = game.scene.getEnemyPokemon()!;
+      expect(enemyPokemon).toBeDefined();
+
+      game.doAttack(getMovePosition(game.scene, 0, Moves.PARTING_SHOT));
+
+      await game.phaseInterceptor.to(BerryPhase, false);
+      const battleStatsOpponent = enemyPokemon.summonData.battleStats;
+      expect(battleStatsOpponent[BattleStat.ATK]).toBe(0);
+      expect(battleStatsOpponent[BattleStat.SPATK]).toBe(0);
+      expect(game.scene.getPlayerField()[0].species.speciesId).toBe(Species.MURKROW);
+    }, TIMEOUT
+  );
+
+  it.skip( // TODO: fix this bug to pass the test!
+    "Parting shot shouldn't allow switch out against clear body ability",
+    async () => {
+      game.override
+        .enemySpecies(Species.TENTACOOL)
+        .enemyAbility(Abilities.CLEAR_BODY);
+      await game.startBattle([Species.SNORLAX, Species.MEOWTH]);
+
+      const enemyPokemon = game.scene.getEnemyPokemon()!;
+      expect(enemyPokemon).toBeDefined();
+
+      game.doAttack(getMovePosition(game.scene, 0, Moves.PARTING_SHOT));
+
+      await game.phaseInterceptor.to(BerryPhase, false);
+      const battleStatsOpponent = enemyPokemon.summonData.battleStats;
+      expect(battleStatsOpponent[BattleStat.ATK]).toBe(0);
+      expect(battleStatsOpponent[BattleStat.SPATK]).toBe(0);
+      expect(game.scene.getPlayerField()[0].species.speciesId).toBe(Species.MURKROW);
+    }, TIMEOUT
+  );
+
+  it.skip( // TODO: fix this bug to pass the test!
+    "Parting shot should de-buff and not fail if no party available to switch - party size 1",
+    async () => {
+      await game.startBattle([Species.MURKROW]);
+
+      const enemyPokemon = game.scene.getEnemyPokemon()!;
+      expect(enemyPokemon).toBeDefined();
+
+      game.doAttack(getMovePosition(game.scene, 0, Moves.PARTING_SHOT));
+
+      await game.phaseInterceptor.to(BerryPhase, false);
+      const battleStatsOpponent = enemyPokemon.summonData.battleStats;
+      expect(battleStatsOpponent[BattleStat.ATK]).toBe(-1);
+      expect(battleStatsOpponent[BattleStat.SPATK]).toBe(-1);
+      expect(game.scene.getPlayerField()[0].species.speciesId).toBe(Species.MURKROW);
+    }, TIMEOUT
+  );
+
+  it.skip( // TODO: fix this bug to pass the test!
+    "Parting shot regularly not fail if no party available to switch - party fainted",
+    async () => {
+      await game.startBattle([Species.MURKROW, Species.MEOWTH]);
+      game.doAttack(getMovePosition(game.scene, 0, Moves.SPLASH));
+
+      // intentionally kill party pokemon, switch to second slot (now 1 party mon is fainted)
+      await game.killPokemon(game.scene.getParty()[0]);
+      expect(game.scene.getParty()[0].isFainted()).toBe(true);
+      await game.phaseInterceptor.run(MessagePhase);
+      game.doSelectPartyPokemon(1);
+
+      await game.phaseInterceptor.to(TurnInitPhase, false);
+      game.doAttack(getMovePosition(game.scene, 0, Moves.PARTING_SHOT));
+
+      await game.phaseInterceptor.to(BerryPhase, false);
+      const battleStatsOpponent = game.scene.currentBattle.enemyParty[0].summonData.battleStats;
+      expect(battleStatsOpponent[BattleStat.ATK]).toBe(0);
+      expect(battleStatsOpponent[BattleStat.SPATK]).toBe(0);
+      expect(game.scene.getPlayerField()[0].species.speciesId).toBe(Species.MEOWTH);
+    }, TIMEOUT
+  );
+});

From c078e5d61286812ea81d033dd83eb653fbbb4845 Mon Sep 17 00:00:00 2001
From: allen925 <62000482+allen925@users.noreply.github.com>
Date: Sun, 11 Aug 2024 22:26:37 -0700
Subject: [PATCH 18/30] [Bug][Test] Fix minor bug of ability Flash Fire, added
 test file (#3458)

* fix: let flash fire hit after frozen, and baton pass not passing it. added: flash fire test file

* added more tests and made small adjustments

* Update src/test/abilities/flash_fire.test.ts

Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>

---------

Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
---
 src/data/ability.ts                   |   2 +-
 src/field/pokemon.ts                  |   6 +-
 src/test/abilities/flash_fire.test.ts | 131 ++++++++++++++++++++++++++
 3 files changed, 136 insertions(+), 3 deletions(-)
 create mode 100644 src/test/abilities/flash_fire.test.ts

diff --git a/src/data/ability.ts b/src/data/ability.ts
index 950538af9f6..edc213099a9 100644
--- a/src/data/ability.ts
+++ b/src/data/ability.ts
@@ -4408,7 +4408,7 @@ export function initAbilities() {
       .attr(StatusEffectImmunityAbAttr, StatusEffect.POISON, StatusEffect.TOXIC)
       .ignorable(),
     new Ability(Abilities.FLASH_FIRE, 3)
-      .attr(TypeImmunityAddBattlerTagAbAttr, Type.FIRE, BattlerTagType.FIRE_BOOST, 1, (pokemon: Pokemon) => !pokemon.status || pokemon.status.effect !== StatusEffect.FREEZE)
+      .attr(TypeImmunityAddBattlerTagAbAttr, Type.FIRE, BattlerTagType.FIRE_BOOST, 1)
       .ignorable(),
     new Ability(Abilities.SHIELD_DUST, 3)
       .attr(IgnoreMoveEffectsAbAttr)
diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 618b4343950..36603b33b90 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -2440,8 +2440,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     }
     for (const tag of source.summonData.tags) {
 
-      // bypass yawn, and infatuation as those can not be passed via Baton Pass
-      if (tag.sourceMove === Moves.YAWN || tag.tagType === BattlerTagType.INFATUATED) {
+      // bypass those can not be passed via Baton Pass
+      const excludeTagTypes = new Set([BattlerTagType.DROWSY, BattlerTagType.INFATUATED, BattlerTagType.FIRE_BOOST]);
+
+      if (excludeTagTypes.has(tag.tagType)) {
         continue;
       }
 
diff --git a/src/test/abilities/flash_fire.test.ts b/src/test/abilities/flash_fire.test.ts
new file mode 100644
index 00000000000..a5b3677edee
--- /dev/null
+++ b/src/test/abilities/flash_fire.test.ts
@@ -0,0 +1,131 @@
+import { Species } from "#app/enums/species.js";
+import GameManager from "#test/utils/gameManager";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+import { SPLASH_ONLY } from "#test/utils/testUtils";
+import { MovePhase, TurnEndPhase } from "#app/phases";
+import { getMovePosition } from "#test/utils/gameManagerUtils";
+import { Status, StatusEffect } from "#app/data/status-effect.js";
+import { BattlerTagType } from "#app/enums/battler-tag-type.js";
+import { BattlerIndex } from "#app/battle.js";
+
+describe("Abilities - Flash Fire", () => {
+  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")
+      .ability(Abilities.FLASH_FIRE)
+      .startingLevel(20)
+      .enemyLevel(20)
+      .disableCrits();
+  });
+
+
+  it("immune to Fire-type moves", async() => {
+    game.override.enemyMoveset(Array(4).fill(Moves.EMBER)).moveset(SPLASH_ONLY);
+    await game.startBattle([Species.BLISSEY]);
+
+    const blissey = game.scene.getPlayerPokemon()!;
+
+    game.doAttack(getMovePosition(game.scene, 0, Moves.SPLASH));
+    await game.phaseInterceptor.to(TurnEndPhase);
+    expect(blissey.hp).toBe(blissey.getMaxHp());
+  }, 20000);
+
+  it("not activate if the Pokémon is protected from the Fire-type move", async() => {
+    game.override.enemyMoveset(Array(4).fill(Moves.EMBER)).moveset([Moves.PROTECT]);
+    await game.startBattle([Species.BLISSEY]);
+
+    const blissey = game.scene.getPlayerPokemon()!;
+
+    game.doAttack(getMovePosition(game.scene, 0, Moves.PROTECT));
+    await game.phaseInterceptor.to(TurnEndPhase);
+    expect(blissey!.getTag(BattlerTagType.FIRE_BOOST)).toBeUndefined();
+  }, 20000);
+
+  it("activated by Will-O-Wisp", async() => {
+    game.override.enemyMoveset(Array(4).fill(Moves.WILL_O_WISP)).moveset(SPLASH_ONLY);
+    await game.startBattle([Species.BLISSEY]);
+
+    const blissey = game.scene.getPlayerPokemon()!;
+
+    game.doAttack(getMovePosition(game.scene, 0, Moves.SPLASH));
+    await game.move.forceHit();
+    await game.phaseInterceptor.to(MovePhase, false);
+    await game.move.forceHit();
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+    expect(blissey!.getTag(BattlerTagType.FIRE_BOOST)).toBeDefined();
+  }, 20000);
+
+  it("activated after being frozen", async() => {
+    game.override.enemyMoveset(Array(4).fill(Moves.EMBER)).moveset(SPLASH_ONLY);
+    await game.startBattle([Species.BLISSEY]);
+
+    const blissey = game.scene.getPlayerPokemon()!;
+
+    blissey!.status = new Status(StatusEffect.FREEZE);
+    expect(blissey.status?.effect).toBe(StatusEffect.FREEZE);
+
+    game.doAttack(getMovePosition(game.scene, 0, Moves.SPLASH));
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+    expect(blissey!.getTag(BattlerTagType.FIRE_BOOST)).toBeDefined();
+  }, 20000);
+
+  it("not passing with baton pass", async() => {
+    game.override.enemyMoveset(Array(4).fill(Moves.EMBER)).moveset([Moves.BATON_PASS]);
+    await game.startBattle([Species.BLISSEY, Species.CHANSEY]);
+
+    // ensure use baton pass after enemy moved
+    game.doAttack(getMovePosition(game.scene, 0, Moves.BATON_PASS));
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+
+    game.doSelectPartyPokemon(1);
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+    const chansey = game.scene.getPlayerPokemon()!;
+    expect(game.scene.getPlayerPokemon()!.species.speciesId).toBe(Species.CHANSEY);
+    expect(chansey!.getTag(BattlerTagType.FIRE_BOOST)).toBeUndefined();
+  }, 20000);
+
+  it("boosts Fire-type move when the ability is activated", async() => {
+    game.override.enemyMoveset(Array(4).fill(Moves.FIRE_PLEDGE)).moveset([Moves.EMBER, Moves.SPLASH]);
+    game.override.enemyAbility(Abilities.FLASH_FIRE).ability(Abilities.NONE);
+    await game.startBattle([Species.BLISSEY]);
+    const blissey = game.scene.getPlayerPokemon()!;
+    const initialHP = 1000;
+    blissey.hp = initialHP;
+
+    // first turn
+    game.doAttack(getMovePosition(game.scene, 0, Moves.EMBER));
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.phaseInterceptor.to(TurnEndPhase);
+    const originalDmg = initialHP - blissey.hp;
+
+    expect(blissey.hp > 0);
+    blissey.hp = initialHP;
+
+    // second turn
+    game.doAttack(getMovePosition(game.scene, 0, Moves.SPLASH));
+    await game.phaseInterceptor.to(TurnEndPhase);
+    const flashFireDmg = initialHP - blissey.hp;
+
+    expect(flashFireDmg).toBeGreaterThan(originalDmg);
+  }, 20000);
+});

From 63b5195b14f19f51ed5f9e7a4be3b55af82b9486 Mon Sep 17 00:00:00 2001
From: Tempoanon <163687446+Tempo-anon@users.noreply.github.com>
Date: Mon, 12 Aug 2024 01:34:53 -0400
Subject: [PATCH 19/30] [Bug] Some fresh start fixes (#3420)

* Fix some fresh start bugs

* Forgot a !

* Add fresh start check on eviolite too

* Remove part about cost being 3

* Update src/game-mode.ts

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>

* Rename isFreshStart helper function

---------

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
---
 src/data/challenge.ts         |  4 ++--
 src/game-mode.ts              | 18 ++++++++++++++++++
 src/modifier/modifier-type.ts |  4 ++--
 src/phases.ts                 |  2 +-
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/data/challenge.ts b/src/data/challenge.ts
index 18cc58ddaf1..0df496c2ea4 100644
--- a/src/data/challenge.ts
+++ b/src/data/challenge.ts
@@ -630,8 +630,8 @@ export class FreshStartChallenge extends Challenge {
   }
 
   applyStarterCost(species: Species, cost: Utils.NumberHolder): boolean {
-    if (defaultStarterSpecies.includes(species) && cost.value !== 3) {
-      cost.value = 3;
+    if (defaultStarterSpecies.includes(species)) {
+      cost.value = speciesStarters[species];
       return true;
     }
     return false;
diff --git a/src/game-mode.ts b/src/game-mode.ts
index 2475cb5cfb4..e78b9017c12 100644
--- a/src/game-mode.ts
+++ b/src/game-mode.ts
@@ -8,6 +8,7 @@ import Overrides from "#app/overrides";
 import * as Utils from "./utils";
 import { Biome } from "#enums/biome";
 import { Species } from "#enums/species";
+import { Challenges } from "./enums/challenges";
 
 export enum GameModes {
   CLASSIC,
@@ -55,6 +56,23 @@ export class GameMode implements GameModeConfig {
     this.battleConfig = battleConfig || {};
   }
 
+  /**
+   * Helper function to see if a GameMode has a specific challenge type
+   * @param challenge the Challenges it looks for
+   * @returns true if the game mode has that challenge
+   */
+  hasChallenge(challenge: Challenges): boolean {
+    return this.challenges.some(c => c.id === challenge);
+  }
+
+  /**
+   * Helper function to see if the game mode is using fresh start
+   * @returns true if a fresh start challenge is being applied
+   */
+  isFreshStartChallenge(): boolean {
+    return this.hasChallenge(Challenges.FRESH_START);
+  }
+
   /**
    * @returns either:
    * - override from overrides.ts
diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts
index 330132b55fc..942ef4e1bfc 100644
--- a/src/modifier/modifier-type.ts
+++ b/src/modifier/modifier-type.ts
@@ -1545,7 +1545,7 @@ const modifierPool: ModifierPool = {
     new WeightedModifierType(modifierTypes.RARE_EVOLUTION_ITEM, (party: Pokemon[]) => Math.min(Math.ceil(party[0].scene.currentBattle.waveIndex / 15) * 4, 32), 32),
     new WeightedModifierType(modifierTypes.AMULET_COIN, skipInLastClassicWaveOrDefault(3)),
     new WeightedModifierType(modifierTypes.EVIOLITE, (party: Pokemon[]) => {
-      if (party[0].scene.gameData.unlocks[Unlockables.EVIOLITE]) {
+      if (!party[0].scene.gameMode.isFreshStartChallenge() && party[0].scene.gameData.unlocks[Unlockables.EVIOLITE]) {
         return party.some(p => ((p.getSpeciesForm(true).speciesId in pokemonEvolutions) || (p.isFusion() && (p.getFusionSpeciesForm(true).speciesId in pokemonEvolutions))) && !p.getHeldItems().some(i => i instanceof Modifiers.EvolutionStatBoosterModifier)) ? 10 : 0;
       }
       return 0;
@@ -1623,7 +1623,7 @@ const modifierPool: ModifierPool = {
     new WeightedModifierType(modifierTypes.MULTI_LENS, 18),
     new WeightedModifierType(modifierTypes.VOUCHER_PREMIUM, (party: Pokemon[], rerollCount: integer) => !party[0].scene.gameMode.isDaily && !party[0].scene.gameMode.isEndless && !party[0].scene.gameMode.isSplicedOnly ? Math.max(5 - rerollCount * 2, 0) : 0, 5),
     new WeightedModifierType(modifierTypes.DNA_SPLICERS, (party: Pokemon[]) => !party[0].scene.gameMode.isSplicedOnly && party.filter(p => !p.fusionSpecies).length > 1 ? 24 : 0, 24),
-    new WeightedModifierType(modifierTypes.MINI_BLACK_HOLE, (party: Pokemon[]) => party[0].scene.gameData.unlocks[Unlockables.MINI_BLACK_HOLE] ? 1 : 0, 1),
+    new WeightedModifierType(modifierTypes.MINI_BLACK_HOLE, (party: Pokemon[]) => (!party[0].scene.gameMode.isFreshStartChallenge() && party[0].scene.gameData.unlocks[Unlockables.MINI_BLACK_HOLE]) ? 1 : 0, 1),
   ].map(m => {
     m.setTier(ModifierTier.MASTER); return m;
   })
diff --git a/src/phases.ts b/src/phases.ts
index fcd3cfb8801..73413b248a4 100644
--- a/src/phases.ts
+++ b/src/phases.ts
@@ -2031,7 +2031,7 @@ export class CommandPhase extends FieldPhase {
       }
       break;
     case Command.BALL:
-      if (this.scene.arena.biomeType === Biome.END && (!this.scene.gameMode.isClassic || (this.scene.getEnemyField().filter(p => p.isActive(true)).some(p => !p.scene.gameData.dexData[p.species.speciesId].caughtAttr) && this.scene.gameData.getStarterCount(d => !!d.caughtAttr) < Object.keys(speciesStarters).length - 1))) {
+      if (!this.scene.gameMode.isFreshStartChallenge() && this.scene.arena.biomeType === Biome.END && (!this.scene.gameMode.isClassic || (this.scene.getEnemyField().filter(p => p.isActive(true)).some(p => !p.scene.gameData.dexData[p.species.speciesId].caughtAttr) && this.scene.gameData.getStarterCount(d => !!d.caughtAttr) < Object.keys(speciesStarters).length - 1))) {
         this.scene.ui.setMode(Mode.COMMAND, this.fieldIndex);
         this.scene.ui.setMode(Mode.MESSAGE);
         this.scene.ui.showText(i18next.t("battle:noPokeballForce"), null, () => {

From d2c6aa5df8ee253608e30327e71a669ad0038ce6 Mon Sep 17 00:00:00 2001
From: "Amani H." <109637146+xsn34kzx@users.noreply.github.com>
Date: Mon, 12 Aug 2024 01:49:32 -0400
Subject: [PATCH 20/30] [Bug] Prevent Relearnable Egg Moves in Fresh Start
 (#3466)

* [Bug] Prevent Relearnable Egg Moves in Fresh Start

* Mention Condition in Docs

* Use `isFreshStartChallenge()`
---
 src/field/pokemon.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 36603b33b90..588b6839d70 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -916,13 +916,13 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    * excluding any moves already known.
    *
    * Available egg moves are only included if the {@linkcode Pokemon} was
-   * in the starting party of the run.
+   * in the starting party of the run and if Fresh Start is not active.
    * @returns an array of {@linkcode Moves}, the length of which is determined
    * by how many learnable moves there are for the {@linkcode Pokemon}.
    */
   getLearnableLevelMoves(): Moves[] {
     let levelMoves = this.getLevelMoves(1, true).map(lm => lm[1]);
-    if (this.metBiome === -1) {
+    if (this.metBiome === -1 && !this.scene.gameMode.isFreshStartChallenge()) {
       levelMoves = this.getUnlockedEggMoves().concat(levelMoves);
     }
     return levelMoves.filter(lm => !this.moveset.some(m => m?.moveId === lm));

From d3d376dca38cc9d7a2e424609b581468964daf56 Mon Sep 17 00:00:00 2001
From: Leo Kim <47556641+KimJeongSun@users.noreply.github.com>
Date: Mon, 12 Aug 2024 15:19:20 +0900
Subject: [PATCH 21/30] [Enhancement] update initial filter setting when not in
 challenge mode (#3506)

* update initial filter setting when not in challenge mode

* Modify the code with more consideration for future scalability.

* update initial setting in challenge mode also. no conditional setting!
---
 src/ui/starter-select-ui-handler.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts
index f7ef4b47353..8cea765fb57 100644
--- a/src/ui/starter-select-ui-handler.ts
+++ b/src/ui/starter-select-ui-handler.ts
@@ -973,13 +973,16 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
    * Set the selections for all filters to their default starting value
    */
   resetFilters() : void {
-    const genDropDown: DropDown = this.filterBar.getFilter(DropDownColumn.GEN);
+    const caughtDropDown: DropDown = this.filterBar.getFilter(DropDownColumn.CAUGHT);
 
     this.filterBar.setValsToDefault();
 
-    if (!this.scene.gameMode.isChallenge) {
-      // if not in a challenge, in Gen hybrid filter hovering mode, set the cursor to the Gen1
-      genDropDown.setCursor(1);
+    // initial setting, in caught filter, select the options excluding the uncaught option
+    for (let i = 0; i < caughtDropDown.options.length; i++) {
+      // if the option is not "ALL" or "UNCAUGHT", toggle it
+      if (caughtDropDown.options[i].val !== "ALL" && caughtDropDown.options[i].val !== "UNCAUGHT") {
+        caughtDropDown.toggleOptionState(i);
+      }
     }
   }
 

From 223295e8277b2639889dc6067a965b5f3bf1bc74 Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Mon, 12 Aug 2024 03:52:39 -0700
Subject: [PATCH 22/30] [Fix] Refactor Disguise to work like Ice Face (#2684)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix typos in `src/data/egg.ts` comments

* Refactor Disguise using Ice Face as a base

i18n {
  Co-authored-by: Arxxer <javiptn7@gmail.com>
  Co-authored-by: GoldTra <162721984+GoldTra@users.noreply.github.com>
  Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>
  Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
  Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
}

Update tests

* Update jsdoc

* Make recoil damage a parameter

* Fix Ice Face i18n parameter name

* Add i18n placeholder strings for translation

* Update disguise test with override helper functions

* Move a form change from `battle-scene.ts` to `ability.ts`

* Remove a bit of obsolete code from the Disguise test

* Add some translations

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: returntoice <dieandbecome@gmail.com>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
Co-authored-by: Sonny Ding <93831983+sonnyding1@users.noreply.github.com>

* Add translation placeholder strings for Japanese and Catalan

* Update for strict-null

* Remove unused parameter from the `BattlerTag` class

* Remove species checks, fusion doesn't seem to be an issue (any more?)

* Move Ice Face weather-based code to a subclass

* Condense conditionals

Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>

---------

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: returntoice <dieandbecome@gmail.com>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
Co-authored-by: Sonny Ding <93831983+sonnyding1@users.noreply.github.com>
Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com>
---
 src/battle-scene.ts                  |   7 -
 src/data/ability.ts                  | 143 ++++++--------------
 src/data/battler-tags.ts             |  61 +++++----
 src/data/pokemon-forms.ts            |   3 +
 src/enums/battler-tag-type.ts        |   1 +
 src/locales/ca_ES/ability-trigger.ts |   1 +
 src/locales/ca_ES/pokemon-form.ts    |   1 +
 src/locales/de/ability-trigger.ts    |   4 +-
 src/locales/de/pokemon-form.ts       |   1 +
 src/locales/en/ability-trigger.ts    |   4 +-
 src/locales/en/pokemon-form.ts       |   1 +
 src/locales/es/ability-trigger.ts    |   6 +-
 src/locales/es/pokemon-form.ts       |   1 +
 src/locales/fr/ability-trigger.ts    |   4 +-
 src/locales/fr/pokemon-form.ts       |   1 +
 src/locales/it/ability-trigger.ts    |   4 +-
 src/locales/it/pokemon-form.ts       |   1 +
 src/locales/ja/ability-trigger.ts    |   1 +
 src/locales/ja/pokemon-form.ts       |   1 +
 src/locales/ko/ability-trigger.ts    |   4 +-
 src/locales/ko/pokemon-form.ts       |   1 +
 src/locales/pt_BR/ability-trigger.ts |   4 +-
 src/locales/pt_BR/pokemon-form.ts    |   1 +
 src/locales/zh_CN/ability-trigger.ts |   4 +-
 src/locales/zh_CN/pokemon-form.ts    |   1 +
 src/locales/zh_TW/ability-trigger.ts |   4 +-
 src/locales/zh_TW/pokemon-form.ts    |   1 +
 src/test/abilities/disguise.test.ts  | 189 ++++++++++++++++++---------
 28 files changed, 238 insertions(+), 217 deletions(-)

diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 0775da48112..21d381a9713 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -55,7 +55,6 @@ import {UiInputs} from "./ui-inputs";
 import { NewArenaEvent } from "./events/battle-scene";
 import { ArenaFlyout } from "./ui/arena-flyout";
 import { EaseType } from "#enums/ease-type";
-import { Abilities } from "#enums/abilities";
 import { BattleSpec } from "#enums/battle-spec";
 import { BattleStyle } from "#enums/battle-style";
 import { Biome } from "#enums/biome";
@@ -1153,12 +1152,6 @@ export default class BattleScene extends SceneBase {
         playerField.forEach((_, p) => this.pushPhase(new ReturnPhase(this, p)));
 
         for (const pokemon of this.getParty()) {
-          // Only trigger form change when Eiscue is in Noice form
-          // Hardcoded Eiscue for now in case it is fused with another pokemon
-          if (pokemon.species.speciesId === Species.EISCUE && pokemon.hasAbility(Abilities.ICE_FACE) && pokemon.formIndex === 1) {
-            this.triggerPokemonFormChange(pokemon, SpeciesFormChangeManualTrigger);
-          }
-
           pokemon.resetBattleData();
           applyPostBattleInitAbAttrs(PostBattleInitAbAttr, pokemon);
         }
diff --git a/src/data/ability.ts b/src/data/ability.ts
index edc213099a9..961c724416a 100644
--- a/src/data/ability.ts
+++ b/src/data/ability.ts
@@ -245,25 +245,6 @@ export class PreDefendAbAttr extends AbAttr {
   }
 }
 
-export class PreDefendFormChangeAbAttr extends PreDefendAbAttr {
-  private formFunc: (p: Pokemon) => integer;
-
-  constructor(formFunc: ((p: Pokemon) => integer)) {
-    super(true);
-
-    this.formFunc = formFunc;
-  }
-
-  applyPreDefend(pokemon: Pokemon, passive: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    const formIndex = this.formFunc(pokemon);
-    if (formIndex !== pokemon.formIndex) {
-      pokemon.scene.triggerPokemonFormChange(pokemon, SpeciesFormChangeManualTrigger, false);
-      return true;
-    }
-
-    return false;
-  }
-}
 export class PreDefendFullHpEndureAbAttr extends PreDefendAbAttr {
   applyPreDefend(pokemon: Pokemon, passive: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
     if (pokemon.isFullHp() &&
@@ -330,21 +311,6 @@ export class ReceivedTypeDamageMultiplierAbAttr extends ReceivedMoveDamageMultip
   }
 }
 
-export class PreDefendMoveDamageToOneAbAttr extends ReceivedMoveDamageMultiplierAbAttr {
-  constructor(condition: PokemonDefendCondition) {
-    super(condition, 1);
-  }
-
-  applyPreDefend(pokemon: Pokemon, passive: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
-    if (this.condition(pokemon, attacker, move)) {
-      (args[0] as Utils.NumberHolder).value = Math.floor(pokemon.getMaxHp() / 8);
-      return true;
-    }
-
-    return false;
-  }
-}
-
 /**
  * Determines whether a Pokemon is immune to a move because of an ability.
  * @extends PreDefendAbAttr
@@ -539,45 +505,6 @@ export class PostDefendGulpMissileAbAttr extends PostDefendAbAttr {
   }
 }
 
-export class PostDefendDisguiseAbAttr extends PostDefendAbAttr {
-
-  applyPostDefend(pokemon: Pokemon, passive: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean {
-    if (pokemon.formIndex === 0 && pokemon.battleData.hitCount !== 0 && (move.category === MoveCategory.SPECIAL || move.category === MoveCategory.PHYSICAL)) {
-
-      const recoilDamage = Math.ceil((pokemon.getMaxHp() / 8) - attacker.turnData.damageDealt);
-      if (!recoilDamage) {
-        return false;
-      }
-      pokemon.damageAndUpdate(recoilDamage, HitResult.OTHER);
-      pokemon.turnData.damageTaken += recoilDamage;
-      pokemon.scene.queueMessage(i18next.t("abilityTriggers:postDefendDisguise", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
-      return true;
-    }
-
-    return false;
-  }
-}
-
-export class PostDefendFormChangeAbAttr extends PostDefendAbAttr {
-  private formFunc: (p: Pokemon) => integer;
-
-  constructor(formFunc: ((p: Pokemon) => integer)) {
-    super(true);
-
-    this.formFunc = formFunc;
-  }
-
-  applyPostDefend(pokemon: Pokemon, passive: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean {
-    const formIndex = this.formFunc(pokemon);
-    if (formIndex !== pokemon.formIndex) {
-      pokemon.scene.triggerPokemonFormChange(pokemon, SpeciesFormChangeManualTrigger, false);
-      return true;
-    }
-
-    return false;
-  }
-}
-
 export class FieldPriorityMoveImmunityAbAttr extends PreDefendAbAttr {
   applyPreDefend(pokemon: Pokemon, passive: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
     const attackPriority = new Utils.IntegerHolder(move.priority);
@@ -4045,34 +3972,44 @@ export class PostSummonStatChangeOnArenaAbAttr extends PostSummonStatChangeAbAtt
 }
 
 /**
- * Takes no damage from the first hit of a physical move.
- * This is used in Ice Face ability.
+ * Takes no damage from the first hit of a damaging move.
+ * This is used in the Disguise and Ice Face abilities.
+ * @extends ReceivedMoveDamageMultiplierAbAttr
  */
-export class IceFaceBlockPhysicalAbAttr extends ReceivedMoveDamageMultiplierAbAttr {
+export class FormBlockDamageAbAttr extends ReceivedMoveDamageMultiplierAbAttr {
   private multiplier: number;
+  private tagType: BattlerTagType;
+  private recoilDamageFunc: ((pokemon: Pokemon) => number) | undefined;
+  private triggerMessageFunc: (pokemon: Pokemon, abilityName: string) => string;
 
-  constructor(condition: PokemonDefendCondition, multiplier: number) {
+  constructor(condition: PokemonDefendCondition, multiplier: number, tagType: BattlerTagType, triggerMessageFunc: (pokemon: Pokemon, abilityName: string) => string, recoilDamageFunc?: (pokemon: Pokemon) => number) {
     super(condition, multiplier);
 
     this.multiplier = multiplier;
+    this.tagType = tagType;
+    this.recoilDamageFunc = recoilDamageFunc;
+    this.triggerMessageFunc = triggerMessageFunc;
   }
 
   /**
-   * Applies the Ice Face pre-defense ability to the Pokémon.
-   * Removes BattlerTagType.ICE_FACE when hit by physical attack and is in Ice Face form.
+   * Applies the pre-defense ability to the Pokémon.
+   * Removes the appropriate `BattlerTagType` when hit by an attack and is in its defense form.
    *
-   * @param {Pokemon} pokemon - The Pokémon with the Ice Face ability.
-   * @param {boolean} passive - Whether the ability is passive.
-   * @param {Pokemon} attacker - The attacking Pokémon.
-   * @param {PokemonMove} move - The move being used.
-   * @param {Utils.BooleanHolder} cancelled - A holder for whether the move was cancelled.
-   * @param {any[]} args - Additional arguments.
-   * @returns {boolean} - Whether the immunity was applied.
+   * @param {Pokemon} pokemon The Pokémon with the ability.
+   * @param {boolean} passive n/a
+   * @param {Pokemon} attacker The attacking Pokémon.
+   * @param {PokemonMove} move The move being used.
+   * @param {Utils.BooleanHolder} cancelled n/a
+   * @param {any[]} args Additional arguments.
+   * @returns {boolean} Whether the immunity was applied.
    */
   applyPreDefend(pokemon: Pokemon, passive: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
     if (this.condition(pokemon, attacker, move)) {
       (args[0] as Utils.NumberHolder).value = this.multiplier;
-      pokemon.removeTag(BattlerTagType.ICE_FACE);
+      pokemon.removeTag(this.tagType);
+      if (this.recoilDamageFunc) {
+        pokemon.damageAndUpdate(this.recoilDamageFunc(pokemon), HitResult.OTHER);
+      }
       return true;
     }
 
@@ -4080,14 +4017,14 @@ export class IceFaceBlockPhysicalAbAttr extends ReceivedMoveDamageMultiplierAbAt
   }
 
   /**
-   * Gets the message triggered when the Pokémon avoids damage using the Ice Face ability.
-   * @param {Pokemon} pokemon - The Pokémon with the Ice Face ability.
-   * @param {string} abilityName - The name of the ability.
-   * @param {...any} args - Additional arguments.
-   * @returns {string} - The trigger message.
+   * Gets the message triggered when the Pokémon avoids damage using the form-changing ability.
+   * @param {Pokemon} pokemon The Pokémon with the ability.
+   * @param {string} abilityName The name of the ability.
+   * @param {...any} args n/a
+   * @returns {string} The trigger message.
    */
   getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string {
-    return i18next.t("abilityTriggers:iceFaceAvoidedDamage", { pokemonName: getPokemonNameWithAffix(pokemon), abilityName });
+    return this.triggerMessageFunc(pokemon, abilityName);
   }
 }
 
@@ -5004,20 +4941,18 @@ export function initAbilities() {
       .attr(NoFusionAbilityAbAttr)
       .bypassFaint(),
     new Ability(Abilities.DISGUISE, 7)
-      .attr(PreDefendMoveDamageToOneAbAttr, (target, user, move) => target.formIndex === 0 && target.getAttackTypeEffectiveness(move.type, user) > 0)
-      .attr(PostSummonFormChangeAbAttr, p => p.battleData.hitCount === 0 ? 0 : 1)
-      .attr(PostBattleInitFormChangeAbAttr, () => 0)
-      .attr(PostDefendFormChangeAbAttr, p => p.battleData.hitCount === 0 ? 0 : 1)
-      .attr(PreDefendFormChangeAbAttr, p => p.battleData.hitCount === 0 ? 0 : 1)
-      .attr(PostDefendDisguiseAbAttr)
       .attr(UncopiableAbilityAbAttr)
       .attr(UnswappableAbilityAbAttr)
       .attr(UnsuppressableAbilityAbAttr)
       .attr(NoTransformAbilityAbAttr)
       .attr(NoFusionAbilityAbAttr)
-      .bypassFaint()
-      .ignorable()
-      .partial(),
+      // Add BattlerTagType.DISGUISE if the pokemon is in its disguised form
+      .conditionalAttr(pokemon => pokemon.formIndex === 0, PostSummonAddBattlerTagAbAttr, BattlerTagType.DISGUISE, 0, false)
+      .attr(FormBlockDamageAbAttr, (target, user, move) => !!target.getTag(BattlerTagType.DISGUISE) && target.getAttackTypeEffectiveness(move.type, user) > 0, 0, BattlerTagType.DISGUISE,
+        (pokemon, abilityName) => i18next.t("abilityTriggers:disguiseAvoidedDamage", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName: abilityName }),
+        (pokemon) => Math.floor(pokemon.getMaxHp() / 8))
+      .attr(PostBattleInitFormChangeAbAttr, () => 0)
+      .ignorable(),
     new Ability(Abilities.BATTLE_BOND, 7)
       .attr(PostVictoryFormChangeAbAttr, () => 2)
       .attr(PostBattleInitFormChangeAbAttr, () => 1)
@@ -5166,7 +5101,9 @@ export function initAbilities() {
       .conditionalAttr(getWeatherCondition(WeatherType.HAIL, WeatherType.SNOW), PostSummonAddBattlerTagAbAttr, BattlerTagType.ICE_FACE, 0)
       // When weather changes to HAIL or SNOW while pokemon is fielded, add BattlerTagType.ICE_FACE
       .attr(PostWeatherChangeAddBattlerTagAttr, BattlerTagType.ICE_FACE, 0, WeatherType.HAIL, WeatherType.SNOW)
-      .attr(IceFaceBlockPhysicalAbAttr, (target, user, move) => move.category === MoveCategory.PHYSICAL && !!target.getTag(BattlerTagType.ICE_FACE), 0)
+      .attr(FormBlockDamageAbAttr, (target, user, move) => move.category === MoveCategory.PHYSICAL && !!target.getTag(BattlerTagType.ICE_FACE), 0, BattlerTagType.ICE_FACE,
+        (pokemon, abilityName) => i18next.t("abilityTriggers:iceFaceAvoidedDamage", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName: abilityName }))
+      .attr(PostBattleInitFormChangeAbAttr, () => 0)
       .ignorable(),
     new Ability(Abilities.POWER_SPOT, 8)
       .attr(AllyMoveCategoryPowerBoostAbAttr, [MoveCategory.SPECIAL, MoveCategory.PHYSICAL], 1.3),
diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts
index 3b6e005d7e8..898bbbc306b 100644
--- a/src/data/battler-tags.ts
+++ b/src/data/battler-tags.ts
@@ -1558,36 +1558,25 @@ export class GroundedTag extends BattlerTag {
   }
 }
 
-/**
- * Provides the Ice Face ability's effects.
- */
-export class IceFaceTag extends BattlerTag {
-  constructor(sourceMove: Moves) {
-    super(BattlerTagType.ICE_FACE, BattlerTagLapseType.CUSTOM, 1, sourceMove);
+/** Common attributes of form change abilities that block damage */
+export class FormBlockDamageTag extends BattlerTag {
+  constructor(tagType: BattlerTagType) {
+    super(tagType, BattlerTagLapseType.CUSTOM, 1);
   }
 
   /**
-   * Determines if the Ice Face tag can be added to the Pokémon.
-   * @param {Pokemon} pokemon - The Pokémon to which the tag might be added.
-   * @returns {boolean} - True if the tag can be added, false otherwise.
+   * Determines if the tag can be added to the Pokémon.
+   * @param {Pokemon} pokemon The Pokémon to which the tag might be added.
+   * @returns {boolean} True if the tag can be added, false otherwise.
    */
   canAdd(pokemon: Pokemon): boolean {
-    const weatherType = pokemon.scene.arena.weather?.weatherType;
-    const isWeatherSnowOrHail = weatherType === WeatherType.HAIL || weatherType === WeatherType.SNOW;
-    const isFormIceFace = pokemon.formIndex === 0;
-
-
-    // Hard code Eiscue for now, this is to prevent the game from crashing if fused pokemon has Ice Face
-    if ((pokemon.species.speciesId === Species.EISCUE && isFormIceFace) ||  isWeatherSnowOrHail) {
-      return true;
-    }
-    return false;
+    return pokemon.formIndex === 0;
   }
 
   /**
-   * Applies the Ice Face tag to the Pokémon.
-   * Triggers a form change to Ice Face if the Pokémon is not in its Ice Face form.
-   * @param {Pokemon} pokemon - The Pokémon to which the tag is added.
+   * Applies the tag to the Pokémon.
+   * Triggers a form change if the Pokémon is not in its defense form.
+   * @param {Pokemon} pokemon The Pokémon to which the tag is added.
    */
   onAdd(pokemon: Pokemon): void {
     super.onAdd(pokemon);
@@ -1598,9 +1587,9 @@ export class IceFaceTag extends BattlerTag {
   }
 
   /**
-   * Removes the Ice Face tag from the Pokémon.
-   * Triggers a form change to Noice when the tag is removed.
-   * @param {Pokemon} pokemon - The Pokémon from which the tag is removed.
+   * Removes the tag from the Pokémon.
+   * Triggers a form change when the tag is removed.
+   * @param {Pokemon} pokemon The Pokémon from which the tag is removed.
    */
   onRemove(pokemon: Pokemon): void {
     super.onRemove(pokemon);
@@ -1609,6 +1598,24 @@ export class IceFaceTag extends BattlerTag {
   }
 }
 
+/** Provides the additional weather-based effects of the Ice Face ability */
+export class IceFaceBlockDamageTag extends FormBlockDamageTag {
+  constructor(tagType: BattlerTagType) {
+    super(tagType);
+  }
+
+  /**
+   * Determines if the tag can be added to the Pokémon.
+   * @param {Pokemon} pokemon The Pokémon to which the tag might be added.
+   * @returns {boolean} True if the tag can be added, false otherwise.
+   */
+  canAdd(pokemon: Pokemon): boolean {
+    const weatherType = pokemon.scene.arena.weather?.weatherType;
+    const isWeatherSnowOrHail = weatherType === WeatherType.HAIL || weatherType === WeatherType.SNOW;
+
+    return super.canAdd(pokemon) || isWeatherSnowOrHail;
+  }
+}
 
 /**
  * Battler tag enabling the Stockpile mechanic. This tag handles:
@@ -1890,7 +1897,9 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: number, source
   case BattlerTagType.DESTINY_BOND:
     return new DestinyBondTag(sourceMove, sourceId);
   case BattlerTagType.ICE_FACE:
-    return new IceFaceTag(sourceMove);
+    return new IceFaceBlockDamageTag(tagType);
+  case BattlerTagType.DISGUISE:
+    return new FormBlockDamageTag(tagType);
   case BattlerTagType.STOCKPILING:
     return new StockpilingTag(sourceMove);
   case BattlerTagType.OCTOLOCK:
diff --git a/src/data/pokemon-forms.ts b/src/data/pokemon-forms.ts
index a55b9186839..c4cf4184f57 100644
--- a/src/data/pokemon-forms.ts
+++ b/src/data/pokemon-forms.ts
@@ -372,6 +372,9 @@ export function getSpeciesFormChangeMessage(pokemon: Pokemon, formChange: Specie
   if (isRevert) {
     return i18next.t("battlePokemonForm:revertChange", { pokemonName: getPokemonNameWithAffix(pokemon) });
   }
+  if (pokemon.getAbility().id === Abilities.DISGUISE) {
+    return i18next.t("battlePokemonForm:disguiseChange");
+  }
   return i18next.t("battlePokemonForm:formChange", { preName });
 }
 
diff --git a/src/enums/battler-tag-type.ts b/src/enums/battler-tag-type.ts
index fd1455eab6c..5aab5036caf 100644
--- a/src/enums/battler-tag-type.ts
+++ b/src/enums/battler-tag-type.ts
@@ -60,6 +60,7 @@ export enum BattlerTagType {
   DESTINY_BOND = "DESTINY_BOND",
   CENTER_OF_ATTENTION = "CENTER_OF_ATTENTION",
   ICE_FACE = "ICE_FACE",
+  DISGUISE = "DISGUISE",
   STOCKPILING = "STOCKPILING",
   RECEIVE_DOUBLE_DAMAGE = "RECEIVE_DOUBLE_DAMAGE",
   ALWAYS_GET_HIT = "ALWAYS_GET_HIT",
diff --git a/src/locales/ca_ES/ability-trigger.ts b/src/locales/ca_ES/ability-trigger.ts
index ce41a964922..2bdd17baa56 100644
--- a/src/locales/ca_ES/ability-trigger.ts
+++ b/src/locales/ca_ES/ability-trigger.ts
@@ -10,6 +10,7 @@ export const abilityTriggers: SimpleTranslationEntries = {
   "trace": "{{pokemonName}} copied {{targetName}}'s\n{{abilityName}}!",
   "windPowerCharged": "Being hit by {{moveName}} charged {{pokemonName}} with power!",
   "quickDraw": "{{pokemonName}} can act faster than normal, thanks to its Quick Draw!",
+  "disguiseAvoidedDamage" : "{{pokemonNameWithAffix}}'s disguise was busted!",
   "blockItemTheft": "{{pokemonNameWithAffix}}'s {{abilityName}}\nprevents item theft!",
   "typeImmunityHeal": "{{pokemonNameWithAffix}}'s {{abilityName}}\nrestored its HP a little!",
   "nonSuperEffectiveImmunity": "{{pokemonNameWithAffix}} avoided damage\nwith {{abilityName}}!",
diff --git a/src/locales/ca_ES/pokemon-form.ts b/src/locales/ca_ES/pokemon-form.ts
index e8d6fb8df4a..922f23fafea 100644
--- a/src/locales/ca_ES/pokemon-form.ts
+++ b/src/locales/ca_ES/pokemon-form.ts
@@ -13,6 +13,7 @@ export const battlePokemonForm: SimpleTranslationEntries = {
   "eternamaxChange": "{{preName}} Eternamaxed\ninto {{pokemonName}}!",
   "revertChange": "{{pokemonName}} reverted\nto its original form!",
   "formChange": "{{preName}} changed form!",
+  "disguiseChange": "Its disguise served it as a decoy!",
 } as const;
 
 export const pokemonForm: SimpleTranslationEntries = {
diff --git a/src/locales/de/ability-trigger.ts b/src/locales/de/ability-trigger.ts
index 30433ec9bdd..72023a842b3 100644
--- a/src/locales/de/ability-trigger.ts
+++ b/src/locales/de/ability-trigger.ts
@@ -4,7 +4,7 @@ export const abilityTriggers: SimpleTranslationEntries = {
   "blockRecoilDamage": "{{pokemonName}} wurde durch {{abilityName}} vor Rückstoß geschützt!",
   "badDreams": "{{pokemonName}} ist in einem Alptraum gefangen!",
   "costar": "{{pokemonName}} kopiert die Statusveränderungen von {{allyName}}!",
-  "iceFaceAvoidedDamage": "{{pokemonName}} wehrt Schaden mit {{abilityName}} ab!",
+  "iceFaceAvoidedDamage": "{{pokemonNameWithAffix}} wehrt Schaden mit {{abilityName}} ab!",
   "perishBody": "Durch {{abilityName}} von {{pokemonName}} werden beide Pokémon nach drei Runden K.O. gehen!",
   "poisonHeal": "{{abilityName}} von {{pokemonName}} füllte einige KP auf!",
   "trace": "{{pokemonName}} kopiert {{abilityName}} von {{targetName}}!",
@@ -13,7 +13,7 @@ export const abilityTriggers: SimpleTranslationEntries = {
   "blockItemTheft": "{{abilityName}} von {{pokemonNameWithAffix}} verhindert Item-Diebstahl!",
   "typeImmunityHeal": "{{abilityName}} von {{pokemonNameWithAffix}} füllte einige KP auf!",
   "nonSuperEffectiveImmunity": "{{pokemonNameWithAffix}} vermeidet Schaden mit {{abilityName}}!",
-  "postDefendDisguise": "Die Tarnung von {{pokemonNameWithAffix}} ist aufgeflogen!!",
+  "disguiseAvoidedDamage": "Die Tarnung von {{pokemonNameWithAffix}} ist aufgeflogen!!",
   "moveImmunity": "Es hat keine Wirkung auf {{pokemonNameWithAffix}}...",
   "reverseDrain": "{{pokemonNameWithAffix}} saugt Kloakensoße auf!",
   "postDefendTypeChange": "{{abilityName}} von {{pokemonNameWithAffix}} macht es zu einem {{typeName}}-Typ!",
diff --git a/src/locales/de/pokemon-form.ts b/src/locales/de/pokemon-form.ts
index 53ecc310411..0aadfc287e0 100644
--- a/src/locales/de/pokemon-form.ts
+++ b/src/locales/de/pokemon-form.ts
@@ -14,6 +14,7 @@ export const battlePokemonForm: SimpleTranslationEntries = {
   "eternamaxChange": "{{preName}} hat sich zu {{pokemonName}} unendynamaximiert!",
   "revertChange": "{{pokemonName}} hat seine ursprüngliche Form zurückerlangt!",
   "formChange": "{{preName}} hat seine Form geändert!",
+  "disguiseChange": "Its disguise served it as a decoy!",
 } as const;
 
 export const pokemonForm: SimpleTranslationEntries = {
diff --git a/src/locales/en/ability-trigger.ts b/src/locales/en/ability-trigger.ts
index ce41a964922..035fe8371be 100644
--- a/src/locales/en/ability-trigger.ts
+++ b/src/locales/en/ability-trigger.ts
@@ -4,16 +4,16 @@ export const abilityTriggers: SimpleTranslationEntries = {
   "blockRecoilDamage": "{{pokemonName}}'s {{abilityName}}\nprotected it from recoil!",
   "badDreams": "{{pokemonName}} is tormented!",
   "costar": "{{pokemonName}} copied {{allyName}}'s stat changes!",
-  "iceFaceAvoidedDamage": "{{pokemonName}} avoided\ndamage with {{abilityName}}!",
+  "iceFaceAvoidedDamage": "{{pokemonNameWithAffix}} avoided\ndamage with {{abilityName}}!",
   "perishBody": "{{pokemonName}}'s {{abilityName}}\nwill faint both pokemon in 3 turns!",
   "poisonHeal": "{{pokemonName}}'s {{abilityName}}\nrestored its HP a little!",
   "trace": "{{pokemonName}} copied {{targetName}}'s\n{{abilityName}}!",
   "windPowerCharged": "Being hit by {{moveName}} charged {{pokemonName}} with power!",
   "quickDraw": "{{pokemonName}} can act faster than normal, thanks to its Quick Draw!",
+  "disguiseAvoidedDamage" : "{{pokemonNameWithAffix}}'s disguise was busted!",
   "blockItemTheft": "{{pokemonNameWithAffix}}'s {{abilityName}}\nprevents item theft!",
   "typeImmunityHeal": "{{pokemonNameWithAffix}}'s {{abilityName}}\nrestored its HP a little!",
   "nonSuperEffectiveImmunity": "{{pokemonNameWithAffix}} avoided damage\nwith {{abilityName}}!",
-  "postDefendDisguise": "{{pokemonNameWithAffix}}'s disguise was busted!",
   "moveImmunity": "It doesn't affect {{pokemonNameWithAffix}}!",
   "reverseDrain": "{{pokemonNameWithAffix}} sucked up the liquid ooze!",
   "postDefendTypeChange": "{{pokemonNameWithAffix}}'s {{abilityName}}\nmade it the {{typeName}} type!",
diff --git a/src/locales/en/pokemon-form.ts b/src/locales/en/pokemon-form.ts
index e8d6fb8df4a..922f23fafea 100644
--- a/src/locales/en/pokemon-form.ts
+++ b/src/locales/en/pokemon-form.ts
@@ -13,6 +13,7 @@ export const battlePokemonForm: SimpleTranslationEntries = {
   "eternamaxChange": "{{preName}} Eternamaxed\ninto {{pokemonName}}!",
   "revertChange": "{{pokemonName}} reverted\nto its original form!",
   "formChange": "{{preName}} changed form!",
+  "disguiseChange": "Its disguise served it as a decoy!",
 } as const;
 
 export const pokemonForm: SimpleTranslationEntries = {
diff --git a/src/locales/es/ability-trigger.ts b/src/locales/es/ability-trigger.ts
index 6b1f66a11e3..60bc186e99d 100644
--- a/src/locales/es/ability-trigger.ts
+++ b/src/locales/es/ability-trigger.ts
@@ -7,13 +7,13 @@ export const abilityTriggers: SimpleTranslationEntries = {
   "iceFaceAvoidedDamage": "¡{{pokemonNameWithAffix}} evitó\ndaño con {{abilityName}}!",
   "perishBody": "{{pokemonName}}'s {{abilityName}}\nwill faint both pokemon in 3 turns!",
   "poisonHeal": "{{pokemonName}}'s {{abilityName}}\nrestored its HP a little!",
-  "trace": "{{pokemonName}} copied {{targetName}}'s\n{{abilityName}}!",
+  "trace": "¡{{pokemonName}} ha copiado la habilidad {{abilityName}} \nde {{targetName}}!",
   "windPowerCharged": "¡{{pokemonName}} se ha cargado de electricidad gracias a {{moveName}}!",
-  "quickDraw": "{{pokemonName}} can act faster than normal, thanks to its Quick Draw!",
+  "quickDraw": "¡{{pokemonName}} ataca primero gracias a la habilidad Mano Rápida!",
+  "disguiseAvoidedDamage" : "¡El disfraz de {{pokemonNameWithAffix}} se ha roto!",
   "blockItemTheft": "{{pokemonNameWithAffix}}'s {{abilityName}}\nprevents item theft!",
   "typeImmunityHeal": "{{pokemonNameWithAffix}}'s {{abilityName}}\nrestored its HP a little!",
   "nonSuperEffectiveImmunity": "{{pokemonNameWithAffix}} avoided damage\nwith {{abilityName}}!",
-  "postDefendDisguise": "{{pokemonNameWithAffix}}'s disguise was busted!",
   "moveImmunity": "It doesn't affect {{pokemonNameWithAffix}}!",
   "reverseDrain": "{{pokemonNameWithAffix}} sucked up the liquid ooze!",
   "postDefendTypeChange": "{{pokemonNameWithAffix}}'s {{abilityName}}\nmade it the {{typeName}} type!",
diff --git a/src/locales/es/pokemon-form.ts b/src/locales/es/pokemon-form.ts
index 96e40bcfbbd..7098ba597f7 100644
--- a/src/locales/es/pokemon-form.ts
+++ b/src/locales/es/pokemon-form.ts
@@ -13,6 +13,7 @@ export const battlePokemonForm: SimpleTranslationEntries = {
   "eternamaxChange": "{{preName}} Eternamaxed\ninto {{pokemonName}}!",
   "revertChange": "{{pokemonName}} reverted\nto its original form!",
   "formChange": "{{preName}} changed form!",
+  "disguiseChange": "Its disguise served it as a decoy!",
 } as const;
 
 export const pokemonForm: SimpleTranslationEntries = {
diff --git a/src/locales/fr/ability-trigger.ts b/src/locales/fr/ability-trigger.ts
index f6b9c306cd1..cd077993b4e 100644
--- a/src/locales/fr/ability-trigger.ts
+++ b/src/locales/fr/ability-trigger.ts
@@ -4,7 +4,7 @@ export const abilityTriggers: SimpleTranslationEntries = {
   "blockRecoilDamage" : "{{abilityName}}\nde {{pokemonName}} le protège du contrecoup !",
   "badDreams": "{{pokemonName}} a le sommeil agité !",
   "costar": "{{pokemonName}} copie les changements de stats\nde {{allyName}} !",
-  "iceFaceAvoidedDamage": "{{pokemonName}} évite les dégâts\navec {{abilityName}} !",
+  "iceFaceAvoidedDamage": "{{pokemonNameWithAffix}} évite les dégâts\navec {{abilityName}} !",
   "perishBody": "{{abilityName}} de {{pokemonName}}\nmettra les deux Pokémon K.O. dans trois tours !",
   "poisonHeal": "{{abilityName}} de {{pokemonName}}\nrestaure un peu ses PV !",
   "trace": "{{pokemonName}} copie le talent {{abilityName}}\nde {{targetName}} !",
@@ -13,7 +13,7 @@ export const abilityTriggers: SimpleTranslationEntries = {
   "blockItemTheft": "{{abilityName}} de {{pokemonNameWithAffix}}\nempêche son objet d’être volé !",
   "typeImmunityHeal": "{{abilityName}} de {{pokemonNameWithAffix}}\nrestaure un peu ses PV !",
   "nonSuperEffectiveImmunity": "{{pokemonNameWithAffix}} évite\nles dégâts avec {{abilityName}} !",
-  "postDefendDisguise": "Le déguisement de {{pokemonNameWithAffix}}\ntombe !",
+  "disguiseAvoidedDamage": "Le déguisement de {{pokemonNameWithAffix}}\ntombe !",
   "moveImmunity": "Ça n'affecte pas {{pokemonNameWithAffix}}…",
   "reverseDrain": "{{pokemonNameWithAffix}} aspire\nle suintement !",
   "postDefendTypeChange": "{{abilityName}} de {{pokemonNameWithAffix}}\nle transforme en type {{typeName}} !",
diff --git a/src/locales/fr/pokemon-form.ts b/src/locales/fr/pokemon-form.ts
index f96931fd0e9..51158356ef3 100644
--- a/src/locales/fr/pokemon-form.ts
+++ b/src/locales/fr/pokemon-form.ts
@@ -13,6 +13,7 @@ export const battlePokemonForm: SimpleTranslationEntries = {
   "eternamaxChange": "{{preName}} devient\n{{pokemonName}} !",
   "revertChange": "{{pokemonName}} retourne\nà sa forme initiale !",
   "formChange": "{{preName}} change de forme !",
+  "disguiseChange": "Le déguisement absorbe l’attaque !",
 } as const;
 
 export const pokemonForm: SimpleTranslationEntries = {
diff --git a/src/locales/it/ability-trigger.ts b/src/locales/it/ability-trigger.ts
index 37472dbdeab..95db5cbf26c 100644
--- a/src/locales/it/ability-trigger.ts
+++ b/src/locales/it/ability-trigger.ts
@@ -4,7 +4,7 @@ export const abilityTriggers: SimpleTranslationEntries = {
   "blockRecoilDamage" : "{{abilityName}} di {{pokemonName}}\nl'ha protetto dal contraccolpo!",
   "badDreams": "{{pokemonName}} è tormentato dagli incubi!",
   "costar": "{{pokemonName}} ha copiato le modifiche alle statistiche\ndel suo alleato {{allyName}}!",
-  "iceFaceAvoidedDamage": "{{pokemonName}} ha evitato\ni danni grazie a {{abilityName}}!",
+  "iceFaceAvoidedDamage": "{{pokemonNameWithAffix}} ha evitato\ni danni grazie a {{abilityName}}!",
   "perishBody": "{{abilityName}} di {{pokemonName}}\nmanderà KO entrambi i Pokémon dopo 3 turni!",
   "poisonHeal": "{{pokemonName}} recupera alcuni PS\ncon {{abilityName}}!",
   "trace": "L'abilità {{abilityName}} di {{targetName}}\nviene copiata da {{pokemonName}} con Traccia!",
@@ -13,7 +13,7 @@ export const abilityTriggers: SimpleTranslationEntries = {
   "blockItemTheft": "{{abilityName}} di {{pokemonNameWithAffix}}\nlo rende immune ai furti!",
   "typeImmunityHeal": "{{pokemonName}} recupera alcuni PS\ncon {{abilityName}}!",
   "nonSuperEffectiveImmunity": "{{pokemonNameWithAffix}} evita il colpo\ncon {{abilityName}}!",
-  "postDefendDisguise": "{{pokemonNameWithAffix}} è stato smascherato!",
+  "disguiseAvoidedDamage": "{{pokemonNameWithAffix}} è stato smascherato!",
   "moveImmunity": "Non ha effetto su {{pokemonNameWithAffix}}!",
   "reverseDrain": "{{pokemonNameWithAffix}} ha assorbito la melma!",
   "postDefendTypeChange": "{{abilityName}} di {{pokemonNameWithAffix}}\nlo ha reso di tipo {{typeName}}!",
diff --git a/src/locales/it/pokemon-form.ts b/src/locales/it/pokemon-form.ts
index eb5d132bacd..d8bf9eeaab2 100644
--- a/src/locales/it/pokemon-form.ts
+++ b/src/locales/it/pokemon-form.ts
@@ -13,6 +13,7 @@ export const battlePokemonForm: SimpleTranslationEntries = {
   "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!",
 } as const;
 
 export const pokemonForm: SimpleTranslationEntries = {
diff --git a/src/locales/ja/ability-trigger.ts b/src/locales/ja/ability-trigger.ts
index a1ef05407be..7c7d081f645 100644
--- a/src/locales/ja/ability-trigger.ts
+++ b/src/locales/ja/ability-trigger.ts
@@ -10,6 +10,7 @@ export const abilityTriggers: SimpleTranslationEntries = {
   "trace": "{{pokemonName}}は　相手の　{{targetName}}の\n{{abilityName}}を　トレースした！",
   "windPowerCharged": "{{pokemonName}}は\n{{moveName}}を　受けて　じゅうでんした！",
   "quickDraw": "{{pokemonName}}は　クイックドロウで\n行動が　はやくなった！",
+  "disguiseAvoidedDamage" : "{{pokemonNameWithAffix}}'s disguise was busted!",
   "blockItemTheft": "{{pokemonNameWithAffix}}の　{{abilityName}}で\n道具を　うばわれない！",
   "typeImmunityHeal": "{{pokemonNameWithAffix}}は　{{abilityName}}で\n体力を　回復した！",
   "nonSuperEffectiveImmunity": "{{pokemonNameWithAffix}}は　{{abilityName}}で\nダメージを　受けない。",
diff --git a/src/locales/ja/pokemon-form.ts b/src/locales/ja/pokemon-form.ts
index e8d6fb8df4a..922f23fafea 100644
--- a/src/locales/ja/pokemon-form.ts
+++ b/src/locales/ja/pokemon-form.ts
@@ -13,6 +13,7 @@ export const battlePokemonForm: SimpleTranslationEntries = {
   "eternamaxChange": "{{preName}} Eternamaxed\ninto {{pokemonName}}!",
   "revertChange": "{{pokemonName}} reverted\nto its original form!",
   "formChange": "{{preName}} changed form!",
+  "disguiseChange": "Its disguise served it as a decoy!",
 } as const;
 
 export const pokemonForm: SimpleTranslationEntries = {
diff --git a/src/locales/ko/ability-trigger.ts b/src/locales/ko/ability-trigger.ts
index 61be21bc7ec..974e6970569 100644
--- a/src/locales/ko/ability-trigger.ts
+++ b/src/locales/ko/ability-trigger.ts
@@ -4,16 +4,16 @@ export const abilityTriggers: SimpleTranslationEntries = {
   "blockRecoilDamage" : "{{pokemonName}}[[는]] {{abilityName}} 때문에\n반동 데미지를 받지 않는다!",
   "badDreams": "{{pokemonName}}[[는]]\n나이트메어 때문에 시달리고 있다!",
   "costar": "{{pokemonName}}[[는]] {{allyName}}의\n능력 변화를 복사했다!",
-  "iceFaceAvoidedDamage": "{{pokemonName}}[[는]] {{abilityName}} 때문에\n데미지를 받지 않는다!",
+  "iceFaceAvoidedDamage": "{{pokemonNameWithAffix}}[[는]] {{abilityName}} 때문에\n데미지를 받지 않는다!",
   "perishBody": "{{pokemonName}}의 {{abilityName}} 때문에\n양쪽 포켓몬 모두는 3턴 후에 쓰러져 버린다!",
   "poisonHeal": "{{pokemonName}}[[는]] {{abilityName}}[[로]]인해\n조금 회복했다.",
   "trace": "{{pokemonName}}[[는]] 상대 {{targetName}}의 \n{{abilityName}}[[를]] 트레이스했다!",
   "windPowerCharged": "{{pokemonName}}[[는]]\n{{moveName}}에 맞아 충전되었다!",
   "quickDraw": "{{pokemonName}}[[는]]\n퀵드로에 의해 행동이 빨라졌다!",
+  "disguiseAvoidedDamage" : "{{pokemonNameWithAffix}}의 정체가 드러났다!",
   "blockItemTheft": "{{pokemonNameWithAffix}}의 {{abilityName}}에 의해\n도구를 빼앗기지 않는다!",
   "typeImmunityHeal": "{{pokemonNameWithAffix}}[[는]]\n{{abilityName}}[[로]] 체력이 회복되었다!",
   "nonSuperEffectiveImmunity": "{{pokemonNameWithAffix}}[[는]] {{abilityName}} 때문에\n데미지를 입지 않는다!",
-  "postDefendDisguise": "{{pokemonNameWithAffix}}의\n정체가 드러났다!",
   "moveImmunity": "{{pokemonNameWithAffix}}에게는\n효과가 없는 것 같다...",
   "reverseDrain": "{{pokemonNameWithAffix}}[[는]]\n해감액을 흡수했다!",
   "postDefendTypeChange": "{{pokemonNameWithAffix}}[[는]] {{abilityName}}[[로]] 인해\n{{typeName}}타입이 됐다!",
diff --git a/src/locales/ko/pokemon-form.ts b/src/locales/ko/pokemon-form.ts
index 78c9a762233..9f6b9b08408 100644
--- a/src/locales/ko/pokemon-form.ts
+++ b/src/locales/ko/pokemon-form.ts
@@ -13,6 +13,7 @@ export const battlePokemonForm: SimpleTranslationEntries = {
   "eternamaxChange": "{{preName}}[[는]]\n{{pokemonName}}가 되었다!",
   "revertChange": "{{pokemonName}}[[는]]\n원래 모습으로 되돌아왔다!",
   "formChange": "{{preName}}[[는]]\n다른 모습으로 변화했다!",
+  "disguiseChange": "탈이 대타가 되었다!",
 } as const;
 
 export const pokemonForm: SimpleTranslationEntries = {
diff --git a/src/locales/pt_BR/ability-trigger.ts b/src/locales/pt_BR/ability-trigger.ts
index f5d9511f3f6..fde45e92af3 100644
--- a/src/locales/pt_BR/ability-trigger.ts
+++ b/src/locales/pt_BR/ability-trigger.ts
@@ -4,16 +4,16 @@ export const abilityTriggers: SimpleTranslationEntries = {
   "blockRecoilDamage": "{{abilityName}} de {{pokemonName}}\nprotegeu-o do dano reverso!",
   "badDreams": "{{pokemonName}} está tendo pesadelos!",
   "costar": "{{pokemonName}} copiou as mudanças\nde atributo de {{allyName}}!",
-  "iceFaceAvoidedDamage": "{{pokemonName}} evitou\ndanos com sua {{abilityName}}!",
+  "iceFaceAvoidedDamage": "{{pokemonNameWithAffix}} evitou\ndanos com sua {{abilityName}}!",
   "perishBody": "{{abilityName}} de {{pokemonName}}\nirá desmaiar ambos os Pokémon em 3 turnos!",
   "poisonHeal": "{{abilityName}} de {{pokemonName}}\nrestaurou seus PS um pouco!",
   "trace": "{{pokemonName}} copiou {{abilityName}}\nde {{targetName}}!",
   "windPowerCharged": "Ser atingido por {{moveName}} carregou {{pokemonName}} com poder!",
   "quickDraw": "{{pokemonName}} pode agir mais rápido que o normal\ngraças ao seu Quick Draw!",
+  "disguiseAvoidedDamage" : "O disfarce de {{pokemonNameWithAffix}} foi descoberto!",
   "blockItemTheft": "{{abilityName}} de {{pokemonNameWithAffix}}\nprevine o roubo de itens!",
   "typeImmunityHeal": "{{abilityName}} de {{pokemonNameWithAffix}}\nrestaurou um pouco de PS!",
   "nonSuperEffectiveImmunity": "{{pokemonNameWithAffix}} evitou dano\ncom {{abilityName}}!",
-  "postDefendDisguise": "O disfarce de {{pokemonNameWithAffix}} foi descoberto!",
   "moveImmunity": "Isso não afeta {{pokemonNameWithAffix}}!",
   "reverseDrain": "{{pokemonNameWithAffix}} absorveu a gosma líquida!",
   "postDefendTypeChange": "{{abilityName}} de {{pokemonNameWithAffix}}\ntransformou-o no tipo {{typeName}}!",
diff --git a/src/locales/pt_BR/pokemon-form.ts b/src/locales/pt_BR/pokemon-form.ts
index 6c7c649862a..01e3f951a9d 100644
--- a/src/locales/pt_BR/pokemon-form.ts
+++ b/src/locales/pt_BR/pokemon-form.ts
@@ -13,6 +13,7 @@ export const battlePokemonForm: SimpleTranslationEntries = {
   "eternamaxChange": "{{preName}} Eternamaxou\npara {{pokemonName}}!",
   "revertChange": "{{pokemonName}} voltou\npara sua forma original!",
   "formChange": "{{preName}} mudou de forma!",
+  "disguiseChange": "O seu disfarce serviu-lhe de isca!",
 } as const;
 
 export const pokemonForm: SimpleTranslationEntries = {
diff --git a/src/locales/zh_CN/ability-trigger.ts b/src/locales/zh_CN/ability-trigger.ts
index 0f2201049d2..0d69a78f0f7 100644
--- a/src/locales/zh_CN/ability-trigger.ts
+++ b/src/locales/zh_CN/ability-trigger.ts
@@ -4,16 +4,16 @@ export const abilityTriggers: SimpleTranslationEntries = {
   "blockRecoilDamage" : "{{pokemonName}}的{{abilityName}}\n抵消了反作用力！",
   "badDreams": "{{pokemonName}}被折磨着！",
   "costar": "{{pokemonName}}复制了{{allyName}}的能力变化！",
-  "iceFaceAvoidedDamage": "{{pokemonName}}因为{{abilityName}}\n避免了伤害！",
+  "iceFaceAvoidedDamage": "{{pokemonNameWithAffix}}因为{{abilityName}}\n避免了伤害！",
   "perishBody": "因为{{pokemonName}}的{{abilityName}}\n双方将在3回合后灭亡！",
   "poisonHeal": "{{pokemonName}}因{{abilityName}}\n回复了少许HP！",
   "trace": "{{pokemonName}}复制了{{targetName}}的\n{{abilityName}}！",
   "windPowerCharged": "受{{moveName}}的影响，{{pokemonName}}提升了能力！",
   "quickDraw":"因为速击效果发动，\n{{pokemonName}}比平常出招更快了！",
+  "disguiseAvoidedDamage" : "{{pokemonNameWithAffix}}的画皮脱落了！",
   "blockItemTheft": "{{pokemonNameWithAffix}}的{{abilityName}}\n阻止了对方夺取道具！",
   "typeImmunityHeal": "{{pokemonNameWithAffix}}因{{abilityName}}\n回复了少许HP！",
   "nonSuperEffectiveImmunity": "{{pokemonNameWithAffix}}因{{abilityName}}\n避免了伤害！",
-  "postDefendDisguise": "{{pokemonNameWithAffix}}的\n画皮脱落了",
   "moveImmunity": "对{{pokemonNameWithAffix}}没有效果！",
   "reverseDrain": "{{pokemonNameWithAffix}}\n吸到了污泥浆！",
   "postDefendTypeChange": "{{pokemonNameWithAffix}}因{{abilityName}}\n变成了{{typeName}}属性！",
diff --git a/src/locales/zh_CN/pokemon-form.ts b/src/locales/zh_CN/pokemon-form.ts
index 8fb82712e64..ea0c611e5aa 100644
--- a/src/locales/zh_CN/pokemon-form.ts
+++ b/src/locales/zh_CN/pokemon-form.ts
@@ -13,6 +13,7 @@ export const battlePokemonForm: SimpleTranslationEntries = {
   "eternamaxChange": "{{preName}}无极巨化成了\n{{pokemonName}}！",
   "revertChange": "{{pokemonName}}变回了\n原本的样子！",
   "formChange": "{{preName}}变成其他样子了。",
+  "disguiseChange": "它的画皮被当作诱饵使用了！",
 } as const;
 
 export const pokemonForm: SimpleTranslationEntries = {
diff --git a/src/locales/zh_TW/ability-trigger.ts b/src/locales/zh_TW/ability-trigger.ts
index baa20614a44..c0d348633bc 100644
--- a/src/locales/zh_TW/ability-trigger.ts
+++ b/src/locales/zh_TW/ability-trigger.ts
@@ -4,16 +4,16 @@ export const abilityTriggers: SimpleTranslationEntries = {
   "blockRecoilDamage" : "{{pokemonName}} 的 {{abilityName}}\n抵消了反作用力！",
   "badDreams": "{{pokemonName}} 被折磨着！",
   "costar": "{{pokemonName}} 複製了 {{allyName}} 的\n能力變化！",
-  "iceFaceAvoidedDamage": "{{pokemonName}} 因爲 {{abilityName}}\n避免了傷害！",
+  "iceFaceAvoidedDamage": "{{pokemonNameWithAffix}} 因爲 {{abilityName}}\n避免了傷害！",
   "perishBody": "{{pokemonName}}'s {{abilityName}}\nwill faint both pokemon in 3 turns!",
   "poisonHeal": "{{pokemonName}}'s {{abilityName}}\nrestored its HP a little!",
   "trace": "{{pokemonName}} 複製了 {{targetName}} 的\n{{abilityName}}!",
   "windPowerCharged": "受 {{moveName}} 的影響， {{pokemonName}} 提升了能力！",
   "quickDraw":"{{pokemonName}} can act faster than normal, thanks to its Quick Draw!",
+  "disguiseAvoidedDamage" : "{{pokemonNameWithAffix}}的畫皮脫落了！",
   "blockItemTheft": "{{pokemonNameWithAffix}}'s {{abilityName}}\nprevents item theft!",
   "typeImmunityHeal": "{{pokemonNameWithAffix}}'s {{abilityName}}\nrestored its HP a little!",
   "nonSuperEffectiveImmunity": "{{pokemonNameWithAffix}} avoided damage\nwith {{abilityName}}!",
-  "postDefendDisguise": "{{pokemonNameWithAffix}}'s disguise was busted!",
   "moveImmunity": "It doesn't affect {{pokemonNameWithAffix}}!",
   "reverseDrain": "{{pokemonNameWithAffix}} sucked up the liquid ooze!",
   "postDefendTypeChange": "{{pokemonNameWithAffix}}'s {{abilityName}}\nmade it the {{typeName}} type!",
diff --git a/src/locales/zh_TW/pokemon-form.ts b/src/locales/zh_TW/pokemon-form.ts
index aa30840fcc0..55bb13946b7 100644
--- a/src/locales/zh_TW/pokemon-form.ts
+++ b/src/locales/zh_TW/pokemon-form.ts
@@ -13,6 +13,7 @@ export const battlePokemonForm: SimpleTranslationEntries = {
   "eternamaxChange": "{{preName}}無極巨化成了\n{{pokemonName}}！",
   "revertChange": "{{pokemonName}}變回了\n原本的樣子！",
   "formChange": "{{preName}}變為其他樣子了。",
+  "disguiseChange": "它的畫皮被當作誘餌使用了！",
 } as const;
 
 export const pokemonForm: SimpleTranslationEntries = {
diff --git a/src/test/abilities/disguise.test.ts b/src/test/abilities/disguise.test.ts
index 09a0dbf7f8a..183295f6f41 100644
--- a/src/test/abilities/disguise.test.ts
+++ b/src/test/abilities/disguise.test.ts
@@ -1,18 +1,21 @@
-import { Status, StatusEffect } from "#app/data/status-effect.js";
-import { QuietFormChangePhase } from "#app/form-change-phase.js";
-import { TurnEndPhase } from "#app/phases.js";
-import { Abilities } from "#enums/abilities";
-import { Moves } from "#enums/moves";
-import { Species } from "#enums/species";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import GameManager from "#test/utils/gameManager";
 import { getMovePosition } from "#test/utils/gameManagerUtils";
-import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
+import { Moves } from "#enums/moves";
+import { Abilities } from "#enums/abilities";
+import { Species } from "#enums/species";
+import { StatusEffect } from "#app/data/status-effect.js";
+import { MoveEffectPhase, MoveEndPhase, TurnEndPhase, TurnInitPhase } from "#app/phases.js";
+import { BattleStat } from "#app/data/battle-stat.js";
+import { SPLASH_ONLY } from "../utils/testUtils";
 
 const TIMEOUT = 20 * 1000;
 
-describe("Abilities - DISGUISE", () => {
+describe("Abilities - Disguise", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
+  const bustedForm = 1;
+  const disguisedForm = 0;
 
   beforeAll(() => {
     phaserGame = new Phaser.Game({
@@ -26,72 +29,134 @@ describe("Abilities - DISGUISE", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    const moveToUse = Moves.SPLASH;
     game.override.battleType("single");
-    game.override.ability(Abilities.DISGUISE);
-    game.override.moveset([moveToUse]);
-    game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]);
-  });
 
-  test(
-    "check if fainted pokemon switched to base form on arena reset",
-    async () => {
-      const baseForm = 0,
-        bustedForm = 1;
-      game.override.startingWave(4);
-      game.override.starterForms({
-        [Species.MIMIKYU]: bustedForm,
-      });
+    game.override.enemySpecies(Species.MIMIKYU);
+    game.override.enemyMoveset(SPLASH_ONLY);
 
-      await game.startBattle([Species.MAGIKARP, Species.MIMIKYU]);
+    game.override.starterSpecies(Species.REGIELEKI);
+    game.override.moveset([Moves.SHADOW_SNEAK, Moves.VACUUM_WAVE, Moves.TOXIC_THREAD, Moves.SPLASH]);
+  }, TIMEOUT);
 
-      const mimikyu = game.scene.getParty().find((p) => p.species.speciesId === Species.MIMIKYU);
-      expect(mimikyu).not.toBe(undefined);
-      expect(mimikyu!.formIndex).toBe(bustedForm);
+  it("takes no damage from attacking move and transforms to Busted form, taking 1/8 max HP damage from the disguise breaking", async () => {
+    await game.startBattle();
 
-      mimikyu!.hp = 0;
-      mimikyu!.status = new Status(StatusEffect.FAINT);
-      expect(mimikyu!.isFainted()).toBe(true);
+    const mimikyu = game.scene.getEnemyPokemon()!;
+    const maxHp = mimikyu.getMaxHp();
+    const disguiseDamage = Math.floor(maxHp / 8);
 
-      game.doAttack(getMovePosition(game.scene, 0, Moves.SPLASH));
-      await game.doKillOpponents();
-      await game.phaseInterceptor.to(TurnEndPhase);
-      game.doSelectModifier();
-      await game.phaseInterceptor.to(QuietFormChangePhase);
+    expect(mimikyu.formIndex).toBe(disguisedForm);
 
-      expect(mimikyu!.formIndex).toBe(baseForm);
-    },
-    TIMEOUT
-  );
+    game.doAttack(getMovePosition(game.scene, 0, Moves.SHADOW_SNEAK));
 
-  test(
-    "damage taken should be equal to 1/8 of its maximum HP, rounded down",
-    async () => {
-      const baseForm = 0,
-        bustedForm = 1;
+    await game.phaseInterceptor.to(MoveEndPhase);
 
-      game.override.enemyMoveset([Moves.DARK_PULSE, Moves.DARK_PULSE, Moves.DARK_PULSE, Moves.DARK_PULSE]);
-      game.override.startingLevel(20);
-      game.override.enemyLevel(20);
-      game.override.enemySpecies(Species.MAGIKARP);
-      game.override.starterForms({
-        [Species.MIMIKYU]: baseForm,
-      });
+    expect(mimikyu.hp).equals(maxHp - disguiseDamage);
+    expect(mimikyu.formIndex).toBe(bustedForm);
+  }, TIMEOUT);
 
-      await game.startBattle([Species.MIMIKYU]);
+  it("doesn't break disguise when attacked with ineffective move", async () => {
+    await game.startBattle();
 
-      const mimikyu = game.scene.getPlayerPokemon()!;
-      const damage = (Math.floor(mimikyu!.getMaxHp()/8));
+    const mimikyu = game.scene.getEnemyPokemon()!;
 
-      expect(mimikyu).not.toBe(undefined);
-      expect(mimikyu!.formIndex).toBe(baseForm);
+    expect(mimikyu.formIndex).toBe(disguisedForm);
 
-      game.doAttack(getMovePosition(game.scene, 0, Moves.SPLASH));
-      await game.phaseInterceptor.to(TurnEndPhase);
+    game.doAttack(getMovePosition(game.scene, 0, Moves.VACUUM_WAVE));
 
-      expect(mimikyu!.formIndex).toBe(bustedForm);
-      expect(game.scene.getEnemyPokemon()!.turnData.currDamageDealt).toBe(damage);
-    },
-    TIMEOUT
-  );
+    await game.phaseInterceptor.to(MoveEndPhase);
+
+    expect(mimikyu.formIndex).toBe(disguisedForm);
+  }, TIMEOUT);
+
+  it("takes no damage from the first hit of a multihit move and transforms to Busted form, then takes damage from the second hit", async () => {
+    game.override.moveset([Moves.SURGING_STRIKES]);
+    game.override.enemyLevel(5);
+    await game.startBattle();
+
+    const mimikyu = game.scene.getEnemyPokemon()!;
+    const maxHp = mimikyu.getMaxHp();
+    const disguiseDamage = Math.floor(maxHp / 8);
+
+    expect(mimikyu.formIndex).toBe(disguisedForm);
+
+    game.doAttack(getMovePosition(game.scene, 0, Moves.SURGING_STRIKES));
+
+    // First hit
+    await game.phaseInterceptor.to(MoveEffectPhase);
+    expect(mimikyu.hp).equals(maxHp - disguiseDamage);
+    expect(mimikyu.formIndex).toBe(disguisedForm);
+
+    // Second hit
+    await game.phaseInterceptor.to(MoveEffectPhase);
+    expect(mimikyu.hp).lessThan(maxHp - disguiseDamage);
+    expect(mimikyu.formIndex).toBe(bustedForm);
+  }, TIMEOUT);
+
+  it("takes effects from status moves and damage from status effects", async () => {
+    await game.startBattle();
+
+    const mimikyu = game.scene.getEnemyPokemon()!;
+    expect(mimikyu.hp).toBe(mimikyu.getMaxHp());
+
+    game.doAttack(getMovePosition(game.scene, 0, Moves.TOXIC_THREAD));
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(mimikyu.formIndex).toBe(disguisedForm);
+    expect(mimikyu.status?.effect).toBe(StatusEffect.POISON);
+    expect(mimikyu.summonData.battleStats[BattleStat.SPD]).toBe(-1);
+    expect(mimikyu.hp).toBeLessThan(mimikyu.getMaxHp());
+  }, TIMEOUT);
+
+  it("persists form change when switched out", async () => {
+    game.override.enemyMoveset(Array(4).fill(Moves.SHADOW_SNEAK));
+    game.override.starterSpecies(0);
+
+    await game.startBattle([Species.MIMIKYU, Species.FURRET]);
+
+    const mimikyu = game.scene.getPlayerPokemon()!;
+    const maxHp = mimikyu.getMaxHp();
+    const disguiseDamage = Math.floor(maxHp / 8);
+
+    game.doAttack(getMovePosition(game.scene, 0, Moves.SPLASH));
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(mimikyu.formIndex).toBe(bustedForm);
+    expect(mimikyu.hp).equals(maxHp - disguiseDamage);
+
+    await game.toNextTurn();
+    game.doSwitchPokemon(1);
+
+    await game.phaseInterceptor.to(TurnEndPhase);
+
+    expect(mimikyu.formIndex).toBe(bustedForm);
+  }, TIMEOUT);
+
+  it("reverts to Disguised on arena reset", async () => {
+    game.override.startingWave(4);
+
+    game.override.starterSpecies(Species.MIMIKYU);
+    game.override.starterForms({
+      [Species.MIMIKYU]: bustedForm
+    });
+
+    game.override.enemySpecies(Species.MAGIKARP);
+    game.override.enemyAbility(Abilities.BALL_FETCH);
+
+    await game.startBattle();
+
+    const mimikyu = game.scene.getPlayerPokemon()!;
+
+    expect(mimikyu.formIndex).toBe(bustedForm);
+
+    game.doAttack(getMovePosition(game.scene, 0, Moves.SPLASH));
+    await game.doKillOpponents();
+    await game.phaseInterceptor.to(TurnEndPhase);
+    game.doSelectModifier();
+    await game.phaseInterceptor.to(TurnInitPhase);
+
+    expect(mimikyu.formIndex).toBe(disguisedForm);
+  }, TIMEOUT);
 });

From a35aff7b2520aa53541386bac5dc4e8d44f2776c Mon Sep 17 00:00:00 2001
From: "Amani H." <109637146+xsn34kzx@users.noreply.github.com>
Date: Mon, 12 Aug 2024 06:54:52 -0400
Subject: [PATCH 23/30] [Refactor/Bug] Overhaul & Document Item/Modifier
 Overrides (#2320)

* Overhaul & Document Item/Modifier Overrides

* add reverse lookup for modifier tier in modifier overrides

* Refactor `withTierFromPool`

* Minor NIT

* Another NIT

* Fix `strict null` issue

---------

Co-authored-by: ImperialSympathizer <imperialsympathizer@gmail.com>
---
 src/modifier/modifier-type.ts | 137 ++++++++++++++++++++++++++++------
 src/modifier/modifier.ts      |  88 +++++++++++-----------
 src/overrides.ts              |  31 +++++---
 3 files changed, 180 insertions(+), 76 deletions(-)

diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts
index 942ef4e1bfc..16a74757598 100644
--- a/src/modifier/modifier-type.ts
+++ b/src/modifier/modifier-type.ts
@@ -115,6 +115,26 @@ export class ModifierType {
     return this;
   }
 
+  /**
+   * Populates the tier field by performing a reverse lookup on the modifier pool specified by {@linkcode poolType} using the
+   * {@linkcode ModifierType}'s id.
+   * @param poolType the {@linkcode ModifierPoolType} to look into to derive the item's tier; defaults to {@linkcode ModifierPoolType.PLAYER}
+   */
+  withTierFromPool(poolType: ModifierPoolType = ModifierPoolType.PLAYER): ModifierType {
+    for (const tier of Object.values(getModifierPoolForType(poolType))) {
+      for (const modifier of tier) {
+        if (this.id === modifier.modifierType.id) {
+          this.tier = modifier.modifierType.tier;
+          break;
+        }
+      }
+      if (this.tier) {
+        break;
+      }
+    }
+    return this;
+  }
+
   newModifier(...args: any[]): Modifier | null {
     return this.newModifierFunc && this.newModifierFunc(this, args);
   }
@@ -855,7 +875,7 @@ export class FusePokemonModifierType extends PokemonModifierType {
 class AttackTypeBoosterModifierTypeGenerator extends ModifierTypeGenerator {
   constructor() {
     super((party: Pokemon[], pregenArgs?: any[]) => {
-      if (pregenArgs) {
+      if (pregenArgs && (pregenArgs.length === 1) && (pregenArgs[0] in Type)) {
         return new AttackTypeBoosterModifierType(pregenArgs[0] as Type, 20);
       }
 
@@ -919,12 +939,13 @@ class SpeciesStatBoosterModifierTypeGenerator extends ModifierTypeGenerator {
 
   constructor() {
     super((party: Pokemon[], pregenArgs?: any[]) => {
-      if (pregenArgs) {
+      const items = SpeciesStatBoosterModifierTypeGenerator.items;
+      if (pregenArgs && (pregenArgs.length === 1) && (pregenArgs[0] in items)) {
         return new SpeciesStatBoosterModifierType(pregenArgs[0] as SpeciesStatBoosterItem);
       }
 
-      const values = Object.values(SpeciesStatBoosterModifierTypeGenerator.items);
-      const keys = Object.keys(SpeciesStatBoosterModifierTypeGenerator.items);
+      const values = Object.values(items);
+      const keys = Object.keys(items);
       const weights = keys.map(() => 0);
 
       for (const p of party) {
@@ -979,7 +1000,10 @@ class SpeciesStatBoosterModifierTypeGenerator extends ModifierTypeGenerator {
 
 class TmModifierTypeGenerator extends ModifierTypeGenerator {
   constructor(tier: ModifierTier) {
-    super((party: Pokemon[]) => {
+    super((party: Pokemon[], pregenArgs?: any[]) => {
+      if (pregenArgs && (pregenArgs.length === 1) && (pregenArgs[0] in Moves)) {
+        return new TmModifierType(pregenArgs[0] as Moves);
+      }
       const partyMemberCompatibleTms = party.map(p => (p as PlayerPokemon).compatibleTms.filter(tm => !p.moveset.find(m => m?.moveId === tm)));
       const tierUniqueCompatibleTms = partyMemberCompatibleTms.flat().filter(tm => tmPoolTiers[tm] === tier).filter(tm => !allMoves[tm].name.endsWith(" (N)")).filter((tm, i, array) => array.indexOf(tm) === i);
       if (!tierUniqueCompatibleTms.length) {
@@ -994,7 +1018,7 @@ class TmModifierTypeGenerator extends ModifierTypeGenerator {
 class EvolutionItemModifierTypeGenerator extends ModifierTypeGenerator {
   constructor(rare: boolean) {
     super((party: Pokemon[], pregenArgs?: any[]) => {
-      if (pregenArgs) {
+      if (pregenArgs && (pregenArgs.length === 1) && (pregenArgs[0] in EvolutionItem)) {
         return new EvolutionItemModifierType(pregenArgs[0] as EvolutionItem);
       }
 
@@ -1021,7 +1045,7 @@ class EvolutionItemModifierTypeGenerator extends ModifierTypeGenerator {
 class FormChangeItemModifierTypeGenerator extends ModifierTypeGenerator {
   constructor() {
     super((party: Pokemon[], pregenArgs?: any[]) => {
-      if (pregenArgs) {
+      if (pregenArgs && (pregenArgs.length === 1) && (pregenArgs[0] in FormChangeItem)) {
         return new FormChangeItemModifierType(pregenArgs[0] as FormChangeItem);
       }
 
@@ -1274,7 +1298,7 @@ export const modifierTypes = {
   SPECIES_STAT_BOOSTER: () => new SpeciesStatBoosterModifierTypeGenerator(),
 
   TEMP_STAT_BOOSTER: () => new ModifierTypeGenerator((party: Pokemon[], pregenArgs?: any[]) => {
-    if (pregenArgs) {
+    if (pregenArgs && (pregenArgs.length === 1) && (pregenArgs[0] in TempBattleStat)) {
       return new TempBattleStatBoosterModifierType(pregenArgs[0] as TempBattleStat);
     }
     const randTempBattleStat = Utils.randSeedInt(6) as TempBattleStat;
@@ -1283,7 +1307,7 @@ export const modifierTypes = {
   DIRE_HIT: () => new TempBattleStatBoosterModifierType(TempBattleStat.CRIT),
 
   BASE_STAT_BOOSTER: () => new ModifierTypeGenerator((party: Pokemon[], pregenArgs?: any[]) => {
-    if (pregenArgs) {
+    if (pregenArgs && (pregenArgs.length === 1) && (pregenArgs[0] in Stat)) {
       const stat = pregenArgs[0] as Stat;
       return new PokemonBaseStatBoosterModifierType(getBaseStatBoosterItemName(stat), stat);
     }
@@ -1294,14 +1318,14 @@ export const modifierTypes = {
   ATTACK_TYPE_BOOSTER: () => new AttackTypeBoosterModifierTypeGenerator(),
 
   MINT: () => new ModifierTypeGenerator((party: Pokemon[], pregenArgs?: any[]) => {
-    if (pregenArgs) {
+    if (pregenArgs && (pregenArgs.length === 1) && (pregenArgs[0] in Nature)) {
       return new PokemonNatureChangeModifierType(pregenArgs[0] as Nature);
     }
     return new PokemonNatureChangeModifierType(Utils.randSeedInt(Utils.getEnumValues(Nature).length) as Nature);
   }),
 
   TERA_SHARD: () => new ModifierTypeGenerator((party: Pokemon[], pregenArgs?: any[]) => {
-    if (pregenArgs) {
+    if (pregenArgs && (pregenArgs.length === 1) && (pregenArgs[0] in Type)) {
       return new TerastallizeModifierType(pregenArgs[0] as Type);
     }
     if (!party[0].scene.getModifiers(Modifiers.TerastallizeAccessModifier).length) {
@@ -1318,7 +1342,7 @@ export const modifierTypes = {
   }),
 
   BERRY: () => new ModifierTypeGenerator((party: Pokemon[], pregenArgs?: any[]) => {
-    if (pregenArgs) {
+    if (pregenArgs && (pregenArgs.length === 1) && (pregenArgs[0] in BerryType)) {
       return new BerryModifierType(pregenArgs[0] as BerryType);
     }
     const berryTypes = Utils.getEnumValues(BerryType);
@@ -1908,15 +1932,36 @@ export function getPlayerModifierTypeOptions(count: integer, party: PlayerPokemo
     }
   });
 
-  // OVERRIDE IF NECESSARY
-  Overrides.ITEM_REWARD_OVERRIDE.forEach((item, i) => {
-    const override = modifierTypes[item]();
-    options[i].type = override instanceof ModifierTypeGenerator ? override.generateType(party) : override;
-  });
+  overridePlayerModifierTypeOptions(options, party);
 
   return options;
 }
 
+/**
+ * Replaces the {@linkcode ModifierType} of the entries within {@linkcode options} with any
+ * {@linkcode ModifierOverride} entries listed in {@linkcode Overrides.ITEM_REWARD_OVERRIDE}
+ * up to the smallest amount of entries between {@linkcode options} and the override array.
+ * @param options Array of naturally rolled {@linkcode ModifierTypeOption}s
+ * @param party Array of the player's current party
+ */
+export function overridePlayerModifierTypeOptions(options: ModifierTypeOption[], party: PlayerPokemon[]) {
+  const minLength = Math.min(options.length, Overrides.ITEM_REWARD_OVERRIDE.length);
+  for (let i = 0; i < minLength; i++) {
+    const override: ModifierOverride = Overrides.ITEM_REWARD_OVERRIDE[i];
+    const modifierFunc = modifierTypes[override.name];
+    let modifierType: ModifierType | null = modifierFunc();
+
+    if (modifierType instanceof ModifierTypeGenerator) {
+      const pregenArgs = ("type" in override) && (override.type !== null) ? [override.type] : undefined;
+      modifierType = modifierType.generateType(party, pregenArgs);
+    }
+
+    if (modifierType) {
+      options[i].type = modifierType.withIdFromFunc(modifierFunc).withTierFromPool();
+    }
+  }
+}
+
 export function getPlayerShopModifierTypeOptionsForWave(waveIndex: integer, baseCost: integer): ModifierTypeOption[] {
   if (!(waveIndex % 10)) {
     return [];
@@ -1955,7 +2000,19 @@ export function getPlayerShopModifierTypeOptionsForWave(waveIndex: integer, base
 }
 
 export function getEnemyBuffModifierForWave(tier: ModifierTier, enemyModifiers: Modifiers.PersistentModifier[], scene: BattleScene): Modifiers.EnemyPersistentModifier {
-  const tierStackCount = tier === ModifierTier.ULTRA ? 5 : tier === ModifierTier.GREAT ? 3 : 1;
+  let tierStackCount: number;
+  switch (tier) {
+  case ModifierTier.ULTRA:
+    tierStackCount = 5;
+    break;
+  case ModifierTier.GREAT:
+    tierStackCount = 3;
+    break;
+  default:
+    tierStackCount = 1;
+    break;
+  }
+
   const retryCount = 50;
   let candidate = getNewModifierTypeOption([], ModifierPoolType.ENEMY_BUFF, tier);
   let r = 0;
@@ -1983,7 +2040,20 @@ export function getDailyRunStarterModifiers(party: PlayerPokemon[]): Modifiers.P
   for (const p of party) {
     for (let m = 0; m < 3; m++) {
       const tierValue = Utils.randSeedInt(64);
-      const tier = tierValue > 25 ? ModifierTier.COMMON : tierValue > 12 ? ModifierTier.GREAT : tierValue > 4 ? ModifierTier.ULTRA : tierValue ? ModifierTier.ROGUE : ModifierTier.MASTER;
+
+      let tier: ModifierTier;
+      if (tierValue > 25) {
+        tier = ModifierTier.COMMON;
+      } else if (tierValue > 12) {
+        tier = ModifierTier.GREAT;
+      } else if (tierValue > 4) {
+        tier = ModifierTier.ULTRA;
+      } else if (tierValue) {
+        tier = ModifierTier.ROGUE;
+      } else {
+        tier = ModifierTier.MASTER;
+      }
+
       const modifier = getNewModifierTypeOption(party, ModifierPoolType.DAILY_STARTER, tier)?.type?.newModifier(p) as Modifiers.PokemonHeldItemModifier;
       ret.push(modifier);
     }
@@ -2029,7 +2099,19 @@ function getNewModifierTypeOption(party: Pokemon[], poolType: ModifierPoolType,
         }
       } while (upgraded);
     }
-    tier = tierValue > 255 ? ModifierTier.COMMON : tierValue > 60 ? ModifierTier.GREAT : tierValue > 12 ? ModifierTier.ULTRA : tierValue ? ModifierTier.ROGUE : ModifierTier.MASTER;
+
+    if (tierValue > 255) {
+      tier = ModifierTier.COMMON;
+    } else if (tierValue > 60) {
+      tier = ModifierTier.GREAT;
+    } else if (tierValue > 12) {
+      tier = ModifierTier.ULTRA;
+    } else if (tierValue) {
+      tier = ModifierTier.ROGUE;
+    } else {
+      tier = ModifierTier.MASTER;
+    }
+
     tier += upgradeCount;
     while (tier && (!modifierPool.hasOwnProperty(tier) || !modifierPool[tier].length)) {
       tier--;
@@ -2122,6 +2204,19 @@ export function getLuckString(luckValue: integer): string {
 }
 
 export function getLuckTextTint(luckValue: integer): integer {
-  const modifierTier = luckValue ? luckValue > 2 ? luckValue > 5 ? luckValue > 9 ? luckValue > 11 ? ModifierTier.LUXURY : ModifierTier.MASTER : ModifierTier.ROGUE : ModifierTier.ULTRA : ModifierTier.GREAT : ModifierTier.COMMON;
+  let modifierTier: ModifierTier;
+  if (luckValue > 11) {
+    modifierTier = ModifierTier.LUXURY;
+  } else if (luckValue > 9) {
+    modifierTier = ModifierTier.MASTER;
+  } else if (luckValue > 5) {
+    modifierTier = ModifierTier.ROGUE;
+  } else if (luckValue > 2) {
+    modifierTier = ModifierTier.ULTRA;
+  } else if (luckValue) {
+    modifierTier = ModifierTier.GREAT;
+  } else {
+    modifierTier = ModifierTier.COMMON;
+  }
   return getModifierTierTextTint(modifierTier);
 }
diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts
index c6871353a7d..93ea067e424 100644
--- a/src/modifier/modifier.ts
+++ b/src/modifier/modifier.ts
@@ -2734,30 +2734,29 @@ export class EnemyFusionChanceModifier extends EnemyPersistentModifier {
 }
 
 /**
- * Uses override from overrides.ts to set PersistentModifiers for starting a new game
- * @param scene current BattleScene
- * @param player is this for player for enemy
+ * Uses either `MODIFIER_OVERRIDE` in overrides.ts to set {@linkcode PersistentModifier}s for either:
+ *  - The player
+ *  - The enemy
+ * @param scene current {@linkcode BattleScene}
+ * @param isPlayer {@linkcode boolean} for whether the the player (`true`) or enemy (`false`) is being overridden
  */
-export function overrideModifiers(scene: BattleScene, player: boolean = true): void {
-  const modifierOverride = player ? Overrides.STARTING_MODIFIER_OVERRIDE : Overrides.OPP_MODIFIER_OVERRIDE;
-  if (!modifierOverride || modifierOverride.length === 0 || !scene) {
+export function overrideModifiers(scene: BattleScene, isPlayer: boolean = true): void {
+  const modifiersOverride: ModifierTypes.ModifierOverride[] = isPlayer ? Overrides.STARTING_MODIFIER_OVERRIDE : Overrides.OPP_MODIFIER_OVERRIDE;
+  if (!modifiersOverride || modifiersOverride.length === 0 || !scene) {
     return;
-  } // if no override, do nothing
-  // if it's the opponent, we clear all his current modifiers to avoid stacking
-  if (!player) {
+  }
+
+  // If it's the opponent, clear all of their current modifiers to avoid stacking
+  if (!isPlayer) {
     scene.clearEnemyModifiers();
   }
-  // we loop through all the modifier name given in the override file
-  modifierOverride.forEach(item => {
-    const modifierName = item.name;
-    const qty = item.count || 1;
-    if (!modifierTypes.hasOwnProperty(modifierName)) {
-      return;
-    } // if the modifier does not exist, we skip it
-    const modifierType: ModifierType = modifierTypes[modifierName]();
-    const modifier: PersistentModifier = modifierType.withIdFromFunc(modifierTypes[modifierName]).newModifier() as PersistentModifier;
-    modifier.stackCount = qty;
-    if (player) {
+
+  modifiersOverride.forEach(item => {
+    const modifierFunc = modifierTypes[item.name];
+    const modifier = modifierFunc().withIdFromFunc(modifierFunc).newModifier() as PersistentModifier;
+    modifier.stackCount = item.count || 1;
+
+    if (isPlayer) {
       scene.addModifier(modifier, true, false, false, true);
     } else {
       scene.addEnemyModifier(modifier, true, true);
@@ -2766,37 +2765,38 @@ export function overrideModifiers(scene: BattleScene, player: boolean = true): v
 }
 
 /**
- * Uses override from overrides.ts to set PokemonHeldItemModifiers for starting a new game
- * @param scene current BattleScene
- * @param player is this for player for enemy
+ * Uses either `HELD_ITEMS_OVERRIDE` in overrides.ts to set {@linkcode PokemonHeldItemModifier}s for either:
+ *  - The first member of the player's team when starting a new game
+ *  - An enemy {@linkcode Pokemon} being spawned in
+ * @param scene current {@linkcode BattleScene}
+ * @param pokemon {@linkcode Pokemon} whose held items are being overridden
+ * @param isPlayer {@linkcode boolean} for whether the {@linkcode pokemon} is the player's (`true`) or an enemy (`false`)
  */
-export function overrideHeldItems(scene: BattleScene, pokemon: Pokemon, player: boolean = true): void {
-  const heldItemsOverride = player ? Overrides.STARTING_HELD_ITEMS_OVERRIDE : Overrides.OPP_HELD_ITEMS_OVERRIDE;
+export function overrideHeldItems(scene: BattleScene, pokemon: Pokemon, isPlayer: boolean = true): void {
+  const heldItemsOverride: ModifierTypes.ModifierOverride[] = isPlayer ? Overrides.STARTING_HELD_ITEMS_OVERRIDE : Overrides.OPP_HELD_ITEMS_OVERRIDE;
   if (!heldItemsOverride || heldItemsOverride.length === 0 || !scene) {
     return;
-  } // if no override, do nothing
-  // we loop through all the itemName given in the override file
+  }
+
   heldItemsOverride.forEach(item => {
-    const itemName = item.name;
+    const modifierFunc = modifierTypes[item.name];
+    let modifierType: ModifierType | null = modifierFunc();
     const qty = item.count || 1;
-    if (!modifierTypes.hasOwnProperty(itemName)) {
-      return;
-    } // if the item does not exist, we skip it
-    const modifierType: ModifierType = modifierTypes[itemName](); // we retrieve the item in the list
-    let itemModifier: PokemonHeldItemModifier;
+
     if (modifierType instanceof ModifierTypes.ModifierTypeGenerator) {
-      const pregenArgs = "type" in item ? [item.type] : undefined;
-      itemModifier = modifierType.generateType([], pregenArgs)?.withIdFromFunc(modifierTypes[itemName]).newModifier(pokemon) as PokemonHeldItemModifier;
-    } else {
-      itemModifier = modifierType.withIdFromFunc(modifierTypes[itemName]).newModifier(pokemon) as PokemonHeldItemModifier;
+      const pregenArgs = ("type" in item) && (item.type !== null) ? [item.type] : undefined;
+      modifierType = modifierType.generateType([], pregenArgs);
     }
-    // we create the item
-    itemModifier.pokemonId = pokemon.id; // we assign the created item to the pokemon
-    itemModifier.stackCount = qty; // we say how many items we want
-    if (player) {
-      scene.addModifier(itemModifier, true, false, false, true);
-    } else {
-      scene.addEnemyModifier(itemModifier, true, true);
+
+    const heldItemModifier = modifierType && modifierType.withIdFromFunc(modifierFunc).newModifier(pokemon) as PokemonHeldItemModifier;
+    if (heldItemModifier) {
+      heldItemModifier.pokemonId = pokemon.id;
+      heldItemModifier.stackCount = qty;
+      if (isPlayer) {
+        scene.addModifier(heldItemModifier, true, false, false, true);
+      } else {
+        scene.addEnemyModifier(heldItemModifier, true, true);
+      }
     }
   });
 }
diff --git a/src/overrides.ts b/src/overrides.ts
index 88db105475c..8b3d628e05e 100644
--- a/src/overrides.ts
+++ b/src/overrides.ts
@@ -12,7 +12,7 @@ import { type PokeballCounts } from "./battle-scene";
 import { Gender } from "./data/gender";
 import { allSpecies } from "./data/pokemon-species"; // eslint-disable-line @typescript-eslint/no-unused-vars
 import { Variant } from "./data/variant";
-import { type ModifierOverride, type ModifierTypeKeys } from "./modifier/modifier-type";
+import { type ModifierOverride } from "./modifier/modifier-type";
 
 /**
  * Overrides that are using when testing different in game situations
@@ -51,6 +51,7 @@ class DefaultOverrides {
   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;
   /** Sets all shop item prices to 0 */
@@ -155,20 +156,28 @@ class DefaultOverrides {
    * STARTING_HELD_ITEM_OVERRIDE = [{name: "BERRY"}]
    * ```
    */
-  readonly STARTING_MODIFIER_OVERRIDE: Array<ModifierOverride> = [];
-  readonly OPP_MODIFIER_OVERRIDE: Array<ModifierOverride> = [];
+  readonly STARTING_MODIFIER_OVERRIDE: ModifierOverride[] = [];
+  /**
+   * Override array of {@linkcode ModifierOverride}s used to provide modifiers to enemies.
+   *
+   * Note that any previous modifiers are cleared.
+   */
+  readonly OPP_MODIFIER_OVERRIDE: ModifierOverride[] = [];
 
-  readonly STARTING_HELD_ITEMS_OVERRIDE: Array<ModifierOverride> = [];
-  readonly OPP_HELD_ITEMS_OVERRIDE: Array<ModifierOverride> = [];
-  readonly NEVER_CRIT_OVERRIDE: boolean = false;
+  /** Override array of {@linkcode ModifierOverride}s used to provide held items to first party member when starting a new game. */
+  readonly STARTING_HELD_ITEMS_OVERRIDE: ModifierOverride[] = [];
+  /** Override array of {@linkcode ModifierOverride}s used to provide held items to enemies on spawn. */
+  readonly OPP_HELD_ITEMS_OVERRIDE: ModifierOverride[] = [];
 
   /**
-   * An array of items by keys as defined in the "modifierTypes" object in the "modifier/modifier-type.ts" file.
-   * Items listed will replace the normal rolls.
-   * If less items are listed than rolled, only some items will be replaced
-   * If more items are listed than rolled, only the first X items will be shown, where X is the number of items rolled.
+   * Override array of {@linkcode ModifierOverride}s used to replace the generated item rolls after a wave.
+   *
+   * If less entries are listed than rolled, only those entries will be used to replace the corresponding items while the rest randomly generated.
+   * If more entries are listed than rolled, only the first X entries will be used, where X is the number of items rolled.
+   *
+   * Note that, for all items in the array, `count` is not used.
    */
-  readonly ITEM_REWARD_OVERRIDE: Array<ModifierTypeKeys> = [];
+  readonly ITEM_REWARD_OVERRIDE: ModifierOverride[] = [];
 }
 
 export const defaultOverrides = new DefaultOverrides();

From 5020d742f76151cdf437d32f778ec7b1ad4e8369 Mon Sep 17 00:00:00 2001
From: Leo Kim <47556641+KimJeongSun@users.noreply.github.com>
Date: Mon, 12 Aug 2024 22:25:24 +0900
Subject: [PATCH 24/30] =?UTF-8?q?[Bug]=20Fixed=20bug=20where=20container?=
 =?UTF-8?q?=20for=20unfiltered=20Pok=C3=A9mon=20does=20not=20try=20to=20se?=
 =?UTF-8?q?tVisible=20(#3509)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/ui/starter-select-ui-handler.ts | 105 +++++++++++++++-------------
 1 file changed, 57 insertions(+), 48 deletions(-)

diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts
index 8cea765fb57..00e6a1881dc 100644
--- a/src/ui/starter-select-ui-handler.ts
+++ b/src/ui/starter-select-ui-handler.ts
@@ -1328,44 +1328,48 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
         break;
       }
     } else {
+
+      let starterContainer;
+      const starterData = this.scene.gameData.starterData[this.lastSpecies.speciesId];
+      // prepare persistent starter data to store changes
+      let starterAttributes = this.starterPreferences[this.lastSpecies.speciesId];
+
+      // this gets the correct pokemon cursor depending on whether you're in the starter screen or the party icons
+      if (!this.starterIconsCursorObj.visible) {
+        starterContainer = this.filteredStarterContainers[this.cursor];
+      } else {
+        // if species is in filtered starters, get the starter container from the filtered starters, it can be undefined if the species is not in the filtered starters
+        starterContainer = this.filteredStarterContainers[this.filteredStarterContainers.findIndex(container => container.species === this.lastSpecies)];
+      }
+
       if (button === Button.ACTION) {
         if (!this.speciesStarterDexEntry?.caughtAttr) {
           error = true;
         } else if (this.starterSpecies.length <= 6) { // checks to see if the party has 6 or fewer pokemon
-
-          let species;
-
-          // this gets the correct generation and pokemon cursor depending on whether you're in the starter screen or the party icons
-          if (!this.starterIconsCursorObj.visible) {
-            species = this.filteredStarterContainers[this.cursor].species;
-          } else {
-            species = this.starterSpecies[this.starterIconsCursorIndex];
-          }
           const ui = this.getUi();
           let options: any[] = []; // TODO: add proper type
 
-          const [isDupe, removeIndex]: [boolean, number] = this.isInParty(species); // checks to see if the pokemon is a duplicate; if it is, returns the index that will be removed
-
+          const [isDupe, removeIndex]: [boolean, number] = this.isInParty(this.lastSpecies); // checks to see if the pokemon is a duplicate; if it is, returns the index that will be removed
 
           const isPartyValid = this.isPartyValid();
           const isValidForChallenge = new Utils.BooleanHolder(true);
 
-          Challenge.applyChallenges(this.scene.gameMode, Challenge.ChallengeType.STARTER_CHOICE, species, isValidForChallenge, this.scene.gameData.getSpeciesDexAttrProps(species, this.getCurrentDexProps(species.speciesId)), isPartyValid);
+          Challenge.applyChallenges(this.scene.gameMode, Challenge.ChallengeType.STARTER_CHOICE, this.lastSpecies, isValidForChallenge, this.scene.gameData.getSpeciesDexAttrProps(this.lastSpecies, this.getCurrentDexProps(this.lastSpecies.speciesId)), isPartyValid);
 
           const currentPartyValue = this.starterSpecies.map(s => s.generation).reduce((total: number, gen: number, i: number) => total += this.scene.gameData.getSpeciesStarterValue(this.starterSpecies[i].speciesId), 0);
-          const newCost = this.scene.gameData.getSpeciesStarterValue(species.speciesId);
+          const newCost = this.scene.gameData.getSpeciesStarterValue(this.lastSpecies.speciesId);
           if (!isDupe && isValidForChallenge.value && currentPartyValue + newCost <= this.getValueLimit() && this.starterSpecies.length < 6) { // this checks to make sure the pokemon doesn't exist in your party, it's valid for the challenge and that it won't go over the cost limit; if it meets all these criteria it will add it to your party
             options = [
               {
                 label: i18next.t("starterSelectUiHandler:addToParty"),
                 handler: () => {
                   ui.setMode(Mode.STARTER_SELECT);
-                  const isOverValueLimit = this.tryUpdateValue(this.scene.gameData.getSpeciesStarterValue(species.speciesId), true);
+                  const isOverValueLimit = this.tryUpdateValue(this.scene.gameData.getSpeciesStarterValue(this.lastSpecies.speciesId), true);
                   if (!isDupe && isValidForChallenge.value && isOverValueLimit) {
                     const cursorObj = this.starterCursorObjs[this.starterSpecies.length];
                     cursorObj.setVisible(true);
                     cursorObj.setPosition(this.cursorObj.x, this.cursorObj.y);
-                    this.addToParty(species, this.dexAttrCursor, this.abilityCursor, this.natureCursor as unknown as Nature, this.starterMoveset?.slice(0) as StarterMoveset);
+                    this.addToParty(this.lastSpecies, this.dexAttrCursor, this.abilityCursor, this.natureCursor as unknown as Nature, this.starterMoveset?.slice(0) as StarterMoveset);
                     ui.playSelect();
                   } else {
                     ui.playError(); // this should be redundant as there is now a trigger for when a pokemon can't be added to party
@@ -1481,9 +1485,6 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
               }
             });
           }
-          const starterContainer = this.filteredStarterContainers[this.cursor];
-          const starterData = this.scene.gameData.starterData[this.lastSpecies.speciesId];
-          let starterAttributes = this.starterPreferences[this.lastSpecies.speciesId];
           if (this.canCycleNature) {
             // if we could cycle natures, enable the improved nature menu
             const showNatureOptions = () => {
@@ -1567,7 +1568,10 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
               label: i18next.t("starterSelectUiHandler:addToFavorites"),
               handler: () => {
                 starterAttributes.favorite = true;
-                starterContainer.favoriteIcon.setVisible(starterAttributes.favorite);
+                // if the starter container not exists, it means the species is not in the filtered starters
+                if (starterContainer) {
+                  starterContainer.favoriteIcon.setVisible(starterAttributes.favorite);
+                }
                 ui.setMode(Mode.STARTER_SELECT);
                 return true;
               }
@@ -1577,7 +1581,10 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
               label: i18next.t("starterSelectUiHandler:removeFromFavorites"),
               handler: () => {
                 starterAttributes.favorite = false;
-                starterContainer.favoriteIcon.setVisible(starterAttributes.favorite);
+                // if the starter container not exists, it means the species is not in the filtered starters
+                if (starterContainer) {
+                  starterContainer.favoriteIcon.setVisible(starterAttributes.favorite);
+                }
                 ui.setMode(Mode.STARTER_SELECT);
                 return true;
               }
@@ -1598,7 +1605,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
                     if (name.length > 0) {
                       this.pokemonNameText.setText(name);
                     } else {
-                      this.pokemonNameText.setText(species.name);
+                      this.pokemonNameText.setText(this.lastSpecies.name);
                     }
                     ui.setMode(Mode.STARTER_SELECT);
                   },
@@ -1631,16 +1638,18 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
                     ui.setMode(Mode.STARTER_SELECT);
                     this.setSpeciesDetails(this.lastSpecies, undefined, undefined, undefined, undefined, undefined, undefined);
 
-                    // Update the candy upgrade display
-                    if (this.isUpgradeIconEnabled() ) {
-                      this.setUpgradeIcon(starterContainer);
-                    }
-                    if (this.isUpgradeAnimationEnabled()) {
-                      this.setUpgradeAnimation(starterContainer.icon, this.lastSpecies, true);
-                    }
-
-                    starterContainer.starterPassiveBgs.setVisible(!!this.scene.gameData.starterData[this.lastSpecies.speciesId].passiveAttr);
+                    // if starterContainer exists, update the passive background
+                    if (starterContainer) {
+                      // Update the candy upgrade display
+                      if (this.isUpgradeIconEnabled() ) {
+                        this.setUpgradeIcon(starterContainer);
+                      }
+                      if (this.isUpgradeAnimationEnabled()) {
+                        this.setUpgradeAnimation(starterContainer.icon, this.lastSpecies, true);
+                      }
 
+                      starterContainer.starterPassiveBgs.setVisible(!!this.scene.gameData.starterData[this.lastSpecies.speciesId].passiveAttr);
+                    }
                     return true;
                   }
                   return false;
@@ -1666,21 +1675,24 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
                         return this.scene.reset(true);
                       }
                     });
-                    this.updateStarterValueLabel(starterContainer);
                     this.tryUpdateValue(0);
                     ui.setMode(Mode.STARTER_SELECT);
                     this.scene.playSound("buy");
 
-                    // If the notification setting is set to 'On', update the candy upgrade display
-                    if (this.scene.candyUpgradeNotification === 2) {
-                      if (this.isUpgradeIconEnabled() ) {
-                        this.setUpgradeIcon(starterContainer);
-                      }
-                      if (this.isUpgradeAnimationEnabled()) {
-                        this.setUpgradeAnimation(starterContainer.icon, this.lastSpecies, true);
+                    // if starterContainer exists, update the value reduction background
+                    if (starterContainer) {
+                      this.updateStarterValueLabel(starterContainer);
+
+                      // If the notification setting is set to 'On', update the candy upgrade display
+                      if (this.scene.candyUpgradeNotification === 2) {
+                        if (this.isUpgradeIconEnabled() ) {
+                          this.setUpgradeIcon(starterContainer);
+                        }
+                        if (this.isUpgradeAnimationEnabled()) {
+                          this.setUpgradeAnimation(starterContainer.icon, this.lastSpecies, true);
+                        }
                       }
                     }
-
                     return true;
                   }
                   return false;
@@ -1755,11 +1767,6 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
         }
       } else {
         const props = this.scene.gameData.getSpeciesDexAttrProps(this.lastSpecies, this.getCurrentDexProps(this.lastSpecies.speciesId));
-        // prepare persistent starter data to store changes
-        let starterAttributes = this.starterPreferences[this.lastSpecies.speciesId];
-        if (!starterAttributes) {
-          starterAttributes = this.starterPreferences[this.lastSpecies.speciesId] = {};
-        }
         switch (button) {
         case Button.CYCLE_SHINY:
           if (this.canCycleShiny) {
@@ -2962,10 +2969,12 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
 
         const isValidForChallenge = new Utils.BooleanHolder(true);
         Challenge.applyChallenges(this.scene.gameMode, Challenge.ChallengeType.STARTER_CHOICE, species, isValidForChallenge, this.scene.gameData.getSpeciesDexAttrProps(species, this.dexAttrCursor), !!this.starterSpecies.length);
-        const currentFilteredContainer = this.filteredStarterContainers.find(p => p.species.speciesId === species.speciesId)!;
-        const starterSprite = currentFilteredContainer.icon as Phaser.GameObjects.Sprite;
-        starterSprite.setTexture(species.getIconAtlasKey(formIndex, shiny, variant), species.getIconId(female!, formIndex, shiny, variant));
-        currentFilteredContainer.checkIconId(female, formIndex, shiny, variant);
+        const currentFilteredContainer = this.filteredStarterContainers.find(p => p.species.speciesId === species.speciesId);
+        if (currentFilteredContainer) {
+          const starterSprite = currentFilteredContainer.icon as Phaser.GameObjects.Sprite;
+          starterSprite.setTexture(species.getIconAtlasKey(formIndex, shiny, variant), species.getIconId(female!, formIndex, shiny, variant));
+          currentFilteredContainer.checkIconId(female, formIndex, shiny, variant);
+        }
         this.canCycleShiny = !!(dexEntry.caughtAttr & DexAttr.NON_SHINY && dexEntry.caughtAttr & DexAttr.SHINY);
         this.canCycleGender = !!(dexEntry.caughtAttr & DexAttr.MALE && dexEntry.caughtAttr & DexAttr.FEMALE);
         this.canCycleAbility = [ abilityAttr & AbilityAttr.ABILITY_1, (abilityAttr & AbilityAttr.ABILITY_2) && species.ability2, abilityAttr & AbilityAttr.ABILITY_HIDDEN ].filter(a => a).length > 1;

From 5505a4d1f07f47e0a88f0fbebbc456cf1067ae61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Ricardo=20Fleury=20Oliveira?=
 <josefleury@discente.ufg.br>
Date: Mon, 12 Aug 2024 11:07:41 -0300
Subject: [PATCH 25/30] [Localization] Updated and localized "The stack for
 this item is full." message (#3491)

* [Localization] Localized "The stack for this item is full." message

* Update src/locales/es/battle.ts

Co-authored-by: Asdar <asdargmng@gmail.com>

* Update src/locales/es/battle.ts

Co-authored-by: Asdar <asdargmng@gmail.com>

* Update src/locales/de/battle.ts

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>

* Update src/locales/fr/battle.ts

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>

* Update src/locales/zh_CN/battle.ts

Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>

* Update src/battle-scene.ts

Co-authored-by: Enoch <enoch.jwsong@gmail.com>

* Update src/locales/zh_TW/battle.ts

Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>

* Update src/locales/ko/battle.ts

Co-authored-by: Enoch <enoch.jwsong@gmail.com>

* remake

* Update src/locales/fr/battle.ts

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>

* Update src/locales/de/battle.ts

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>

* Update src/locales/es/battle.ts

Co-authored-by: Asdar <asdargmng@gmail.com>

* Update src/locales/es/battle.ts

Co-authored-by: Asdar <asdargmng@gmail.com>

* Update src/locales/ja/battle.ts

Co-authored-by: protimita <protimitajp@gmail.com>

* Update Korean translation for battle.ts

* Update src/locales/zh_CN/battle.ts

Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>

* Update src/locales/zh_TW/battle.ts

Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>

* Update src/locales/zh_CN/battle.ts

* trailing space

---------

Co-authored-by: Asdar <asdargmng@gmail.com>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
Co-authored-by: protimita <protimitajp@gmail.com>
---
 src/battle-scene.ts         | 2 +-
 src/locales/ca_ES/battle.ts | 1 +
 src/locales/de/battle.ts    | 1 +
 src/locales/en/battle.ts    | 1 +
 src/locales/es/battle.ts    | 5 +++--
 src/locales/fr/battle.ts    | 1 +
 src/locales/it/battle.ts    | 1 +
 src/locales/ja/battle.ts    | 1 +
 src/locales/ko/battle.ts    | 1 +
 src/locales/pt_BR/battle.ts | 1 +
 src/locales/zh_CN/battle.ts | 1 +
 src/locales/zh_TW/battle.ts | 1 +
 12 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 21d381a9713..66b966270fd 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -2215,7 +2215,7 @@ export default class BattleScene extends SceneBase {
           }
         } else if (!virtual) {
           const defaultModifierType = getDefaultModifierTypeForTier(modifier.type.tier);
-          this.queueMessage(`The stack for this item is full.\n You will receive ${defaultModifierType.name} instead.`, undefined, true);
+          this.queueMessage(i18next.t("battle:itemStackFull", { fullItemName: modifier.type.name, itemName: defaultModifierType.name }), undefined, true);
           return this.addModifier(defaultModifierType.newModifier(), ignoreUpdate, playSound, false, instant).then(success => resolve(success));
         }
 
diff --git a/src/locales/ca_ES/battle.ts b/src/locales/ca_ES/battle.ts
index 9513e010579..522fbb3261b 100644
--- a/src/locales/ca_ES/battle.ts
+++ b/src/locales/ca_ES/battle.ts
@@ -60,6 +60,7 @@ export const battle: SimpleTranslationEntries = {
   "turnEndHpRestore": "{{pokemonName}}'s HP was restored.",
   "hpIsFull": "{{pokemonName}}'s\nHP is full!",
   "skipItemQuestion": "Are you sure you want to skip taking an item?",
+  "itemStackFull": "The stack for {{fullItemName}} is full.\nYou will receive {{itemName}} instead.",
   "eggHatching": "Oh?",
   "ivScannerUseQuestion": "Use IV Scanner on {{pokemonName}}?",
   "wildPokemonWithAffix": "Wild {{pokemonName}}",
diff --git a/src/locales/de/battle.ts b/src/locales/de/battle.ts
index 778411aad9b..b082a6932e9 100644
--- a/src/locales/de/battle.ts
+++ b/src/locales/de/battle.ts
@@ -57,6 +57,7 @@ export const battle: SimpleTranslationEntries = {
   "escapeVerbSwitch": "auswechseln",
   "escapeVerbFlee": "flucht",
   "skipItemQuestion": "Bist du sicher, dass du kein Item nehmen willst?",
+  "itemStackFull": "Du hast bereits zu viele von {{fullItemName}}. Du erhältst stattdessen {{itemName}}.",
   "notDisabled": "{{moveName}} von {{pokemonName}} ist nicht mehr deaktiviert!",
   "turnEndHpRestore": "Die KP von {{pokemonName}} wurden wiederhergestellt.",
   "hpIsFull": "Die KP von {{pokemonName}} sind voll!",
diff --git a/src/locales/en/battle.ts b/src/locales/en/battle.ts
index 9513e010579..522fbb3261b 100644
--- a/src/locales/en/battle.ts
+++ b/src/locales/en/battle.ts
@@ -60,6 +60,7 @@ export const battle: SimpleTranslationEntries = {
   "turnEndHpRestore": "{{pokemonName}}'s HP was restored.",
   "hpIsFull": "{{pokemonName}}'s\nHP is full!",
   "skipItemQuestion": "Are you sure you want to skip taking an item?",
+  "itemStackFull": "The stack for {{fullItemName}} is full.\nYou will receive {{itemName}} instead.",
   "eggHatching": "Oh?",
   "ivScannerUseQuestion": "Use IV Scanner on {{pokemonName}}?",
   "wildPokemonWithAffix": "Wild {{pokemonName}}",
diff --git a/src/locales/es/battle.ts b/src/locales/es/battle.ts
index 582766ec5b6..eb37699d911 100644
--- a/src/locales/es/battle.ts
+++ b/src/locales/es/battle.ts
@@ -57,9 +57,10 @@ export const battle: SimpleTranslationEntries = {
   "escapeVerbSwitch": "cambiar",
   "escapeVerbFlee": "huir",
   "notDisabled": "¡El movimiento {{moveName}} de {{pokemonName}}\nya no está anulado!",
-  "turnEndHpRestore": "{{pokemonName}}'s HP was restored.",
-  "hpIsFull": "{{pokemonName}}'s\nHP is full!",
+  "turnEndHpRestore": "Los PS de {{pokemonName}} fueron restaurados.",
+  "hpIsFull": "¡Los PS de {{pokemonName}}\nestán al máximo!",
   "skipItemQuestion": "¿Estás seguro de que no quieres coger un objeto?",
+  "itemStackFull": "El máximo número de {{fullItemName}} ha sido alcanzado. Recibirás {{itemName}} en su lugar.",
   "eggHatching": "¿Y esto?",
   "ivScannerUseQuestion": "¿Quieres usar el Escáner de IVs en {{pokemonName}}?",
   "wildPokemonWithAffix": "El {{pokemonName}} salvaje",
diff --git a/src/locales/fr/battle.ts b/src/locales/fr/battle.ts
index 4a775bc89dc..12ee9e0d696 100644
--- a/src/locales/fr/battle.ts
+++ b/src/locales/fr/battle.ts
@@ -60,6 +60,7 @@ export const battle: SimpleTranslationEntries = {
   "turnEndHpRestore": "{{pokemonName}} récupère des PV !",
   "hpIsFull": "Les PV de {{pokemonName}}\nsont au maximum !",
   "skipItemQuestion": "Êtes-vous sûr·e de ne pas vouloir prendre d’objet ?",
+  "itemStackFull": "Quantité maximale de {{fullItemName}} atteinte.\nVous recevez {{itemName}} à la place.",
   "eggHatching": "Hein ?",
   "ivScannerUseQuestion": "Utiliser le Scanner d’IV\nsur {{pokemonName}} ?",
   "wildPokemonWithAffix": "{{pokemonName}} sauvage",
diff --git a/src/locales/it/battle.ts b/src/locales/it/battle.ts
index 16cb1f58642..bd7227eacb6 100644
--- a/src/locales/it/battle.ts
+++ b/src/locales/it/battle.ts
@@ -60,6 +60,7 @@ export const battle: SimpleTranslationEntries = {
   "turnEndHpRestore": "{{pokemonName}} ha recuperato dei PS.",
   "hpIsFull": "{{pokemonName}} ha già\ntutti i PS!",
   "skipItemQuestion": "Sei sicuro di non voler prendere nessun oggetto?",
+  "itemStackFull": "The stack for {{fullItemName}} is full.\nYou will receive {{itemName}} instead.",
   "eggHatching": "Oh?",
   "ivScannerUseQuestion": "Vuoi usare lo scanner di IV su {{pokemonName}}?",
   "stealEatBerry": "{{pokemonName}} ha rubato e mangiato\nla {{berryName}} di {{targetName}}!",
diff --git a/src/locales/ja/battle.ts b/src/locales/ja/battle.ts
index 116dff28c0a..926e2d9b0e4 100644
--- a/src/locales/ja/battle.ts
+++ b/src/locales/ja/battle.ts
@@ -60,6 +60,7 @@ export const battle: SimpleTranslationEntries = {
   "turnEndHpRestore": "{{pokemonName}}の　体力が　回復した！",
   "hpIsFull": "{{pokemonName}}の\n体力が　満タンだ!",
   "skipItemQuestion": "本当に　アイテムを　取らずに　進みますか？",
+  "itemStackFull": "{{fullItemName}}の　スタックが　いっぱいです。\n代わりに　{{itemName}}を　取得します。",
   "eggHatching": "おや？",
   "ivScannerUseQuestion": "{{pokemonName}}を\n個体値スキャナーで　操作しますか?",
   "wildPokemonWithAffix": "野生の　{{pokemonName}}",
diff --git a/src/locales/ko/battle.ts b/src/locales/ko/battle.ts
index c1149c8efcd..bdbcbcdf8d2 100644
--- a/src/locales/ko/battle.ts
+++ b/src/locales/ko/battle.ts
@@ -60,6 +60,7 @@ export const battle: SimpleTranslationEntries = {
   "turnEndHpRestore": "{{pokemonName}}의\n체력이 회복되었다!",
   "hpIsFull": "그러나 {{pokemonName}}의\n체력이 가득 찬 상태다!",
   "skipItemQuestion": "아이템을 받지 않고 넘어가시겠습니까?",
+  "itemStackFull": "{{fullItemName}}의 소지 한도에 도달했습니다.\n{{itemname}}[[를]] 대신 받습니다.",
   "eggHatching": "어라…?",
   "ivScannerUseQuestion": "{{pokemonName}}에게 개체값탐지기를 사용하시겠습니까?",
   "wildPokemonWithAffix": "야생 {{pokemonName}}",
diff --git a/src/locales/pt_BR/battle.ts b/src/locales/pt_BR/battle.ts
index daa8d56ccb3..920acd17d6f 100644
--- a/src/locales/pt_BR/battle.ts
+++ b/src/locales/pt_BR/battle.ts
@@ -60,6 +60,7 @@ export const battle: SimpleTranslationEntries = {
   "turnEndHpRestore": "Os PS de {{pokemonName}} foram restaurados!",
   "hpIsFull": "Os PS de {{pokemonName}}\njá estão cheios!",
   "skipItemQuestion": "Tem certeza de que não quer escolher um item?",
+  "itemStackFull": "O estoque de {{fullItemName}} está cheio.\nVocê receberá {{itemName}} no lugar.",
   "eggHatching": "Opa?",
   "ivScannerUseQuestion": "Quer usar o Scanner de IVs em {{pokemonName}}?",
   "wildPokemonWithAffix": "{{pokemonName}} selvagem",
diff --git a/src/locales/zh_CN/battle.ts b/src/locales/zh_CN/battle.ts
index c018faa0b01..5a73fbba09f 100644
--- a/src/locales/zh_CN/battle.ts
+++ b/src/locales/zh_CN/battle.ts
@@ -60,6 +60,7 @@ export const battle: SimpleTranslationEntries = {
   "turnEndHpRestore": "{{pokemonName}}的体力恢复了。",
   "hpIsFull": "{{pokemonName}}的体力已满！",
   "skipItemQuestion": "你确定要跳过拾取道具吗？",
+  "itemStackFull": "{{fullItemName}}持有数达到上限，\n你获得了{{itemName}}作为替代。",
   "eggHatching": "咦？",
   "stealEatBerry": "{{pokemonName}}夺取并吃掉了\n{{targetName}}的{{berryName}}！",
   "ppHealBerry": "{{pokemonNameWithAffix}}用{{berryName}}\n回复了{{moveName}}的PP！",
diff --git a/src/locales/zh_TW/battle.ts b/src/locales/zh_TW/battle.ts
index e8ecd5228f5..357ad4ffbc3 100644
--- a/src/locales/zh_TW/battle.ts
+++ b/src/locales/zh_TW/battle.ts
@@ -60,6 +60,7 @@ export const battle: SimpleTranslationEntries = {
   "turnEndHpRestore": "{{pokemonName}}'s HP was restored.",
   "hpIsFull": "{{pokemonName}}'s\nHP is full!",
   "skipItemQuestion": "你要跳過拾取道具嗎？",
+  "itemStackFull": "{{fullItemName}}持有數已達到上限，\n你獲得了{{itemName}}作爲代替。",
   "eggHatching": "咦？",
   "ivScannerUseQuestion": "對 {{pokemonName}} 使用個體值掃描儀？",
   "wildPokemonWithAffix": "野生的 {{pokemonName}}",

From 4a095af4117dc648dc2c5a387cf5366ee550d412 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Ricardo=20Fleury=20Oliveira?=
 <josefleury@discente.ufg.br>
Date: Mon, 12 Aug 2024 11:07:51 -0300
Subject: [PATCH 26/30] [Localization] Updated Portuguese translations (#3511)

* berry

* favorites

* more updates
---
 src/locales/pt_BR/ability-trigger.ts           |  2 +-
 src/locales/pt_BR/battle.ts                    |  2 +-
 src/locales/pt_BR/config.ts                    | 12 ++++++------
 src/locales/pt_BR/move-trigger.ts              |  4 ++--
 src/locales/pt_BR/pokemon-form.ts              | 18 +++++++++---------
 src/locales/pt_BR/starter-select-ui-handler.ts |  4 ++--
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/locales/pt_BR/ability-trigger.ts b/src/locales/pt_BR/ability-trigger.ts
index fde45e92af3..da91fa3213f 100644
--- a/src/locales/pt_BR/ability-trigger.ts
+++ b/src/locales/pt_BR/ability-trigger.ts
@@ -10,7 +10,7 @@ export const abilityTriggers: SimpleTranslationEntries = {
   "trace": "{{pokemonName}} copiou {{abilityName}}\nde {{targetName}}!",
   "windPowerCharged": "Ser atingido por {{moveName}} carregou {{pokemonName}} com poder!",
   "quickDraw": "{{pokemonName}} pode agir mais rápido que o normal\ngraças ao seu Quick Draw!",
-  "disguiseAvoidedDamage" : "O disfarce de {{pokemonNameWithAffix}} foi descoberto!",
+  "disguiseAvoidedDamage": "O disfarce de {{pokemonNameWithAffix}} foi descoberto!",
   "blockItemTheft": "{{abilityName}} de {{pokemonNameWithAffix}}\nprevine o roubo de itens!",
   "typeImmunityHeal": "{{abilityName}} de {{pokemonNameWithAffix}}\nrestaurou um pouco de PS!",
   "nonSuperEffectiveImmunity": "{{pokemonNameWithAffix}} evitou dano\ncom {{abilityName}}!",
diff --git a/src/locales/pt_BR/battle.ts b/src/locales/pt_BR/battle.ts
index 920acd17d6f..24d4e8c928f 100644
--- a/src/locales/pt_BR/battle.ts
+++ b/src/locales/pt_BR/battle.ts
@@ -68,7 +68,7 @@ export const battle: SimpleTranslationEntries = {
   "useMove": "{{pokemonNameWithAffix}} usou {{moveName}}!",
   "drainMessage": "{{pokemonName}} teve sua\nenergia drenada!",
   "regainHealth": "{{pokemonName}} recuperou\npontos de saúde!",
-  "stealEatBerry": "{{pokemonName}} stole and ate\n{{targetName}}'s {{berryName}}!",
+  "stealEatBerry": "{{pokemonName}} roubou e comeu\na {{berryName}} de {{targetName}}!",
   "ppHealBerry": "{{pokemonNameWithAffix}} restaurou PP do movimento {{moveName}}\nusando sua {{berryName}}!",
   "hpHealBerry": "{{pokemonNameWithAffix}} restarou sua saúde usando\nsua {{berryName}}!",
   "fainted": "{{pokemonNameWithAffix}} desmaiou!",
diff --git a/src/locales/pt_BR/config.ts b/src/locales/pt_BR/config.ts
index 5f7582dca63..b48fcfdc8d8 100644
--- a/src/locales/pt_BR/config.ts
+++ b/src/locales/pt_BR/config.ts
@@ -35,11 +35,12 @@ import { modifier } from "./modifier";
 import { modifierSelectUiHandler } from "./modifier-select-ui-handler";
 import { modifierType } from "./modifier-type";
 import { move } from "./move";
+import { moveTriggers } from "./move-trigger";
 import { nature } from "./nature";
 import { partyUiHandler } from "./party-ui-handler";
 import { pokeball } from "./pokeball";
 import { pokemon } from "./pokemon";
-import { pokemonForm, battlePokemonForm } from "./pokemon-form";
+import { battlePokemonForm, pokemonForm } from "./pokemon-form";
 import { pokemonInfo } from "./pokemon-info";
 import { pokemonInfoContainer } from "./pokemon-info-container";
 import { pokemonSummary } from "./pokemon-summary";
@@ -52,7 +53,6 @@ import { titles, trainerClasses, trainerNames } from "./trainers";
 import { tutorial } from "./tutorial";
 import { voucher } from "./voucher";
 import { terrain, weather } from "./weather";
-import { moveTriggers } from "./move-trigger";
 
 export const ptBrConfig = {
   ability: ability,
@@ -89,9 +89,12 @@ export const ptBrConfig = {
   menu: menu,
   menuUiHandler: menuUiHandler,
   modifier: modifier,
+  modifierSelectUiHandler: modifierSelectUiHandler,
   modifierType: modifierType,
   move: move,
+  moveTriggers: moveTriggers,
   nature: nature,
+  partyUiHandler: partyUiHandler,
   pokeball: pokeball,
   pokemon: pokemon,
   pokemonForm: pokemonForm,
@@ -109,8 +112,5 @@ export const ptBrConfig = {
   trainerNames: trainerNames,
   tutorial: tutorial,
   voucher: voucher,
-  weather: weather,
-  partyUiHandler: partyUiHandler,
-  modifierSelectUiHandler: modifierSelectUiHandler,
-  moveTriggers: moveTriggers
+  weather: weather
 };
diff --git a/src/locales/pt_BR/move-trigger.ts b/src/locales/pt_BR/move-trigger.ts
index a6a6e198b8f..9dc151e12b9 100644
--- a/src/locales/pt_BR/move-trigger.ts
+++ b/src/locales/pt_BR/move-trigger.ts
@@ -1,13 +1,13 @@
 import { SimpleTranslationEntries } from "#app/interfaces/locales";
 
 export const moveTriggers: SimpleTranslationEntries = {
-  "hitWithRecoil" : "{{pokemonName}} foi ferido pelo dano reverso!",
+  "hitWithRecoil": "{{pokemonName}} foi ferido pelo dano reverso!",
   "cutHpPowerUpMove": "{{pokemonName}} diminuiu seus PS para aumentar o poder do ataque!",
   "absorbedElectricity": "{{pokemonName}} absorveu eletricidade!",
   "switchedStatChanges": "{{pokemonName}} trocou as mudanças de atributo com o alvo!",
   "goingAllOutForAttack": "{{pokemonName}} está arriscando tudo nesse ataque!",
   "regainedHealth": "{{pokemonName}} recuperou/nsaúde!",
-  "keptGoingAndCrashed": "{{pokemonName}} continuou/nindo e bateu!",
+  "keptGoingAndCrashed": "{{pokemonName}} errou o alvo/ne se arrebentou!",
   "fled": "{{pokemonName}} fugiu!",
   "cannotBeSwitchedOut": "{{pokemonName}} não pode ser trocado!",
   "swappedAbilitiesWithTarget": "{{pokemonName}} trocou/nde habilidades com o alvo!",
diff --git a/src/locales/pt_BR/pokemon-form.ts b/src/locales/pt_BR/pokemon-form.ts
index 01e3f951a9d..062fc165ae0 100644
--- a/src/locales/pt_BR/pokemon-form.ts
+++ b/src/locales/pt_BR/pokemon-form.ts
@@ -181,15 +181,15 @@ export const pokemonForm: SimpleTranslationEntries = {
   "gimmighoulChest": "Baú",
   "gimmighoulRoaming": "Perambulante",
   "koraidonApexBuild": "Apex Build",
-  "koraidonLimitedBuild":"Limited Build",
-  "koraidonSprintingBuild":"Sprinting Build",
-  "koraidonSwimmingBuild":"Swimming Build",
-  "koraidonGlidingBuild":"Gliding Build",
-  "miraidonUltimateMode":"Ultimate Mode",
-  "miraidonLowPowerMode":"Low Power Mode",
-  "miraidonDriveMode":"Drive Mode",
-  "miraidonAquaticMode":"Aquatic Mode",
-  "miraidonGlideMode":"Glide Mode",
+  "koraidonLimitedBuild": "Limited Build",
+  "koraidonSprintingBuild": "Sprinting Build",
+  "koraidonSwimmingBuild": "Swimming Build",
+  "koraidonGlidingBuild": "Gliding Build",
+  "miraidonUltimateMode": "Ultimate Mode",
+  "miraidonLowPowerMode": "Low Power Mode",
+  "miraidonDriveMode": "Drive Mode",
+  "miraidonAquaticMode": "Aquatic Mode",
+  "miraidonGlideMode": "Glide Mode",
   "poltchageistCounterfeit": "Imitação",
   "poltchageistArtisan": "Artesão",
   "paldeaTaurosCombat": "Combate",
diff --git a/src/locales/pt_BR/starter-select-ui-handler.ts b/src/locales/pt_BR/starter-select-ui-handler.ts
index 2cec9a5335e..f76762ffe9f 100644
--- a/src/locales/pt_BR/starter-select-ui-handler.ts
+++ b/src/locales/pt_BR/starter-select-ui-handler.ts
@@ -28,8 +28,8 @@ export const starterSelectUiHandler: SimpleTranslationEntries = {
   "toggleIVs": "Mostrar IVs",
   "manageMoves": "Mudar Movimentos",
   "manageNature": "Mudar Natureza",
-  "addToFavorites": "Add to Favorites",
-  "removeFromFavorites": "Remove from Favorites",
+  "addToFavorites": "Adicionar aos Favoritos",
+  "removeFromFavorites": "Remover dos Favoritos",
   "useCandies": "Usar Doces",
   "selectNature": "Escolha uma natureza.",
   "selectMoveSwapOut": "Escolha um movimento para substituir.",

From 377b422cd17af889cd14a8df96d57de405a05510 Mon Sep 17 00:00:00 2001
From: Lugiad <adrien.grivel@hotmail.fr>
Date: Mon, 12 Aug 2024 16:08:23 +0200
Subject: [PATCH 27/30] [Localization] - Missing translations to the Filter bar
 in some languages (#3457)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update filter-bar.ts

* Update filter-bar.ts

* Update filter-bar.ts

* Update filter-bar.ts

* Update filter-bar.ts

* Update filter-bar.ts

* Update filter-bar.ts

* Update filter-bar.ts

* Update filter-bar.ts

* Update filter-bar.ts

* Update filter-bar.ts

* Update src/locales/es/filter-bar.ts

Co-authored-by: Asdar <asdargmng@gmail.com>

* Update src/locales/es/filter-bar.ts

Co-authored-by: Asdar <asdargmng@gmail.com>

* Update src/locales/es/filter-bar.ts

Co-authored-by: Asdar <asdargmng@gmail.com>

* Update src/locales/es/filter-bar.ts

Co-authored-by: Asdar <asdargmng@gmail.com>

* Update src/locales/es/filter-bar.ts

Co-authored-by: Asdar <asdargmng@gmail.com>

* Update src/locales/de/filter-bar.ts

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>

* Update src/locales/de/filter-bar.ts

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>

* Update src/locales/de/filter-bar.ts

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>

* Update filter-bar.ts

* Update filter-bar.ts

* Update filter-bar.ts

* Update filter-bar.ts

* Update filter-bar.ts

* Update filter-bar.ts

* Update filter-bar.ts

* Update filter-bar.ts

* Update filter-bar.ts

* Update filter-bar.ts

* Update filter-bar.ts

* Update filter-bar.ts

* Update filter-bar.ts

* Update filter-bar.ts

* Update filter-bar.ts

* Update src/locales/de/filter-bar.ts

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>

* Update filter-bar.ts

* Update filter-bar.ts

* Update src/locales/pt_BR/filter-bar.ts

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* Update filter-bar.ts

* Update src/locales/ja/filter-bar.ts

Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>

* Update filter-bar.ts

* Update filter-bar.ts

* Update filter-bar.ts

* Update filter-bar.ts

* Update filter-bar.ts

* Update src/locales/zh_CN/filter-bar.ts

Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>

* Update filter-bar.ts

* Update src/locales/zh_CN/filter-bar.ts

Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>

* Update src/locales/zh_TW/filter-bar.ts

Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>

* Update src/locales/zh_TW/filter-bar.ts

Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>

* Update src/locales/zh_TW/filter-bar.ts

Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>

* Update src/locales/zh_TW/filter-bar.ts

Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>

* Update src/locales/zh_TW/filter-bar.ts

Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>

* Update src/locales/zh_TW/filter-bar.ts

Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>

* Update filter-bar.ts

* Update filter-bar.ts

* Update filter-bar.ts

* Update filter-bar.ts

* Update filter-bar.ts

* Update filter-bar.ts

* Update filter-bar.ts

* Update filter-bar.ts

* [Localization][JA]Update filter-bar.ts

Added hyphens for constancy.
Added 4 new translations.

* Update src/locales/pt_BR/filter-bar.ts

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* Update src/locales/pt_BR/filter-bar.ts

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* Update src/locales/pt_BR/filter-bar.ts

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* Update filter-bar.ts

* Update filter-bar.ts

* Update src/locales/es/filter-bar.ts

Co-authored-by: Asdar <asdargmng@gmail.com>

* Update src/locales/es/filter-bar.ts

Co-authored-by: Asdar <asdargmng@gmail.com>

* Update src/locales/es/filter-bar.ts

Co-authored-by: Asdar <asdargmng@gmail.com>

* Update src/locales/es/filter-bar.ts

Co-authored-by: Asdar <asdargmng@gmail.com>

* Update filter-bar.ts

* Update src/locales/de/filter-bar.ts

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>

* Update src/locales/de/filter-bar.ts

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>

* Update src/locales/de/filter-bar.ts

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>

* Update filter-bar.ts

* Update src/locales/pt_BR/filter-bar.ts

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* Update src/locales/pt_BR/filter-bar.ts

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* Update src/locales/zh_CN/filter-bar.ts

Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>

* Update src/locales/zh_CN/filter-bar.ts

Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>

* Update src/locales/zh_CN/filter-bar.ts

Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>

* Update src/locales/zh_CN/filter-bar.ts

Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>

* Update src/locales/zh_TW/filter-bar.ts

Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>

* Update src/locales/zh_TW/filter-bar.ts

Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>

---------

Co-authored-by: Asdar <asdargmng@gmail.com>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
Co-authored-by: Chapybara-jp <charlie.beer@hotmail.com>
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com>
Co-authored-by: protimita <protimitajp@gmail.com>
---
 src/locales/ca_ES/filter-bar.ts |  6 +--
 src/locales/de/filter-bar.ts    | 32 +++++++--------
 src/locales/en/filter-bar.ts    |  6 +--
 src/locales/es/filter-bar.ts    | 48 +++++++++++-----------
 src/locales/fr/filter-bar.ts    | 36 ++++++++---------
 src/locales/it/filter-bar.ts    | 40 +++++++++----------
 src/locales/ja/filter-bar.ts    | 70 ++++++++++++++++-----------------
 src/locales/pt_BR/filter-bar.ts | 16 ++++----
 src/locales/zh_CN/filter-bar.ts | 14 +++----
 src/locales/zh_TW/filter-bar.ts | 32 +++++++--------
 10 files changed, 150 insertions(+), 150 deletions(-)

diff --git a/src/locales/ca_ES/filter-bar.ts b/src/locales/ca_ES/filter-bar.ts
index ffd227f90ca..cbdb22c03bd 100644
--- a/src/locales/ca_ES/filter-bar.ts
+++ b/src/locales/ca_ES/filter-bar.ts
@@ -29,9 +29,9 @@ export const filterBar: SimpleTranslationEntries = {
   "noHiddenAbility": "Hidden Ability - No",
   "egg": "Egg",
   "eggPurchasable": "Purchasable Egg",
-  "pokerus": "Pokerus",
-  "hasPokerus": "Pokerus - Yes",
-  "noPokerus": "Pokerus - No",
+  "pokerus": "Pokérus",
+  "hasPokerus": "Pokérus - Yes",
+  "noPokerus": "Pokérus - No",
   "sortByNumber": "No.",
   "sortByCost": "Cost",
   "sortByCandies": "Candy Count",
diff --git a/src/locales/de/filter-bar.ts b/src/locales/de/filter-bar.ts
index 10736b226c5..102686dd93f 100644
--- a/src/locales/de/filter-bar.ts
+++ b/src/locales/de/filter-bar.ts
@@ -13,25 +13,25 @@ export const filterBar: SimpleTranslationEntries = {
   "passive": "Passive",
   "passiveUnlocked": "Passive freigeschaltet",
   "passiveLocked": "Passive gesperrt",
-  "passiveUnlockable": "Passive - Can Unlock",
-  "costReduction": "Cost Reduction",
-  "costReductionUnlocked": "Cost Reduction Unlocked",
-  "costReductionLocked": "Cost Reduction Locked",
-  "costReductionUnlockable": "Cost Reduction - Can Unlock",
-  "favorite": "Favorite",
-  "isFavorite": "Favorite - Yes",
-  "notFavorite": "Favorite - No",
+  "passiveUnlockable": "Passive - Freischalten möglich",
+  "costReduction": "Kostenreduzierung",
+  "costReductionUnlocked": "Kosten bereits reduziert",
+  "costReductionLocked": "Kosten noch nicht reduziert",
+  "costReductionUnlockable": "Kosten können reduziert werden",
+  "favorite": "Favorit",
+  "isFavorite": "Favorit - Ja",
+  "notFavorite": "Favorit - Nein",
   "ribbon": "Band",
   "hasWon": "Hat Klassik-Modus gewonnen",
   "hasNotWon": "Hat Klassik-Modus nicht gewonnen",
-  "hiddenAbility": "Hidden Ability",
-  "hasHiddenAbility": "Hidden Ability - Yes",
-  "noHiddenAbility": "Hidden Ability - No",
-  "egg": "Egg",
-  "eggPurchasable": "Purchasable Egg",
-  "pokerus": "Pokerus",
-  "hasPokerus": "Pokerus - Yes",
-  "noPokerus": "Pokerus - No",
+  "hiddenAbility": "Versteckte Fähigkeit",
+  "hasHiddenAbility": "Versteckte Fähigkeit - Ja",
+  "noHiddenAbility": "Versteckte Fähigkeit - Nein",
+  "egg": "Ei",
+  "eggPurchasable": "Kauf möglich",
+  "pokerus": "Pokérus",
+  "hasPokerus": "Pokérus - Ja",
+  "noPokerus": "Pokérus - Nein",
   "sortByNumber": "Pokédex-Nummer",
   "sortByCost": "Kosten",
   "sortByCandies": "Anzahl Bonbons",
diff --git a/src/locales/en/filter-bar.ts b/src/locales/en/filter-bar.ts
index ffd227f90ca..cbdb22c03bd 100644
--- a/src/locales/en/filter-bar.ts
+++ b/src/locales/en/filter-bar.ts
@@ -29,9 +29,9 @@ export const filterBar: SimpleTranslationEntries = {
   "noHiddenAbility": "Hidden Ability - No",
   "egg": "Egg",
   "eggPurchasable": "Purchasable Egg",
-  "pokerus": "Pokerus",
-  "hasPokerus": "Pokerus - Yes",
-  "noPokerus": "Pokerus - No",
+  "pokerus": "Pokérus",
+  "hasPokerus": "Pokérus - Yes",
+  "noPokerus": "Pokérus - No",
   "sortByNumber": "No.",
   "sortByCost": "Cost",
   "sortByCandies": "Candy Count",
diff --git a/src/locales/es/filter-bar.ts b/src/locales/es/filter-bar.ts
index e713c10c21b..e98289c447c 100644
--- a/src/locales/es/filter-bar.ts
+++ b/src/locales/es/filter-bar.ts
@@ -3,35 +3,35 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales";
 export const filterBar: SimpleTranslationEntries = {
   "genFilter": "Gen.",
   "typeFilter": "Tipo",
-  "caughtFilter": "Caught",
+  "caughtFilter": "Capturado",
   "unlocksFilter": "Otros",
-  "miscFilter": "Misc",
+  "miscFilter": "Misc.",
   "sortFilter": "Orden",
   "all": "Todo",
   "normal": "Normal",
   "uncaught": "No Capt.",
-  "passive": "Passive",
-  "passiveUnlocked": "Pasiva Desbloq.",
-  "passiveLocked": "Pasiva Bloq.",
-  "passiveUnlockable": "Passive - Can Unlock",
-  "costReduction": "Cost Reduction",
-  "costReductionUnlocked": "Cost Reduction Unlocked",
-  "costReductionLocked": "Cost Reduction Locked",
-  "costReductionUnlockable": "Cost Reduction - Can Unlock",
-  "favorite": "Favorite",
-  "isFavorite": "Favorite - Yes",
-  "notFavorite": "Favorite - No",
-  "ribbon": "Ribbon",
-  "hasWon": "Ya ha ganado",
-  "hasNotWon": "Aún no ha ganado",
-  "hiddenAbility": "Hidden Ability",
-  "hasHiddenAbility": "Hidden Ability - Yes",
-  "noHiddenAbility": "Hidden Ability - No",
-  "egg": "Egg",
-  "eggPurchasable": "Purchasable Egg",
-  "pokerus": "Pokerus",
-  "hasPokerus": "Pokerus - Yes",
-  "noPokerus": "Pokerus - No",
+  "passive": "Pasiva",
+  "passiveUnlocked": "Pasiva desbloq.",
+  "passiveLocked": "Pasiva bloq.",
+  "passiveUnlockable": "Pasiva - puede desbloq.",
+  "costReduction": "Reducción de coste",
+  "costReductionUnlocked": "Reducción de coste desbloq.",
+  "costReductionLocked": "Reducción de coste bloq.",
+  "costReductionUnlockable": "Red. de coste - puede desbloq.",
+  "favorite": "Favoritos",
+  "isFavorite": "Favoritos - Sí",
+  "notFavorite": "Favoritos - No",
+  "ribbon": "Cinta",
+  "hasWon": "Cinta - Sí",
+  "hasNotWon": "Cinta - No",
+  "hiddenAbility": "Habilidad oculta",
+  "hasHiddenAbility": "Habilidad oculta - Sí",
+  "noHiddenAbility": "Habilidad oculta - No",
+  "egg": "Huevo",
+  "eggPurchasable": "Huevo - puede comprar",
+  "pokerus": "Pokérus",
+  "hasPokerus": "Pokérus - Sí",
+  "noPokerus": "Pokérus - No",
   "sortByNumber": "Núm.",
   "sortByCost": "Coste",
   "sortByCandies": "# Caramelos",
diff --git a/src/locales/fr/filter-bar.ts b/src/locales/fr/filter-bar.ts
index f3130808f40..9b519fc75e6 100644
--- a/src/locales/fr/filter-bar.ts
+++ b/src/locales/fr/filter-bar.ts
@@ -13,25 +13,25 @@ export const filterBar: SimpleTranslationEntries = {
   "passive": "Passif",
   "passiveUnlocked": "Passif débloqué",
   "passiveLocked": "Passif verrouillé",
-  "passiveUnlockable": "Passive - Can Unlock",
-  "costReduction": "Cost Reduction",
-  "costReductionUnlocked": "Cost Reduction Unlocked",
-  "costReductionLocked": "Cost Reduction Locked",
-  "costReductionUnlockable": "Cost Reduction - Can Unlock",
-  "favorite": "Favorite",
-  "isFavorite": "Favorite - Yes",
-  "notFavorite": "Favorite - No",
+  "passiveUnlockable": "Passif débloquable",
+  "costReduction": "Cout réduit",
+  "costReductionUnlocked": "Cout réduit débloqué",
+  "costReductionLocked": "Cout réduit verrouillé",
+  "costReductionUnlockable": "Cout réduit débloquable",
+  "favorite": "Favoris",
+  "isFavorite": "Favoris uniquement",
+  "notFavorite": "Sans Favoris",
   "ribbon": "Ruban",
-  "hasWon": "Ruban - Oui",
-  "hasNotWon": "Ruban - Non",
-  "hiddenAbility": "Hidden Ability",
-  "hasHiddenAbility": "Hidden Ability - Yes",
-  "noHiddenAbility": "Hidden Ability - No",
-  "egg": "Egg",
-  "eggPurchasable": "Purchasable Egg",
-  "pokerus": "Pokerus",
-  "hasPokerus": "Pokerus - Yes",
-  "noPokerus": "Pokerus - No",
+  "hasWon": "Ruban - Avec",
+  "hasNotWon": "Ruban - Sans",
+  "hiddenAbility": "Talent caché",
+  "hasHiddenAbility": "Talent caché - Avec",
+  "noHiddenAbility": "Talent caché  - Sans",
+  "egg": "Œuf",
+  "eggPurchasable": "Œuf achetable",
+  "pokerus": "Pokérus",
+  "hasPokerus": "Pokérus - Avec",
+  "noPokerus": "Pokérus - Sans",
   "sortByNumber": "Par N°",
   "sortByCost": "Par cout",
   "sortByCandies": "Par bonbons",
diff --git a/src/locales/it/filter-bar.ts b/src/locales/it/filter-bar.ts
index f956544291d..0256f6bcf21 100644
--- a/src/locales/it/filter-bar.ts
+++ b/src/locales/it/filter-bar.ts
@@ -3,7 +3,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales";
 export const filterBar: SimpleTranslationEntries = {
   "genFilter": "Gen",
   "typeFilter": "Tipo",
-  "caughtFilter": "Caught",
+  "caughtFilter": "Catturati",
   "unlocksFilter": "Altro",
   "miscFilter": "Misc",
   "sortFilter": "Ordina",
@@ -13,25 +13,25 @@ export const filterBar: SimpleTranslationEntries = {
   "passive": "Passive",
   "passiveUnlocked": "Passiva sbloccata",
   "passiveLocked": "Passiva bloccata",
-  "passiveUnlockable": "Passive - Can Unlock",
-  "costReduction": "Cost Reduction",
-  "costReductionUnlocked": "Cost Reduction Unlocked",
-  "costReductionLocked": "Cost Reduction Locked",
-  "costReductionUnlockable": "Cost Reduction - Can Unlock",
-  "favorite": "Favorite",
-  "isFavorite": "Favorite - Yes",
-  "notFavorite": "Favorite - No",
-  "ribbon": "Ribbon",
-  "hasWon": "Ribbon - Yes",
-  "hasNotWon": "Ribbon - No",
-  "hiddenAbility": "Hidden Ability",
-  "hasHiddenAbility": "Hidden Ability - Yes",
-  "noHiddenAbility": "Hidden Ability - No",
-  "egg": "Egg",
-  "eggPurchasable": "Purchasable Egg",
-  "pokerus": "Pokerus",
-  "hasPokerus": "Pokerus - Yes",
-  "noPokerus": "Pokerus - No",
+  "passiveUnlockable": "Passiva sbloccabile",
+  "costReduction": "Costo ridotto",
+  "costReductionUnlocked": "Costo ridotto sbloccato",
+  "costReductionLocked": "Costo ridotto bloccato",
+  "costReductionUnlockable": "Costo ridotto sbloccabile",
+  "favorite": "Preferiti",
+  "isFavorite": "Preferiti - Sì",
+  "notFavorite": "Preferiti - No",
+  "ribbon": "Fiocco",
+  "hasWon": "Fiocco - Sì",
+  "hasNotWon": "Fiocco - No",
+  "hiddenAbility": "Abilità speciale",
+  "hasHiddenAbility": "Abilità speciale - Sì",
+  "noHiddenAbility": "Abilità speciale - No",
+  "egg": "Uova",
+  "eggPurchasable": "Uovo acquistabile",
+  "pokerus": "Pokérus",
+  "hasPokerus": "Pokérus - Sì",
+  "noPokerus": "Pokérus - No",
   "sortByNumber": "Num. Dex",
   "sortByCost": "Costo",
   "sortByCandies": "Caramelle",
diff --git a/src/locales/ja/filter-bar.ts b/src/locales/ja/filter-bar.ts
index ffd227f90ca..9900cb02800 100644
--- a/src/locales/ja/filter-bar.ts
+++ b/src/locales/ja/filter-bar.ts
@@ -1,40 +1,40 @@
 import { SimpleTranslationEntries } from "#app/interfaces/locales";
 
 export const filterBar: SimpleTranslationEntries = {
-  "genFilter": "Gen",
-  "typeFilter": "Type",
-  "caughtFilter": "Caught",
-  "unlocksFilter": "Unlocks",
-  "miscFilter": "Misc",
-  "sortFilter": "Sort",
-  "all": "All",
-  "normal": "Not Shiny",
-  "uncaught": "Uncaught",
-  "passive": "Passive",
-  "passiveUnlocked": "Passive - Yes",
-  "passiveLocked": "Passive - No",
-  "passiveUnlockable": "Passive - Can Unlock",
-  "costReduction": "Cost Reduction",
-  "costReductionUnlocked": "Cost Reduction - Yes",
-  "costReductionLocked": "Cost Reduction - No",
-  "costReductionUnlockable": "Cost Reduction - Can Unlock",
-  "favorite": "Favorite",
-  "isFavorite": "Favorite - Yes",
-  "notFavorite": "Favorite - No",
-  "ribbon": "Ribbon",
-  "hasWon": "Ribbon - Yes",
-  "hasNotWon": "Ribbon - No",
-  "hiddenAbility": "Hidden Ability",
-  "hasHiddenAbility": "Hidden Ability - Yes",
-  "noHiddenAbility": "Hidden Ability - No",
-  "egg": "Egg",
-  "eggPurchasable": "Purchasable Egg",
-  "pokerus": "Pokerus",
-  "hasPokerus": "Pokerus - Yes",
-  "noPokerus": "Pokerus - No",
+  "genFilter": "世代",
+  "typeFilter": "タイプ",
+  "caughtFilter": "捕獲",
+  "unlocksFilter": "解放",
+  "miscFilter": "その他",
+  "sortFilter": "並べ替え",
+  "all": "すべて",
+  "normal": "非色違い",
+  "uncaught": "未捕獲",
+  "passive": "パッシブ",
+  "passiveUnlocked": "パッシブ - 解放済み",
+  "passiveLocked": "パッシブ - 未解放",
+  "passiveUnlockable": "パッシブ - 解放可能",
+  "costReduction": "ポイント削減",
+  "costReductionUnlocked": "ポイント削減 - 解放済み",
+  "costReductionLocked": "ポイント削減 - 未解放",
+  "costReductionUnlockable": "ポイント削減 - 解放可能",
+  "favorite": "お気に入り",
+  "isFavorite": "お気に入り - あり",
+  "notFavorite": "お気に入り - なし",
+  "ribbon": "リボン",
+  "hasWon": "リボン - あり",
+  "hasNotWon": "リボン - なし",
+  "hiddenAbility": "隠れ特性",
+  "hasHiddenAbility": "隠れ特性 - あり",
+  "noHiddenAbility": "隠れ特性 - なし",
+  "egg": "タマゴ",
+  "eggPurchasable": "タマゴ - 購入可能",
+  "pokerus": "ポケルス",
+  "hasPokerus": "ポケルス - あり",
+  "noPokerus": "ポケルス - なし",
   "sortByNumber": "No.",
-  "sortByCost": "Cost",
-  "sortByCandies": "Candy Count",
-  "sortByIVs": "IVs",
-  "sortByName": "Name",
+  "sortByCost": "ポイント",
+  "sortByCandies": "飴の数",
+  "sortByIVs": "個体値",
+  "sortByName": "名前",
 };
diff --git a/src/locales/pt_BR/filter-bar.ts b/src/locales/pt_BR/filter-bar.ts
index d85fa65a536..1e39c1445d4 100644
--- a/src/locales/pt_BR/filter-bar.ts
+++ b/src/locales/pt_BR/filter-bar.ts
@@ -13,22 +13,22 @@ export const filterBar: SimpleTranslationEntries = {
   "passive": "Passiva",
   "passiveUnlocked": "Passiva Desbloqueada",
   "passiveLocked": "Passiva Bloqueada",
-  "passiveUnlockable": "Passive - Can Unlock",
+  "passiveUnlockable": "Passiva - Pode Desbloquear",
   "costReduction": "Redução de Custo",
   "costReductionUnlocked": "Redução de Custo Desbloq.",
-  "costReductionLocked": "Redução de Custo Bloq.",
-  "costReductionUnlockable": "Cost Reduction - Can Unlock",
-  "favorite": "Favorite",
-  "isFavorite": "Favorite - Yes",
-  "notFavorite": "Favorite - No",
+  "costReductionLocked": "Redução de Custo Bloqueada",
+  "costReductionUnlockable": "Redução de Custo Disponível",
+  "favorite": "Favoritos",
+  "isFavorite": "Favoritos - Sim",
+  "notFavorite": "Favoritos - Não",
   "ribbon": "Fita",
   "hasWon": "Fita - Sim",
   "hasNotWon": "Fita - Não",
   "hiddenAbility": "Habilidade Oculta",
   "hasHiddenAbility": "Habilidade Oculta - Sim",
   "noHiddenAbility": "Habilidade Oculta - Não",
-  "egg": "Egg",
-  "eggPurchasable": "Purchasable Egg",
+  "egg": "Ovo",
+  "eggPurchasable": "Ovo Comprável",
   "pokerus": "Pokérus",
   "hasPokerus": "Pokérus - Sim",
   "noPokerus": "Pokérus - Não",
diff --git a/src/locales/zh_CN/filter-bar.ts b/src/locales/zh_CN/filter-bar.ts
index 48b56d15071..3ca59de4e2c 100644
--- a/src/locales/zh_CN/filter-bar.ts
+++ b/src/locales/zh_CN/filter-bar.ts
@@ -13,22 +13,22 @@ export const filterBar: SimpleTranslationEntries = {
   "passive": "被动",
   "passiveUnlocked": "被动解锁",
   "passiveLocked": "被动未解锁",
-  "passiveUnlockable": "Passive - Can Unlock",
+  "passiveUnlockable": "被动可解锁",
   "costReduction": "费用降低",
   "costReductionUnlocked": "已降费",
   "costReductionLocked": "未降费",
-  "costReductionUnlockable": "Cost Reduction - Can Unlock",
-  "favorite": "Favorite",
-  "isFavorite": "Favorite - Yes",
-  "notFavorite": "Favorite - No",
+  "costReductionUnlockable": "可降费",
+  "favorite": "最爱",
+  "isFavorite": "包含最爱",
+  "notFavorite": "不包含最爱",
   "ribbon": "缎带",
   "hasWon": "有缎带",
   "hasNotWon": "无缎带",
   "hiddenAbility": "梦特",
   "hasHiddenAbility": "有梦特",
   "noHiddenAbility": "无梦特",
-  "egg": "Egg",
-  "eggPurchasable": "Purchasable Egg",
+  "egg": "蛋",
+  "eggPurchasable": "可购买蛋",
   "pokerus": "病毒",
   "hasPokerus": "有病毒",
   "noPokerus": "无病毒",
diff --git a/src/locales/zh_TW/filter-bar.ts b/src/locales/zh_TW/filter-bar.ts
index d784b0a6b6a..4c0821d98db 100644
--- a/src/locales/zh_TW/filter-bar.ts
+++ b/src/locales/zh_TW/filter-bar.ts
@@ -13,25 +13,25 @@ export const filterBar: SimpleTranslationEntries = {
   "passive": "被動",
   "passiveUnlocked": "被動解鎖",
   "passiveLocked": "被動未解鎖",
-  "passiveUnlockable": "Passive - Can Unlock",
-  "costReduction": "Cost Reduction",
-  "costReductionUnlocked": "Cost Reduction Unlocked",
-  "costReductionLocked": "Cost Reduction Locked",
-  "costReductionUnlockable": "Cost Reduction - Can Unlock",
-  "favorite": "Favorite",
-  "isFavorite": "Favorite - Yes",
-  "notFavorite": "Favorite - No",
+  "passiveUnlockable": "被動可解鎖",
+  "costReduction": "費用降低",
+  "costReductionUnlocked": "已降費",
+  "costReductionLocked": "未降費",
+  "costReductionUnlockable": "可降費",
+  "favorite": "最愛",
+  "isFavorite": "包含最愛",
+  "notFavorite": "不包含最愛",
   "ribbon": "緞帶",
   "hasWon": "有緞帶",
   "hasNotWon": "無緞帶",
-  "hiddenAbility": "Hidden Ability",
-  "hasHiddenAbility": "Hidden Ability - Yes",
-  "noHiddenAbility": "Hidden Ability - No",
-  "egg": "Egg",
-  "eggPurchasable": "Purchasable Egg",
-  "pokerus": "Pokerus",
-  "hasPokerus": "Pokerus - Yes",
-  "noPokerus": "Pokerus - No",
+  "hiddenAbility": "隱藏特性",
+  "hasHiddenAbility": "有隱藏特性",
+  "noHiddenAbility": "無隱藏特性",
+  "egg": "蛋",
+  "eggPurchasable": "可購買蛋",
+  "pokerus": "病毒",
+  "hasPokerus": "有病毒",
+  "noPokerus": "無病毒",
   "sortByNumber": "編號",
   "sortByCost": "花費",
   "sortByCandies": "糖果",

From 55174f14aad10db582e2f3db7d8a7e5deb6f5d55 Mon Sep 17 00:00:00 2001
From: Chapybara-jp <charlie.beer@hotmail.com>
Date: Mon, 12 Aug 2024 16:10:18 +0200
Subject: [PATCH 28/30] [Localisation(ja)] arena-tag.ts (#3510)

Technical issues made it so that my suggestions weren't added in the PR, added them here instead.
toxicSpikesActivateTrapPoison seems to have incorrect dialog in English as well. ( "[X] absorbed [Y]!" )
---
 src/locales/ja/arena-tag.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/locales/ja/arena-tag.ts b/src/locales/ja/arena-tag.ts
index 54df26fa44f..fc86ddec886 100644
--- a/src/locales/ja/arena-tag.ts
+++ b/src/locales/ja/arena-tag.ts
@@ -11,16 +11,16 @@ export const arenaTag: SimpleTranslationEntries = {
   "reflectOnAdd": "リフレクターで　物理ダメージを　さげた",
   "reflectOnAddPlayer": "味方の　リフレクターで\n物理ダメージを　さげた",
   "reflectOnAddEnemy": "相手の　リフレクターで\n物理ダメージを　さげた",
-  "lightScreenOnAdd": "ひかりのかべで\n物理ダメージを　さげた",
-  "lightScreenOnAddPlayer": "味方の　ひかりのかべで\n物理ダメージを　さげた",
-  "lightScreenOnAddEnemy": "相手の　ひかりのかべで\n物理ダメージを　さげた",
+  "lightScreenOnAdd": "ひかりのかべで\n特殊ダメージを　さげた",
+  "lightScreenOnAddPlayer": "味方の　ひかりのかべで\n特殊ダメージを　さげた",
+  "lightScreenOnAddEnemy": "相手の　ひかりのかべで\n特殊ダメージを　さげた",
   "auroraVeilOnAdd": "オーロラベールで\n攻撃の　ダメージを　さげた",
   "auroraVeilOnAddPlayer": "味方の　オーロラベールで\n攻撃ダメージを　さげた",
   "auroraVeilOnAddEnemy": "相手の　オーロラベールで\n攻撃ダメージを　さげた",
   "conditionalProtectOnAdd": "{{moveName}}に　守られた！",
   "conditionalProtectOnAddPlayer": "見方が　{{moveName}}に　守られた！",
   "conditionalProtectOnAddEnemy": "相手が　{{moveName}}に　守られた！",
-  "conditionalProtectApply": "{{pokemonNameWithAffix}}が\n{{moveName}}に 守られた！",
+  "conditionalProtectApply": "{{pokemonNameWithAffix}}が\n{{moveName}}に　守られた！",
   "matBlockOnAdd": "{{pokemonNameWithAffix}}は\nたたみがえしを　ねらっている！",
   "noCritOnAddPlayer": "{{moveName}}の　力で　味方の急所が　隠れた！",
   "noCritOnAddEnemy": "{{moveName}}の　力で　相手の急所が　隠れた！",
@@ -33,7 +33,7 @@ export const arenaTag: SimpleTranslationEntries = {
   "spikesOnAdd": "{{opponentDesc}}の　足下に\n{{moveName}}が　散らばった！",
   "spikesActivateTrap": "{{pokemonNameWithAffix}}は\nまきびしの　ダメージを　受けた！",
   "toxicSpikesOnAdd": "{{opponentDesc}}の　足下に\n{{moveName}}が　散らばった！",
-  "toxicSpikesActivateTrapPoison": "{{pokemonNameWithAffix}}は {{moveName}}を　吸収した！",
+  "toxicSpikesActivateTrapPoison": "{{pokemonNameWithAffix}}は　{{moveName}}で　毒を　あびた！",
   "stealthRockOnAdd": "{{opponentDesc}}の　周りに\nとがった岩が　ただよい始めた！",
   "stealthRockActivateTrap": "{{pokemonNameWithAffix}}に\nとがった岩が　食い込んだ！",
   "stickyWebOnAdd": "相手の　足下に\n{{moveName}}が　広がった！",

From f1dfaff6063753629ac70f0c285208167149fd49 Mon Sep 17 00:00:00 2001
From: Kevin <herrbach.kevin@gmail.com>
Date: Mon, 12 Aug 2024 23:18:40 +0900
Subject: [PATCH 29/30] [Typo] Swaps bug report field names (#3507)

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 644fdcbe563..23c4a0a2159 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -21,7 +21,7 @@ body:
   - type: textarea
     id: session-file
     attributes:
-      label: User data export file
+      label: Session export file
       description: Open Menu → ManageData → Export Session → Select slot. The file should now be in your `/Downloads` directory. Change the file extension type from `.prsv` to `.txt` (How to [Windows](https://www.guidingtech.com/how-to-change-file-type-on-windows/) | [Mac](https://support.apple.com/guide/mac-help/show-or-hide-filename-extensions-on-mac-mchlp2304/mac) | [iOS](https://www.guidingtech.com/change-file-type-extension-on-iphone/)).
       placeholder: Focus me and then drop your file here (or use the upload button at the bottom)
     validations:
@@ -29,7 +29,7 @@ body:
   - type: textarea
     id: data-file
     attributes:
-      label: Session export file
+      label: User data export file
       description: Open Menu → ManageData → Export Data. The file should now be in your `/Downloads` directory. Change the file extension type from `.prsv` to `.txt` (How to [Windows](https://www.guidingtech.com/how-to-change-file-type-on-windows/) | [Mac](https://support.apple.com/guide/mac-help/show-or-hide-filename-extensions-on-mac-mchlp2304/mac) | [iOS](https://www.guidingtech.com/change-file-type-extension-on-iphone/)).
       placeholder: Focus me and then drop your file here (or use the upload button at the bottom)
     validations:

From 6a6b333fa1d22a4fed3cab2202c38351abac5695 Mon Sep 17 00:00:00 2001
From: Lugiad <adrien.grivel@hotmail.fr>
Date: Mon, 12 Aug 2024 16:21:43 +0200
Subject: [PATCH 30/30] [Localization(fr)] Update filter-bar.ts (#3515)

---
 src/locales/fr/filter-bar.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/locales/fr/filter-bar.ts b/src/locales/fr/filter-bar.ts
index 9b519fc75e6..be7c1035ea4 100644
--- a/src/locales/fr/filter-bar.ts
+++ b/src/locales/fr/filter-bar.ts
@@ -4,7 +4,7 @@ export const filterBar: SimpleTranslationEntries = {
   "genFilter": "Gen",
   "typeFilter": "Type",
   "caughtFilter": "Capturés",
-  "unlocksFilter": "Débloq.",
+  "unlocksFilter": "Amélio.",
   "miscFilter": "Divers",
   "sortFilter": "Tri",
   "all": "Tous",
@@ -13,11 +13,11 @@ export const filterBar: SimpleTranslationEntries = {
   "passive": "Passif",
   "passiveUnlocked": "Passif débloqué",
   "passiveLocked": "Passif verrouillé",
-  "passiveUnlockable": "Passif débloquable",
+  "passiveUnlockable": "Passif déblocable",
   "costReduction": "Cout réduit",
   "costReductionUnlocked": "Cout réduit débloqué",
   "costReductionLocked": "Cout réduit verrouillé",
-  "costReductionUnlockable": "Cout réduit débloquable",
+  "costReductionUnlockable": "Cout réduit déblocable",
   "favorite": "Favoris",
   "isFavorite": "Favoris uniquement",
   "notFavorite": "Sans Favoris",