misc: Forgot about ReactiveObject

Enable this settings screen via a boolean in Config.json
First one is the xb2 menu softlock fix

src/Ryujinx.Common/Configuration/DirtyHacks.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace Ryujinx.Common.Configuration
+{
+    [Flags]
+    public enum DirtyHacks
+    {
+        None = 0,
+        Xc2MenuSoftlockFix = 1 << 10
+    }
+}

src/Ryujinx.Common/Extensions/StreamExtensions.cs

@@ -8,10 +8,10 @@ namespace Ryujinx.Common
     public static class StreamExtensions
     {
         /// <summary>
-        /// Writes a <see cref="ReadOnlySpan{int}" /> to this stream.
+        /// Writes an int span to this stream.
         ///
         /// This default implementation converts each buffer value to a stack-allocated
-        /// byte array, then writes it to the Stream using <cref="System.Stream.Write(byte[])" />.
+        /// byte array, then writes it to the Stream using <see cref="Stream.Write(ReadOnlySpan{byte})" />.
         /// </summary>
         /// <param name="stream">The stream to be written to</param>
         /// <param name="buffer">The buffer of values to be written</param>

src/Ryujinx.Common/TitleIDs.cs

@@ -8,6 +8,8 @@ namespace Ryujinx.Common
 {
     public static class TitleIDs
     {
+        public static ReactiveObject<Optional<string>> CurrentApplication { get; set; } = new();
+        
         public static GraphicsBackend SelectGraphicsBackend(string titleId, GraphicsBackend currentBackend)
         {
             switch (currentBackend)
@@ -33,6 +35,7 @@ namespace Ryujinx.Common
             "010028600EBDA000", // Mario 3D World
             "0100152000022000", // Mario Kart 8 Deluxe
             "01005CA01580E000", // Persona 5
+            "01001f5010dfa000", // Pokemon Legends Arceus
             "01008C0016544000", // Sea of Stars
             "01006A800016E000", // Smash Ultimate
             "0100000000010000", // Super Mario Odyessy

src/Ryujinx.Graphics.Gpu/GraphicsConfig.cs

@@ -46,7 +46,7 @@ namespace Ryujinx.Graphics.Gpu
         /// Enables or disables high-level emulation of common GPU Macro code.
         /// </summary>
         public static bool EnableMacroHLE = true;
-
+        
         /// <summary>
         /// Title id of the current running game.
         /// Used by the shader cache.

src/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs

@@ -1,3 +1,4 @@
+using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.GAL;

src/Ryujinx.Graphics.Metal/Window.cs

@@ -22,13 +22,15 @@ namespace Ryujinx.Graphics.Metal
 
         private int _requestedWidth;
         private int _requestedHeight;
-
-        // private bool _vsyncEnabled;
+        
         private AntiAliasing _currentAntiAliasing;
         private bool _updateEffect;
         private IPostProcessingEffect _effect;
         private IScalingFilter _scalingFilter;
         private bool _isLinear;
+
+        public bool IsVSyncEnabled => _metalLayer.DisplaySyncEnabled;
+        
         // private float _scalingFilterLevel;
         private bool _updateScalingFilter;
         private ScalingFilter _currentScalingFilter;
@@ -40,7 +42,7 @@ namespace Ryujinx.Graphics.Metal
             _metalLayer = metalLayer;
         }
 
-        private unsafe void ResizeIfNeeded()
+        private void ResizeIfNeeded()
         {
             if (_requestedWidth != 0 && _requestedHeight != 0)
             {
@@ -54,7 +56,7 @@ namespace Ryujinx.Graphics.Metal
             }
         }
 
-        public unsafe void Present(ITexture texture, ImageCrop crop, Action swapBuffersCallback)
+        public void Present(ITexture texture, ImageCrop crop, Action swapBuffersCallback)
         {
             if (_renderer.Pipeline is Pipeline pipeline && texture is Texture tex)
             {
@@ -141,15 +143,7 @@ namespace Ryujinx.Graphics.Metal
         
         public void ChangeVSyncMode(VSyncMode vSyncMode)
         {
-            switch (vSyncMode)
-            {
-                case VSyncMode.Unbounded:
-                    _metalLayer.DisplaySyncEnabled = false;
-                    break;
-                case VSyncMode.Switch:
-                    _metalLayer.DisplaySyncEnabled = true;
-                    break;
-            }
+            _metalLayer.DisplaySyncEnabled = vSyncMode is VSyncMode.Switch;
         }
 
         public void SetAntiAliasing(AntiAliasing effect)

src/Ryujinx.Graphics.Nvdec.Vp9/BitDepth.cs

@@ -2,8 +2,8 @@ namespace Ryujinx.Graphics.Nvdec.Vp9
 {
     internal enum BitDepth
     {
-        Bits8 = 8,   /**<  8 bits */
-        Bits10 = 10, /**< 10 bits */
-        Bits12 = 12, /**< 12 bits */
+        Bits8 = 8,   // <  8 bits
+        Bits10 = 10, // < 10 bits
+        Bits12 = 12, // < 12 bits
     }
 }

src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs

@@ -1,3 +1,4 @@
+using Gommon;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.GAL;
@@ -890,7 +891,12 @@ namespace Ryujinx.Graphics.Vulkan
 
         private void PrintGpuInformation()
         {
-            Logger.Notice.Print(LogClass.Gpu, $"{GpuVendor} {GpuRenderer} ({GpuVersion})");
+            string gpuInfoMessage = $"{GpuRenderer} ({GpuVersion})";
+            if (!GpuRenderer.StartsWithIgnoreCase(GpuVendor))
+                gpuInfoMessage = gpuInfoMessage.Prepend(GpuVendor);
+
+            Logger.Notice.Print(LogClass.Gpu, gpuInfoMessage);
+            
             Logger.Notice.Print(LogClass.Gpu, $"GPU Memory: {GetTotalGPUMemory() / (1024 * 1024)} MiB");
         }
 

src/Ryujinx.HLE/HLEConfiguration.cs

@@ -188,6 +188,11 @@ namespace Ryujinx.HLE
         /// An action called when HLE force a refresh of output after docked mode changed.
         /// </summary>
         public Action RefreshInputConfig { internal get; set; }
+        
+        /// <summary>
+        ///     The desired hacky workarounds.
+        /// </summary>
+        public DirtyHacks Hacks { internal get; set; }
 
         public HLEConfiguration(VirtualFileSystem virtualFileSystem,
                                 LibHacHorizonManager libHacHorizonManager,
@@ -218,7 +223,8 @@ namespace Ryujinx.HLE
                                 bool multiplayerDisableP2p,
                                 string multiplayerLdnPassphrase,
                                 string multiplayerLdnServer,
-                                int customVSyncInterval)
+                                int customVSyncInterval,
+                                DirtyHacks dirtyHacks = DirtyHacks.None)
         {
             VirtualFileSystem = virtualFileSystem;
             LibHacHorizonManager = libHacHorizonManager;
@@ -250,6 +256,7 @@ namespace Ryujinx.HLE
             MultiplayerDisableP2p = multiplayerDisableP2p;
             MultiplayerLdnPassphrase = multiplayerLdnPassphrase;
             MultiplayerLdnServer = multiplayerLdnServer;
+            Hacks = dirtyHacks;
         }
     }
 }

src/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IStorage.cs

@@ -1,6 +1,9 @@
 using LibHac;
 using LibHac.Common;
 using LibHac.Sf;
+using Ryujinx.Common;
+using Ryujinx.Common.Configuration;
+using System.Threading;
 
 namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
 {
@@ -13,6 +16,8 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
             _baseStorage = SharedRef<LibHac.FsSrv.Sf.IStorage>.CreateMove(ref baseStorage);
         }
 
+        private const string Xc2TitleId = "0100e95004038000";
+
         [CommandCmif(0)]
         // Read(u64 offset, u64 length) -> buffer<u8, 0x46, 0> buffer
         public ResultCode Read(ServiceCtx context)
@@ -33,6 +38,13 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
 
                 using var region = context.Memory.GetWritableRegion(bufferAddress, (int)bufferLen, true);
                 Result result = _baseStorage.Get.Read((long)offset, new OutBuffer(region.Memory.Span), (long)size);
+                
+                if (context.Device.DirtyHacks.HasFlag(DirtyHacks.Xc2MenuSoftlockFix) && TitleIDs.CurrentApplication.Value == Xc2TitleId)
+                {
+                    // Add a load-bearing sleep to avoid XC2 softlock
+                    // https://web.archive.org/web/20240728045136/https://github.com/Ryujinx/Ryujinx/issues/2357
+                    Thread.Sleep(2);
+                }
 
                 return (ResultCode)result.Value;
             }

src/Ryujinx.HLE/Loaders/Processes/Extensions/FileSystemExtensions.cs

@@ -4,8 +4,10 @@ using LibHac.Fs.Fsa;
 using LibHac.Loader;
 using LibHac.Ns;
 using LibHac.Tools.FsSystem;
+using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
+using Ryujinx.Graphics.Gpu;
 using Ryujinx.HLE.Loaders.Executables;
 using Ryujinx.Memory;
 using System;
@@ -102,7 +104,7 @@ namespace Ryujinx.HLE.Loaders.Processes.Extensions
             }
 
             // Initialize GPU.
