From 22a030675af0edad9b14f069e5e2a92c065405cf Mon Sep 17 00:00:00 2001
From: Amatsune <fsvb@me.com>
Date: Mon, 24 Jun 2024 21:44:50 +0200
Subject: [PATCH] =?UTF-8?q?fixed=20CN=20affixes=20inversion=20(double=20in?=
 =?UTF-8?q?version=E2=80=A6)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/@types/i18next.d.ts     |  1 +
 src/data/pokemon-species.ts | 25 ++++++++++++++++++++++---
 src/interfaces/locales.ts   |  2 +-
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/@types/i18next.d.ts b/src/@types/i18next.d.ts
index ccf02d95271..60c0f528a14 100644
--- a/src/@types/i18next.d.ts
+++ b/src/@types/i18next.d.ts
@@ -39,6 +39,7 @@ declare module "i18next" {
         pokeball: SimpleTranslationEntries;
         pokemon: SimpleTranslationEntries;
         fusionAffixes: FusionTranslationEntries;
+        shouldReverse: FusionTranslationEntries;
         pokemonInfo: PokemonInfoTranslationEntries;
         pokemonInfoContainer: SimpleTranslationEntries;
         saveSlotSelectUiHandler: SimpleTranslationEntries;
diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts
index b72a43168b6..a0ffd285e8a 100644
--- a/src/data/pokemon-species.ts
+++ b/src/data/pokemon-species.ts
@@ -53,15 +53,34 @@ export function getPokemonSpeciesForm(species: Species, formIndex: integer): Pok
 export function getFusedSpeciesName(speciesA: PokemonSpecies, speciesB: PokemonSpecies): string {
   let firstKey = "fusionPrefix";
   let secondKey = "fusionSuffix";
+
+  const shouldReverse = i18next.t("fusionAffixes:shouldReverse");
+  console.log(`shouldReverse: ${shouldReverse}`); // logs the value of shouldReverse
+
   if (i18next.t("fusionAffixes:shouldReverse") === "true") {
+
     firstKey = "fusionSuffix";
     secondKey = "fusionPrefix";
+
+    console.log(`firstKey: ${firstKey}, secondKey: ${secondKey}`); // logs the values of firstKey and secondKey
   }
 
-  const prefix = i18next.t(`fusionAffixes:${Species[speciesA.speciesId].toLowerCase()}.${firstKey}`);
-  const suffix = i18next.t(`fusionAffixes:${Species[speciesB.speciesId].toLowerCase()}.${secondKey}`);
+  const radKey = i18next.t(`fusionAffixes:${Species[speciesA.speciesId].toLowerCase()}.${firstKey}`);
+  const desKey = i18next.t(`fusionAffixes:${Species[speciesB.speciesId].toLowerCase()}.${secondKey}`);
 
-  return `${prefix}${suffix}`;
+  let prefix = radKey;
+  let suffix = desKey;
+
+  if (i18next.t("fusionAffixes:shouldReverse") === "true") {
+    prefix = desKey;
+    suffix = radKey;
+  }
+
+  console.log(`prefix: ${prefix}, suffix: ${suffix}`); // logs the values of prefix and suffix
+
+  const fusedName =`${prefix}${suffix}`;
+
+  return fusedName;
 }
 
 export type PokemonSpeciesFilter = (species: PokemonSpecies) => boolean;
diff --git a/src/interfaces/locales.ts b/src/interfaces/locales.ts
index b2f8485007f..d7a09444824 100644
--- a/src/interfaces/locales.ts
+++ b/src/interfaces/locales.ts
@@ -10,7 +10,7 @@ export interface SimpleTranslationEntries {
   }
 
 export interface FusionTranslationEntries {
-  shouldReverse: string,
+  shouldReverse?: string,
   [key: string]: FusionTranslationEntry | string,
   }