From 3ca5453e48569529dd90aca22ada9ca7fdc8f3f8 Mon Sep 17 00:00:00 2001
From: innerthunder <brandonerickson98@gmail.com>
Date: Thu, 15 Aug 2024 15:53:23 -0700
Subject: [PATCH] Reorganized Substitute translation keys

---
 src/data/battler-tags.ts          | 6 +++---
 src/locales/ca_ES/battler-tags.ts | 3 +++
 src/locales/de/battle.ts          | 3 ---
 src/locales/de/battler-tags.ts    | 3 +++
 src/locales/en/battle.ts          | 3 ---
 src/locales/en/battler-tags.ts    | 3 +++
 src/locales/es/battle.ts          | 3 ---
 src/locales/es/battler-tags.ts    | 3 +++
 src/locales/fr/battle.ts          | 3 ---
 src/locales/fr/battler-tags.ts    | 3 +++
 src/locales/it/battle.ts          | 3 ---
 src/locales/it/battler-tags.ts    | 3 +++
 src/locales/ja/battler-tags.ts    | 3 +++
 src/locales/ko/battle.ts          | 3 ---
 src/locales/ko/battler-tags.ts    | 3 +++
 src/locales/pt_BR/battle.ts       | 3 ---
 src/locales/pt_BR/battler-tags.ts | 3 +++
 src/locales/zh_CN/battle.ts       | 3 ---
 src/locales/zh_CN/battler-tags.ts | 3 +++
 src/locales/zh_TW/battle.ts       | 3 ---
 src/locales/zh_TW/battler-tags.ts | 3 +++
 21 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts
index aa3ed5115b8..66f51a1fd80 100644
--- a/src/data/battler-tags.ts
+++ b/src/data/battler-tags.ts
@@ -1843,7 +1843,7 @@ export class SubstituteTag extends BattlerTag {
 
     // Queue battle animation and message
     pokemon.scene.triggerPokemonBattleAnim(pokemon, PokemonAnimType.SUBSTITUTE_ADD);
-    pokemon.scene.queueMessage(i18next.t("battle:battlerTagsSubstituteOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }), 1500);
+    pokemon.scene.queueMessage(i18next.t("battlerTags:substituteOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }), 1500);
 
     // Remove any trapping effects from the user
     pokemon.findAndRemoveTags(tag => tag instanceof TrappedTag);
@@ -1857,7 +1857,7 @@ export class SubstituteTag extends BattlerTag {
     } else {
       this.sprite.destroy();
     }
-    pokemon.scene.queueMessage(i18next.t("battle:battlerTagsSubstituteOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+    pokemon.scene.queueMessage(i18next.t("battlerTags:substituteOnRemove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
   }
 
   lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
@@ -1896,7 +1896,7 @@ export class SubstituteTag extends BattlerTag {
       const firstHit = (attacker.turnData.hitCount === attacker.turnData.hitsLeft);
 
       if (firstHit && !move.canIgnoreSubstitute(attacker)) {
-        pokemon.scene.queueMessage(i18next.t("battle:battlerTagsSubstituteOnHit", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+        pokemon.scene.queueMessage(i18next.t("battlerTags:substituteOnHit", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
       }
     }
   }
diff --git a/src/locales/ca_ES/battler-tags.ts b/src/locales/ca_ES/battler-tags.ts
index d0775efda08..67a56946be1 100644
--- a/src/locales/ca_ES/battler-tags.ts
+++ b/src/locales/ca_ES/battler-tags.ts
@@ -70,4 +70,7 @@ export const battlerTags: SimpleTranslationEntries = {
   "cursedOnAdd": "{{pokemonNameWithAffix}} cut its own HP and put a curse on the {{pokemonName}}!",
   "cursedLapse": "{{pokemonNameWithAffix}} is afflicted by the Curse!",
   "stockpilingOnAdd": "{{pokemonNameWithAffix}} stockpiled {{stockpiledCount}}!",
+  "substituteOnAdd": "{{pokemonNameWithAffix}} put in a substitute!",
+  "substituteOnHit": "The substitute took damage for {{pokemonNameWithAffix}}!",
+  "substituteOnRemove": "{{pokemonNameWithAffix}}'s substitute faded!",
 } as const;
diff --git a/src/locales/de/battle.ts b/src/locales/de/battle.ts
index f6032412695..b082a6932e9 100644
--- a/src/locales/de/battle.ts
+++ b/src/locales/de/battle.ts
@@ -96,7 +96,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}}!",
-  "battlerTagsSubstituteOnAdd": "Ein Delegator von {{pokemonNameWithAffix}} ist erschienen!",
-  "battlerTagsSubstituteOnHit": "Der Delegator steckt den Schlag für {{pokemonNameWithAffix}} ein!",
-  "battlerTagsSubstituteOnRemove": "Der Delegator von {{pokemonNameWithAffix}} hört auf zu wirken!"
 } as const;
diff --git a/src/locales/de/battler-tags.ts b/src/locales/de/battler-tags.ts
index 27d5f14c597..138b2af921e 100644
--- a/src/locales/de/battler-tags.ts
+++ b/src/locales/de/battler-tags.ts
@@ -70,4 +70,7 @@ export const battlerTags: SimpleTranslationEntries = {
   "cursedOnAdd": "{{pokemonNameWithAffix}} nimmt einen Teil seiner KP und legt einen Fluch auf {{pokemonName}}!",
   "cursedLapse": "{{pokemonNameWithAffix}} wurde durch den Fluch verletzt!",
   "stockpilingOnAdd": "{{pokemonNameWithAffix}} stockpiled {{stockpiledCount}}!",
+  "substituteOnAdd": "Ein Delegator von {{pokemonNameWithAffix}} ist erschienen!",
+  "substituteOnHit": "Der Delegator steckt den Schlag für {{pokemonNameWithAffix}} ein!",
+  "substituteOnRemove": "Der Delegator von {{pokemonNameWithAffix}} hört auf zu wirken!",
 } as const;
diff --git a/src/locales/en/battle.ts b/src/locales/en/battle.ts
index f858e0bb125..522fbb3261b 100644
--- a/src/locales/en/battle.ts
+++ b/src/locales/en/battle.ts
@@ -96,7 +96,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}}!",
-  "battlerTagsSubstituteOnAdd": "{{pokemonNameWithAffix}} put in a substitute!",
-  "battlerTagsSubstituteOnHit": "The substitute took damage for {{pokemonNameWithAffix}}!",
-  "battlerTagsSubstituteOnRemove": "{{pokemonNameWithAffix}}'s substitute faded!"
 } as const;
diff --git a/src/locales/en/battler-tags.ts b/src/locales/en/battler-tags.ts
index d0775efda08..67a56946be1 100644
--- a/src/locales/en/battler-tags.ts
+++ b/src/locales/en/battler-tags.ts
@@ -70,4 +70,7 @@ export const battlerTags: SimpleTranslationEntries = {
   "cursedOnAdd": "{{pokemonNameWithAffix}} cut its own HP and put a curse on the {{pokemonName}}!",
   "cursedLapse": "{{pokemonNameWithAffix}} is afflicted by the Curse!",
   "stockpilingOnAdd": "{{pokemonNameWithAffix}} stockpiled {{stockpiledCount}}!",
+  "substituteOnAdd": "{{pokemonNameWithAffix}} put in a substitute!",
+  "substituteOnHit": "The substitute took damage for {{pokemonNameWithAffix}}!",
+  "substituteOnRemove": "{{pokemonNameWithAffix}}'s substitute faded!",
 } as const;
diff --git a/src/locales/es/battle.ts b/src/locales/es/battle.ts
index db24ed8ae09..eb37699d911 100644
--- a/src/locales/es/battle.ts
+++ b/src/locales/es/battle.ts
@@ -96,7 +96,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}}!",
-  "battlerTagsSubstituteOnAdd": "¡{{pokemonNameWithAffix}} creó un sustituto!",
-  "battlerTagsSubstituteOnHit": "¡El sustituto recibe daño en lugar del {{pokemonNameWithAffix}}!",
-  "battlerTagsSubstituteOnRemove": "¡El sustituto del {{pokemonNameWithAffix}} se debilitó!"
 } as const;