-            Graphics.Gpu.GraphicsConfig.TitleId = programId.ToString("X16");
+            GraphicsConfig.TitleId = programId.ToString("X16");
             device.Gpu.HostInitalized.Set();
 
             if (!MemoryBlock.SupportsFlags(MemoryAllocationFlags.ViewCompatible))

src/Ryujinx.HLE/Loaders/Processes/ProcessLoader.cs

@@ -6,7 +6,9 @@ using LibHac.Ns;
 using LibHac.Tools.Fs;
 using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.NcaUtils;
+using Ryujinx.Common;
 using Ryujinx.Common.Logging;
+using Ryujinx.Graphics.Gpu;
 using Ryujinx.HLE.Loaders.Executables;
 using Ryujinx.HLE.Loaders.Processes.Extensions;
 using System;
@@ -59,6 +61,8 @@ namespace Ryujinx.HLE.Loaders.Processes
                 {
                     _latestPid = processResult.ProcessId;
 
+                    TitleIDs.CurrentApplication.Value = processResult.ProgramIdText;
+
                     return true;
                 }
             }
@@ -86,6 +90,8 @@ namespace Ryujinx.HLE.Loaders.Processes
                 {
                     _latestPid = processResult.ProcessId;
 
+                    TitleIDs.CurrentApplication.Value = processResult.ProgramIdText;
+
                     return true;
                 }
             }
@@ -113,6 +119,8 @@ namespace Ryujinx.HLE.Loaders.Processes
                     if (processResult.ProgramId > 0x01000000000007FF)
                     {
                         _latestPid = processResult.ProcessId;
+
+                        TitleIDs.CurrentApplication.Value = processResult.ProgramIdText;
                     }
 
                     return true;
@@ -132,6 +140,8 @@ namespace Ryujinx.HLE.Loaders.Processes
                 {
                     _latestPid = processResult.ProcessId;
 
+                    TitleIDs.CurrentApplication.Value = processResult.ProgramIdText;
+
                     return true;
                 }
             }
@@ -183,14 +193,17 @@ namespace Ryujinx.HLE.Loaders.Processes
                     if (nacpData.Value.PresenceGroupId != 0)
                     {
                         programId = nacpData.Value.PresenceGroupId;
+                        TitleIDs.CurrentApplication.Value = programId.ToString("X16");
                     }
                     else if (nacpData.Value.SaveDataOwnerId != 0)
                     {
                         programId = nacpData.Value.SaveDataOwnerId;
+                        TitleIDs.CurrentApplication.Value = programId.ToString("X16");
                     }
                     else if (nacpData.Value.AddOnContentBaseId != 0)
                     {
                         programId = nacpData.Value.AddOnContentBaseId - 0x1000;
+                        TitleIDs.CurrentApplication.Value = programId.ToString("X16");
                     }
                 }
 
@@ -204,7 +217,7 @@ namespace Ryujinx.HLE.Loaders.Processes
             }
 
             // Explicitly null TitleId to disable the shader cache.
-            Graphics.Gpu.GraphicsConfig.TitleId = null;
+            GraphicsConfig.TitleId = null;
             _device.Gpu.HostInitalized.Set();
 
             ProcessResult processResult = ProcessLoaderHelper.LoadNsos(_device,

src/Ryujinx.HLE/Switch.cs

@@ -2,6 +2,7 @@ using LibHac.Common;
 using LibHac.Ns;
 using Ryujinx.Audio.Backends.CompatLayer;
 using Ryujinx.Audio.Integration;
+using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Graphics.Gpu;
 using Ryujinx.HLE.FileSystem;
@@ -17,6 +18,8 @@ namespace Ryujinx.HLE
 {
     public class Switch : IDisposable
     {
+        public static Switch Shared { get; private set; }
+        
         public HLEConfiguration Configuration { get; }
         public IHardwareDeviceDriver AudioDeviceDriver { get; }
         public MemoryBlock Memory { get; }
@@ -37,6 +40,8 @@ namespace Ryujinx.HLE
 
         public bool IsFrameAvailable => Gpu.Window.IsFrameAvailable;
 
+        public DirtyHacks DirtyHacks { get; }
+
         public Switch(HLEConfiguration configuration)
         {
             ArgumentNullException.ThrowIfNull(configuration.GpuRenderer);
@@ -72,8 +77,11 @@ namespace Ryujinx.HLE
             System.EnablePtc                        = Configuration.EnablePtc;
             System.FsIntegrityCheckLevel            = Configuration.FsIntegrityCheckLevel;
             System.GlobalAccessLogMode              = Configuration.FsGlobalAccessLogMode;
+            DirtyHacks                              = Configuration.Hacks;
             UpdateVSyncInterval();
 #pragma warning restore IDE0055
+
+            Shared = this;
         }
 
         public void ProcessFrame()
@@ -142,6 +150,9 @@ namespace Ryujinx.HLE
                 AudioDeviceDriver.Dispose();
                 FileSystem.Dispose();
                 Memory.Dispose();
+
+                TitleIDs.CurrentApplication.Value = null;
+                Shared = null;
             }
         }
     }

