Disable console in RelWithDebInfo configuration

UnleashedRecomp/CMakeLists.txt

@@ -293,7 +293,7 @@ if (WIN32)
     add_executable(UnleashedRecomp ${UNLEASHED_RECOMP_CXX_SOURCES} "${CMAKE_BINARY_DIR}/res.rc")
 
     # Hide console for release configurations.
-    if (${CMAKE_BUILD_TYPE} MATCHES "Release")
+    if (${CMAKE_BUILD_TYPE} MATCHES "Release" OR ${CMAKE_BUILD_TYPE} MATCHES "RelWithDebInfo")
         target_link_options(UnleashedRecomp PRIVATE "/SUBSYSTEM:WINDOWS" "/ENTRY:mainCRTStartup")
     endif()
 else()
@@ -352,7 +352,7 @@ if (WIN32)
         Synchronization
         winmm
     )
-endif()
+endif()
 
 target_link_libraries(UnleashedRecomp PRIVATE
     fmt::fmt

UnleashedRecomp/app.h

@@ -8,7 +8,6 @@ public:
     static inline bool s_isInit;
     static inline bool s_isMissingDLC;
     static inline bool s_isLoading;
-    static inline bool s_isSaving;
     static inline bool s_isWerehog;
     static inline bool s_isSaveDataCorrupt;
 

UnleashedRecomp/apu/driver/sdl2_driver.cpp

@@ -38,11 +38,6 @@ static void CreateAudioDevice()
 
 void XAudioInitializeSystem()
 {
-#ifdef _WIN32
-    // Force wasapi on Windows.
-    SDL_setenv("SDL_AUDIODRIVER", "wasapi", true);
-#endif
-
     SDL_SetHint(SDL_HINT_AUDIO_CATEGORY, "playback");
     SDL_SetHint(SDL_HINT_AUDIO_DEVICE_APP_NAME, "Unleashed Recompiled");
 

UnleashedRecomp/locale/locale.cpp

@@ -692,17 +692,6 @@ std::unordered_map<std::string_view, std::unordered_map<ELanguage, std::string>>
             { ELanguage::Italian,  "Impossibile creare un backend D3D12 (Windows) o Vulkan.\n\nAssicurati che:\n\n- Il tuo sistema soddisfi i requisiti minimi.\n- I driver della scheda grafica siano aggiornati.\n- Il tuo sistema operativo sia aggiornato." }
         }
     },