diff --git a/src/locales/es/battler-tags.ts b/src/locales/es/battler-tags.ts
index d0775efda08..dfc5caba970 100644
--- a/src/locales/es/battler-tags.ts
+++ b/src/locales/es/battler-tags.ts
@@ -70,4 +70,7 @@ export const battlerTags: SimpleTranslationEntries = {
   "cursedOnAdd": "{{pokemonNameWithAffix}} cut its own HP and put a curse on the {{pokemonName}}!",
   "cursedLapse": "{{pokemonNameWithAffix}} is afflicted by the Curse!",
   "stockpilingOnAdd": "{{pokemonNameWithAffix}} stockpiled {{stockpiledCount}}!",
+  "substituteOnAdd": "¡{{pokemonNameWithAffix}} creó un sustituto!",
+  "substituteOnHit": "¡El sustituto recibe daño en lugar del {{pokemonNameWithAffix}}!",
+  "substituteOnRemove": "¡El sustituto del {{pokemonNameWithAffix}} se debilitó!",
 } as const;
diff --git a/src/locales/fr/battle.ts b/src/locales/fr/battle.ts
index e96f9bfdfc9..12ee9e0d696 100644
--- a/src/locales/fr/battle.ts
+++ b/src/locales/fr/battle.ts
@@ -96,7 +96,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}} !",
-  "battlerTagsSubstituteOnAdd": "{{pokemonNameWithAffix}}\ncrée un clone !",
-  "battlerTagsSubstituteOnHit": "Le clone subit les dégâts à la place\nde {{pokemonNameWithAffix}} !",
-  "battlerTagsSubstituteOnRemove": "Le clone de {{pokemonNameWithAffix}}\ndisparait…"
 } as const;
diff --git a/src/locales/fr/battler-tags.ts b/src/locales/fr/battler-tags.ts
index 7598dcaff74..6c045d3ae28 100644
--- a/src/locales/fr/battler-tags.ts
+++ b/src/locales/fr/battler-tags.ts
@@ -70,4 +70,7 @@ export const battlerTags: SimpleTranslationEntries = {
   "cursedOnAdd": "{{pokemonNameWithAffix}} sacrifie des PV\net lance une malédiction sur {{pokemonName}} !",
   "cursedLapse": "{{pokemonNameWithAffix}} est touché par la malédiction !",
   "stockpilingOnAdd": "{{pokemonNameWithAffix}} utilise\nla capacité Stockage {{stockpiledCount}} fois !",
+  "substituteOnAdd": "{{pokemonNameWithAffix}}\ncrée un clone !",
+  "substituteOnHit": "Le clone subit les dégâts à la place\nde {{pokemonNameWithAffix}} !",
+  "substituteOnRemove": "Le clone de {{pokemonNameWithAffix}}\ndisparait…",
 } as const;
diff --git a/src/locales/it/battle.ts b/src/locales/it/battle.ts
index 3fbaee54d49..bd7227eacb6 100644
--- a/src/locales/it/battle.ts
+++ b/src/locales/it/battle.ts
@@ -96,7 +96,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}}!",
-  "battlerTagsSubstituteOnAdd": "Appare un sostituto di {{pokemonNameWithAffix}}!",
-  "battlerTagsSubstituteOnHit": "Il sostituto viene colpito al posto di {{pokemonNameWithAffix}}!",
-  "battlerTagsSubstituteOnRemove": "Il sostituto di {{pokemonNameWithAffix}} svanisce!"
 } as const;
diff --git a/src/locales/it/battler-tags.ts b/src/locales/it/battler-tags.ts
index 7dd3ebc6fb1..7b5a180c8e3 100644
--- a/src/locales/it/battler-tags.ts
+++ b/src/locales/it/battler-tags.ts
@@ -70,4 +70,7 @@ export const battlerTags: SimpleTranslationEntries = {
   "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!",
+  "substituteOnAdd": "Appare un sostituto di {{pokemonNameWithAffix}}!",
+  "substituteOnHit": "Il sostituto viene colpito al posto di {{pokemonNameWithAffix}}!",
+  "substituteOnRemove": "Il sostituto di {{pokemonNameWithAffix}} svanisce!",
 } as const;
diff --git a/src/locales/ja/battler-tags.ts b/src/locales/ja/battler-tags.ts
index 38a37f0f715..790477835f0 100644
--- a/src/locales/ja/battler-tags.ts
+++ b/src/locales/ja/battler-tags.ts
@@ -70,4 +70,7 @@ export const battlerTags: SimpleTranslationEntries = {
   "cursedOnAdd": "{{pokemonNameWithAffix}}は　自分の　体力を　削って\n{{pokemonName}}に　のろいを　かけた!",
   "cursedLapse": "{{pokemonNameWithAffix}}は　のろわれている！",
   "stockpilingOnAdd": "{{pokemonNameWithAffix}}は　{{stockpiledCount}}つ　たくわえた!",
+  "substituteOnAdd": "{{pokemonNameWithAffix}} put in a substitute!",
+  "substituteOnHit": "The substitute took damage for {{pokemonNameWithAffix}}!",
+  "substituteOnRemove": "{{pokemonNameWithAffix}}'s substitute faded!",
 } as const;