src/Ryujinx.Input.SDL2/SDL2GamepadDriver.cs

@@ -1,4 +1,3 @@
-using Ryujinx.Common.Logging;
 using Ryujinx.SDL2.Common;
 using System;
 using System.Collections.Generic;
@@ -37,7 +36,6 @@ namespace Ryujinx.Input.SDL2
             SDL2Driver.Instance.Initialize();
             SDL2Driver.Instance.OnJoyStickConnected += HandleJoyStickConnected;
             SDL2Driver.Instance.OnJoystickDisconnected += HandleJoyStickDisconnected;
-            SDL2Driver.Instance.OnJoyBatteryUpdated += HandleJoyBatteryUpdated;
 
             // Add already connected gamepads
             int numJoysticks = SDL_NumJoysticks();
@@ -85,30 +83,19 @@ namespace Ryujinx.Input.SDL2
 
         private void HandleJoyStickDisconnected(int joystickInstanceId)
         {
-            bool joyConPairDisconnected = false;
             if (!_gamepadsInstanceIdsMapping.Remove(joystickInstanceId, out string id))
                 return;
 
             lock (_lock)
             {
                 _gamepadsIds.Remove(id);
-                if (!SDL2JoyConPair.IsCombinable(_gamepadsIds))
-                {
-                    _gamepadsIds.Remove(SDL2JoyConPair.Id);
-                    joyConPairDisconnected = true;
-                }
             }
 
             OnGamepadDisconnected?.Invoke(id);
-            if (joyConPairDisconnected)
-            {
-                OnGamepadDisconnected?.Invoke(SDL2JoyConPair.Id);
-            }
         }
 
         private void HandleJoyStickConnected(int joystickDeviceId, int joystickInstanceId)
         {
-            bool joyConPairConnected = false;
             if (SDL_IsGameController(joystickDeviceId) == SDL_bool.SDL_TRUE)
             {
                 if (_gamepadsInstanceIdsMapping.ContainsKey(joystickInstanceId))
@@ -133,29 +120,13 @@ namespace Ryujinx.Input.SDL2
                             _gamepadsIds.Insert(joystickDeviceId, id);
                         else
                             _gamepadsIds.Add(id);
-                        if (SDL2JoyConPair.IsCombinable(_gamepadsIds))
-                        {
-                            _gamepadsIds.Remove(SDL2JoyConPair.Id);
-                            _gamepadsIds.Add(SDL2JoyConPair.Id);
-                            joyConPairConnected = true;
-                        }
                     }
 
                     OnGamepadConnected?.Invoke(id);
-                    if (joyConPairConnected)
-                    {
-                        OnGamepadConnected?.Invoke(SDL2JoyConPair.Id);
-                    }
                 }
             }
         }
 
-        private void HandleJoyBatteryUpdated(int joystickDeviceId, SDL_JoystickPowerLevel powerLevel)
-        {
-            Logger.Info?.Print(LogClass.Hid,
-                $"{SDL_GameControllerNameForIndex(joystickDeviceId)} power level: {powerLevel}");
-        }
-
         protected virtual void Dispose(bool disposing)
         {
             if (disposing)
@@ -186,14 +157,6 @@ namespace Ryujinx.Input.SDL2
 
         public IGamepad GetGamepad(string id)
         {
-            if (id == SDL2JoyConPair.Id)
-            {
-                lock (_lock)
-                {
-                    return SDL2JoyConPair.GetGamepad(_gamepadsIds);
-                }
-            }
-
             int joystickIndex = GetJoystickIndexByGamepadId(id);
 
             if (joystickIndex == -1)
@@ -202,16 +165,12 @@ namespace Ryujinx.Input.SDL2
             }
 
             nint gamepadHandle = SDL_GameControllerOpen(joystickIndex);
+
             if (gamepadHandle == nint.Zero)
             {
                 return null;
             }
 
-            if (SDL_GameControllerName(gamepadHandle).StartsWith(SDL2JoyCon.Prefix))
-            {
-                return new SDL2JoyCon(gamepadHandle, id);    
-            }
-
             return new SDL2Gamepad(gamepadHandle, id);
         }
     }

src/Ryujinx.Input.SDL2/SDL2JoyCon.cs