-    {
-        "System_Win32_MissingDLLs",
-        {
-            { ELanguage::English,  "The module \"%s\" could not be found.\n\nPlease make sure that:\n\n- You extracted this copy of Unleashed Recompiled fully and not just the *.exe file.\n- You are not running Unleashed Recompiled from a *.zip file." },
-            { ELanguage::Japanese, "モジュール\"%s\"が見つかりませんでした\n\n次の点を確認してください：\n\n※Unleashed Recompiledの*.exeファイルだけを抽出していなく、 コピーを完全に抽出してること\n※Unleashed Recompiledを*.zipファイルから実行していないこと" },
-            { ELanguage::German,   "Das Modul \"%s\" konnte nicht gefunden werden.\n\nBitte stelle sicher, dass:\n\n- Diese Kopie von Unleashed Recompiled vollständig entpackt wurde und nicht nur die *.exe-Datei.\n- Unleashed Recompiled nicht direkt aus einer *.zip-Datei ausgeführt wird." },
-            { ELanguage::French,   "Le module \"%s\" n'a pas pu être trouvé.\n\nVeuillez vous assurer que :\n\n- Vous avez extrait Unleashed Recompiled dans son entièreté et pas seulement le fichier *.exe.\n- Vous n'exécutez pas Unleashed Recompiled à partir d'un fichier *.zip." },
-            { ELanguage::Spanish,  "No se pudo encontrar el módulo \"%s\".\n\nAsegúrese de que:\n\n- Ha extraido esta copia de Unleashed Recompiled por completo y no solo el archivo *.exe.\n- No está ejecutando Unleashed Recompiled desde un archivo *.zip." },
-            { ELanguage::Italian,  "Impossibile trovare il modulo \"%s\".\n\nAssicurati che:\n\n- Hai estratto questa copia di Unleashed Recompiled correttamente e non solo il file *.exe.\n- Non stai eseguendo Unleashed Recompiled da un file *.zip." }
-        }
-    },
     {
         "Common_On",
         {

UnleashedRecomp/main.cpp

@@ -1,5 +1,4 @@
 #include <stdafx.h>
-#include <cpuid.h>
 #include <cpu/guest_thread.h>
 #include <gpu/video.h>
 #include <kernel/function.h>
@@ -28,15 +27,6 @@
 #include <timeapi.h>
 #endif
 
-#if defined(_WIN32) && defined(UNLEASHED_RECOMP_D3D12)
-static std::array<std::string_view, 3> g_D3D12RequiredModules =
-{
-    "D3D12/D3D12Core.dll",
-    "dxcompiler.dll",
-    "dxil.dll"
-};
-#endif
-
 const size_t XMAIOBegin = 0x7FEA0000;
 const size_t XMAIOEnd = XMAIOBegin + 0x0000FFFF;
 
@@ -157,29 +147,6 @@ uint32_t LdrLoadModule(const std::filesystem::path &path)
     return entry;
 }
 
-__attribute__((constructor(101), target("no-avx,no-avx2"), noinline))
-void init()
-{
-#ifdef __x86_64__
-    uint32_t eax, ebx, ecx, edx;
-
-    // Execute CPUID for processor info and feature bits.
-    __get_cpuid(1, &eax, &ebx, &ecx, &edx);
-
-    // Check for AVX support.
-    if ((ecx & (1 << 28)) == 0)
-    {
-        printf("[*] CPU does not support the AVX instruction set.\n");
-
-#ifdef _WIN32
-        MessageBoxA(nullptr, "Your CPU does not meet the minimum system requirements.", "Unleashed Recompiled", MB_ICONERROR);
-#endif
-
-        std::_Exit(1);
-    }
-#endif
-}
-
 int main(int argc, char *argv[])
 {
 #ifdef _WIN32
@@ -189,7 +156,7 @@ int main(int argc, char *argv[])
     os::process::CheckConsole();
 
     if (!os::registry::Init())
-        LOGN_WARNING("OS does not support registry.");
+        LOGN_WARNING("OS doesn't support registry");
 
     os::logger::Init();
 
@@ -213,19 +180,6 @@ int main(int argc, char *argv[])
 
     Config::Load();
 
-#if defined(_WIN32) && defined(UNLEASHED_RECOMP_D3D12)
-    for (auto& dll : g_D3D12RequiredModules)
-    {
-        if (!std::filesystem::exists(g_executableRoot / dll))
-        {
-            char text[512];
-            snprintf(text, sizeof(text), Localise("System_Win32_MissingDLLs").c_str(), dll.data());
-            SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, GameWindow::GetTitle(), text, GameWindow::s_pWindow);
-            std::_Exit(1);
-        }
-    }
-#endif
-
     // Check the time since the last time an update was checked. Store the new time if the difference is more than six hours.
     constexpr double TimeBetweenUpdateChecksInSeconds = 6 * 60 * 60;
     time_t timeNow = std::time(nullptr);

UnleashedRecomp/patches/input_patches.cpp

@@ -212,7 +212,7 @@ g_sdlEventListenerForInputPatches;
 
 static bool IsDPadThreshold(const SWA::SPadState* pPadState)
 {
-    if (Config::DisableDPadMovement)
+    if (Config::DisableDPadAsAnalogInput)
         return false;
 
     return pPadState->IsDown(SWA::eKeyState_DpadUp)   ||
@@ -240,7 +240,7 @@ static bool IsCursorThreshold(double deadzone = 0, bool isBelowThreshold = false
 
 static void SetDPadAnalogDirectionX(PPCRegister& pPadState, PPCRegister& x, bool invert, float max = 1.0f)
 {
-    if (Config::DisableDPadMovement)
+    if (Config::DisableDPadAsAnalogInput)
         return;
 
     auto pGuestPadState = (SWA::SPadState*)g_memory.Translate(pPadState.u32);
@@ -254,7 +254,7 @@ static void SetDPadAnalogDirectionX(PPCRegister& pPadState, PPCRegister& x, bool
 
 static void SetDPadAnalogDirectionY(PPCRegister& pPadState, PPCRegister& y, bool invert, float max = 1.0f)
 {
-    if (Config::DisableDPadMovement)
+    if (Config::DisableDPadAsAnalogInput)
         return;
 
     auto pGuestPadState = (SWA::SPadState*)g_memory.Translate(pPadState.u32);
@@ -292,7 +292,7 @@ void PostureDPadSupportYMidAsmHook(PPCRegister& pPadState, PPCRegister& y)
 
 void PostureSpaceHurrierDPadSupportXMidAsmHook(PPCRegister& pPadState, PPCVRegister& vector)
 {
-    if (Config::DisableDPadMovement)
+    if (Config::DisableDPadAsAnalogInput)
         return;
     
     auto pGuestPadState = (SWA::SPadState*)g_memory.Translate(pPadState.u32);
@@ -306,7 +306,7 @@ void PostureSpaceHurrierDPadSupportXMidAsmHook(PPCRegister& pPadState, PPCVRegis
 
 void PostureSpaceHurrierDPadSupportYMidAsmHook(PPCRegister& pPadState, PPCVRegister& vector)
 {
-    if (Config::DisableDPadMovement)
+    if (Config::DisableDPadAsAnalogInput)
         return;
 
     auto pGuestPadState = (SWA::SPadState*)g_memory.Translate(pPadState.u32);
@@ -318,18 +318,6 @@ void PostureSpaceHurrierDPadSupportYMidAsmHook(PPCRegister& pPadState, PPCVRegis
         vector.f32[3] = -1.0f;
 }
 
-void SetXButtonHomingMidAsmHook(PPCRegister& r1)
-{
-    auto pXButtonHoming = (bool*)(g_memory.base + r1.u32 + 0x63);
-
-    *pXButtonHoming = !Config::HomingAttackOnJump;
-}
-
-bool IsHomingAttackOnJump()
-{
-    return Config::HomingAttackOnJump;
-}
-
 // ------------- WORLD MAP ------------- //
 
 bool WorldMapDeadzoneMidAsmHook(PPCRegister& pPadState)
@@ -430,7 +418,7 @@ PPC_FUNC(sub_8256C938)
         pWorldMapCursor->m_LeftStickVertical = rPadState.LeftStickVertical;
         pWorldMapCursor->m_LeftStickHorizontal = rPadState.LeftStickHorizontal;
 
-        if (!Config::DisableDPadMovement)
+        if (!Config::DisableDPadAsAnalogInput)
         {
             if (rPadState.IsDown(SWA::eKeyState_DpadUp))
                 pWorldMapCursor->m_LeftStickVertical = 1.0f;

UnleashedRecomp/patches/player_patches.cpp

@@ -95,6 +95,13 @@ void PostUnleashMidAsmHook(PPCRegister& r30)
     g_isUnleashCancelled = false;
 }
 
+void SetXButtonHomingMidAsmHook(PPCRegister& r1)
+{
+    auto pXButtonHoming = (bool*)(g_memory.base + r1.u32 + 0x63);
+    
+    *pXButtonHoming = !Config::HomingAttackOnJump;
+}
+
 // SWA::Player::CEvilSonicContext
 PPC_FUNC_IMPL(__imp__sub_823B49D8);
 PPC_FUNC(sub_823B49D8)

UnleashedRecomp/patches/resident_patches.cpp

@@ -97,8 +97,6 @@ PPC_FUNC(sub_824E5170)
 
     __imp__sub_824E5170(ctx, base);
 
-    App::s_isSaving = pSaveIcon->m_IsVisible;
-
     if (pSaveIcon->m_IsVisible)
     {
         App::s_isSaveDataCorrupt = false;

UnleashedRecomp/res/version.txt

@@ -1,4 +1,4 @@
 VERSION_MILESTONE=""
 VERSION_MAJOR=1
 VERSION_MINOR=0
-VERSION_REVISION=2
+VERSION_REVISION=1

UnleashedRecomp/ui/game_window.cpp

@@ -34,14 +34,8 @@ int Window_OnSDLEvent(void*, SDL_Event* event)
     switch (event->type)
     {
         case SDL_QUIT:
-        {
-            if (App::s_isSaving)
-                break;
-
             App::Exit();
-
             break;
-        }
 
         case SDL_KEYDOWN:
         {

UnleashedRecomp/user/config_def.h

@@ -79,9 +79,7 @@ CONFIG_DEFINE_HIDDEN("Codes", bool, AllowCancellingUnleash, false);
 CONFIG_DEFINE_HIDDEN("Codes", bool, DisableAutoSaveWarning, false);
 CONFIG_DEFINE_HIDDEN("Codes", bool, DisableBoostFilter, false);
 CONFIG_DEFINE_HIDDEN("Codes", bool, DisableDLCIcon, false);
-CONFIG_DEFINE_HIDDEN("Codes", bool, DisableDPadMovement, false);
 CONFIG_DEFINE_HIDDEN("Codes", bool, DisableDWMRoundedCorners, false);
-CONFIG_DEFINE_HIDDEN("Codes", bool, DisableLowResolutionFontOnCustomUI, false);
 CONFIG_DEFINE_HIDDEN("Codes", bool, EnableEventCollisionDebugView, false);
 CONFIG_DEFINE_HIDDEN("Codes", bool, EnableGIMipLevelDebugView, false);
 CONFIG_DEFINE_HIDDEN("Codes", bool, EnableObjectCollisionDebugView, false);
@@ -94,5 +92,7 @@ CONFIG_DEFINE_HIDDEN("Codes", bool, SaveScoreAtCheckpoints, false);
 CONFIG_DEFINE_HIDDEN("Codes", bool, SkipIntroLogos, false);
 CONFIG_DEFINE_HIDDEN("Codes", bool, UseArrowsForTimeOfDayTransition, false);
 CONFIG_DEFINE_HIDDEN("Codes", bool, UseOfficialTitleOnTitleBar, false);
+CONFIG_DEFINE_HIDDEN("Codes", bool, DisableLowResolutionFontOnCustomUI, false);
+CONFIG_DEFINE_HIDDEN("Codes", bool, DisableDPadAsAnalogInput, false);
 
 CONFIG_DEFINE("Update", time_t, LastChecked, 0);

UnleashedRecomp/user/paths.h

@@ -8,8 +8,6 @@
 #define GAME_INSTALL_DIRECTORY "."
 #endif
 
-extern std::filesystem::path g_executableRoot;
-
 inline std::filesystem::path GetGamePath()
 {
     return GAME_INSTALL_DIRECTORY;

UnleashedRecompLib/config/SWA.toml

@@ -181,8 +181,8 @@ jump_address_on_true = 0x829E40A0
 # Disable Chip hints for shoe upgrades
 [[midasm_hook]]
 name = "DisableHintsMidAsmHook"
-address = 0x82691DD0
+address = 0x82691CB0
-jump_address_on_true = 0x82691DD4
+jump_address_on_true = 0x82691E24
 
 # Disable navigation volumes
 [[midasm_hook]]
@@ -197,18 +197,11 @@ address = 0x823A4FF0
 registers = ["r4", "r5"]
 return_on_false = true
 
-# Set default value for XButtonHoming.
 [[midasm_hook]]
 name = "SetXButtonHomingMidAsmHook"
 address = 0x8237AC90
 registers = ["r1"]
 
-# Disable XML reading for XButtonHoming.
-[[midasm_hook]]
-name = "IsHomingAttackOnJump"
-address = 0x8237ACE4
-jump_address_on_true = 0x8237ACE8
-
 # Down force HFR fix
 [[midasm_hook]]
 name = "DownForceDeltaTimeFixMidAsmHook"