From eac4bef886a944ecdaf4eb6bab093453766a7307 Mon Sep 17 00:00:00 2001
From: Eucalyptus <eucalyptusj109@gmail.com>
Date: Wed, 7 Aug 2024 03:33:06 -0400
Subject: [PATCH] Move Trick locales to move-trigger

---
 src/data/move.ts                  | 4 ++--
 src/locales/de/battle.ts          | 4 +---
 src/locales/de/move-trigger.ts    | 2 ++
 src/locales/en/battle.ts          | 4 +---
 src/locales/en/move-trigger.ts    | 2 ++
 src/locales/es/battle.ts          | 4 +---
 src/locales/es/move-trigger.ts    | 2 ++
 src/locales/fr/battle.ts          | 4 +---
 src/locales/fr/move-trigger.ts    | 2 ++
 src/locales/it/battle.ts          | 4 +---
 src/locales/it/move-trigger.ts    | 2 ++
 src/locales/ko/battle.ts          | 4 +---
 src/locales/ko/move-trigger.ts    | 2 ++
 src/locales/pt_BR/battle.ts       | 4 +---
 src/locales/pt_BR/move-trigger.ts | 2 ++
 src/locales/zh_CN/battle.ts       | 4 +---
 src/locales/zh_CN/move-trigger.ts | 2 ++
 src/locales/zh_TW/battle.ts       | 4 +---
 src/locales/zh_TW/move-trigger.ts | 2 ++
 19 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/data/move.ts b/src/data/move.ts
index 272dbe4d769..1c34e055d23 100644
--- a/src/data/move.ts
+++ b/src/data/move.ts
@@ -5999,7 +5999,7 @@ export class SwapHeldItemsAttr extends MoveEffectAttr {
       return false;
     }
 