@@ -1,132 +0,0 @@
-using Ryujinx.Common.Configuration.Hid;
-using System.Numerics;
-
-namespace Ryujinx.Input.SDL2
-{
-    internal class SDL2JoyCon : IGamepad
-    {
-        readonly IGamepad _gamepad;
-        private enum JoyConType
-        {
-            Left , Right
-        }
-
-        public const string Prefix = "Nintendo Switch Joy-Con";
-        public const string LeftName = "Nintendo Switch Joy-Con (L)";
-        public const string RightName = "Nintendo Switch Joy-Con (R)";
-
-        private readonly JoyConType _joyConType;
-
-        public SDL2JoyCon(nint gamepadHandle, string driverId)
-        {
-            _gamepad = new SDL2Gamepad(gamepadHandle, driverId);
-            _joyConType = Name switch
-            {
-                LeftName => JoyConType.Left,
-                RightName => JoyConType.Right,
-                _ => JoyConType.Left
-            };
-        }
-
-        public Vector3 GetMotionData(MotionInputId inputId)
-        {
-            var motionData = _gamepad.GetMotionData(inputId);
-            return _joyConType switch
-            {
-                JoyConType.Left => new Vector3(-motionData.Z, motionData.Y, motionData.X),
-                JoyConType.Right => new Vector3(motionData.Z, motionData.Y, -motionData.X),
-                _ => Vector3.Zero
-            };
-        }
-
-        public void SetTriggerThreshold(float triggerThreshold)
-        {
-            _gamepad.SetTriggerThreshold(triggerThreshold);
-        }
-
-        public void SetConfiguration(InputConfig configuration)
-        {
-            _gamepad.SetConfiguration(configuration);
-        }
-
-        public void Rumble(float lowFrequency, float highFrequency, uint durationMs)
-        {
-            _gamepad.Rumble(lowFrequency, highFrequency, durationMs);
-        }
-
-        public GamepadStateSnapshot GetMappedStateSnapshot()
-        {
-            return GetStateSnapshot();
-        }
-
-        public GamepadStateSnapshot GetStateSnapshot()
-        {
-            return IGamepad.GetStateSnapshot(this);
-        }
-
-
-        public (float, float) GetStick(StickInputId inputId)
-        {
-            switch (inputId)
-            {
-                case StickInputId.Left when _joyConType == JoyConType.Left:
-                    {
-                        (float x, float y) = _gamepad.GetStick(inputId);
-                        return (y, -x);
-                    }
-                case StickInputId.Right when _joyConType == JoyConType.Right:
-                    {
-                        (float x, float y) = _gamepad.GetStick(StickInputId.Left);
-                        return (-y, x);
-                    }
-                default:
-                    return (0, 0);
-            }
-        }
-
-        public GamepadFeaturesFlag Features => _gamepad.Features;
-        public string Id => _gamepad.Id;
-        public string Name => _gamepad.Name;
-        public bool IsConnected => _gamepad.IsConnected;
-
-        public bool IsPressed(GamepadButtonInputId inputId)
-        {
-            return _joyConType switch
-            {
-                JoyConType.Left => inputId switch
-                {
-                    GamepadButtonInputId.LeftStick => _gamepad.IsPressed(GamepadButtonInputId.LeftStick),
-                    GamepadButtonInputId.DpadUp => _gamepad.IsPressed(GamepadButtonInputId.Y),
-                    GamepadButtonInputId.DpadDown => _gamepad.IsPressed(GamepadButtonInputId.A),
-                    GamepadButtonInputId.DpadLeft => _gamepad.IsPressed(GamepadButtonInputId.B),
-                    GamepadButtonInputId.DpadRight => _gamepad.IsPressed(GamepadButtonInputId.X),
-                    GamepadButtonInputId.Minus => _gamepad.IsPressed(GamepadButtonInputId.Start),
-                    GamepadButtonInputId.LeftShoulder => _gamepad.IsPressed(GamepadButtonInputId.Paddle2),
-                    GamepadButtonInputId.LeftTrigger => _gamepad.IsPressed(GamepadButtonInputId.Paddle4),
-                    GamepadButtonInputId.SingleRightTrigger0 => _gamepad.IsPressed(GamepadButtonInputId.RightShoulder),
-                    GamepadButtonInputId.SingleLeftTrigger0 => _gamepad.IsPressed(GamepadButtonInputId.LeftShoulder),
-                    _ => false
-                },
-                JoyConType.Right => inputId switch
-                {
-                    GamepadButtonInputId.RightStick => _gamepad.IsPressed(GamepadButtonInputId.LeftStick),
-                    GamepadButtonInputId.A => _gamepad.IsPressed(GamepadButtonInputId.B),
-                    GamepadButtonInputId.B => _gamepad.IsPressed(GamepadButtonInputId.Y),
-                    GamepadButtonInputId.X => _gamepad.IsPressed(GamepadButtonInputId.A),
-                    GamepadButtonInputId.Y => _gamepad.IsPressed(GamepadButtonInputId.X),
-                    GamepadButtonInputId.Plus => _gamepad.IsPressed(GamepadButtonInputId.Start),
-                    GamepadButtonInputId.RightShoulder => _gamepad.IsPressed(GamepadButtonInputId.Paddle1),
-                    GamepadButtonInputId.RightTrigger => _gamepad.IsPressed(GamepadButtonInputId.Paddle3),
-                    GamepadButtonInputId.SingleRightTrigger1 => _gamepad.IsPressed(GamepadButtonInputId.RightShoulder),
-                    GamepadButtonInputId.SingleLeftTrigger1 => _gamepad.IsPressed(GamepadButtonInputId.LeftShoulder),
-                    _ => false
-                }
-            };
-        }
-
-        public void Dispose()
-        {
-            _gamepad.Dispose();
-        }
-    }
-}

src/Ryujinx.Input.SDL2/SDL2JoyConPair.cs

@@ -1,142 +0,0 @@
-using Ryujinx.Common.Configuration.Hid;
-using Ryujinx.Common.Configuration.Hid.Controller;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Numerics;
-using static SDL2.SDL;
-
-namespace Ryujinx.Input.SDL2
-{
-    internal class SDL2JoyConPair(IGamepad left, IGamepad right) : IGamepad
-    {
-        private StandardControllerInputConfig _configuration;
-
-        private readonly StickInputId[] _stickUserMapping =
-        [
-            StickInputId.Unbound,
-            StickInputId.Left,
-            StickInputId.Right
-        ];
-
-        public GamepadFeaturesFlag Features => (left?.Features ?? GamepadFeaturesFlag.None) |
-                                               (right?.Features ?? GamepadFeaturesFlag.None);
-
-        public const string Id = "JoyConPair";
-        string IGamepad.Id => Id;
-
-        public string Name => "Nintendo Switch Joy-Con (L/R)";
-        public bool IsConnected => left is { IsConnected: true } && right is { IsConnected: true };
-
-        public void Dispose()
-        {
-            left?.Dispose();
-            right?.Dispose();
-        }
-
-        public GamepadStateSnapshot GetMappedStateSnapshot()
-        {
-            return GetStateSnapshot();
-        }
-
-        public Vector3 GetMotionData(MotionInputId inputId)
-        {
-            return inputId switch
-            {
-                MotionInputId.Accelerometer or
-                    MotionInputId.Gyroscope => left.GetMotionData(inputId),
-                MotionInputId.SecondAccelerometer => right.GetMotionData(MotionInputId.Accelerometer),
-                MotionInputId.SecondGyroscope => right.GetMotionData(MotionInputId.Gyroscope),
-                _ => Vector3.Zero
-            };
-        }
-
-        public GamepadStateSnapshot GetStateSnapshot()
-        {
-            return IGamepad.GetStateSnapshot(this);
-        }
-
-        public (float, float) GetStick(StickInputId inputId)
-        {
-            return inputId switch
-            {
-                StickInputId.Left => left.GetStick(StickInputId.Left),
-                StickInputId.Right => right.GetStick(StickInputId.Right),
-                _ => (0, 0)
-            };
-        }
-
-        public bool IsPressed(GamepadButtonInputId inputId)
-        {
-            return left.IsPressed(inputId) || right.IsPressed(inputId);
-        }
-
-        public void Rumble(float lowFrequency, float highFrequency, uint durationMs)
-        {
-            if (lowFrequency != 0)
-            {
-                right.Rumble(lowFrequency, lowFrequency, durationMs);
-            }
-
-            if (highFrequency != 0)
-            {
-                left.Rumble(highFrequency, highFrequency, durationMs);
-            }
-
-            if (lowFrequency == 0 && highFrequency == 0)
-            {
-                left.Rumble(0, 0, durationMs);
-                right.Rumble(0, 0, durationMs);
-            }
-        }
-
-        public void SetConfiguration(InputConfig configuration)
-        {
-            left.SetConfiguration(configuration);
-            right.SetConfiguration(configuration);
-        }
-
-        public void SetTriggerThreshold(float triggerThreshold)
-        {
-            left.SetTriggerThreshold(triggerThreshold);
-            right.SetTriggerThreshold(triggerThreshold);
-        }
-
-        public static bool IsCombinable(List<string> gamepadsIds)
-        {
-            (int leftIndex, int rightIndex) = DetectJoyConPair(gamepadsIds);
-            return leftIndex >= 0 && rightIndex >= 0;
-        }
-
-        private static (int leftIndex, int rightIndex) DetectJoyConPair(List<string> gamepadsIds)
-        {
-            var gamepadNames = gamepadsIds.Where(gamepadId => gamepadId != Id)
-                .Select((_, index) => SDL_GameControllerNameForIndex(index)).ToList();
-            int leftIndex = gamepadNames.IndexOf(SDL2JoyCon.LeftName);
-            int rightIndex = gamepadNames.IndexOf(SDL2JoyCon.RightName);
-
-            return (leftIndex, rightIndex);
-        }
-
-        public static IGamepad GetGamepad(List<string> gamepadsIds)
-        {
-            (int leftIndex, int rightIndex) = DetectJoyConPair(gamepadsIds);
-            if (leftIndex == -1 || rightIndex == -1)
-            {
-                return null;
-            }
-
-            nint leftGamepadHandle = SDL_GameControllerOpen(leftIndex);
-            nint rightGamepadHandle = SDL_GameControllerOpen(rightIndex);
-
-            if (leftGamepadHandle == nint.Zero || rightGamepadHandle == nint.Zero)
-            {
-                return null;
-            }
-
-
-            return new SDL2JoyConPair(new SDL2JoyCon(leftGamepadHandle, gamepadsIds[leftIndex]),
-                new SDL2JoyCon(rightGamepadHandle, gamepadsIds[rightIndex]));
-        }
-    }
-}

