From 813d5350024f0cf18480b55d8d9caf137c4e825f Mon Sep 17 00:00:00 2001
From: Nayla Hanegan <naylahanegan@gmail.com>
Date: Fri, 3 Jan 2025 16:54:19 -0500
Subject: [PATCH] change registry flag

---
 Source/Core/Common/CommonPaths.h               | 8 ++++----
 Source/Core/Core/GeckoCode.cpp                 | 2 +-
 Source/Core/Core/HLE/HLE.cpp                   | 3 ++-
 Source/Core/Core/HLE/HLE_Misc.cpp              | 3 ++-
 Source/Core/DolphinQt/Settings/GeneralPane.cpp | 4 +++-
 Source/Core/UICommon/UICommon.cpp              | 4 ++--
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Source/Core/Common/CommonPaths.h b/Source/Core/Common/CommonPaths.h
index ebecb3886b..d5cba1905a 100644
--- a/Source/Core/Common/CommonPaths.h
+++ b/Source/Core/Common/CommonPaths.h
@@ -12,13 +12,13 @@
 
 // The normal user directory
 #ifdef _WIN32
-#define NORMAL_USER_DIR "Dolphin Emulator"
+#define NORMAL_USER_DIR "Dolphin MPN"
 #elif defined(__APPLE__)
-#define NORMAL_USER_DIR "Library/Application Support/Dolphin"
+#define NORMAL_USER_DIR "Library/Application Support/Dolphin MPN"
 #elif defined(ANDROID)
-#define NORMAL_USER_DIR "/sdcard/dolphin-emu"
+#define NORMAL_USER_DIR "/sdcard/dolphin-mpn"
 #else
-#define NORMAL_USER_DIR "dolphin-emu"
+#define NORMAL_USER_DIR "dolphin-mpn"
 #endif
 
 // The portable user directory
diff --git a/Source/Core/Core/GeckoCode.cpp b/Source/Core/Core/GeckoCode.cpp
index 2480744b93..777b03361b 100644
--- a/Source/Core/Core/GeckoCode.cpp
+++ b/Source/Core/Core/GeckoCode.cpp
@@ -118,7 +118,7 @@ const char* GetGeckoCodeHandlerPath()
   case 1:
     return GECKO_CODE_HANDLER_MPN;  // MPN (Extended)
   default:
-    return GECKO_CODE_HANDLER;  // Fallback
+    return GECKO_CODE_HANDLER_MPN;  // Fallback
   }
 }
 
diff --git a/Source/Core/Core/HLE/HLE.cpp b/Source/Core/Core/HLE/HLE.cpp
index 4779d5309b..993dd7ebb3 100644
--- a/Source/Core/Core/HLE/HLE.cpp
+++ b/Source/Core/Core/HLE/HLE.cpp
@@ -86,7 +86,8 @@ const char* GetGeckoCodeHandlerPath()
   {
     case 0: return GECKO_CODE_HANDLER; // Dolphin (Stock)
     case 1: return GECKO_CODE_HANDLER_MPN; // MPN (Extended)
-    default: return GECKO_CODE_HANDLER; // Fallback
+    default:
+      return GECKO_CODE_HANDLER_MPN;  // Fallback
   }
 }
 
diff --git a/Source/Core/Core/HLE/HLE_Misc.cpp b/Source/Core/Core/HLE/HLE_Misc.cpp
index 7f1d76a4b8..7663a45fe5 100644
--- a/Source/Core/Core/HLE/HLE_Misc.cpp
+++ b/Source/Core/Core/HLE/HLE_Misc.cpp
@@ -33,7 +33,8 @@ const char* GetGeckoCodeHandlerPath()
   {
     case 0: return GECKO_CODE_HANDLER; // Dolphin (Stock)
     case 1: return GECKO_CODE_HANDLER_MPN; // MPN (Extended)
-    default: return GECKO_CODE_HANDLER; // Fallback
+    default:
+      return GECKO_CODE_HANDLER_MPN;  // Fallback
   }
 }
 
diff --git a/Source/Core/DolphinQt/Settings/GeneralPane.cpp b/Source/Core/DolphinQt/Settings/GeneralPane.cpp
index c1fa947bd5..ebdbf9bbc9 100644
--- a/Source/Core/DolphinQt/Settings/GeneralPane.cpp
+++ b/Source/Core/DolphinQt/Settings/GeneralPane.cpp
@@ -225,7 +225,9 @@ void GeneralPane::CreateCheats()
   m_combobox_codehandler = new QComboBox();
   
   m_combobox_codehandler->addItem(tr("Dolphin (Stock)"), QVariant(0));
-  m_combobox_codehandler->addItem(tr("MPN (Super Extended)"), QVariant(2));
+  m_combobox_codehandler->addItem(tr("MPN (Extended)"), QVariant(1));
+
+  m_combobox_codehandler->setCurrentIndex(1);
 
   code_handler_layout->addRow(code_handler_label, m_combobox_codehandler);
   cheats_group_layout->addLayout(code_handler_layout);
diff --git a/Source/Core/UICommon/UICommon.cpp b/Source/Core/UICommon/UICommon.cpp
index e4f79a6a6a..cd8ba71f38 100644
--- a/Source/Core/UICommon/UICommon.cpp
+++ b/Source/Core/UICommon/UICommon.cpp
@@ -318,7 +318,7 @@ void SetUserDirectory(std::string custom_path)
   wil::unique_hkey hkey;
   DWORD local = 0;
   std::unique_ptr<TCHAR[]> configPath;
-  if (RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Software\\Dolphin Emulator"), 0, KEY_QUERY_VALUE,
+  if (RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Software\\Dolphin MPN"), 0, KEY_QUERY_VALUE,
                    hkey.put()) == ERROR_SUCCESS)
   {
     DWORD size = sizeof(local);
@@ -372,7 +372,7 @@ void SetUserDirectory(std::string custom_path)
     // they will use this as the User directory instead.
     // (If we're in this case, then this key doesn't exist, so it's OK to set it.)
     std::wstring wstr_path = UTF8ToWString(user_path);
-    RegSetKeyValueW(HKEY_CURRENT_USER, TEXT("Software\\Dolphin Emulator"), TEXT("UserConfigPath"),
+    RegSetKeyValueW(HKEY_CURRENT_USER, TEXT("Software\\Dolphin MPN"), TEXT("UserConfigPath"),
                     REG_SZ, wstr_path.c_str(),
                     static_cast<DWORD>((wstr_path.size() + 1) * sizeof(wchar_t)));
   }