From 87d2ab5af16a12b922b786276b0fcedd4df745fb Mon Sep 17 00:00:00 2001
From: Hyper <34012267+hyperbx@users.noreply.github.com>
Date: Fri, 31 Jan 2025 00:47:01 +0000
Subject: [PATCH] locale: update localisation for Voice Language

---
 UnleashedRecomp/locale/config_locale.cpp | 57 +++++++++++++++++++-----
 UnleashedRecomp/user/config.cpp          |  6 ---
 UnleashedRecomp/user/config.h            | 12 ++---
 UnleashedRecompResources                 |  2 +-
 4 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/UnleashedRecomp/locale/config_locale.cpp b/UnleashedRecomp/locale/config_locale.cpp
index 40a1d0d..30d7bee 100644
--- a/UnleashedRecomp/locale/config_locale.cpp
+++ b/UnleashedRecomp/locale/config_locale.cpp
@@ -49,6 +49,52 @@ CONFIG_DEFINE_ENUM_LOCALE(ELanguage)
     }
 };
 
+CONFIG_DEFINE_ENUM_LOCALE(EVoiceLanguage)
+{
+    {
+        ELanguage::English,
+        {
+            { EVoiceLanguage::English,  { "ENGLISH", "" } },
+            { EVoiceLanguage::Japanese, { "JAPANESE", "" } }
+        }
+    },
+    {
+        ELanguage::Japanese,
+        {
+            { EVoiceLanguage::English,  { "英語", "" } },
+            { EVoiceLanguage::Japanese, { "日本語", "" } }
+        }
+    },
+    {
+        ELanguage::German,
+        {
+            { EVoiceLanguage::English,  { "ENGLISCH", "" } },
+            { EVoiceLanguage::Japanese, { "JAPANISCH", "" } }
+        }
+    },
+    {
+        ELanguage::French,
+        {
+            { EVoiceLanguage::English,  { "ANGLAIS", "" } },
+            { EVoiceLanguage::Japanese, { "JAPONAIS", "" } }
+        }
+    },
+    {
+        ELanguage::Spanish,
+        {
+            { EVoiceLanguage::English,  { "INGLÉS", "" } },
+            { EVoiceLanguage::Japanese, { "JAPONÉS", "" } }
+        }
+    },
+    {
+        ELanguage::Italian,
+        {
+            { EVoiceLanguage::English,  { "INGLESE", "" } },
+            { EVoiceLanguage::Japanese, { "GIAPPONESE", "" } }
+        }
+    },
+};
+
 CONFIG_DEFINE_LOCALE(Hints)
 {
     { ELanguage::English, { "Hints", "Show hint rings in stages." } }
@@ -169,17 +215,6 @@ CONFIG_DEFINE_LOCALE(VoiceLanguage)
     { ELanguage::English, { "Voice Language", "Change the language used for character voices." } }
 };
 
-CONFIG_DEFINE_ENUM_LOCALE(EVoiceLanguage)
-{
-    {
-        ELanguage::English,
-        {
-            { EVoiceLanguage::English,  { "ENGLISH", "" } },
-            { EVoiceLanguage::Japanese, { "日本語", "" } }
-        }
-    }
-};
-
 CONFIG_DEFINE_LOCALE(Subtitles)
 {
     { ELanguage::English, { "Subtitles", "Show subtitles during dialogue." } }
diff --git a/UnleashedRecomp/user/config.cpp b/UnleashedRecomp/user/config.cpp
index 86a61a1..4c52b52 100644
--- a/UnleashedRecomp/user/config.cpp
+++ b/UnleashedRecomp/user/config.cpp
@@ -18,12 +18,6 @@ CONFIG_DEFINE_ENUM_TEMPLATE(ELanguage)
     { "Italian",  ELanguage::Italian }
 };
 
-CONFIG_DEFINE_ENUM_TEMPLATE(EUnleashGaugeBehaviour)
-{
-    { "Original", EUnleashGaugeBehaviour::Original },
-    { "Revised",  EUnleashGaugeBehaviour::Revised }
-};
-
 CONFIG_DEFINE_ENUM_TEMPLATE(ETimeOfDayTransition)
 {
     { "Xbox",        ETimeOfDayTransition::Xbox },
diff --git a/UnleashedRecomp/user/config.h b/UnleashedRecomp/user/config.h
index 2e92893..000e17c 100644
--- a/UnleashedRecomp/user/config.h
+++ b/UnleashedRecomp/user/config.h
@@ -29,10 +29,10 @@ public:
 
 extern std::vector<IConfigDef*> g_configDefinitions;
 
-enum class EUnleashGaugeBehaviour : uint32_t
+enum class EVoiceLanguage : uint32_t
 {
-    Original,
-    Revised
+    English,
+    Japanese
 };
 
 enum class ETimeOfDayTransition : uint32_t
@@ -60,12 +60,6 @@ enum class EChannelConfiguration : uint32_t
     Surround
 };
 
-enum class EVoiceLanguage : uint32_t
-{
-    English,
-    Japanese
-};
-
 enum class EGraphicsAPI : uint32_t
 {
 #ifdef UNLEASHED_RECOMP_D3D12
diff --git a/UnleashedRecompResources b/UnleashedRecompResources
index 598576f..2d135d1 160000
--- a/UnleashedRecompResources
+++ b/UnleashedRecompResources
@@ -1 +1 @@
-Subproject commit 598576ff8375631b638298815cba4c5e8777191c
+Subproject commit 2d135d175dfbedd84d78fb846bcc7de4a859f8ef