src/Ryujinx.Input/HLE/NpadController.cs

@@ -266,7 +266,6 @@ namespace Ryujinx.Input.HLE
             if (motionConfig.MotionBackend != MotionInputBackendType.CemuHook)
             {
                 _leftMotionInput = new MotionInput();
-                _rightMotionInput = new MotionInput();
             }
             else
             {
@@ -299,20 +298,7 @@ namespace Ryujinx.Input.HLE
 
                             if (controllerConfig.ControllerType == ConfigControllerType.JoyconPair)
                             {
-                                if (gamepad.Id== "JoyConPair")
-                                {
-                                    Vector3 rightAccelerometer = gamepad.GetMotionData(MotionInputId.SecondAccelerometer);
-                                    Vector3 rightGyroscope = gamepad.GetMotionData(MotionInputId.SecondGyroscope);
-
-                                    rightAccelerometer = new Vector3(rightAccelerometer.X, -rightAccelerometer.Z, rightAccelerometer.Y);
-                                    rightGyroscope = new Vector3(rightGyroscope.X, -rightGyroscope.Z, rightGyroscope.Y);
-
-                                    _rightMotionInput.Update(rightAccelerometer, rightGyroscope, (ulong)PerformanceCounter.ElapsedNanoseconds / 1000, controllerConfig.Motion.Sensitivity, (float)controllerConfig.Motion.GyroDeadzone);
-                                }
-                                else
-                                {
-                                    _rightMotionInput = _leftMotionInput;
-                                }
+                                _rightMotionInput = _leftMotionInput;
                             }
                         }
                     }
@@ -347,7 +333,6 @@ namespace Ryujinx.Input.HLE
                 // Reset states
                 State = default;
                 _leftMotionInput = null;
-                _rightMotionInput = null;
             }
         }
 

src/Ryujinx.Input/MotionInputId.cs

@@ -21,17 +21,5 @@ namespace Ryujinx.Input
         /// </summary>
         /// <remarks>Values are in degrees</remarks>
         Gyroscope,
-
-        /// <summary>
-        /// Second accelerometer.
-        /// </summary>
-        /// <remarks>Values are in m/s^2</remarks>
-        SecondAccelerometer,
-
-        /// <summary>
-        /// Second gyroscope.
-        /// </summary>
-        /// <remarks>Values are in degrees</remarks>
-        SecondGyroscope
     }
 }

src/Ryujinx.SDL2.Common/SDL2Driver.cs

@@ -25,17 +25,14 @@ namespace Ryujinx.SDL2.Common
 
         public static Action<Action> MainThreadDispatcher { get; set; }
 
-        private const uint SdlInitFlags = SDL_INIT_EVENTS | SDL_INIT_GAMECONTROLLER | SDL_INIT_JOYSTICK |
-                                          SDL_INIT_AUDIO | SDL_INIT_VIDEO;
+        private const uint SdlInitFlags = SDL_INIT_EVENTS | SDL_INIT_GAMECONTROLLER | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_VIDEO;
 
         private bool _isRunning;
         private uint _refereceCount;
         private Thread _worker;
 
-        private const uint SQL_JOYBATTERYUPDATED = 1543;
         public event Action<int, int> OnJoyStickConnected;
         public event Action<int> OnJoystickDisconnected;
-        public event Action<int, SDL_JoystickPowerLevel> OnJoyBatteryUpdated;
 
         private ConcurrentDictionary<uint, Action<SDL_Event>> _registeredWindowHandlers;
 
@@ -81,14 +78,12 @@ namespace Ryujinx.SDL2.Common
                 // First ensure that we only enable joystick events (for connected/disconnected).
                 if (SDL_GameControllerEventState(SDL_IGNORE) != SDL_IGNORE)
                 {
-                    Logger.Error?.PrintMsg(LogClass.Application,
-                        "Couldn't change the state of game controller events.");
+                    Logger.Error?.PrintMsg(LogClass.Application, "Couldn't change the state of game controller events.");
                 }
 
                 if (SDL_JoystickEventState(SDL_ENABLE) < 0)
                 {
-                    Logger.Error?.PrintMsg(LogClass.Application,
-                        $"Failed to enable joystick event polling: {SDL_GetError()}");
+                    Logger.Error?.PrintMsg(LogClass.Application, $"Failed to enable joystick event polling: {SDL_GetError()}");
                 }
 
                 // Disable all joysticks information, we don't need them no need to flood the event queue for that.