diff --git a/src/locales/ko/battle.ts b/src/locales/ko/battle.ts
index c052c2202b1..bdbcbcdf8d2 100644
--- a/src/locales/ko/battle.ts
+++ b/src/locales/ko/battle.ts
@@ -96,7 +96,4 @@ export const battle: SimpleTranslationEntries = {
   "congratulations": "축하합니다!",
   "beatModeFirstTime": "{{speciesName}}[[가]] {{gameMode}} 모드를 처음으로 클리어했다!\n{{newModifier}}[[를]] 손에 넣었다!",
   "ppReduced": "{{targetName}}의\n{{moveName}}[[를]] {{reduction}} 깎았다!",
-  "battlerTagsSubstituteOnAdd": "{{pokemonNameWithAffix}}의\n대타가 나타났다!",
-  "battlerTagsSubstituteOnHit": "{{pokemonNameWithAffix}}[[를]] 대신하여\n대타가 공격을 받았다!",
-  "battlerTagsSubstituteOnRemove": "{{pokemonNameWithAffix}}의\n대타는 사라져 버렸다..."
 } as const;
diff --git a/src/locales/ko/battler-tags.ts b/src/locales/ko/battler-tags.ts
index 39647466ada..d9374130011 100644
--- a/src/locales/ko/battler-tags.ts
+++ b/src/locales/ko/battler-tags.ts
@@ -70,4 +70,7 @@ export const battlerTags: SimpleTranslationEntries = {
   "cursedOnAdd": "{{pokemonNameWithAffix}}[[는]] 자신의 체력을 깎아서\n{{pokemonName}}에게 저주를 걸었다!",
   "cursedLapse": "{{pokemonNameWithAffix}}[[는]]\n저주받고 있다!",
   "stockpilingOnAdd": "{{pokemonNameWithAffix}}[[는]]\n{{stockpiledCount}}개 비축했다!",
+  "substituteOnAdd": "{{pokemonNameWithAffix}}의\n대타가 나타났다!",
+  "substituteOnHit": "{{pokemonNameWithAffix}}[[를]] 대신하여\n대타가 공격을 받았다!",
+  "substituteOnRemove": "{{pokemonNameWithAffix}}의\n대타는 사라져 버렸다...",
 } as const;
diff --git a/src/locales/pt_BR/battle.ts b/src/locales/pt_BR/battle.ts
index 5b2979628b5..24d4e8c928f 100644
--- a/src/locales/pt_BR/battle.ts
+++ b/src/locales/pt_BR/battle.ts
@@ -96,7 +96,4 @@ export const battle: SimpleTranslationEntries = {
   "unlockedSomething": "{{unlockedThing}}\nfoi desbloqueado.",
   "congratulations": "Parabéns!",
   "beatModeFirstTime": "{{speciesName}} venceu o Modo {{gameMode}} pela primeira vez!\nVocê recebeu {{newModifier}}!",
-  "battlerTagsSubstituteOnAdd": "{{pokemonNameWithAffix}} colocou um substituto!",
-  "battlerTagsSubstituteOnHit": "O substituto tomou o dano pelo {{pokemonNameWithAffix}}!",
-  "battlerTagsSubstituteOnRemove": "O substituto de {{pokemonNameWithAffix}} desbotou!"
 } as const;
diff --git a/src/locales/pt_BR/battler-tags.ts b/src/locales/pt_BR/battler-tags.ts
index 1758fed38d6..4d4189b86bd 100644
--- a/src/locales/pt_BR/battler-tags.ts
+++ b/src/locales/pt_BR/battler-tags.ts
@@ -70,4 +70,7 @@ export const battlerTags: SimpleTranslationEntries = {
   "cursedOnAdd": "{{pokemonNameWithAffix}} cortou seus PS pela metade e amaldiçoou {{pokemonName}}!",
   "cursedLapse": "{{pokemonNameWithAffix}} foi ferido pelo Curse!",
   "stockpilingOnAdd": "{{pokemonNameWithAffix}} estocou {{stockpiledCount}}!",
+  "substituteOnAdd": "{{pokemonNameWithAffix}} colocou um substituto!",
+  "substituteOnHit": "O substituto tomou o dano pelo {{pokemonNameWithAffix}}!",
+  "substituteOnRemove": "O substituto de {{pokemonNameWithAffix}} desbotou!",
 } as const;