-    user.scene.queueMessage(i18next.t("battle:battlerTagsTrickOnSwap", {
+    user.scene.queueMessage(i18next.t("moveTriggers:trickOnSwap", {
       pokemonNameWithAffix: getPokemonNameWithAffix(user),
     }));
 
@@ -6012,7 +6012,7 @@ export class SwapHeldItemsAttr extends MoveEffectAttr {
       const userItemToSwap = userHeldItems[user.randSeedInt(userHeldItems.length)];
       target.scene.tryTransferHeldItemModifier(userItemToSwap, target, false);
 
-      user.scene.queueMessage(i18next.t("battle:battlerTagsTrickFoeNewItem", {
+      user.scene.queueMessage(i18next.t("moveTriggers:trickFoeNewItem", {
         pokemonNameWithAffix: getPokemonNameWithAffix(target),
         itemName: userItemToSwap.type.name,
       }));
diff --git a/src/locales/de/battle.ts b/src/locales/de/battle.ts
index b2d2d668b3f..9657553cfd2 100644
--- a/src/locales/de/battle.ts
+++ b/src/locales/de/battle.ts
@@ -155,7 +155,5 @@ export const battle: SimpleTranslationEntries = {
   "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}} hortet {{stockpiledCount}}!",
-  "battlerTagsTrickOnSwap": "{{pokemonNameWithAffix}} tauscht Items mit dem Ziel!",
-  "battlerTagsTrickFoeNewItem": "{{pokemonNameWithAffix}} erhält {{itemName}}."
+  "battlerTagsStockpilingOnAdd": "{{pokemonNameWithAffix}} hortet {{stockpiledCount}}!"
 } as const;
diff --git a/src/locales/de/move-trigger.ts b/src/locales/de/move-trigger.ts
index 427ec6acbde..7167dd92a2b 100644
--- a/src/locales/de/move-trigger.ts
+++ b/src/locales/de/move-trigger.ts
@@ -59,4 +59,6 @@ export const moveTriggers: SimpleTranslationEntries = {
   "copyType": "{{pokemonName}} hat den Typ von {{targetPokemonName}} angenommen!",
   "suppressAbilities": "Die Fähigkeit von {{pokemonName}} wirkt nicht mehr!",
   "swapArenaTags": "{{pokemonName}} hat die Effekte, die auf den beiden Seiten des Kampffeldes wirken, miteinander getauscht!",
+  "trickOnSwap": "{{pokemonNameWithAffix}} tauscht Items mit dem Ziel!",
+  "trickFoeNewItem": "{{pokemonNameWithAffix}} erhält {{itemName}}."
 } as const;
diff --git a/src/locales/en/battle.ts b/src/locales/en/battle.ts
index 23e69f4a3b6..12a0f2c99c6 100644
--- a/src/locales/en/battle.ts
+++ b/src/locales/en/battle.ts
@@ -155,7 +155,5 @@ export const battle: SimpleTranslationEntries = {
   "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}}!",
-  "battlerTagsTrickOnSwap": "{{pokemonNameWithAffix}} switched items with its target!",
-  "battlerTagsTrickFoeNewItem": "{{pokemonNameWithAffix}} obtained one {{itemName}}."
+  "battlerTagsStockpilingOnAdd": "{{pokemonNameWithAffix}} stockpiled {{stockpiledCount}}!"
 } as const;
diff --git a/src/locales/en/move-trigger.ts b/src/locales/en/move-trigger.ts
index 1d9d6459d83..46d9405aa08 100644
--- a/src/locales/en/move-trigger.ts
+++ b/src/locales/en/move-trigger.ts
@@ -59,4 +59,6 @@ export const moveTriggers: SimpleTranslationEntries = {
   "copyType": "{{pokemonName}}'s type became the same as\n{{targetPokemonName}}'s type!",
   "suppressAbilities": "{{pokemonName}}'s ability\nwas suppressed!",
   "swapArenaTags": "{{pokemonName}} swapped the battle effects affecting each side of the field!",
+  "trickOnSwap": "{{pokemonNameWithAffix}} switched items with its target!",
+  "trickFoeNewItem": "{{pokemonNameWithAffix}} obtained one {{itemName}}."
 } as const;
diff --git a/src/locales/es/battle.ts b/src/locales/es/battle.ts
index 762468a109d..7f29060c5d3 100644
--- a/src/locales/es/battle.ts
+++ b/src/locales/es/battle.ts
@@ -155,7 +155,5 @@ export const battle: SimpleTranslationEntries = {
   "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}}!",
-  "battlerTagsTrickOnSwap": "{{pokemonNameWithAffix}} switched items with its target!",
-  "battlerTagsTrickFoeNewItem": "{{pokemonNameWithAffix}} obtained one {{itemName}}."
+  "battlerTagsStockpilingOnAdd": "{{pokemonNameWithAffix}} stockpiled {{stockpiledCount}}!"
 } as const;
diff --git a/src/locales/es/move-trigger.ts b/src/locales/es/move-trigger.ts
index 3ff93997cc2..690af1d5e3d 100644
--- a/src/locales/es/move-trigger.ts
+++ b/src/locales/es/move-trigger.ts
@@ -59,4 +59,6 @@ export const moveTriggers: SimpleTranslationEntries = {
   "copyType": "{{pokemonName}}'s type\nchanged to match {{targetPokemonName}}'s!",
   "suppressAbilities": "{{pokemonName}}'s ability\nwas suppressed!",
   "swapArenaTags": "{{pokemonName}} swapped the battle effects affecting each side of the field!",
+  "trickOnSwap": "{{pokemonNameWithAffix}} switched items with its target!",
+  "trickFoeNewItem": "{{pokemonNameWithAffix}} obtained one {{itemName}}."
 } as const;
diff --git a/src/locales/fr/battle.ts b/src/locales/fr/battle.ts
index a68693ba81b..7feee4e81f4 100644
--- a/src/locales/fr/battle.ts
+++ b/src/locales/fr/battle.ts
@@ -155,7 +155,5 @@ export const battle: SimpleTranslationEntries = {
   "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}} utilise\nla capacité Stockage {{stockpiledCount}} fois !",
-  "battlerTagsTrickOnSwap": "{{pokemonNameWithAffix}} échange\nun objet avec sa cible !",
-  "battlerTagsTrickFoeNewItem": "{{pokemonNameWithAffix}} obtient\nl’objet {{itemName}} !"
+  "battlerTagsStockpilingOnAdd": "{{pokemonNameWithAffix}} utilise\nla capacité Stockage {{stockpiledCount}} fois !"
 } as const;
diff --git a/src/locales/fr/move-trigger.ts b/src/locales/fr/move-trigger.ts
index d1fbda50b03..6c2046969b4 100644
--- a/src/locales/fr/move-trigger.ts
+++ b/src/locales/fr/move-trigger.ts
@@ -59,4 +59,6 @@ export const moveTriggers: SimpleTranslationEntries = {
   "copyType": "{{pokemonName}} prend le type\nde {{targetPokemonName}} !",
   "suppressAbilities": "Le talent de {{pokemonName}}\na été rendu inactif !",
   "swapArenaTags": "Les effets affectant chaque côté du terrain\nont été échangés par {{pokemonName}} !",
+  "trickOnSwap": "{{pokemonNameWithAffix}} échange\nun objet avec sa cible !",
+  "trickFoeNewItem": "{{pokemonNameWithAffix}} obtient\nl’objet {{itemName}} !"
 } as const;
diff --git a/src/locales/it/battle.ts b/src/locales/it/battle.ts
index 0d6f11845b0..954f52e4a7f 100644
--- a/src/locales/it/battle.ts
+++ b/src/locales/it/battle.ts
@@ -155,7 +155,5 @@ export const battle: SimpleTranslationEntries = {
   "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!",
-  "battlerTagsTrickOnSwap": "{{pokemonNameWithAffix}} switched items with its target!",
-  "battlerTagsTrickFoeNewItem": "{{pokemonNameWithAffix}} obtained one {{itemName}}."
+  "battlerTagsStockpilingOnAdd": "{{pokemonNameWithAffix}} ha usato Accumulo per la\n{{stockpiledCount}}ª volta!"
 } as const;
diff --git a/src/locales/it/move-trigger.ts b/src/locales/it/move-trigger.ts
index 60679d844c0..115c0964bd8 100644
--- a/src/locales/it/move-trigger.ts
+++ b/src/locales/it/move-trigger.ts
@@ -59,4 +59,6 @@ export const moveTriggers: SimpleTranslationEntries = {
   "copyType": "{{pokemonName}} assume il tipo\ndi {{targetPokemonName}}!",
   "suppressAbilities": "L’abilità di {{pokemonName}}\nperde ogni efficacia!",
   "swapArenaTags": "{{pokemonName}} ha invertito gli effetti attivi\nnelle due metà del campo!",
+  "trickOnSwap": "{{pokemonNameWithAffix}} switched items with its target!",
+  "trickFoeNewItem": "{{pokemonNameWithAffix}} obtained one {{itemName}}."
 } as const;
diff --git a/src/locales/ko/battle.ts b/src/locales/ko/battle.ts
index ec22f5f95f5..68b21d75ce1 100644
--- a/src/locales/ko/battle.ts
+++ b/src/locales/ko/battle.ts
@@ -155,7 +155,5 @@ export const battle: SimpleTranslationEntries = {
   "battlerTagsSaltCuredLapse": "{{pokemonNameWithAffix}}[[는]] 소금절이의\n데미지를 입고 있다.",
   "battlerTagsCursedOnAdd": "{{pokemonNameWithAffix}}[[는]] 자신의 체력을 깎아서\n{{pokemonName}}에게 저주를 걸었다!",
   "battlerTagsCursedLapse": "{{pokemonNameWithAffix}}[[는]]\n저주받고 있다!",
-  "battlerTagsStockpilingOnAdd": "{{pokemonNameWithAffix}}[[는]]\n{{stockpiledCount}}개 비축했다!",
-  "battlerTagsTrickOnSwap": "{{pokemonNameWithAffix}}[[는]] 서로의\n도구를 교체했다!",
-  "battlerTagsTrickFoeNewItem": "{{pokemonNameWithAffix}}[[는]]\n{{itemName}}[[를]] 손에 넣었다!"
+  "battlerTagsStockpilingOnAdd": "{{pokemonNameWithAffix}}[[는]]\n{{stockpiledCount}}개 비축했다!"
 } as const;
diff --git a/src/locales/ko/move-trigger.ts b/src/locales/ko/move-trigger.ts
index 9ebf08b1017..b5f1bf59f0c 100644
--- a/src/locales/ko/move-trigger.ts
+++ b/src/locales/ko/move-trigger.ts
@@ -59,4 +59,6 @@ export const moveTriggers: SimpleTranslationEntries = {
   "copyType": "{{pokemonName}}[[는]]\n{{targetPokemonName}}[[와]] 같은 타입이 되었다!",
   "suppressAbilities": "{{pokemonName}}의\n특성이 효과를 발휘하지 못하게 되었다!",
   "swapArenaTags": "{{pokemonName}}[[는]]\n서로의 필드 효과를 교체했다!",
+  "trickOnSwap": "{{pokemonNameWithAffix}}[[는]] 서로의\n도구를 교체했다!",
+  "trickFoeNewItem": "{{pokemonNameWithAffix}}[[는]]\n{{itemName}}[[를]] 손에 넣었다!"
 } as const;
diff --git a/src/locales/pt_BR/battle.ts b/src/locales/pt_BR/battle.ts
index d8d26def7d1..1b78943da9f 100644
--- a/src/locales/pt_BR/battle.ts
+++ b/src/locales/pt_BR/battle.ts
@@ -155,7 +155,5 @@ export const battle: SimpleTranslationEntries = {
   "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}}!",
-  "battlerTagsTrickOnSwap": "{{pokemonNameWithAffix}} trocou de itens com seu alvo!",
-  "battlerTagsTrickFoeNewItem": "{{pokemonNameWithAffix}} obteve um(a) {{itemName}}."
+  "battlerTagsStockpilingOnAdd": "{{pokemonNameWithAffix}} estocou {{stockpiledCount}}!"
 } as const;
diff --git a/src/locales/pt_BR/move-trigger.ts b/src/locales/pt_BR/move-trigger.ts
index c6f35d8f6d1..c46c711a09c 100644
--- a/src/locales/pt_BR/move-trigger.ts
+++ b/src/locales/pt_BR/move-trigger.ts
@@ -59,4 +59,6 @@ export const moveTriggers: SimpleTranslationEntries = {
   "copyType": "O tipo de {{pokemonName}}\nmudou para combinar com {{targetPokemonName}}!",
   "suppressAbilities": "A habilidade de {{pokemonName}}\nfoi suprimida!",
   "swapArenaTags": "{{pokemonName}} trocou os efeitos de batalha que afetam cada lado do campo!",
+  "trickOnSwap": "{{pokemonNameWithAffix}} trocou de itens com seu alvo!",
+  "trickFoeNewItem": "{{pokemonNameWithAffix}} obteve um(a) {{itemName}}."
 } as const;
diff --git a/src/locales/zh_CN/battle.ts b/src/locales/zh_CN/battle.ts
index f993ddc192e..b07cb79e258 100644
--- a/src/locales/zh_CN/battle.ts
+++ b/src/locales/zh_CN/battle.ts
@@ -147,7 +147,5 @@ export const battle: SimpleTranslationEntries = {
   "battlerTagsSaltCuredLapse": "{{pokemonNameWithAffix}}\n受到了{{moveName}}的伤害！",
   "battlerTagsCursedOnAdd": "{{pokemonNameWithAffix}}削减了自己的体力，\n并诅咒了{{pokemonName}}！",
   "battlerTagsCursedLapse": "{{pokemonNameWithAffix}}\n正受到诅咒！",
-  "battlerTagsStockpilingOnAdd": "{{pokemonNameWithAffix}}蓄力了{{stockpiledCount}}次！",
-  "battlerTagsTrickOnSwap": "{{pokemonNameWithAffix}}\n互换了各自的道具！",
-  "battlerTagsTrickFoeNewItem": "{{pokemonNameWithAffix}}\n获得了{{itemName}}！"
+  "battlerTagsStockpilingOnAdd": "{{pokemonNameWithAffix}}蓄力了{{stockpiledCount}}次！"
 } as const;
diff --git a/src/locales/zh_CN/move-trigger.ts b/src/locales/zh_CN/move-trigger.ts
index 0efe24f76f0..7dffa7c45ba 100644
--- a/src/locales/zh_CN/move-trigger.ts
+++ b/src/locales/zh_CN/move-trigger.ts
@@ -59,4 +59,6 @@ export const moveTriggers: SimpleTranslationEntries = {
   "copyType": "{{pokemonName}}\n变成了{{targetPokemonName}}的属性！",
   "suppressAbilities": "{{pokemonName}}的特性\n变得无效了！",
   "swapArenaTags": "{{pokemonName}}\n交换了双方的场地效果！",
+  "trickOnSwap": "{{pokemonNameWithAffix}}\n互换了各自的道具！",
+  "trickFoeNewItem": "{{pokemonNameWithAffix}}\n获得了{{itemName}}！"
 } as const;
diff --git a/src/locales/zh_TW/battle.ts b/src/locales/zh_TW/battle.ts
index dd7063568c2..4673474d313 100644
--- a/src/locales/zh_TW/battle.ts
+++ b/src/locales/zh_TW/battle.ts
@@ -144,7 +144,5 @@ export const battle: SimpleTranslationEntries = {
   "battlerTagsSaltCuredLapse": "{{pokemonNameWithAffix}} 受到了{{moveName}}的傷害！",
   "battlerTagsCursedOnAdd": "{{pokemonNameWithAffix}}削減了自己的體力，並詛咒了{{pokemonName}}！",
   "battlerTagsCursedLapse": "{{pokemonNameWithAffix}}正受到詛咒！",
-  "battlerTagsStockpilingOnAdd": "{{pokemonNameWithAffix}} stockpiled {{stockpiledCount}}!",
-  "battlerTagsTrickOnSwap": "{{pokemonNameWithAffix}}\n互換了各自的道具！",
-  "battlerTagsTrickFoeNewItem": "{{pokemonNameWithAffix}}\n獲得了{{itemName}}！"
+  "battlerTagsStockpilingOnAdd": "{{pokemonNameWithAffix}} stockpiled {{stockpiledCount}}!"
 } as const;
diff --git a/src/locales/zh_TW/move-trigger.ts b/src/locales/zh_TW/move-trigger.ts
index 019aa84390c..6198b5dc3c0 100644
--- a/src/locales/zh_TW/move-trigger.ts
+++ b/src/locales/zh_TW/move-trigger.ts
@@ -59,4 +59,6 @@ export const moveTriggers: SimpleTranslationEntries = {
   "copyType": "{{pokemonName}}變成了{{targetPokemonName}}的屬性！",
   "suppressAbilities": "{{pokemonName}}的特性\n變得無效了！",
   "swapArenaTags": "{{pokemonName}}\n交換了雙方的場地效果！",
+  "trickOnSwap": "{{pokemonNameWithAffix}}\n互換了各自的道具！",
+  "trickFoeNewItem": "{{pokemonNameWithAffix}}\n獲得了{{itemName}}！"
 } as const;