@@ -148,12 +143,7 @@ namespace Ryujinx.SDL2.Common
 
                 OnJoystickDisconnected?.Invoke(evnt.cbutton.which);
             }
-            else if ((uint)evnt.type == SQL_JOYBATTERYUPDATED)
-            {
-                OnJoyBatteryUpdated?.Invoke(evnt.cbutton.which, (SDL_JoystickPowerLevel)evnt.user.code);
-            }
-            else if (evnt.type is SDL_EventType.SDL_WINDOWEVENT or SDL_EventType.SDL_MOUSEBUTTONDOWN
-                     or SDL_EventType.SDL_MOUSEBUTTONUP)
+            else if (evnt.type is SDL_EventType.SDL_WINDOWEVENT or SDL_EventType.SDL_MOUSEBUTTONDOWN or SDL_EventType.SDL_MOUSEBUTTONUP)
             {
                 if (_registeredWindowHandlers.TryGetValue(evnt.window.windowID, out Action<SDL_Event> handler))
                 {

src/Ryujinx.UI.Common/Configuration/ConfigurationFileFormat.cs

@@ -17,7 +17,7 @@ namespace Ryujinx.UI.Common.Configuration
         /// <summary>
         /// The current version of the file format
         /// </summary>
-        public const int CurrentVersion = 57;
+        public const int CurrentVersion = 58;
 
         /// <summary>
         /// Version of the configuration file format
@@ -429,7 +429,17 @@ namespace Ryujinx.UI.Common.Configuration
         /// Uses Hypervisor over JIT if available
         /// </summary>
         public bool UseHypervisor { get; set; }
-
+        
+        /// <summary>
+        ///     Show toggles for dirty hacks in the UI.
+        /// </summary>
+        public bool ShowDirtyHacks { get; set; }
+        
+        /// <summary>
+        ///     The packed value of the enabled dirty hacks.
+        /// </summary>
+        public int EnabledDirtyHacks { get; set; }
+        
         /// <summary>
         /// Loads a configuration file from disk
         /// </summary>

src/Ryujinx.UI.Common/Configuration/ConfigurationState.Migration.cs

@@ -735,6 +735,9 @@ namespace Ryujinx.UI.Common.Configuration
             Multiplayer.DisableP2p.Value = configurationFileFormat.MultiplayerDisableP2p;
             Multiplayer.LdnPassphrase.Value = configurationFileFormat.MultiplayerLdnPassphrase;
             Multiplayer.LdnServer.Value = configurationFileFormat.LdnServer;
+            
+            Hacks.ShowDirtyHacks.Value = configurationFileFormat.ShowDirtyHacks;
+            Hacks.Xc2MenuSoftlockFix.Value = ((DirtyHacks)configurationFileFormat.EnabledDirtyHacks).HasFlag(DirtyHacks.Xc2MenuSoftlockFix);
 
             if (configurationFileUpdated)
             {

src/Ryujinx.UI.Common/Configuration/ConfigurationState.Model.cs

@@ -1,4 +1,5 @@
 using ARMeilleure;
+using Gommon;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
@@ -617,6 +618,49 @@ namespace Ryujinx.UI.Common.Configuration
             }
         }
 
+        public class HacksSection
+        {
+            /// <summary>
+            /// Show toggles for dirty hacks in the UI.
+            /// </summary>
+            public ReactiveObject<bool> ShowDirtyHacks { get; private set; }
+            
+            public ReactiveObject<bool> Xc2MenuSoftlockFix { get; private set; }
+
+            public HacksSection()
+            {
+                ShowDirtyHacks = new ReactiveObject<bool>();
+                Xc2MenuSoftlockFix = new ReactiveObject<bool>();
+                Xc2MenuSoftlockFix.Event += HackChanged;
+            }
+
+            private void HackChanged(object sender, ReactiveEventArgs<bool> rxe)
+            {
+                Ryujinx.Common.Logging.Logger.Info?.Print(LogClass.Configuration, $"EnabledDirtyHacks set to: {EnabledHacks}", "LogValueChange");
+            }
+
+            public DirtyHacks EnabledHacks
+            {
+                get
+                {
+                    DirtyHacks dirtyHacks = DirtyHacks.None;
+                    
+                    if (Xc2MenuSoftlockFix)
+                        Apply(DirtyHacks.Xc2MenuSoftlockFix);
+                    
+                    return dirtyHacks;
+
+                    void Apply(DirtyHacks hack)
+                    {
+                        if (dirtyHacks is not DirtyHacks.None)
+                            dirtyHacks |= hack;
+                        else
+                            dirtyHacks = hack;
+                    }
+                }
+            }
+        }
+
         /// <summary>
         /// The default configuration instance
         /// </summary>
@@ -651,6 +695,11 @@ namespace Ryujinx.UI.Common.Configuration
         /// The Multiplayer section
         /// </summary>
         public MultiplayerSection Multiplayer { get; private set; }
+        
+        /// <summary>
+        ///     The Dirty Hacks section
+        /// </summary>
+        public HacksSection Hacks { get; private set; }
 
         /// <summary>
         /// Enables or disables Discord Rich Presence
@@ -700,6 +749,7 @@ namespace Ryujinx.UI.Common.Configuration
             Graphics = new GraphicsSection();
             Hid = new HidSection();
             Multiplayer = new MultiplayerSection();
+            Hacks = new HacksSection();
             EnableDiscordIntegration = new ReactiveObject<bool>();
             CheckUpdatesOnStart = new ReactiveObject<bool>();
             ShowConfirmExit = new ReactiveObject<bool>();

src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs

@@ -138,6 +138,8 @@ namespace Ryujinx.UI.Common.Configuration
                 MultiplayerDisableP2p = Multiplayer.DisableP2p,
                 MultiplayerLdnPassphrase = Multiplayer.LdnPassphrase,
                 LdnServer = Multiplayer.LdnServer,
+                ShowDirtyHacks = Hacks.ShowDirtyHacks,
+                EnabledDirtyHacks = (int)Hacks.EnabledHacks,
             };
 
             return configurationFile;

src/Ryujinx.UI.Common/DiscordIntegrationModule.cs

@@ -2,6 +2,7 @@ using DiscordRPC;
 using Humanizer;
 using Humanizer.Localisation;
 using Ryujinx.Common;
+using Ryujinx.HLE;
 using Ryujinx.HLE.Loaders.Processes;
 using Ryujinx.UI.App.Common;
 using Ryujinx.UI.Common.Configuration;
@@ -44,6 +45,16 @@ namespace Ryujinx.UI.Common
             };
 
             ConfigurationState.Instance.EnableDiscordIntegration.Event += Update;