diff --git a/src/locales/zh_CN/battle.ts b/src/locales/zh_CN/battle.ts
index ab81ca4fefd..5a73fbba09f 100644
--- a/src/locales/zh_CN/battle.ts
+++ b/src/locales/zh_CN/battle.ts
@@ -88,7 +88,4 @@ export const battle: SimpleTranslationEntries = {
   "unlockedSomething": "{{unlockedThing}}\n已解锁。",
   "congratulations": "恭喜！",
   "beatModeFirstTime": "{{speciesName}}首次击败了{{gameMode}}！\n你获得了{{newModifier}}！",
-  "battlerTagsSubstituteOnAdd": "{{pokemonNameWithAffix}}的\n替身出现了！",
-  "battlerTagsSubstituteOnHit": "替身代替{{pokemonNameWithAffix}}\n承受了攻击！",
-  "battlerTagsSubstituteOnRemove": "{{pokemonNameWithAffix}}的\n替身消失了……"
 } as const;
diff --git a/src/locales/zh_CN/battler-tags.ts b/src/locales/zh_CN/battler-tags.ts
index 7af764cf117..e3262472ab7 100644
--- a/src/locales/zh_CN/battler-tags.ts
+++ b/src/locales/zh_CN/battler-tags.ts
@@ -70,4 +70,7 @@ export const battlerTags: SimpleTranslationEntries = {
   "cursedOnAdd": "{{pokemonNameWithAffix}}削减了自己的体力，\n并诅咒了{{pokemonName}}！",
   "cursedLapse": "{{pokemonNameWithAffix}}\n正受到诅咒！",
   "stockpilingOnAdd": "{{pokemonNameWithAffix}}蓄力了{{stockpiledCount}}次！",
+  "substituteOnAdd": "{{pokemonNameWithAffix}}的\n替身出现了！",
+  "substituteOnHit": "替身代替{{pokemonNameWithAffix}}\n承受了攻击！",
+  "substituteOnRemove": "{{pokemonNameWithAffix}}的\n替身消失了……",
 } as const;
diff --git a/src/locales/zh_TW/battle.ts b/src/locales/zh_TW/battle.ts
index fcff7541cb1..357ad4ffbc3 100644
--- a/src/locales/zh_TW/battle.ts
+++ b/src/locales/zh_TW/battle.ts
@@ -85,7 +85,4 @@ export const battle: SimpleTranslationEntries = {
   "unlockedSomething": "{{unlockedThing}}\nhas been unlocked.",
   "congratulations": "Congratulations!",
   "beatModeFirstTime": "{{speciesName}} beat {{gameMode}} Mode for the first time!\nYou received {{newModifier}}!",
-  "battlerTagsSubstituteOnAdd": "{{pokemonNameWithAffix}}的\n替身出現了！",
-  "battlerTagsSubstituteOnHit": "替身代替{{pokemonNameWithAffix}}承受了攻擊！",
-  "battlerTagsSubstituteOnRemove": "{{pokemonNameWithAffix}}的\n替身消失了……"
 } as const;
diff --git a/src/locales/zh_TW/battler-tags.ts b/src/locales/zh_TW/battler-tags.ts
index 9e933336387..04795f39b5d 100644
--- a/src/locales/zh_TW/battler-tags.ts
+++ b/src/locales/zh_TW/battler-tags.ts
@@ -70,4 +70,7 @@ export const battlerTags: SimpleTranslationEntries = {
   "cursedOnAdd": "{{pokemonNameWithAffix}}削減了自己的體力，並詛咒了{{pokemonName}}！",
   "cursedLapse": "{{pokemonNameWithAffix}}正受到詛咒！",
   "stockpilingOnAdd": "{{pokemonNameWithAffix}} stockpiled {{stockpiledCount}}!",
+  "substituteOnAdd": "{{pokemonNameWithAffix}}的\n替身出現了！",
+  "substituteOnHit": "替身代替{{pokemonNameWithAffix}}承受了攻擊！",
+  "substituteOnRemove": "{{pokemonNameWithAffix}}的\n替身消失了……",
 } as const;