From aec99b4f428b9a3b27e47b60c1b66ee3434f0d05 Mon Sep 17 00:00:00 2001
From: Skyth <19259897+blueskythlikesclouds@users.noreply.github.com>
Date: Sat, 7 Dec 2024 16:47:58 +0300
Subject: [PATCH] Rename "Controller Buttons" to "Controller Icons".

---
 UnleashedRecomp/gpu/video.cpp                |  2 +-
 UnleashedRecomp/locale/config_locale.h       | 10 +++++-----
 UnleashedRecomp/patches/resident_patches.cpp |  2 +-
 UnleashedRecomp/ui/options_menu.cpp          |  2 +-
 UnleashedRecomp/user/config.h                |  2 +-
 UnleashedRecomp/user/config_detail.h         |  8 ++++----
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/UnleashedRecomp/gpu/video.cpp b/UnleashedRecomp/gpu/video.cpp
index 7da98cf1..24970e22 100644
--- a/UnleashedRecomp/gpu/video.cpp
+++ b/UnleashedRecomp/gpu/video.cpp
@@ -2614,7 +2614,7 @@ static void ProcSetViewport(const RenderCommand& cmd)
 
 static void SetTexture(GuestDevice* device, uint32_t index, GuestTexture* texture) 
 {
-    if (Config::ControllerButtons == EControllerButtons::PlayStation && texture != nullptr && texture->patchedTexture != nullptr)
+    if (Config::ControllerIcons == EControllerIcons::PlayStation && texture != nullptr && texture->patchedTexture != nullptr)
         texture = texture->patchedTexture.get();
 
     RenderCommand cmd;
diff --git a/UnleashedRecomp/locale/config_locale.h b/UnleashedRecomp/locale/config_locale.h
index 28c72d75..86fced1b 100644
--- a/UnleashedRecomp/locale/config_locale.h
+++ b/UnleashedRecomp/locale/config_locale.h
@@ -131,18 +131,18 @@ CONFIG_DEFINE_ENUM_LOCALE(ETimeOfDayTransition)
     }
 };
 
-CONFIG_DEFINE_LOCALE(ControllerButtons)
+CONFIG_DEFINE_LOCALE(ControllerIcons)
 {
-    { ELanguage::English, { "Controller Buttons", "[PLACEHOLDER]" } }
+    { ELanguage::English, { "Controller Icons", "[PLACEHOLDER]" } }
 };
 
-CONFIG_DEFINE_ENUM_LOCALE(EControllerButtons)
+CONFIG_DEFINE_ENUM_LOCALE(EControllerIcons)
 {
     {
         ELanguage::English,
         {
-            { EControllerButtons::Xbox,        { "XBOX", "[PLACEHOLDER]" } },
-            { EControllerButtons::PlayStation, { "PLAYSTATION", "[PLACEHOLDER]" } }
+            { EControllerIcons::Xbox,        { "XBOX", "[PLACEHOLDER]" } },
+            { EControllerIcons::PlayStation, { "PLAYSTATION", "[PLACEHOLDER]" } }
         }
     }
 };
diff --git a/UnleashedRecomp/patches/resident_patches.cpp b/UnleashedRecomp/patches/resident_patches.cpp
index ea82a391..52f09a62 100644
--- a/UnleashedRecomp/patches/resident_patches.cpp
+++ b/UnleashedRecomp/patches/resident_patches.cpp
@@ -114,7 +114,7 @@ void LoadingScreenControllerMidAsmHook()
         0x820301E8, // 360_super
     };
 
-    const char* prefix = Config::ControllerButtons == EControllerButtons::PlayStation ? "ps3" : "360";
+    const char* prefix = Config::ControllerIcons == EControllerIcons::PlayStation ? "ps3" : "360";
     for (auto address : STR_ADDRESSES)
         memcpy(g_memory.Translate(address), prefix, 3);
 }
diff --git a/UnleashedRecomp/ui/options_menu.cpp b/UnleashedRecomp/ui/options_menu.cpp
index fc96f9c1..8c7799db 100644
--- a/UnleashedRecomp/ui/options_menu.cpp
+++ b/UnleashedRecomp/ui/options_menu.cpp
@@ -790,7 +790,7 @@ static void DrawConfigOptions()
         DrawConfigOption(rowCount++, yOffset, &Config::InvertCameraX, true);
         DrawConfigOption(rowCount++, yOffset, &Config::InvertCameraY, true);
         DrawConfigOption(rowCount++, yOffset, &Config::AllowBackgroundInput, true);
-        DrawConfigOption(rowCount++, yOffset, &Config::ControllerButtons, true);
+        DrawConfigOption(rowCount++, yOffset, &Config::ControllerIcons, true);
         break;
     case 2: // AUDIO
         DrawConfigOption(rowCount++, yOffset, &Config::MusicVolume, true);
diff --git a/UnleashedRecomp/user/config.h b/UnleashedRecomp/user/config.h
index cd5ca442..44a14e62 100644
--- a/UnleashedRecomp/user/config.h
+++ b/UnleashedRecomp/user/config.h
@@ -24,7 +24,7 @@ public:
     CONFIG_DEFINE_LOCALISED("Input", bool, XButtonHoming, true);
     CONFIG_DEFINE_LOCALISED("Input", bool, AllowCancellingUnleash, false);
     CONFIG_DEFINE_LOCALISED("Input", bool, AllowBackgroundInput, false);
-    CONFIG_DEFINE_ENUM_LOCALISED("Input", EControllerButtons, ControllerButtons, EControllerButtons::Xbox);
+    CONFIG_DEFINE_ENUM_LOCALISED("Input", EControllerIcons, ControllerIcons, EControllerIcons::Xbox);
 
     CONFIG_DEFINE_LOCALISED("Audio", float, MusicVolume, 1.0f);
     CONFIG_DEFINE_LOCALISED("Audio", float, EffectsVolume, 1.0f);
diff --git a/UnleashedRecomp/user/config_detail.h b/UnleashedRecomp/user/config_detail.h
index b7eeefe1..4966f687 100644
--- a/UnleashedRecomp/user/config_detail.h
+++ b/UnleashedRecomp/user/config_detail.h
@@ -67,16 +67,16 @@ CONFIG_DEFINE_ENUM_TEMPLATE(ETimeOfDayTransition)
     { "PlayStation", ETimeOfDayTransition::PlayStation }
 };
 
-enum class EControllerButtons : uint32_t
+enum class EControllerIcons : uint32_t
 {
     Xbox,
     PlayStation
 };
 
-CONFIG_DEFINE_ENUM_TEMPLATE(EControllerButtons)
+CONFIG_DEFINE_ENUM_TEMPLATE(EControllerIcons)
 {
-    { "Xbox", EControllerButtons::Xbox },
-    { "PlayStation", EControllerButtons::PlayStation }
+    { "Xbox", EControllerIcons::Xbox },
+    { "PlayStation", EControllerIcons::PlayStation }
 };
 
 enum class EVoiceLanguage : uint32_t