+            TitleIDs.CurrentApplication.Event += (_, e) =>
+            {
+                if (e.NewValue)
+                    SwitchToPlayingState(
+                        ApplicationLibrary.LoadAndSaveMetaData(e.NewValue),
+                        Switch.Shared.Processes.ActiveApplication
+                    );
+                else 
+                    SwitchToMainState();
+            };
         }
 
         private static void Update(object sender, ReactiveEventArgs<bool> evnt)
@@ -69,7 +80,7 @@ namespace Ryujinx.UI.Common
             }
         }
 
-        public static void SwitchToPlayingState(ApplicationMetadata appMeta, ProcessResult procRes)
+        private static void SwitchToPlayingState(ApplicationMetadata appMeta, ProcessResult procRes)
         {
             _discordClient?.SetPresence(new RichPresence
             {
@@ -88,7 +99,7 @@ namespace Ryujinx.UI.Common
             });
         }
 
-        public static void SwitchToMainState() => _discordClient?.SetPresence(_discordPresenceMain);
+        private static void SwitchToMainState() => _discordClient?.SetPresence(_discordPresenceMain);
 
         private static string TruncateToByteLength(string input)
         {

src/Ryujinx/AppHost.cs

@@ -311,6 +311,7 @@ namespace Ryujinx.Ava
                 Device.VSyncMode = e.NewValue;
                 Device.UpdateVSyncInterval();
             }
+            
             _renderer.Window?.ChangeVSyncMode(e.NewValue);
 
             _viewModel.ShowCustomVSyncIntervalPicker = (e.NewValue == VSyncMode.Custom);
@@ -577,7 +578,6 @@ namespace Ryujinx.Ava
         public void Stop()
         {
             _isActive = false;
-            DiscordIntegrationModule.SwitchToMainState();
         }
 
         private void Exit()
@@ -861,13 +861,11 @@ namespace Ryujinx.Ava
 
                 return false;
             }
-
-            ApplicationMetadata appMeta = ApplicationLibrary.LoadAndSaveMetaData(Device.Processes.ActiveApplication.ProgramIdText,
+            
+            ApplicationLibrary.LoadAndSaveMetaData(Device.Processes.ActiveApplication.ProgramIdText,
                 appMetadata => appMetadata.UpdatePreGame()
             );
 
-            DiscordIntegrationModule.SwitchToPlayingState(appMeta, Device.Processes.ActiveApplication);
-
             return true;
         }
 
@@ -923,7 +921,7 @@ namespace Ryujinx.Ava
             // Initialize Configuration.
             var memoryConfiguration = ConfigurationState.Instance.System.DramSize.Value;
 
-            Device = new HLE.Switch(new HLEConfiguration(
+            Device = new Switch(new HLEConfiguration(
                 VirtualFileSystem,
                 _viewModel.LibHacHorizonManager,
                 ContentManager,
@@ -953,7 +951,8 @@ namespace Ryujinx.Ava
                 ConfigurationState.Instance.Multiplayer.DisableP2p,
                 ConfigurationState.Instance.Multiplayer.LdnPassphrase,
                 ConfigurationState.Instance.Multiplayer.LdnServer,
-                ConfigurationState.Instance.Graphics.CustomVSyncInterval.Value));
+                ConfigurationState.Instance.Graphics.CustomVSyncInterval.Value,
+                ConfigurationState.Instance.Hacks.ShowDirtyHacks ? ConfigurationState.Instance.Hacks.EnabledHacks : DirtyHacks.None));
         }
 
         private static IHardwareDeviceDriver InitializeAudio()

src/Ryujinx/Assets/locales.json

@@ -17426,25 +17426,25 @@
       "ID": "TitleUpdateVersionLabel",
       "Translations": {
         "ar_SA": "الإصدار: {0}",
-        "de_DE": "Version {0} - {1}",
-        "el_GR": "Version {0} - {1}",
-        "en_US": "Version {0} - {1}",
-        "es_ES": "Versión {0} - {1}",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Version {0}",
+        "es_ES": "Versión {0}",
         "fr_FR": "",
-        "he_IL": "גרסה {0} - {1}",
-        "it_IT": "Versione {0} - {1}",
-        "ja_JP": "バージョン {0} - {1}",
-        "ko_KR": "버전 {0} - {1}",
-        "no_NO": "Versjon {0} - {1}",
-        "pl_PL": "Wersja {0} - {1}",
-        "pt_BR": "Versão {0} - {1}",
-        "ru_RU": "Версия {0} - {1}",
-        "sv_SE": "Version {0} - {1}",
-        "th_TH": "เวอร์ชั่น {0} - {1}",
-        "tr_TR": "Sürüm {0} - {1}",
-        "uk_UA": "Версія {0} - {1}",
-        "zh_CN": "游戏更新的版本 {0} - {1}",
-        "zh_TW": "版本 {0} - {1}"
+        "he_IL": "גרסה: {0}",
+        "it_IT": "Versione {0}",
+        "ja_JP": "バージョン {0}",
+        "ko_KR": "버전 {0}",
+        "no_NO": "Versjon {0}",
+        "pl_PL": "Wersja {0}",
+        "pt_BR": "Versão {0}",
+        "ru_RU": "Версия {0}",
+        "sv_SE": "Version {0}",
+        "th_TH": "เวอร์ชั่น {0}",
+        "tr_TR": "Sürüm {0}",
+        "uk_UA": "Версія {0}",
+        "zh_CN": "游戏更新的版本 {0}",
+        "zh_TW": "版本 {0}"
       }
     },
     {
@@ -22598,4 +22598,4 @@
       }
     }
   ]
-}
+}

src/Ryujinx/Ryujinx.csproj

@@ -139,4 +139,10 @@
   <ItemGroup>
     <AdditionalFiles Include="Assets\locales.json" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Update="UI\Views\Settings\SettingsHacksView.axaml.cs">
+      <DependentUpon>SettingsHacksView.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
 </Project>

src/Ryujinx/UI/ViewModels/BaseModel.cs

@@ -13,8 +13,9 @@ namespace Ryujinx.Ava.UI.ViewModels
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
         
-        protected void OnPropertiesChanged(params ReadOnlySpan<string> propertyNames)
+        protected void OnPropertiesChanged(string firstPropertyName, params ReadOnlySpan<string> propertyNames)
         {
+            OnPropertyChanged(firstPropertyName);
             foreach (var propertyName in propertyNames)
             {
                 OnPropertyChanged(propertyName);

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -1,6 +1,7 @@
 using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Threading;
+using Gommon;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.OpenAL;
 using Ryujinx.Audio.Backends.SDL2;
@@ -62,7 +63,9 @@ namespace Ryujinx.Ava.UI.ViewModels
         private int _networkInterfaceIndex;
         private int _multiplayerModeIndex;
         private string _ldnPassphrase;
-        private string _LdnServer;
+        private string _ldnServer;
+
+        private bool _xc2MenuSoftlockFix = ConfigurationState.Instance.Hacks.Xc2MenuSoftlockFix;
 
         public int ResolutionScale
         {
@@ -162,9 +165,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             get => _vSyncMode;
             set
             {
-                if (value == VSyncMode.Custom ||
-                    value == VSyncMode.Switch ||
-                    value == VSyncMode.Unbounded)
+                if (value is VSyncMode.Custom or VSyncMode.Switch or VSyncMode.Unbounded)
                 {
                     _vSyncMode = value;
                     OnPropertyChanged();
@@ -258,6 +259,8 @@ namespace Ryujinx.Ava.UI.ViewModels
         public bool UseHypervisor { get; set; }
         public bool DisableP2P { get; set; }
 
+        public bool ShowDirtyHacks => ConfigurationState.Instance.Hacks.ShowDirtyHacks;
+
         public string TimeZone { get; set; }
         public string ShaderDumpPath { get; set; }
 
@@ -274,6 +277,17 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
+        public bool Xc2MenuSoftlockFixEnabled
+        {
+            get => _xc2MenuSoftlockFix;
+            set
+            {
+                _xc2MenuSoftlockFix = value;
+                
+                OnPropertyChanged();
+            }
+        }
+
         public int Language { get; set; }
         public int Region { get; set; }
         public int FsGlobalAccessLogMode { get; set; }
@@ -374,10 +388,10 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public string LdnServer
         {
-            get => _LdnServer;
+            get => _ldnServer;
             set
             {
-                _LdnServer = value;
+                _ldnServer = value;
                 OnPropertyChanged();
             }
         }
@@ -746,6 +760,9 @@ namespace Ryujinx.Ava.UI.ViewModels
             config.Multiplayer.DisableP2p.Value = DisableP2P;
             config.Multiplayer.LdnPassphrase.Value = LdnPassphrase;
             config.Multiplayer.LdnServer.Value = LdnServer;
+            
+            // Dirty Hacks
+            config.Hacks.Xc2MenuSoftlockFix.Value = Xc2MenuSoftlockFixEnabled;
 
             config.ToFileFormat().SaveConfig(Program.ConfigurationPath);
 
@@ -779,5 +796,18 @@ namespace Ryujinx.Ava.UI.ViewModels
             RevertIfNotSaved();
             CloseWindow?.Invoke();
         }
+
+        public static string Xc2MenuFixTooltip { get; } = Lambda.String(sb =>
+        {
+            sb.AppendLine(
+                "This fix applies a 2ms delay (via 'Thread.Sleep(2)') every time the game tries to read data from the emulated Switch filesystem.")
+                .AppendLine();
+            
+            sb.AppendLine("From the issue on GitHub:").AppendLine();
+            sb.Append(
+                "When clicking very fast from game main menu to 2nd submenu, " +
+                "there is a low chance that the game will softlock, " +
+                "the submenu won't show up, while background music is still there.");
+        });
     }
 }

src/Ryujinx/UI/Views/Settings/SettingsHacksView.axaml

@@ -0,0 +1,48 @@
+<UserControl
+    x:Class="Ryujinx.Ava.UI.Views.Settings.SettingsHacksView"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
+    mc:Ignorable="d"
+    x:DataType="viewModels:SettingsViewModel">
+    <Design.DataContext>
+        <viewModels:SettingsViewModel />
+    </Design.DataContext>
+    <ScrollViewer
+        Name="HacksPage"
+        HorizontalAlignment="Stretch"
+        VerticalAlignment="Stretch"
+        HorizontalScrollBarVisibility="Disabled"
+        VerticalScrollBarVisibility="Auto">
+        <Border Classes="settings">
+            <StackPanel
+                Margin="10"
+                HorizontalAlignment="Center"
+                Orientation="Vertical"
+                Spacing="5">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    Classes="h1"
+                    Text="Dirty Hacks" />
+                <TextBlock
+                    Foreground="{DynamicResource SecondaryTextColor}"
+                    TextDecorations="Underline"
+                    Text="Game-specific hacks &amp; tricks to alleviate performance issues or crashing. May cause issues." />
+                <StackPanel
+                    Margin="0,10,0,0"
+                    Orientation="Horizontal"
+                    HorizontalAlignment="Center"
+                    ToolTip.Tip="{Binding Xc2MenuFixTooltip}">
+                    <CheckBox
+                        Margin="0"
+                        IsChecked="{Binding Xc2MenuSoftlockFixEnabled}"/>
+                    <TextBlock
+                        VerticalAlignment="Center"
+                        Text="Xenoblade Chronicles 2 Menu Softlock Fix" />
+                </StackPanel>
+            </StackPanel>
+        </Border>
+    </ScrollViewer>
+</UserControl>

src/Ryujinx/UI/Views/Settings/SettingsHacksView.axaml.cs

@@ -0,0 +1,17 @@
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.UI.Common.Configuration;
+
+namespace Ryujinx.Ava.UI.Views.Settings
+{
+    public partial class SettingsHacksView : UserControl
+    {
+        public SettingsViewModel ViewModel;
+        
+        public SettingsHacksView()
+        {
+            InitializeComponent();
+        }
+    }
+}

src/Ryujinx/UI/Windows/SettingsWindow.axaml

@@ -37,6 +37,7 @@
             <settings:SettingsAudioView Name="AudioPage" />
             <settings:SettingsNetworkView Name="NetworkPage" />
             <settings:SettingsLoggingView Name="LoggingPage" />
+            <settings:SettingsHacksView Name="HacksPage" />
         </Grid>
         <ui:NavigationView
             Grid.Row="1"
@@ -91,6 +92,11 @@
                     Content="{ext:Locale SettingsTabLogging}"
                     Tag="LoggingPage"
                     IconSource="Document" />
+                <ui:NavigationViewItem
+                    IsVisible="{Binding ShowDirtyHacks}"
+                    Content="Dirty Hacks"
+                    Tag="HacksPage"
+                    IconSource="Code" />
             </ui:NavigationView.MenuItems>
             <ui:NavigationView.Styles>
                 <Style Selector="Grid#PlaceholderGrid">

src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs

@@ -86,6 +86,10 @@ namespace Ryujinx.Ava.UI.Windows
                     case nameof(LoggingPage):
                         NavPanel.Content = LoggingPage;
                         break;
+                    case nameof(HacksPage):
+                        HacksPage.ViewModel = ViewModel;
+                        NavPanel.Content = HacksPage;
+                        break;
                     default:
                         throw new NotImplementedException();
                 }