Merge 6d78e71fc7 into 3ecc7819cc

Directory.Packages.props

@@ -3,6 +3,7 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
+    <PackageVersion Include="Alimer.Bindings.SDL" Version="3.7.1" />
     <PackageVersion Include="Avalonia" Version="11.0.13" />
     <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.13" />
     <PackageVersion Include="Avalonia.Desktop" Version="11.0.13" />

Ryujinx.sln

@@ -75,6 +75,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Horizon", "src\Ryuj
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Horizon.Kernel.Generators", "src\Ryujinx.Horizon.Kernel.Generators\Ryujinx.Horizon.Kernel.Generators.csproj", "{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.Input.SDL3", "src\Ryujinx.Input.SDL3\Ryujinx.Input.SDL3.csproj", "{3BF24278-547D-42C2-9D43-182B978F54DD}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.HLE.Generators", "src\Ryujinx.HLE.Generators\Ryujinx.HLE.Generators.csproj", "{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.Graphics.Metal", "src\Ryujinx.Graphics.Metal\Ryujinx.Graphics.Metal.csproj", "{C08931FA-1191-417A-864F-3882D93E683B}"
@@ -259,6 +261,10 @@ Global
 		{81EA598C-DBA1-40B0-8DA4-4796B78F2037}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{81EA598C-DBA1-40B0-8DA4-4796B78F2037}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{81EA598C-DBA1-40B0-8DA4-4796B78F2037}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3BF24278-547D-42C2-9D43-182B978F54DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3BF24278-547D-42C2-9D43-182B978F54DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3BF24278-547D-42C2-9D43-182B978F54DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3BF24278-547D-42C2-9D43-182B978F54DD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

docs/compatibility.csv

@@ -332,7 +332,6 @@
 0100E680149DC000,"Arcaea",,playable,2023-03-16 19:31:21
 01003C2010C78000,"Archaica: The Path Of Light",crash,nothing,2020-10-16 13:22:26
 01004DA012976000,"Area 86",,playable,2020-12-16 16:45:52
-01008d8006a6a000,"Arena of Valor",crash,boots,2025-02-03 22:19:34
 0100691013C46000,"ARIA CHRONICLE",,playable,2022-11-16 13:50:55
 0100D4A00B284000,"ARK: Survival Evolved",gpu;nvdec;online-broken;UE4;ldn-untested,ingame,2024-04-16 00:53:56
 0100C56012C96000,"Arkanoid vs. Space Invaders",services,ingame,2021-01-21 12:50:30
@@ -427,7 +426,6 @@
 0100E48013A34000,"Balan Wonderworld Demo",gpu;services;UE4;demo,ingame,2023-02-16 20:05:07
 0100CD801CE5E000,"Balatro",,ingame,2024-04-21 02:01:53
 010010A00DA48000,"Baldur's Gate and Baldur's Gate II: Enhanced Editions",32-bit,playable,2022-09-12 23:52:15
-0100fd1014726000,"Baldur's Gate: Dark Alliance",ldn-untested,ingame,2025-02-03 22:21:00
 0100BC400FB64000,"Balthazar's Dream",,playable,2022-09-13 00:13:22
 01008D30128E0000,"Bamerang",,playable,2022-10-26 00:29:39
 010013C010C5C000,"Banner of the Maid",,playable,2021-06-14 15:23:37
@@ -530,7 +528,6 @@
 01005950022EC000,"Blade Strangers",nvdec,playable,2022-07-17 19:02:43
 0100DF0011A6A000,"Bladed Fury",,playable,2022-10-26 11:36:26
 0100CFA00CC74000,"Blades of Time",deadlock;online,boots,2022-07-17 19:19:58
-01003d700dd8a000,"Blades",,boots,2025-02-03 22:22:00
 01006CC01182C000,"Blair Witch",nvdec;UE4,playable,2022-10-01 14:06:16
 010039501405E000,"Blanc",gpu;slow,ingame,2023-02-22 14:00:13
 0100698009C6E000,"Blasphemous",nvdec,playable,2021-03-01 12:15:31
@@ -958,7 +955,7 @@
 010012800EBAE000,"Disney TSUM TSUM FESTIVAL",crash,menus,2020-07-14 14:05:28
 01009740120FE000,"DISTRAINT 2",,playable,2020-09-03 16:08:12
 010075B004DD2000,"DISTRAINT: Deluxe Edition",,playable,2020-06-15 23:42:24
-010027400CDC6000,"Divinity: Original Sin 2 - Definitive Edition",services;crash;online-broken;regression,ingame,2025-02-03 22:12:30
+010027400CDC6000,"Divinity: Original Sin 2 - Definitive Edition",services;crash;online-broken;regression,menus,2023-08-13 17:20:03
 01001770115C8000,"Dodo Peak",nvdec;UE4,playable,2022-10-04 16:13:05
 010077B0100DA000,"Dogurai",,playable,2020-10-04 02:40:16
 010048100D51A000,"Dokapon Up! Mugen no Roulette",gpu;Needs Update,menus,2022-12-08 19:39:10
@@ -1657,7 +1654,7 @@
 0100A73006E74000,"Legendary Eleven",,playable,2021-06-08 12:09:03
 0100A7700B46C000,"Legendary Fishing",online,playable,2021-04-14 15:08:46
 0100739018020000,"LEGO® 2K Drive",gpu;ldn-works,ingame,2024-04-09 02:05:12
-010085500130a000,"LEGO® CITY Undercover",nvdec,playable,2024-09-30 08:44:27
+01003A30012C0000,"LEGO® CITY Undercover",nvdec,playable,2024-09-30 08:44:27
 010070D009FEC000,"LEGO® DC Super-Villains",,playable,2021-05-27 18:10:37
 010052A00B5D2000,"LEGO® Harry Potter™ Collection",crash,ingame,2024-01-31 10:28:07
 010073C01AF34000,"LEGO® Horizon Adventures™",vulkan-backend-bug;opengl-backend-bug;UE4,ingame,2025-01-07 04:24:56
@@ -1916,7 +1913,6 @@
 010073E008E6E000,"Mugsters",,playable,2021-01-28 17:57:17
 0100A8400471A000,"MUJO",,playable,2020-05-08 16:31:04
 0100211005E94000,"Mulaka",,playable,2021-01-28 18:07:20
-01008e2013fb4000,"Multi Quiz",ldn-untested,ingame,2025-02-03 22:26:00
 010038B00B9AE000,"Mummy Pinball",,playable,2022-08-05 16:08:11
 01008E200C5C2000,"Muse Dash",,playable,2020-06-06 14:41:29
 010035901046C000,"Mushroom Quest",,playable,2020-05-17 13:07:08
@@ -2032,7 +2028,6 @@
 010003C00B868000,"Ninjin: Clash of Carrots",online-broken,playable,2024-07-10 05:12:26
 0100746010E4C000,"NinNinDays",,playable,2022-11-20 15:17:29
 0100C9A00ECE6000,"Nintendo 64™ – Nintendo Switch Online",gpu;vulkan,ingame,2024-04-23 20:21:07
-0100e0601c632000,"Nintendo 64™ – Nintendo Switch Online: MATURE 17+",,ingame,2025-02-03 22:27:00
 0100D870045B6000,"Nintendo Entertainment System™ - Nintendo Switch Online",online,playable,2022-07-01 15:45:06
 0100C4B0034B2000,"Nintendo Labo Toy-Con 01 Variety Kit",gpu,ingame,2022-08-07 12:56:07
 01001E9003502000,"Nintendo Labo Toy-Con 03 Vehicle Kit",services;crash,menus,2022-08-03 17:20:11
@@ -2537,7 +2532,7 @@
 0100C3E00B700000,"SEGA AGES Space Harrier",,playable,2021-01-11 12:57:40
 010054400D2E6000,"SEGA AGES Virtua Racing",online-broken,playable,2023-01-29 17:08:39
 01001E700AC60000,"SEGA AGES Wonder Boy: Monster Land",online,playable,2021-05-05 16:28:25
-0100B3C014BDA000,"SEGA Genesis™ – Nintendo Switch Online",crash;regression,ingame,2025-02-03 22:13:30
+0100B3C014BDA000,"SEGA Genesis™ – Nintendo Switch Online",crash;regression,nothing,2022-04-11 07:27:21
 0100F7300B24E000,"SEGA Mega Drive Classics",online,playable,2021-01-05 11:08:00
 01009840046BC000,"Semispheres",,playable,2021-01-06 23:08:31
 0100D1800D902000,"SENRAN KAGURA Peach Ball",,playable,2021-06-03 15:12:10
@@ -2969,7 +2964,6 @@
 0100C38004DCC000,"The Flame In The Flood: Complete Edition",gpu;nvdec;UE4,ingame,2022-08-22 16:23:49
 010007700D4AC000,"The Forbidden Arts",,playable,2021-01-26 16:26:24
 010030700CBBC000,"The friends of Ringo Ishikawa",,playable,2022-08-22 16:33:17
-0100b620139d8000,"The Game of Life 2",ldn-untested,ingame,2025-02-03 22:30:00
 01006350148DA000,"The Gardener and the Wild Vines",gpu,ingame,2024-04-29 16:32:10
 0100B13007A6A000,"The Gardens Between",,playable,2021-01-29 16:16:53
 010036E00FB20000,"The Great Ace Attorney Chronicles",,playable,2023-06-22 21:26:29
@@ -2987,8 +2981,6 @@
 010015D003EE4000,"The Jackbox Party Pack 2",online-working,playable,2022-08-22 18:23:40
 0100CC80013D6000,"The Jackbox Party Pack 3",slow;online-working,playable,2022-08-22 18:41:06
 0100E1F003EE8000,"The Jackbox Party Pack 4",online-working,playable,2022-08-22 18:56:34
-01006fe0096ac000,"The Jackbox Party Pack 5",ldn-untested,boots,2025-02-03 22:32:00
-01005a400db52000,"The Jackbox Party Pack 6",ldn-untested,boots,2025-02-03 22:32:00
 010052C00B184000,"The Journey Down: Chapter One",nvdec,playable,2021-02-24 13:32:41
 01006BC00B188000,"The Journey Down: Chapter Three",nvdec,playable,2021-02-24 13:45:27
 01009AB00B186000,"The Journey Down: Chapter Two",nvdec,playable,2021-02-24 13:32:13
@@ -3167,7 +3159,6 @@
 010055E00CA68000,"Trine 4: The Nightmare Prince",gpu,nothing,2025-01-07 05:47:46
 0100D9000A930000,"Trine Enchanted Edition",ldn-untested;nvdec,playable,2021-06-03 11:28:15
 01002D7010A54000,"Trinity Trigger",crash,ingame,2023-03-03 03:09:09
-010020700a5e0000,"TRIVIAL PURSUIT Live!",ldn-untested,ingame,2025-02-03 22:35:00
 0100868013FFC000,"TRIVIAL PURSUIT Live! 2",,boots,2022-12-19 00:04:33
 0100F78002040000,"Troll and I™",gpu;nvdec,ingame,2021-06-04 16:58:50
 0100145011008000,"Trollhunters: Defenders of Arcadia",gpu;nvdec,ingame,2020-11-30 13:27:09
@@ -3217,7 +3208,6 @@
 0100AB2010B4C000,"Unlock The King",,playable,2020-09-01 13:58:27
 0100A3E011CB0000,"Unlock the King 2",,playable,2021-06-15 20:43:55
 01005AA00372A000,"UNO® for Nintendo Switch",nvdec;ldn-untested,playable,2022-07-28 14:49:47
-0100b6e012ebe000,"UNO",ldn-untested,ingame,2025-02-03 22:40:00
 0100E5D00CC0C000,"Unravel Two",nvdec,playable,2024-05-23 15:45:05
 010001300CC4A000,"Unruly Heroes",,playable,2021-01-07 18:09:31
 0100B410138C0000,"Unspottable",,playable,2022-10-25 19:28:49
@@ -3382,7 +3372,6 @@
 0100F47016F26000,"Yomawari 3",,playable,2022-05-10 08:26:51
 010012F00B6F2000,"Yomawari: The Long Night Collection",,playable,2022-09-03 14:36:59
 0100CC600ABB2000,"Yonder: The Cloud Catcher Chronicles (Retail Only)",,playable,2021-01-28 14:06:25
-0100534009ff2000,"Yonder: The Cloud Catcher Chronicles",,playable,2025-02-03 22:19:13
 0100BE50042F6000,"Yono and the Celestial Elephants",,playable,2021-01-28 18:23:58
 0100F110029C8000,"Yooka-Laylee",,playable,2021-01-28 14:21:45
 010022F00DA66000,"Yooka-Laylee and the Impossible Lair",,playable,2021-03-05 17:32:21

src/ARMeilleure/Memory/ReservedRegion.cs

@@ -7,7 +7,6 @@ namespace ARMeilleure.Memory
         public const int DefaultGranularity = 65536; // Mapping granularity in Windows.
 
         public IJitMemoryBlock Block { get; }
-        public IJitMemoryAllocator Allocator { get; }
 
         public nint Pointer => Block.Pointer;
 
@@ -22,7 +21,6 @@ namespace ARMeilleure.Memory
                 granularity = DefaultGranularity;
             }
 
-            Allocator = allocator;
             Block = allocator.Reserve(maxSize);
             _maxSize = maxSize;
             _sizeGranularity = granularity;

src/ARMeilleure/Translation/Cache/JitCache.cs

@@ -2,8 +2,6 @@ using ARMeilleure.CodeGen;
 using ARMeilleure.CodeGen.Unwinding;
 using ARMeilleure.Memory;
 using ARMeilleure.Native;
-using Humanizer;
-using Ryujinx.Common.Logging;
 using Ryujinx.Memory;
 using System;
 using System.Collections.Generic;
@@ -20,8 +18,9 @@ namespace ARMeilleure.Translation.Cache
         private static readonly int _pageMask = _pageSize - 1;
 
         private const int CodeAlignment = 4; // Bytes.
-        private const int CacheSize = 256 * 1024 * 1024;
+        private const int CacheSize = 2047 * 1024 * 1024;
 
+        private static ReservedRegion _jitRegion;
         private static JitCacheInvalidation _jitCacheInvalidator;
 
         private static CacheMemoryAllocator _cacheAllocator;
@@ -31,9 +30,6 @@ namespace ARMeilleure.Translation.Cache
         private static readonly Lock _lock = new();
         private static bool _initialized;
 
-        private static readonly List<ReservedRegion> _jitRegions = new();
-        private static int _activeRegionIndex = 0;
-
         [SupportedOSPlatform("windows")]
         [LibraryImport("kernel32.dll", SetLastError = true)]
         public static partial nint FlushInstructionCache(nint hProcess, nint lpAddress, nuint dwSize);
@@ -52,9 +48,7 @@ namespace ARMeilleure.Translation.Cache
                     return;
                 }
 
-                ReservedRegion firstRegion = new(allocator, CacheSize);
+                _jitRegion = new ReservedRegion(allocator, CacheSize);
-                _jitRegions.Add(firstRegion);
-                _activeRegionIndex = 0;
 
                 if (!OperatingSystem.IsWindows() && !OperatingSystem.IsMacOS())
                 {
@@ -65,9 +59,7 @@ namespace ARMeilleure.Translation.Cache
 
                 if (OperatingSystem.IsWindows())
                 {
-                    JitUnwindWindows.InstallFunctionTableHandler(
+                    JitUnwindWindows.InstallFunctionTableHandler(_jitRegion.Pointer, CacheSize, _jitRegion.Pointer + Allocate(_pageSize));
-                        firstRegion.Pointer, CacheSize, firstRegion.Pointer + Allocate(_pageSize)
-                    );
                 }
 
                 _initialized = true;
@@ -83,8 +75,8 @@ namespace ARMeilleure.Translation.Cache
                 Debug.Assert(_initialized);
 
                 int funcOffset = Allocate(code.Length);
-                ReservedRegion targetRegion = _jitRegions[_activeRegionIndex];
+
-                nint funcPtr = targetRegion.Pointer + funcOffset;
+                nint funcPtr = _jitRegion.Pointer + funcOffset;
 
                 if (OperatingSystem.IsMacOS() && RuntimeInformation.ProcessArchitecture == Architecture.Arm64)
                 {
@@ -98,9 +90,9 @@ namespace ARMeilleure.Translation.Cache
                 }
                 else
                 {
-                    ReprotectAsWritable(targetRegion, funcOffset, code.Length);
+                    ReprotectAsWritable(funcOffset, code.Length);
                     Marshal.Copy(code, 0, funcPtr, code.Length);
-                    ReprotectAsExecutable(targetRegion, funcOffset, code.Length);
+                    ReprotectAsExecutable(funcOffset, code.Length);
 
                     if (OperatingSystem.IsWindows() && RuntimeInformation.ProcessArchitecture == Architecture.Arm64)
                     {
@@ -124,83 +116,52 @@ namespace ARMeilleure.Translation.Cache
             {
                 Debug.Assert(_initialized);
 
-                foreach (ReservedRegion region in _jitRegions)
+                int funcOffset = (int)(pointer.ToInt64() - _jitRegion.Pointer.ToInt64());
+
+                if (TryFind(funcOffset, out CacheEntry entry, out int entryIndex) && entry.Offset == funcOffset)
                 {
-                    if (pointer.ToInt64() < region.Pointer.ToInt64() ||
+                    _cacheAllocator.Free(funcOffset, AlignCodeSize(entry.Size));
-                        pointer.ToInt64() >= (region.Pointer + CacheSize).ToInt64())
+                    _cacheEntries.RemoveAt(entryIndex);
-                    {
-                        continue;
-                    }
-
-                    int funcOffset = (int)(pointer.ToInt64() - region.Pointer.ToInt64());
-
-                    if (TryFind(funcOffset, out CacheEntry entry, out int entryIndex) && entry.Offset == funcOffset)
-                    {
-                        _cacheAllocator.Free(funcOffset, AlignCodeSize(entry.Size));
-                        _cacheEntries.RemoveAt(entryIndex);
-                    }
-
-                    return;
                 }
             }
         }
 
-        private static void ReprotectAsWritable(ReservedRegion region, int offset, int size)
+        private static void ReprotectAsWritable(int offset, int size)
         {
             int endOffs = offset + size;
+
             int regionStart = offset & ~_pageMask;
             int regionEnd = (endOffs + _pageMask) & ~_pageMask;
 
-            region.Block.MapAsRwx((ulong)regionStart, (ulong)(regionEnd - regionStart));
+            _jitRegion.Block.MapAsRwx((ulong)regionStart, (ulong)(regionEnd - regionStart));
         }
 
-        private static void ReprotectAsExecutable(ReservedRegion region, int offset, int size)
+        private static void ReprotectAsExecutable(int offset, int size)
         {
             int endOffs = offset + size;
+
             int regionStart = offset & ~_pageMask;
             int regionEnd = (endOffs + _pageMask) & ~_pageMask;
 
-            region.Block.MapAsRx((ulong)regionStart, (ulong)(regionEnd - regionStart));
+            _jitRegion.Block.MapAsRx((ulong)regionStart, (ulong)(regionEnd - regionStart));
         }
 
         private static int Allocate(int codeSize)
         {
             codeSize = AlignCodeSize(codeSize);
 
-            for (int i = _activeRegionIndex; i < _jitRegions.Count; i++)
+            int allocOffset = _cacheAllocator.Allocate(codeSize);
+
+            if (allocOffset < 0)
             {
-                int allocOffset = _cacheAllocator.Allocate(codeSize);
+                throw new OutOfMemoryException("JIT Cache exhausted.");
-        
-                if (allocOffset >= 0)
-                {
-                    _jitRegions[i].ExpandIfNeeded((ulong)allocOffset + (ulong)codeSize);
-                    _activeRegionIndex = i;
-                    return allocOffset;
-                }
             }
 
-            int exhaustedRegion = _activeRegionIndex;
+            _jitRegion.ExpandIfNeeded((ulong)allocOffset + (ulong)codeSize);
-            var newRegion = new ReservedRegion(_jitRegions[0].Allocator, CacheSize);
-            _jitRegions.Add(newRegion);
-            _activeRegionIndex = _jitRegions.Count - 1;
-            
-            int newRegionNumber = _activeRegionIndex;
 
-            Logger.Warning?.Print(LogClass.Cpu, $"JIT Cache Region {exhaustedRegion} exhausted, creating new Cache Region {newRegionNumber} ({((newRegionNumber + 1) * CacheSize).Bytes()} Total Allocation).");
+            return allocOffset;
-        
-            _cacheAllocator = new CacheMemoryAllocator(CacheSize);
-
-            int allocOffsetNew = _cacheAllocator.Allocate(codeSize);
-            if (allocOffsetNew < 0)
-            {
-                throw new OutOfMemoryException("Failed to allocate in new Cache Region!");
-            }
-
-            newRegion.ExpandIfNeeded((ulong)allocOffsetNew + (ulong)codeSize);
-            return allocOffsetNew;
         }
 
-
         private static int AlignCodeSize(int codeSize)
         {
             return checked(codeSize + (CodeAlignment - 1)) & ~(CodeAlignment - 1);
@@ -224,21 +185,18 @@ namespace ARMeilleure.Translation.Cache
         {
             lock (_lock)
             {
-                foreach (ReservedRegion _ in _jitRegions)
+                int index = _cacheEntries.BinarySearch(new CacheEntry(offset, 0, default));
+
+                if (index < 0)
                 {
-                    int index = _cacheEntries.BinarySearch(new CacheEntry(offset, 0, default));
+                    index = ~index - 1;
+                }
 
-                    if (index < 0)
+                if (index >= 0)
-                    {
+                {
-                        index = ~index - 1;
+                    entry = _cacheEntries[index];
-                    }
+                    entryIndex = index;
-
+                    return true;
-                    if (index >= 0)
-                    {
-                        entry = _cacheEntries[index];
-                        entryIndex = index;
-                        return true;
-                    }
                 }
             }
 

src/ARMeilleure/Translation/PTC/PtcProfiler.cs

@@ -144,15 +144,17 @@ namespace ARMeilleure.Translation.PTC
 
         public List<ulong> GetBlacklistedFunctions()
         {
-            List<ulong> funcs = [];
+            List<ulong> funcs = new List<ulong>();
 
-            foreach ((ulong ptr, FuncProfile funcProfile) in ProfiledFuncs)
+            foreach (var profiledFunc in ProfiledFuncs)
             {
-                if (!funcProfile.Blacklist)
+                if (profiledFunc.Value.Blacklist)
-                    continue;
+                {
-
+                    if (!funcs.Contains(profiledFunc.Key))
-                if (!funcs.Contains(ptr)) 
+                    {
-                    funcs.Add(ptr);
+                        funcs.Add(profiledFunc.Key);
+                    }
+                }
             }
 
             return funcs;

src/Ryujinx.Common/Configuration/Hid/Controller/Motion/JsonMotionConfigControllerConverter.cs

@@ -56,6 +56,7 @@ namespace Ryujinx.Common.Configuration.Hid.Controller.Motion
             return motionBackendType switch
             {
                 MotionInputBackendType.GamepadDriver => JsonSerializer.Deserialize(ref reader, _serializerContext.StandardMotionConfigController),
+                MotionInputBackendType.Handheld => JsonSerializer.Deserialize(ref reader, _serializerContext.StandardMotionConfigController),
                 MotionInputBackendType.CemuHook => JsonSerializer.Deserialize(ref reader, _serializerContext.CemuHookMotionConfigController),
                 _ => throw new InvalidOperationException($"Unknown backend type {motionBackendType}"),
             };
@@ -66,6 +67,7 @@ namespace Ryujinx.Common.Configuration.Hid.Controller.Motion
             switch (value.MotionBackend)
             {
                 case MotionInputBackendType.GamepadDriver:
+                case MotionInputBackendType.Handheld:
                     JsonSerializer.Serialize(writer, value as StandardMotionConfigController, _serializerContext.StandardMotionConfigController);
                     break;
                 case MotionInputBackendType.CemuHook:

src/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionInputBackendType.cs

@@ -9,5 +9,6 @@ namespace Ryujinx.Common.Configuration.Hid.Controller.Motion
         Invalid,
         GamepadDriver,
         CemuHook,
+        Handheld,
     }
 }

src/Ryujinx.Common/TitleIDs.cs

@@ -164,16 +164,15 @@ namespace Ryujinx.Common
             "0100ba0018500000", // Splatoon 3: Splatfest World Premiere
 
                           //NSO Membership games
+            "0100ccf019c8c000", // F-ZERO 99
             "0100c62011050000", // GB - Nintendo Switch Online
             "010012f017576000", // GBA - Nintendo Switch Online
             "0100c9a00ece6000", // N64 - Nintendo Switch Online
             "0100e0601c632000", // N64 - Nintendo Switch Online 18+
             "0100d870045b6000", // NES - Nintendo Switch Online
-            "0100b3c014bda000", // SEGA Genesis - Nintendo Switch Online
-            "01008d300c50c000", // SNES - Nintendo Switch Online
-            "0100ccf019c8c000", // F-ZERO 99
             "0100ad9012510000", // PAC-MAN 99
             "010040600c5ce000", // Tetris 99
+            "01008d300c50c000", // SNES - Nintendo Switch Online
             "0100277011f1a000", // Super Mario Bros. 35
 
                           //Misc Nintendo 1st party games

src/Ryujinx.Cpu/LightningJit/Cache/JitCache.cs

@@ -1,6 +1,4 @@
 using ARMeilleure.Memory;
-using Humanizer;
-using Ryujinx.Common.Logging;
 using Ryujinx.Memory;
 using System;
 using System.Collections.Generic;
@@ -17,8 +15,9 @@ namespace Ryujinx.Cpu.LightningJit.Cache
         private static readonly int _pageMask = _pageSize - 1;
 
         private const int CodeAlignment = 4; // Bytes.
-        private const int CacheSize = 256 * 1024 * 1024;
+        private const int CacheSize = 2047 * 1024 * 1024;
 
+        private static ReservedRegion _jitRegion;
         private static JitCacheInvalidation _jitCacheInvalidator;
 
         private static CacheMemoryAllocator _cacheAllocator;
@@ -27,8 +26,6 @@ namespace Ryujinx.Cpu.LightningJit.Cache
 
         private static readonly Lock _lock = new();
         private static bool _initialized;
-        private static readonly List<ReservedRegion> _jitRegions = new();
-        private static int _activeRegionIndex = 0;
 
         [SupportedOSPlatform("windows")]
         [LibraryImport("kernel32.dll", SetLastError = true)]
@@ -48,9 +45,7 @@ namespace Ryujinx.Cpu.LightningJit.Cache
                     return;
                 }
 
-                ReservedRegion firstRegion = new(allocator, CacheSize);
+                _jitRegion = new ReservedRegion(allocator, CacheSize);
-                _jitRegions.Add(firstRegion);
-                _activeRegionIndex = 0;
 
                 if (!OperatingSystem.IsWindows() && !OperatingSystem.IsMacOS())
                 {
@@ -70,8 +65,8 @@ namespace Ryujinx.Cpu.LightningJit.Cache
                 Debug.Assert(_initialized);
 
                 int funcOffset = Allocate(code.Length);
-                ReservedRegion targetRegion = _jitRegions[_activeRegionIndex];
+
-                nint funcPtr = targetRegion.Pointer + funcOffset;
+                nint funcPtr = _jitRegion.Pointer + funcOffset;
 
                 if (OperatingSystem.IsMacOS() && RuntimeInformation.ProcessArchitecture == Architecture.Arm64)
                 {
@@ -85,11 +80,18 @@ namespace Ryujinx.Cpu.LightningJit.Cache
                 }
                 else
                 {
-                    ReprotectAsWritable(targetRegion, funcOffset, code.Length);
+                    ReprotectAsWritable(funcOffset, code.Length);
-                    Marshal.Copy(code.ToArray(), 0, funcPtr, code.Length);
+                    code.CopyTo(new Span<byte>((void*)funcPtr, code.Length));
-                    ReprotectAsExecutable(targetRegion, funcOffset, code.Length);
+                    ReprotectAsExecutable(funcOffset, code.Length);
 
-                    _jitCacheInvalidator?.Invalidate(funcPtr, (ulong)code.Length);
+                    if (OperatingSystem.IsWindows() && RuntimeInformation.ProcessArchitecture == Architecture.Arm64)
+                    {
+                        FlushInstructionCache(Process.GetCurrentProcess().Handle, funcPtr, (nuint)code.Length);
+                    }
+                    else
+                    {
+                        _jitCacheInvalidator?.Invalidate(funcPtr, (ulong)code.Length);
+                    }
                 }
 
                 Add(funcOffset, code.Length);
@@ -104,80 +106,50 @@ namespace Ryujinx.Cpu.LightningJit.Cache
             {
                 Debug.Assert(_initialized);
 
-                foreach (ReservedRegion region in _jitRegions)
+                int funcOffset = (int)(pointer.ToInt64() - _jitRegion.Pointer.ToInt64());
+
+                if (TryFind(funcOffset, out CacheEntry entry, out int entryIndex) && entry.Offset == funcOffset)
                 {
-                    if (pointer.ToInt64() < region.Pointer.ToInt64() ||
+                    _cacheAllocator.Free(funcOffset, AlignCodeSize(entry.Size));
-                        pointer.ToInt64() >= (region.Pointer + CacheSize).ToInt64())
+                    _cacheEntries.RemoveAt(entryIndex);
-                    {
-                        continue;
-                    }
-
-                    int funcOffset = (int)(pointer.ToInt64() - region.Pointer.ToInt64());
-
-                    if (TryFind(funcOffset, out CacheEntry entry, out int entryIndex) && entry.Offset == funcOffset)
-                    {
-                        _cacheAllocator.Free(funcOffset, AlignCodeSize(entry.Size));
-                        _cacheEntries.RemoveAt(entryIndex);
-                    }
-
-                    return;
                 }
             }
         }
 
-        private static void ReprotectAsWritable(ReservedRegion region, int offset, int size)
+        private static void ReprotectAsWritable(int offset, int size)
         {
             int endOffs = offset + size;
+
             int regionStart = offset & ~_pageMask;
             int regionEnd = (endOffs + _pageMask) & ~_pageMask;
 
-            region.Block.MapAsRwx((ulong)regionStart, (ulong)(regionEnd - regionStart));
+            _jitRegion.Block.MapAsRwx((ulong)regionStart, (ulong)(regionEnd - regionStart));
         }
 
-        private static void ReprotectAsExecutable(ReservedRegion region, int offset, int size)
+        private static void ReprotectAsExecutable(int offset, int size)
         {
             int endOffs = offset + size;
+
             int regionStart = offset & ~_pageMask;
             int regionEnd = (endOffs + _pageMask) & ~_pageMask;
 
-            region.Block.MapAsRx((ulong)regionStart, (ulong)(regionEnd - regionStart));
+            _jitRegion.Block.MapAsRx((ulong)regionStart, (ulong)(regionEnd - regionStart));
         }
 
         private static int Allocate(int codeSize)
         {
             codeSize = AlignCodeSize(codeSize);
 
-            for (int i = _activeRegionIndex; i < _jitRegions.Count; i++)
+            int allocOffset = _cacheAllocator.Allocate(codeSize);
+
+            if (allocOffset < 0)
             {
-                int allocOffset = _cacheAllocator.Allocate(codeSize);
+                throw new OutOfMemoryException("JIT Cache exhausted.");
-        
-                if (allocOffset >= 0)
-                {
-                    _jitRegions[i].ExpandIfNeeded((ulong)allocOffset + (ulong)codeSize);
-                    _activeRegionIndex = i;
-                    return allocOffset;
-                }
             }
 
-            int exhaustedRegion = _activeRegionIndex;
+            _jitRegion.ExpandIfNeeded((ulong)allocOffset + (ulong)codeSize);
-            ReservedRegion newRegion = new(_jitRegions[0].Allocator, CacheSize);
-            _jitRegions.Add(newRegion);
-            _activeRegionIndex = _jitRegions.Count - 1;
-            
-            int newRegionNumber = _activeRegionIndex;
 
-            Logger.Warning?.Print(LogClass.Cpu, $"JIT Cache Region {exhaustedRegion} exhausted, creating new Cache Region {newRegionNumber} ({((newRegionNumber + 1) * CacheSize).Bytes()} Total Allocation).");
+            return allocOffset;
-        
-            _cacheAllocator = new CacheMemoryAllocator(CacheSize);
-
-            int allocOffsetNew = _cacheAllocator.Allocate(codeSize);
-            if (allocOffsetNew < 0)
-            {
-                throw new OutOfMemoryException("Failed to allocate in new Cache Region!");
-            }
-
-            newRegion.ExpandIfNeeded((ulong)allocOffsetNew + (ulong)codeSize);
-            return allocOffsetNew;
         }
 
         private static int AlignCodeSize(int codeSize)

src/Ryujinx.Cpu/LightningJit/Cache/NoWxCache.cs

@@ -12,7 +12,7 @@ namespace Ryujinx.Cpu.LightningJit.Cache
     {
         private const int CodeAlignment = 4; // Bytes.
         private const int SharedCacheSize = 2047 * 1024 * 1024;
-        private const int LocalCacheSize = 256 * 1024 * 1024;
+        private const int LocalCacheSize = 128 * 1024 * 1024;
 
         // How many calls to the same function we allow until we pad the shared cache to force the function to become available there
         // and allow the guest to take the fast path.

src/Ryujinx.Graphics.Vulkan/Vendor.cs

@@ -1,4 +1,5 @@
 using Silk.NET.Vulkan;
+using System.Text.RegularExpressions;
 
 namespace Ryujinx.Graphics.Vulkan
 {

src/Ryujinx.HLE/HOS/Applets/Error/ErrorApplet.cs

@@ -15,6 +15,7 @@ using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
+using System.Text.RegularExpressions;
 
 namespace Ryujinx.HLE.HOS.Applets.Error
 {

src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/Impl/WinSockHelper.cs

@@ -150,7 +150,6 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             { BsdSocketOption.SoLinger,      SocketOptionName.Linger },
             { BsdSocketOption.SoOobInline,   SocketOptionName.OutOfBandInline },
             { BsdSocketOption.SoReusePort,   SocketOptionName.ReuseAddress },
-            { BsdSocketOption.SoNoSigpipe,   SocketOptionName.DontLinger },
             { BsdSocketOption.SoSndBuf,      SocketOptionName.SendBuffer },
             { BsdSocketOption.SoRcvBuf,      SocketOptionName.ReceiveBuffer },
             { BsdSocketOption.SoSndLoWat,    SocketOptionName.SendLowWater },

src/Ryujinx.Horizon/HorizonStatic.cs

@@ -1,5 +1,5 @@
+using MsgPack;
 using Ryujinx.Horizon.Common;
-using Ryujinx.Horizon.Prepo.Types;
 using Ryujinx.Memory;
 using System;
 using System.Threading;
@@ -8,7 +8,7 @@ namespace Ryujinx.Horizon
 {
     public static class HorizonStatic
     {
-        internal static void HandlePlayReport(PlayReport report) => 
+        internal static void HandlePlayReport(MessagePackObject report) => 
             new Thread(() => PlayReport?.Invoke(report))
             {
                 Name = "HLE.PlayReportEvent", 
@@ -16,7 +16,7 @@ namespace Ryujinx.Horizon
                 Priority = ThreadPriority.AboveNormal
             }.Start();
         
-        public static event Action<PlayReport> PlayReport;
+        public static event Action<MessagePackObject> PlayReport;
 
         [field: ThreadStatic]
         public static HorizonOptions Options { get; private set; }

src/Ryujinx.Horizon/Prepo/Ipc/PrepoService.cs

@@ -1,3 +1,4 @@
+using Gommon;
 using MsgPack;
 using MsgPack.Serialization;
 using Ryujinx.Common.Logging;
@@ -11,12 +12,19 @@ using Ryujinx.Horizon.Sdk.Sf;
 using Ryujinx.Horizon.Sdk.Sf.Hipc;
 using System;
 using System.Text;
+using System.Threading;
 using ApplicationId = Ryujinx.Horizon.Sdk.Ncm.ApplicationId;
 
 namespace Ryujinx.Horizon.Prepo.Ipc
 {
     partial class PrepoService : IPrepoService
     {
+        enum PlayReportKind
+        {
+            Normal,
+            System,
+        }
+
         private readonly ArpApi _arp;
         private readonly PrepoServicePermissionLevel _permissionLevel;
         private ulong _systemSessionId;
@@ -188,17 +196,10 @@ namespace Ryujinx.Horizon.Prepo.Ipc
             {
                 return PrepoResult.InvalidBufferSize;
             }
-            
+
             StringBuilder builder = new();
             MessagePackObject deserializedReport = MessagePackSerializer.UnpackMessagePackObject(reportBuffer.ToArray());
 
-            PlayReport playReport = new()
-            {
-                Kind = playReportKind, 
-                Room = gameRoom,
-                ReportData = deserializedReport
-            };
-            
             builder.AppendLine();
             builder.AppendLine("PlayReport log:");
             builder.AppendLine($" Kind: {playReportKind}");
@@ -208,12 +209,10 @@ namespace Ryujinx.Horizon.Prepo.Ipc
             if (pid != 0)
             {
                 builder.AppendLine($" Pid: {pid}");
-                playReport.Pid = pid;
             }
             else
             {
                 builder.AppendLine($" ApplicationId: {applicationId}");
-                playReport.AppId = applicationId;
             }
 
             Result result = _arp.GetApplicationInstanceId(out ulong applicationInstanceId, pid);
@@ -224,20 +223,17 @@ namespace Ryujinx.Horizon.Prepo.Ipc
 
             _arp.GetApplicationLaunchProperty(out ApplicationLaunchProperty applicationLaunchProperty, applicationInstanceId).AbortOnFailure();
 
-            playReport.Version = applicationLaunchProperty.Version;
-            
             builder.AppendLine($" ApplicationVersion: {applicationLaunchProperty.Version}");
 
             if (!userId.IsNull)
             {
                 builder.AppendLine($" UserId: {userId}");
-                playReport.UserId = userId;
             }
 
             builder.AppendLine($" Room: {gameRoom}");
             builder.AppendLine($" Report: {MessagePackObjectFormatter.Format(deserializedReport)}");
             
-            HorizonStatic.HandlePlayReport(playReport);
+            HorizonStatic.HandlePlayReport(deserializedReport);
 
             Logger.Info?.Print(LogClass.ServicePrepo, builder.ToString());
 

src/Ryujinx.Horizon/Prepo/Types/PlayReport.cs

@@ -1,24 +0,0 @@
-using MsgPack;
-using Ryujinx.Horizon.Sdk.Account;
-using Ryujinx.Horizon.Sdk.Ncm;
-
-namespace Ryujinx.Horizon.Prepo.Types
-{
-    public struct PlayReport
-    {
-        public PlayReportKind Kind { get; init; }
-        public string Room { get; init; }
-        public MessagePackObject ReportData { get; init; }
-        
-        public ApplicationId? AppId;
-        public ulong? Pid;
-        public uint Version;
-        public Uid? UserId;
-    }
-    
-    public enum PlayReportKind
-    {
-        Normal,
-        System,
-    }
-}

src/Ryujinx.Input.SDL3/Ryujinx.Input.SDL3.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Ryujinx.Input\Ryujinx.Input.csproj" />
+    <PackageReference Include="Alimer.Bindings.SDL" />
+  </ItemGroup>
+
+</Project>

src/Ryujinx.Input.SDL3/SDL3MotionDriver.cs

@@ -0,0 +1,85 @@
+using SDL3;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using static SDL3.SDL3;
+
+namespace Ryujinx.Input.SDL3
+{
+    public unsafe class SDL3MotionDriver : IHandheld, IDisposable
+    {
+        private readonly Dictionary<SDL_SensorType, SDL_Sensor> sensors;
+        private bool _disposed;
+
+        public SDL3MotionDriver()
+        {
+            int result = SDL_Init(SDL_InitFlags.Sensor);
+            if (result < 0)
+            {
+                throw new InvalidOperationException($"SDL sensor initialization failed: {SDL_GetError()}");
+            }
+            sensors = SDL_GetSensors().ToArray().ToDictionary(SDL_GetSensorTypeForID, SDL_OpenSensor);
+        }
+
+        ~SDL3MotionDriver()
+        {
+            Dispose(false);
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (_disposed)
+            {
+                return;
+            }
+
+            if (disposing && sensors != null)
+            {
+                foreach (var sensor in sensors.Values)
+                {
+                    if (sensor != IntPtr.Zero)
+                    {
+                        SDL_CloseSensor(sensor);
+                    }
+                }
+            }
+
+            _disposed = true;
+        }
+
+        public Vector3 GetMotionData(MotionInputId inputType)
+        {
+            ObjectDisposedException.ThrowIf(_disposed, this);
+
+            return inputType switch
+            {
+                MotionInputId.Gyroscope => GetSensorVector(SDL_SensorType.Gyro) * 180 / MathF.PI,
+                MotionInputId.Accelerometer => GetSensorVector(SDL_SensorType.Accel) / SDL_STANDARD_GRAVITY,
+                _ => Vector3.Zero
+            };
+        }
+
+        private Vector3 GetSensorVector(SDL_SensorType sensorType)
+        {
+            if (!sensors.TryGetValue(sensorType, out SDL_Sensor sensor))
+            {
+                return Vector3.Zero;
+            }
+
+            var data = stackalloc float[3];
+            if (SDL_GetSensorData(sensor, data, 3) < 0)
+            {
+                return Vector3.Zero;
+            }
+
+            return new Vector3(data[0], data[1], data[2]);
+        }
+    }
+}

src/Ryujinx.Input/HLE/InputManager.cs

@@ -2,12 +2,13 @@ using System;
 
 namespace Ryujinx.Input.HLE
 {
-    public class InputManager(IGamepadDriver keyboardDriver, IGamepadDriver gamepadDriver)
+    public class InputManager(IGamepadDriver keyboardDriver, IGamepadDriver gamepadDriver, IHandheld handheld)
         : IDisposable
     {
         public IGamepadDriver KeyboardDriver { get; } = keyboardDriver;
         public IGamepadDriver GamepadDriver { get; } = gamepadDriver;
         public IGamepadDriver MouseDriver { get; private set; }
+        public IHandheld Handheld { get; } = handheld;
 
         public void SetMouseDriver(IGamepadDriver mouseDriver)
         {
@@ -18,7 +19,7 @@ namespace Ryujinx.Input.HLE
 
         public NpadManager CreateNpadManager()
         {
-            return new NpadManager(KeyboardDriver, GamepadDriver, MouseDriver);
+            return new NpadManager(KeyboardDriver, GamepadDriver, MouseDriver, Handheld);
         }
 
         public TouchScreenManager CreateTouchScreenManager()
@@ -38,6 +39,7 @@ namespace Ryujinx.Input.HLE
                 KeyboardDriver?.Dispose();
                 GamepadDriver?.Dispose();
                 MouseDriver?.Dispose();
+                Handheld?.Dispose();
             }
         }
 

src/Ryujinx.Input/HLE/NpadController.cs

@@ -218,12 +218,14 @@ namespace Ryujinx.Input.HLE
         public string Id { get; private set; }
 
         private readonly CemuHookClient _cemuHookClient;
+        private readonly IHandheld _handheld;
 
-        public NpadController(CemuHookClient cemuHookClient)
+        public NpadController(CemuHookClient cemuHookClient, IHandheld handheld)
         {
             State = default;
             Id = null;
             _cemuHookClient = cemuHookClient;
+            _handheld = handheld;
         }
 
         public bool UpdateDriverConfiguration(IGamepadDriver gamepadDriver, InputConfig config)
@@ -287,6 +289,18 @@ namespace Ryujinx.Input.HLE
 
                 if (_config is StandardControllerInputConfig controllerConfig && controllerConfig.Motion.EnableMotion)
                 {
+                    if (controllerConfig.Motion.MotionBackend == MotionInputBackendType.Handheld)
+                    {
+                        Vector3 accelerometer = _handheld.GetMotionData(MotionInputId.Accelerometer);
+                        Vector3 gyroscope = _handheld.GetMotionData(MotionInputId.Gyroscope);
+
+                        accelerometer = new Vector3(accelerometer.X, -accelerometer.Z, accelerometer.Y);
+                        gyroscope = new Vector3(gyroscope.X, -gyroscope.Z, gyroscope.Y);
+
+                        _leftMotionInput.Update(accelerometer, gyroscope, (ulong)PerformanceCounter.ElapsedNanoseconds / 1000, controllerConfig.Motion.Sensitivity, (float)controllerConfig.Motion.GyroDeadzone);
+                        _rightMotionInput = _leftMotionInput;
+                    }
+
                     if (controllerConfig.Motion.MotionBackend == MotionInputBackendType.GamepadDriver)
                     {
                         if (gamepad.Features.HasFlag(GamepadFeaturesFlag.Motion))

src/Ryujinx.Input/HLE/NpadManager.cs

@@ -31,6 +31,7 @@ namespace Ryujinx.Input.HLE
         private readonly IGamepadDriver _keyboardDriver;
         private readonly IGamepadDriver _gamepadDriver;
         private readonly IGamepadDriver _mouseDriver;
+        private readonly IHandheld _handheld;
         private bool _isDisposed;
 
         private List<InputConfig> _inputConfig;
@@ -38,7 +39,7 @@ namespace Ryujinx.Input.HLE
         private bool _enableMouse;
         private Switch _device;
 
-        public NpadManager(IGamepadDriver keyboardDriver, IGamepadDriver gamepadDriver, IGamepadDriver mouseDriver)
+        public NpadManager(IGamepadDriver keyboardDriver, IGamepadDriver gamepadDriver, IGamepadDriver mouseDriver, IHandheld handheld)
         {
             _controllers = new NpadController[MaxControllers];
             _cemuHookClient = new CemuHookClient(this);
@@ -47,6 +48,7 @@ namespace Ryujinx.Input.HLE
             _gamepadDriver = gamepadDriver;
             _mouseDriver = mouseDriver;
             _inputConfig = [];
+            _handheld = handheld;
 
             _gamepadDriver.OnGamepadConnected += HandleOnGamepadConnected;
             _gamepadDriver.OnGamepadDisconnected += HandleOnGamepadDisconnected;
@@ -139,7 +141,7 @@ namespace Ryujinx.Input.HLE
                     }
                     else
                     {
-                        controller = new(_cemuHookClient);
+                        controller = new(_cemuHookClient, _handheld);
                     }
 
                     bool isValid = DriverConfigurationUpdate(ref controller, inputConfigEntry);

src/Ryujinx.Input/IHandheld.cs

@@ -0,0 +1,10 @@
+using System;
+using System.Numerics;
+
+namespace Ryujinx.Input
+{
+    public interface IHandheld : IDisposable
+    {
+        Vector3 GetMotionData(MotionInputId gyroscope);
+    }
+}

src/Ryujinx/Assets/locales.json

@@ -584,7 +584,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "UI를 숨긴 상태에서 게임 시작",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -1543,7 +1543,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "由 {0} 开发",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -1576,50 +1576,50 @@
       "ID": "GameListHeaderTimePlayed",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "Spielzeit:",
+        "de_DE": "Spielzeit: {0}",
-        "el_GR": "Χρόνος:",
+        "el_GR": "Χρόνος: {0}",
-        "en_US": "Play Time:",
+        "en_US": "Play Time: {0}",
-        "es_ES": "Tiempo jugado:",
+        "es_ES": "Tiempo jugado: {0}",
-        "fr_FR": "Temps de jeu:",
+        "fr_FR": "Temps de jeu: {0}",
         "he_IL": "",
-        "it_IT": "Tempo di gioco:",
+        "it_IT": "Tempo di gioco: {0}",
-        "ja_JP": "プレイ時間:",
+        "ja_JP": "プレイ時間: {0}",
-        "ko_KR": "플레이 타임:",
+        "ko_KR": "플레이 타임: {0}",
-        "no_NO": "Spilletid:",
+        "no_NO": "Spilletid: {0}",
-        "pl_PL": "Czas w grze:",
+        "pl_PL": "Czas w grze: {0}",
-        "pt_BR": "Tempo de jogo:",
+        "pt_BR": "Tempo de jogo: {0}",
-        "ru_RU": "Время в игре:",
+        "ru_RU": "Время в игре: {0}",
-        "sv_SE": "Speltid:",
+        "sv_SE": "Speltid: {0}",
-        "th_TH": "เล่นไปแล้ว:",
+        "th_TH": "เล่นไปแล้ว: {0}",
-        "tr_TR": "Oynama Süresi:",
+        "tr_TR": "Oynama Süresi: {0}",
-        "uk_UA": "Зіграно часу:",
+        "uk_UA": "Зіграно часу: {0}",
-        "zh_CN": "游玩时长:",
+        "zh_CN": "游玩时长: {0}",
-        "zh_TW": "遊玩時數:"
+        "zh_TW": "遊玩時數: {0}"
       }
     },
     {
       "ID": "GameListHeaderLastPlayed",
       "Translations": {
         "ar_SA": "",
-        "de_DE": "Zuletzt gespielt: ",
+        "de_DE": "Zuletzt gespielt: {0}",
-        "el_GR": "Παίχτηκε: ",
+        "el_GR": "Παίχτηκε: {0}",
-        "en_US": "Last Played:",
+        "en_US": "Last Played: {0}",
-        "es_ES": "Jugado por última vez:",
+        "es_ES": "Jugado por última vez: {0}",
-        "fr_FR": "Dernière partie jouée:",
+        "fr_FR": "Dernière partie jouée: {0}",
         "he_IL": "",
-        "it_IT": "Ultima partita:",
+        "it_IT": "Ultima partita: {0}",
-        "ja_JP": "最終プレイ日時:",
+        "ja_JP": "最終プレイ日時: {0}",
-        "ko_KR": "마지막 플레이:",
+        "ko_KR": "마지막 플레이: {0}",
-        "no_NO": "Sist Spilt:",
+        "no_NO": "Sist Spilt: {0}",
-        "pl_PL": "Ostatnio grane:",
+        "pl_PL": "Ostatnio grane: {0}",
-        "pt_BR": "Último jogo:",
+        "pt_BR": "Último jogo: {0}",
-        "ru_RU": "Последний запуск:",
+        "ru_RU": "Последний запуск: {0}",
-        "sv_SE": "Senast spelad:",
+        "sv_SE": "Senast spelad: {0}",
-        "th_TH": "เล่นล่าสุด:",
+        "th_TH": "เล่นล่าสุด: {0}",
-        "tr_TR": "Son Oynama Tarihi:",
+        "tr_TR": "Son Oynama Tarihi: {0}",
-        "uk_UA": "Востаннє зіграно:",
+        "uk_UA": "Востаннє зіграно: {0}",
-        "zh_CN": "最近游玩:",
+        "zh_CN": "最近游玩: {0}",
-        "zh_TW": "最近遊玩:"
+        "zh_TW": "最近遊玩: {0}"
       }
     },
     {
@@ -1843,7 +1843,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "兼容性:",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -1868,7 +1868,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "标题 ID:",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -1893,7 +1893,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "服务的游戏: {0}",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -1918,7 +1918,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "在线玩家: {0}",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -2259,7 +2259,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "PPTC 캐시 제거",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -2268,7 +2268,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "清理 PPTC 缓存",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -2284,7 +2284,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "앱의 모든 PPTC 캐시 파일 삭제",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -2293,7 +2293,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "删除应用程序的所有 PPTC 缓存",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -2609,7 +2609,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "선택한 DLC 파일에서 RomFS 추출",
+        "ko_KR": "",
         "no_NO": "Pakk ut RomFS filene fra valgt DLC fil",
         "pl_PL": "",
         "pt_BR": "",
@@ -2759,7 +2759,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "호환성 항목 표시",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -2768,7 +2768,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "显示兼容性项目",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -2784,7 +2784,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "일반적으로 도움말 메뉴를 통해 접근할 수 있는 호환성 목록에 선택한 게임을 표시합니다.",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -2793,7 +2793,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "在兼容性列表中显示选定的游戏,您通常可以通过帮助菜单访问。",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -2809,7 +2809,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "게임 통계 표시",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -2818,7 +2818,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "显示游戏信息",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -2834,7 +2834,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "그리드 보기 레이아웃에서 누락된 현재 선택된 게임에 대한 다양한 정보를 표시합니다.",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -2843,7 +2843,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "显示当前选定游戏的状态与详细信息。",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -3350,101 +3350,26 @@
     {
       "ID": "SettingsTabGeneralCheckUpdatesOnLaunch",
       "Translations": {
-        "ar_SA": "",
+        "ar_SA": "التحقق من وجود تحديثات عند التشغيل",
-        "de_DE": "",
+        "de_DE": "Beim Start nach Updates suchen",
-        "el_GR": "",
+        "el_GR": "Έλεγχος για Ενημερώσεις στην Εκκίνηση",
-        "en_US": "Check for Updates:",
+        "en_US": "Check for Updates on Launch",
-        "es_ES": "",
+        "es_ES": "Buscar actualizaciones al iniciar",
-        "fr_FR": "",
+        "fr_FR": "Vérifier les mises à jour au démarrage",
-        "he_IL": "",
+        "he_IL": "בדוק אם קיימים עדכונים בהפעלה",
-        "it_IT": "",
+        "it_IT": "Controlla aggiornamenti all'avvio",
-        "ja_JP": "",
+        "ja_JP": "起動時にアップデートを確認する",
-        "ko_KR": "",
+        "ko_KR": "시작 시, 업데이트 확인",
-        "no_NO": "",
+        "no_NO": "Se etter oppdateringer ved oppstart",
-        "pl_PL": "",
+        "pl_PL": "Sprawdzaj aktualizacje przy uruchomieniu",
-        "pt_BR": "",
+        "pt_BR": "Verificar se há atualizações ao iniciar",
-        "ru_RU": "",
+        "ru_RU": "Проверять наличие обновлений при запуске",
-        "sv_SE": "",
+        "sv_SE": "Leta efter uppdatering vid uppstart",
-        "th_TH": "",
+        "th_TH": "ตรวจหาการอัปเดตเมื่อเปิดโปรแกรม",
-        "tr_TR": "",
+        "tr_TR": "Her Açılışta Güncellemeleri Denetle",
-        "uk_UA": "",
+        "uk_UA": "Перевіряти наявність оновлень під час запуску",
-        "zh_CN": "",
+        "zh_CN": "启动时检查更新",
-        "zh_TW": ""
+        "zh_TW": "啟動時檢查更新"
-      }
-    },
-    {
-      "ID": "SettingsTabGeneralCheckUpdatesOnLaunchOff",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Off",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
-    {
-      "ID": "SettingsTabGeneralCheckUpdatesOnLaunchPromptAtStartup",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Prompt",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
-    {
-      "ID": "SettingsTabGeneralCheckUpdatesOnLaunchBackground",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Background",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
       }
     },
     {
@@ -3684,7 +3609,7 @@
         "he_IL": "",
         "it_IT": "Aggiornamenti e DLC che fanno riferimento a file mancanti verranno disabilitati automaticamente",
         "ja_JP": "",
-        "ko_KR": "누락된 파일을 참조하는 DLC 및 업데이트가 자동으로 불러오기 취소",
+        "ko_KR": "누락된 파일을 참조하는 DLC 및 업데이트가 자동으로 언로드",
         "no_NO": "DLC og oppdateringer som henviser til manglende filer, vil bli lastet ned automatisk",
         "pl_PL": "",
         "pt_BR": "DLCs e Atualizações que se referem a arquivos ausentes serão descarregadas automaticamente",
@@ -4459,7 +4384,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "스웨덴어",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -4484,7 +4409,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "노르웨이어",
+        "ko_KR": "",
         "no_NO": "Norsk",
         "pl_PL": "",
         "pt_BR": "",
@@ -4559,7 +4484,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "매치 시스템 시간",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -4568,7 +4493,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "与系统时间同步",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -5822,31 +5747,6 @@
         "zh_TW": "啟用客體日誌"
       }
     },
-    {
-      "ID": "SettingsTabLoggingEnableAvaloniaLogs",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Enable UI Logs",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
     {
       "ID": "SettingsTabLoggingEnableFsAccessLogs",
       "Translations": {
@@ -6222,56 +6122,6 @@
         "zh_TW": "關閉"
       }
     },
-    {
-      "ID": "SettingsButtonReset",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Reset Settings",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "重置设置",
-        "zh_TW": ""
-      }
-    },
-    {
-      "ID": "SettingsButtonResetConfirm",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "I want to reset my settings.",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "我要重置我的设置。",
-        "zh_TW": ""
-      }
-    },
     {
       "ID": "SettingsButtonOk",
       "Translations": {
@@ -7997,6 +7847,31 @@
         "zh_TW": "使用與 CemuHook 相容的體感"
       }
     },
+    {
+      "ID": "ControllerSettingsMotionUseHandheldCompatibleMotion",
+      "Translations": {
+        "ar_SA": "استخدام الحركة المتوافقة مع Hendheld",
+        "de_DE": "Hendheld kompatible Bewegungssteuerung",
+        "el_GR": "Κίνηση συμβατή με Hendheld",
+        "en_US": "Use Hendheld compatible motion",
+        "es_ES": "Usar movimiento compatible con Hendheld",
+        "fr_FR": "Utiliser un capteur de mouvements Hendheld",
+        "he_IL": "השתמש בתנועת Hendheld תואמת ",
+        "it_IT": "Usa sensore compatibile con Hendheld",
+        "ja_JP": "Hendheld 互換モーションを使用",
+        "ko_KR": "Hendheld 호환 모션 사용",
+        "no_NO": "Bruk Hendheld kompatibel bevegelse",
+        "pl_PL": "Użyj ruchu zgodnego z Hendheld",
+        "pt_BR": "Usar sensor compatível com Hendheld",
+        "ru_RU": "Включить совместимость с Hendheld",
+        "sv_SE": "Använd Hendheld-kompatibel rörelse",
+        "th_TH": "ใช้การเคลื่อนไหวที่เข้ากันได้กับ Hendheld",
+        "tr_TR": "Hendheld uyumlu hareket kullan",
+        "uk_UA": "Використовувати рух, сумісний з Hendheld",
+        "zh_CN": "使用 Hendheld 兼容的体感协议",
+        "zh_TW": "使用與 Hendheld 相容的體感"
+      }
+    },
     {
       "ID": "ControllerSettingsMotionControllerSlot",
       "Translations": {
@@ -8184,7 +8059,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "비활성화",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -8209,7 +8084,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "레인보우",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -8234,7 +8109,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "레인보우 속도",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -8243,7 +8118,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "彩虹滚动速度",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -8259,7 +8134,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "색상",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -13509,7 +13384,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "다음에서 모든 PPTC 데이터를 제거하려고 합니다:\n\n{0}\n\n계속하시겠습니까?",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -13518,7 +13393,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "您正要清理 PPTC 数据:\n\n{0}\n\n您确实要继续吗?",
+        "zh_CN": "",
         "zh_TW": ""
       }
     },
@@ -16822,31 +16697,6 @@
         "zh_TW": "謹慎使用"
       }
     },
-    {
-      "ID": "AvaloniaLogTooltip",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Prints Avalonia (UI) log messages in the console.",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
     {
       "ID": "OpenGlLogLevel",
       "Translations": {
@@ -19534,7 +19384,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "LED 설정",
+        "ko_KR": "",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -22459,7 +22309,7 @@
         "he_IL": "ממשק רשת",
         "it_IT": "Interfaccia di rete:",
         "ja_JP": "ネットワークインタフェース:",
-        "ko_KR": "네트워크 인터페이스 :",
+        "ko_KR": "네트워크 인터페이스:",
         "no_NO": "Nettverksgrensesnitt",
         "pl_PL": "Interfejs sieci:",
         "pt_BR": "Interface de rede:",
@@ -23434,7 +23284,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "최종 업데이트 : {0}",
+        "ko_KR": "",
         "no_NO": "Sist oppdatert: {0}",
         "pl_PL": "",
         "pt_BR": "",
@@ -23672,131 +23522,6 @@
         "zh_TW": "無法啟動"
       }
     },
-    {
-      "ID": "CompatibilityListPlayableTooltip",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Boots and plays without any crashes or GPU bugs of any kind, and at a speed fast enough to reasonably enjoy on an average PC.",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "启动和游戏时不会出现任何崩溃或任何类型的 GPU bug 且速度足够快可以在一般 PC 上尽情游玩。",
-        "zh_TW": ""
-      }
-    },
-    {
-      "ID": "CompatibilityListIngameTooltip",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Boots and goes in-game but suffers from one or more of the following: crashes, deadlocks, GPU bugs, distractingly bad audio, or is simply too slow. Game still might able to be played all the way through, but not as the game is intended to play.",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "可以成功启动并进入游戏但可能会遇到以下一种或多种问题: 崩溃、卡死、GPU bug、令人无法接受的音频,或者只是太慢。仍然可以继续进行游戏,但是可能无法达到预期。",
-        "zh_TW": ""
-      }
-    },
-    {
-      "ID": "CompatibilityListMenusTooltip",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Boots and goes past the title screen but does not make it into main gameplay.",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "可以启动并通过标题画面但是无法进入到主要的游戏流程。",
-        "zh_TW": ""
-      }
-    },
-    {
-      "ID": "CompatibilityListBootsTooltip",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Boots but does not make it past the title screen.",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "可以启动但是无法通过标题画面。",
-        "zh_TW": ""
-      }
-    },
-    {
-      "ID": "CompatibilityListNothingTooltip",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Does not boot or shows no signs of activity.",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "无法启动或显示无任何动静。",
-        "zh_TW": ""
-      }
-    },
     {
       "ID": "ExtractAocListHeader",
       "Translations": {
@@ -23809,7 +23534,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "추출할 DLC 선택",
+        "ko_KR": "",
         "no_NO": "Velg en DLC og hente ut",
         "pl_PL": "",
         "pt_BR": "",
@@ -23821,56 +23546,6 @@
         "zh_CN": "选择一个要解压的 DLC",
         "zh_TW": ""
       }
-    },
-    {
-      "ID": "GameInfoRpcImage",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Rich Presence Image",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "Rich Presence 图像",
-        "zh_TW": ""
-      }
-    },
-    {
-      "ID": "GameInfoRpcDynamic",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Dynamic Rich Presence",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "动态 Rich Presence",
-        "zh_TW": ""
-      }
     }
   ]
-}
+}

src/Ryujinx/DiscordIntegrationModule.cs

@@ -1,15 +1,19 @@
 using DiscordRPC;
 using Gommon;
+using MsgPack;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Ava.Utilities.Configuration;
-using Ryujinx.Ava.Utilities.PlayReport;
 using Ryujinx.Common;
+using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
 using Ryujinx.HLE;
 using Ryujinx.HLE.Loaders.Processes;
 using Ryujinx.Horizon;
-using Ryujinx.Horizon.Prepo.Types;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
 using System.Text;
 
 namespace Ryujinx.Ava
@@ -37,9 +41,6 @@ namespace Ryujinx.Ava
         private static RichPresence _discordPresencePlaying;
         private static ApplicationMetadata _currentApp;
 
-        public static bool HasAssetImage(string titleId) => TitleIDs.DiscordGameAssetKeys.ContainsIgnoreCase(titleId);
-        public static bool HasAnalyzer(string titleId) => PlayReports.Analyzer.TitleIds.ContainsIgnoreCase(titleId);
-
         public static void Initialize()
         {
             _discordPresenceMain = new RichPresence
@@ -123,22 +124,20 @@ namespace Ryujinx.Ava
             _currentApp = null;
         }
 
-        private static void HandlePlayReport(PlayReport playReport)
+        private static void HandlePlayReport(MessagePackObject playReport)
         {
             if (_discordClient is null) return;
             if (!TitleIDs.CurrentApplication.Value.HasValue) return;
             if (_discordPresencePlaying is null) return;
 
-            FormattedValue formattedValue =
+            PlayReportAnalyzer.FormattedValue formattedValue =
-                PlayReports.Analyzer.Format(TitleIDs.CurrentApplication.Value, _currentApp, playReport);
+                PlayReport.Analyzer.Format(TitleIDs.CurrentApplication.Value, _currentApp, playReport);
 
             if (!formattedValue.Handled) return;
 
-            _discordPresencePlaying.Details = TruncateToByteLength(
+            _discordPresencePlaying.Details = formattedValue.Reset 
-                formattedValue.Reset
+                ? $"Playing {_currentApp.Title}" 
-                    ? $"Playing {_currentApp.Title}"
+                : formattedValue.FormattedString;
-                    : formattedValue.FormattedString
-            );
 
             if (_discordClient.CurrentPresence.Details.Equals(_discordPresencePlaying.Details))
                 return; //don't trigger an update if the set presence Details are identical to current

src/Ryujinx/Headless/HeadlessRyujinx.cs

@@ -23,6 +23,7 @@ using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.Input;
 using Ryujinx.Input.HLE;
 using Ryujinx.Input.SDL2;
+using Ryujinx.Input.SDL3;
 using Ryujinx.SDL2.Common;
 using System;
 using System.Collections.Generic;
@@ -182,7 +183,7 @@ namespace Ryujinx.Headless
             _accountManager = new AccountManager(_libHacHorizonManager.RyujinxClient, option.UserProfile);
             _userChannelPersistence = new UserChannelPersistence();
 
-            _inputManager = new InputManager(new SDL2KeyboardDriver(), new SDL2GamepadDriver());
+            _inputManager = new InputManager(new SDL2KeyboardDriver(), new SDL2GamepadDriver(), new SDL3MotionDriver());
 
             GraphicsConfig.EnableShaderCache = !option.DisableShaderCache;
 

src/Ryujinx/Headless/Options.cs

@@ -387,7 +387,7 @@ namespace Ryujinx.Headless
         [Option("graphics-shaders-dump-path", Required = false, HelpText = "Dumps shaders in this local directory. (Developer only)")]
         public string GraphicsShadersDumpPath { get; set; }
 
-        [Option("graphics-backend", Required = false, Default = GraphicsBackend.Vulkan, HelpText = "Change Graphics Backend to use.")]
+        [Option("graphics-backend", Required = false, Default = GraphicsBackend.OpenGl, HelpText = "Change Graphics Backend to use.")]
         public GraphicsBackend GraphicsBackend { get; set; }
 
         [Option("preferred-gpu-vendor", Required = false, Default = "", HelpText = "When using the Vulkan backend, prefer using the GPU from the specified vendor.")]

src/Ryujinx/Ryujinx.csproj

@@ -76,6 +76,7 @@
     <ProjectReference Include="..\Ryujinx.Graphics.Metal\Ryujinx.Graphics.Metal.csproj" />
     <ProjectReference Include="..\Ryujinx.Input\Ryujinx.Input.csproj" />
     <ProjectReference Include="..\Ryujinx.Input.SDL2\Ryujinx.Input.SDL2.csproj" />
+    <ProjectReference Include="..\Ryujinx.Input.SDL3\Ryujinx.Input.SDL3.csproj" />
     <ProjectReference Include="..\Ryujinx.Audio.Backends.OpenAL\Ryujinx.Audio.Backends.OpenAL.csproj" />
     <ProjectReference Include="..\Ryujinx.Audio.Backends.SoundIo\Ryujinx.Audio.Backends.SoundIo.csproj" />
     <ProjectReference Include="..\Ryujinx.Common\Ryujinx.Common.csproj" />

src/Ryujinx/UI/Controls/ApplicationDataView.axaml

@@ -4,7 +4,6 @@
              xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
              xmlns:ext="using:Ryujinx.Ava.Common.Markup"
              xmlns:viewModels="using:Ryujinx.Ava.UI.ViewModels"
-             xmlns:ui="using:FluentAvalonia.UI.Controls"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Ryujinx.Ava.UI.Controls.ApplicationDataView"
@@ -42,12 +41,13 @@
                             HorizontalAlignment="Left"
                             Orientation="Vertical"
                             Spacing="5">
-                    <StackPanel Orientation="Horizontal" IsVisible="{Binding AppData.HasPlayabilityInfo}">
+                    <StackPanel Orientation="Horizontal">
                         <TextBlock Padding="0, 0, 5, 0" Text="{ext:Locale GameListHeaderCompatibilityStatus}" />
                         <Button
                             Click="PlayabilityStatus_OnClick"
                             HorizontalContentAlignment="Left"
                             VerticalAlignment="Center"
+                            IsVisible="{Binding AppData.HasPlayabilityInfo}"
                             Background="{DynamicResource AppListBackgroundColor}"
                             Padding="0">
                             <TextBlock
@@ -56,20 +56,7 @@
                                 Text="{Binding AppData.LocalizedStatus}"
                                 Foreground="{Binding AppData.PlayabilityStatus, Converter={x:Static helpers:PlayabilityStatusConverter.Shared}}"
                                 TextAlignment="Start"
-                                TextWrapping="Wrap">
+                                TextWrapping="Wrap" />
-                                <ToolTip.Tip>
-                                    <StackPanel Orientation="Vertical">
-                                        <TextBlock 
-                                            Text="{Binding AppData.LocalizedStatusTooltip}" />
-                                        <Separator 
-                                            Margin="0, 10, 0, 10" 
-                                            IsVisible="{Binding AppData.HasCompatibilityLabels}" />
-                                        <TextBlock 
-                                            IsVisible="{Binding AppData.HasCompatibilityLabels}"
-                                            Text="{Binding AppData.FormattedCompatibilityLabels}" />
-                                    </StackPanel>
-                                </ToolTip.Tip>
-                            </TextBlock>
                             <Button.Styles>
                                 <Style Selector="Button">
                                     <Setter Property="MinWidth"
@@ -98,49 +85,6 @@
                 </StackPanel>
             </Grid>
             <Separator Margin="0, 10, 0, 10" Height="1" BorderBrush="Gray" Background="Gray" />
-            <StackPanel Orientation="Vertical" Spacing="5">
-                <StackPanel Orientation="Horizontal" Spacing="5">
-                    <ui:SymbolIcon Foreground="ForestGreen" Symbol="Checkmark" IsVisible="{Binding AppData.HasRichPresenceAsset}"/>
-                    <TextBlock
-                        Foreground="ForestGreen"
-                        HorizontalAlignment="Stretch"
-                        IsVisible="{Binding AppData.HasRichPresenceAsset}"
-                        Text="{ext:Locale GameInfoRpcImage}"
-                        TextAlignment="Start"
-                        TextWrapping="Wrap" >
-                    </TextBlock>
-                    <ui:SymbolIcon Foreground="Red" Symbol="Cancel" IsVisible="{Binding !AppData.HasRichPresenceAsset}"/>
-                    <TextBlock
-                        Foreground="Red"
-                        HorizontalAlignment="Stretch"
-                        IsVisible="{Binding !AppData.HasRichPresenceAsset}"
-                        Text="{ext:Locale GameInfoRpcImage}"
-                        TextAlignment="Start"
-                        TextWrapping="Wrap" >
-                    </TextBlock>
-                </StackPanel>
-                <StackPanel Orientation="Horizontal" Spacing="5">
-                    <ui:SymbolIcon Foreground="ForestGreen" Symbol="Checkmark" IsVisible="{Binding AppData.HasDynamicRichPresenceSupport}"/>
-                    <TextBlock
-                        Foreground="ForestGreen"
-                        HorizontalAlignment="Stretch"
-                        IsVisible="{Binding AppData.HasDynamicRichPresenceSupport}"
-                        Text="{ext:Locale GameInfoRpcDynamic}"
-                        TextAlignment="Start"
-                        TextWrapping="Wrap" >
-                    </TextBlock>
-                    <ui:SymbolIcon Foreground="Red" Symbol="Cancel" IsVisible="{Binding !AppData.HasDynamicRichPresenceSupport}"/>
-                    <TextBlock
-                        Foreground="Red"
-                        HorizontalAlignment="Stretch"
-                        IsVisible="{Binding !AppData.HasDynamicRichPresenceSupport}"
-                        Text="{ext:Locale GameInfoRpcDynamic}"
-                        TextAlignment="Start"
-                        TextWrapping="Wrap" >
-                    </TextBlock>
-                </StackPanel>
-            </StackPanel>
-            <Separator Margin="0, 10, 0, 10" Height="1" BorderBrush="Gray" Background="Gray" />
             <TextBlock
                 HorizontalAlignment="Stretch"
                 IsVisible="{Binding AppData.HasLdnGames}"
@@ -148,35 +92,22 @@
                 TextAlignment="Start"
                 TextWrapping="Wrap" />
             <Separator IsVisible="{Binding AppData.HasLdnGames}" Margin="0, 10, 0, 10" Height="1" BorderBrush="Gray" Background="Gray" />
-            <StackPanel Orientation="Vertical" Spacing="5">
+            <StackPanel
-                <Grid 
+                HorizontalAlignment="Left"
-                    ColumnDefinitions="Auto,*,Auto">
+                VerticalAlignment="Top"
-                    <TextBlock 
+                Orientation="Vertical"
-                        Grid.Column="0"
+                Spacing="5">
-                        Text="{ext:Locale GameListHeaderLastPlayed}"
+                <TextBlock
-                        VerticalAlignment="Top"
+                    HorizontalAlignment="Stretch"
-                        TextAlignment="Start"
+                    Text="{Binding FormattedLastPlayed}"
-                        TextWrapping="NoWrap" />
+                    TextAlignment="Start"
-                    <TextBlock 
+                    TextWrapping="Wrap" />
-                        Grid.Column="2"
+                <TextBlock
-                        Text="{Binding AppData.LastPlayedString}"
+                    HorizontalAlignment="Stretch"
-                        TextAlignment="End"
+                    Text="{Binding FormattedPlayTime}"
-                        TextWrapping="Wrap" />
+                    IsVisible="{Binding AppData.HasPlayedPreviously}"
-                </Grid>
+                    TextAlignment="Start"
-                <Grid 
+                    TextWrapping="Wrap" />
-                    ColumnDefinitions="Auto,*,Auto"
-                    IsVisible="{Binding AppData.HasPlayedPreviously}">
-                    <TextBlock 
-                        Grid.Column="0"
-                        Text="{ext:Locale GameListHeaderTimePlayed}"
-                        VerticalAlignment="Top"
-                        TextAlignment="Start"
-                        TextWrapping="NoWrap" />
-                    <TextBlock Grid.Column="2"
-                        Text="{Binding AppData.TimePlayedString}"
-                        TextAlignment="End"
-                        TextWrapping="Wrap" />
-                </Grid>
             </StackPanel>
         </StackPanel>
     </StackPanel>

src/Ryujinx/UI/Controls/ApplicationDataView.axaml.cs

@@ -1,9 +1,12 @@
-using Avalonia.Controls;
+using Avalonia;
+using Avalonia.Controls;
 using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
 using Avalonia.Styling;
 using FluentAvalonia.UI.Controls;
+using Ryujinx.Ava;
 using Ryujinx.Ava.Common.Locale;
+using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.Windows;

src/Ryujinx/UI/Controls/ApplicationListView.axaml

@@ -93,19 +93,7 @@
                                             IsVisible="{Binding HasPlayabilityInfo}"
                                             Background="{DynamicResource AppListBackgroundColor}"
                                             Margin="-1, 0, 0, 0"
-                                            Padding="0">
+                                            Padding="0" >
-                                            <ToolTip.Tip>
-                                                <StackPanel Orientation="Vertical">
-                                                    <TextBlock 
-                                                        Text="{Binding LocalizedStatusTooltip}" />
-                                                    <Separator 
-                                                        Margin="0, 10, 0, 10" 
-                                                        IsVisible="{Binding HasCompatibilityLabels}" />
-                                                    <TextBlock 
-                                                        IsVisible="{Binding HasCompatibilityLabels}"
-                                                        Text="{Binding FormattedCompatibilityLabels}" />
-                                                </StackPanel>
-                                            </ToolTip.Tip>
                                             <TextBlock
                                                 Margin="1.5"
                                                 Tag="{Binding IdString}"

src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs

@@ -7,6 +7,7 @@ using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Ava.Utilities.Compat;
 using System;
+using System.Globalization;
 using System.Linq;
 
 namespace Ryujinx.Ava.UI.Controls

src/Ryujinx/UI/Helpers/Converters/PlayabilityStatusConverter.cs

@@ -18,7 +18,7 @@ namespace Ryujinx.Ava.UI.Helpers
                 LocaleKeys.CompatibilityListNothing or 
                     LocaleKeys.CompatibilityListBoots or 
                     LocaleKeys.CompatibilityListMenus => Brushes.Red,
-                LocaleKeys.CompatibilityListIngame => Brushes.DarkOrange,
+                LocaleKeys.CompatibilityListIngame => Brushes.Yellow,
                 _ => Brushes.ForestGreen
             };
 

src/Ryujinx/UI/Helpers/LoggerAdapter.cs

@@ -1,7 +1,6 @@
 using Avalonia.Logging;
 using Avalonia.Utilities;
 using Gommon;
-using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common.Logging;
 using System;
 using System.Text;
@@ -15,19 +14,13 @@ namespace Ryujinx.Ava.UI.Helpers
 
     internal class LoggerAdapter : ILogSink
     {
-        private static bool _avaloniaLogsEnabled = ConfigurationState.Instance.Logger.EnableAvaloniaLog; 
-        
         public static void Register()
         {
             AvaLogger.Sink = new LoggerAdapter();
-            ConfigurationState.Instance.Logger.EnableAvaloniaLog.Event 
-                += (_, e) => _avaloniaLogsEnabled = e.NewValue;
         }
 
         private static RyuLogger.Log? GetLog(AvaLogLevel level, string area)
         {
-            if (!_avaloniaLogsEnabled) return null;
-            
             return level switch
             {
                 AvaLogLevel.Verbose => RyuLogger.Debug,

src/Ryujinx/UI/Models/Input/GamepadInputConfig.cs

@@ -10,6 +10,7 @@ namespace Ryujinx.Ava.UI.Models.Input
     public partial class GamepadInputConfig : BaseModel
     {
         public bool EnableCemuHookMotion { get; set; }
+        public bool EnableHandheldMotion { get; set; }
         public string DsuServerHost { get; set; }
         public int DsuServerPort { get; set; }
         public int Slot { get; set; }
@@ -162,7 +163,7 @@ namespace Ryujinx.Ava.UI.Models.Input
                     EnableMotion = controllerInput.Motion.EnableMotion;
                     GyroDeadzone = controllerInput.Motion.GyroDeadzone;
                     Sensitivity = controllerInput.Motion.Sensitivity;
-
+                    EnableHandheldMotion = controllerInput.Motion.MotionBackend == MotionInputBackendType.Handheld;
                     if (controllerInput.Motion is CemuHookMotionConfigController cemuHook)
                     {
                         EnableCemuHookMotion = true;
@@ -285,7 +286,7 @@ namespace Ryujinx.Ava.UI.Models.Input
                 config.Motion = new StandardMotionConfigController
                 {
                     EnableMotion = EnableMotion,
-                    MotionBackend = MotionInputBackendType.GamepadDriver,
+                    MotionBackend = EnableHandheldMotion ? MotionInputBackendType.Handheld : MotionInputBackendType.GamepadDriver,
                     GyroDeadzone = GyroDeadzone,
                     Sensitivity = Sensitivity,
                 };

src/Ryujinx/UI/ViewModels/ApplicationDataViewModel.cs

@@ -12,7 +12,10 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public string FormattedVersion => LocaleManager.Instance[LocaleKeys.GameListHeaderVersion].Format(AppData.Version);
         public string FormattedDeveloper => LocaleManager.Instance[LocaleKeys.GameListHeaderDeveloper].Format(AppData.Developer);
+        
         public string FormattedFileExtension => LocaleManager.Instance[LocaleKeys.GameListHeaderFileExtension].Format(AppData.FileExtension);
+        public string FormattedLastPlayed => LocaleManager.Instance[LocaleKeys.GameListHeaderLastPlayed].Format(AppData.LastPlayedString);
+        public string FormattedPlayTime => LocaleManager.Instance[LocaleKeys.GameListHeaderTimePlayed].Format(AppData.TimePlayedString);
         public string FormattedFileSize => LocaleManager.Instance[LocaleKeys.GameListHeaderFileSize].Format(AppData.FileSizeString);
         
         public string FormattedLdnInfo => 

src/Ryujinx/UI/ViewModels/Input/MotionInputViewModel.cs

@@ -18,6 +18,34 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
         [ObservableProperty] private double _gyroDeadzone;
 
-        [ObservableProperty] private bool _enableCemuHookMotion;
+        private bool _enableCemuHookMotion;
+        public bool EnableCemuHookMotion
+        {
+            get => _enableCemuHookMotion;
+            set
+            {
+                if (value)
+                {
+                    EnableHandheldMotion = false;
+                }
+                _enableCemuHookMotion = value;
+                OnPropertyChanged();
+            }
+        }
+
+        private bool _enableHandheldMotion;
+        public bool EnableHandheldMotion
+        {
+            get => _enableHandheldMotion;
+            set
+            {
+                if (value)
+                {
+                    EnableCemuHookMotion = false;
+                }
+                _enableHandheldMotion = value;
+                OnPropertyChanged();
+            }
+        }
     }
 }

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -1147,10 +1147,10 @@ namespace Ryujinx.Ava.UI.ViewModels
                 List<string> dirs = result.Select(it => it.Path.LocalPath).ToList();
                 int numAdded = onDirsSelected(dirs, out int numRemoved);
 
-                string msg = string.Join("\n",
+                string msg = String.Join("\r\n", new string[] {
                     string.Format(LocaleManager.Instance[localeMessageRemovedKey], numRemoved),
                     string.Format(LocaleManager.Instance[localeMessageAddedKey], numAdded)
-                );
+                });
 
                 await Dispatcher.UIThread.InvokeAsync(async () =>
                 {

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -2,7 +2,7 @@ using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
+using Gommon;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.OpenAL;
 using Ryujinx.Audio.Backends.SDL2;
@@ -13,7 +13,6 @@ using Ryujinx.Ava.UI.Models.Input;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Ava.Utilities.Configuration.System;
-using Ryujinx.Ava.Utilities.Configuration.UI;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Multiplayer;
 using Ryujinx.Common.GraphicsDriver;
@@ -29,6 +28,8 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Net.NetworkInformation;
+using System.Runtime.InteropServices;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using TimeZone = Ryujinx.Ava.UI.Models.TimeZone;
 
@@ -122,7 +123,6 @@ namespace Ryujinx.Ava.UI.ViewModels
         public bool RememberWindowState { get; set; }
         public bool ShowTitleBar { get; set; }
         public int HideCursor { get; set; }
-        public int UpdateCheckerType { get; set; }
         public bool EnableDockedMode { get; set; }
         public bool EnableKeyboard { get; set; }
         public bool EnableMouse { get; set; }
@@ -206,7 +206,6 @@ namespace Ryujinx.Ava.UI.ViewModels
         public bool EnableTrace { get; set; }
         public bool EnableGuest { get; set; }
         public bool EnableFsAccessLog { get; set; }
-        public bool EnableAvaloniaLog { get; set; }
         public bool EnableDebug { get; set; }
         public bool IsOpenAlEnabled { get; set; }
         public bool IsSoundIoEnabled { get; set; }
@@ -478,7 +477,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             RememberWindowState = config.RememberWindowState;
             ShowTitleBar = config.ShowTitleBar;
             HideCursor = (int)config.HideCursor.Value;
-            UpdateCheckerType = (int)config.UpdateCheckerType.Value;
 
             GameDirectories.Clear();
             GameDirectories.AddRange(config.UI.GameDirs.Value);
@@ -564,7 +562,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             EnableGuest = config.Logger.EnableGuest;
             EnableDebug = config.Logger.EnableDebug;
             EnableFsAccessLog = config.Logger.EnableFsAccessLog;
-            EnableAvaloniaLog = config.Logger.EnableAvaloniaLog;
             FsGlobalAccessLogMode = config.System.FsGlobalAccessLogMode;
             OpenglDebugLevel = (int)config.Logger.GraphicsDebugLevel.Value;
 
@@ -585,7 +582,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             config.RememberWindowState.Value = RememberWindowState;
             config.ShowTitleBar.Value = ShowTitleBar;
             config.HideCursor.Value = (HideCursorMode)HideCursor;
-            config.UpdateCheckerType.Value = (UpdaterType)UpdateCheckerType;
 
             if (GameDirectoryChanged)
             {
@@ -685,7 +681,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             config.Logger.EnableGuest.Value = EnableGuest;
             config.Logger.EnableDebug.Value = EnableDebug;
             config.Logger.EnableFsAccessLog.Value = EnableFsAccessLog;
-            config.Logger.EnableAvaloniaLog.Value = EnableAvaloniaLog;
             config.System.FsGlobalAccessLogMode.Value = FsGlobalAccessLogMode;
             config.Logger.GraphicsDebugLevel.Value = (GraphicsDebugLevel)OpenglDebugLevel;
 
@@ -727,25 +722,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             CloseWindow?.Invoke();
         }
 
-        [ObservableProperty] private bool _wantsToReset;
-
-        public AsyncRelayCommand ResetButton => Commands.Create(async () =>
-        {
-            if (!WantsToReset) return;
-            
-            CloseWindow?.Invoke();
-            ConfigurationState.Instance.LoadDefault();
-            ConfigurationState.Instance.ToFileFormat().SaveConfig(Program.ConfigurationPath);
-            RyujinxApp.MainWindow.LoadApplications();
-
-            await ContentDialogHelper.CreateInfoDialog(
-                $"Your {RyujinxApp.FullAppName} configuration has been reset.",
-                "",
-                string.Empty,
-                LocaleManager.Instance[LocaleKeys.SettingsButtonClose],
-                "Configuration Reset");
-        });
-
         public void CancelButton()
         {
             RevertIfNotSaved();

src/Ryujinx/UI/Views/Input/MotionInputView.axaml

@@ -61,6 +61,17 @@
                     Margin="5, 0"
                     Text="{Binding GyroDeadzone, StringFormat=\{0:0.00\}}" />
             </StackPanel>
+            <Separator
+                Height="1"
+                Margin="0,5" />
+            <CheckBox
+                Margin="5"
+                IsChecked="{Binding EnableHandheldMotion}">
+                <TextBlock
+                    Margin="0,3,0,0"
+                    VerticalAlignment="Center"
+                    Text="{ext:Locale ControllerSettingsMotionUseHandheldCompatibleMotion}" />
+            </CheckBox>
             <Separator
                 Height="1"
                 Margin="0,5" />

src/Ryujinx/UI/Views/Input/MotionInputView.axaml.cs

@@ -30,6 +30,7 @@ namespace Ryujinx.Ava.UI.Views.Input
                 Sensitivity = config.Sensitivity,
                 GyroDeadzone = config.GyroDeadzone,
                 EnableCemuHookMotion = config.EnableCemuHookMotion,
+                EnableHandheldMotion = config.EnableHandheldMotion,
             };
 
             InitializeComponent();
@@ -58,6 +59,7 @@ namespace Ryujinx.Ava.UI.Views.Input
                 config.DsuServerHost = content._viewModel.DsuServerHost;
                 config.DsuServerPort = content._viewModel.DsuServerPort;
                 config.EnableCemuHookMotion = content._viewModel.EnableCemuHookMotion;
+                config.EnableHandheldMotion = content._viewModel.EnableHandheldMotion;
                 config.MirrorInput = content._viewModel.MirrorInput;
             };
 

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

@@ -74,10 +74,6 @@
                                   ToolTip.Tip="{ext:Locale DebugLogTooltip}">
                             <TextBlock Text="{ext:Locale SettingsTabLoggingEnableDebugLogs}" />
                         </CheckBox>
-                        <CheckBox IsChecked="{Binding EnableAvaloniaLog}"
-                                  ToolTip.Tip="{ext:Locale AvaloniaLogTooltip}">
-                            <TextBlock Text="{ext:Locale SettingsTabLoggingEnableAvaloniaLogs}" />
-                        </CheckBox>
                         <StackPanel Margin="0,10,0,0" Orientation="Horizontal" VerticalAlignment="Stretch">
                             <TextBlock VerticalAlignment="Center"
                                     ToolTip.Tip="{ext:Locale FSAccessLogModeTooltip}"

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

@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using Avalonia.Interactivity;
 using Ryujinx.Ava.UI.ViewModels;
 using TimeZone = Ryujinx.Ava.UI.Models.TimeZone;
 

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

@@ -6,7 +6,6 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
     mc:Ignorable="d"
     x:DataType="viewModels:SettingsViewModel">
     <Design.DataContext>
@@ -31,33 +30,18 @@
                                    ToolTip.Tip="{ext:Locale ToggleDiscordTooltip}"
                                    Text="{ext:Locale SettingsTabGeneralEnableDiscordRichPresence}" />
                     </CheckBox>
+                    <CheckBox IsChecked="{Binding CheckUpdatesOnStart}">
+                        <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunch}" />
+                    </CheckBox>
                     <CheckBox IsChecked="{Binding ShowConfirmExit}">
                         <TextBlock Text="{ext:Locale SettingsTabGeneralShowConfirmExitDialog}" />
                     </CheckBox>
                     <CheckBox IsChecked="{Binding RememberWindowState}">
                         <TextBlock Text="{ext:Locale SettingsTabGeneralRememberWindowState}" />
                     </CheckBox>
-                    <CheckBox IsChecked="{Binding ShowTitleBar}" IsVisible="{x:Static helper:RunningPlatform.IsWindows}">
+                    <CheckBox IsChecked="{Binding ShowTitleBar}" Name="ShowTitleBarBox">
                         <TextBlock Text="{ext:Locale SettingsTabGeneralShowTitleBar}" />
                     </CheckBox>
-                    <StackPanel Margin="0, 15, 0, 0" Orientation="Horizontal">
-                        <TextBlock VerticalAlignment="Center"
-                                   Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunch}"
-                                   Width="150" />
-                        <ComboBox SelectedIndex="{Binding UpdateCheckerType}"
-                                  HorizontalContentAlignment="Left"
-                                  MinWidth="100">
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchOff}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchPromptAtStartup}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchBackground}" />
-                            </ComboBoxItem>
-                        </ComboBox>
-                    </StackPanel>
                     <StackPanel Margin="0, 15, 0, 0" Orientation="Horizontal">
                         <TextBlock VerticalAlignment="Center"
                                    Text="{ext:Locale SettingsTabGeneralHideCursor}"

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

@@ -21,6 +21,7 @@ namespace Ryujinx.Ava.UI.Views.Settings
         public SettingsUiView()
         {
             InitializeComponent();
+            ShowTitleBarBox.IsVisible = OperatingSystem.IsWindows();
             AddGameDirButton.Command =
                 Commands.Create(() => AddDirButton(GameDirPathBox, ViewModel.GameDirectories, true));
             AddAutoloadDirButton.Command =

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

@@ -19,7 +19,6 @@ using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Ava.Utilities.Configuration;
-using Ryujinx.Ava.Utilities.Configuration.UI;
 using Ryujinx.Common;
 using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
@@ -30,6 +29,7 @@ using Ryujinx.HLE.HOS;
 using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.Input.HLE;
 using Ryujinx.Input.SDL2;
+using Ryujinx.Input.SDL3;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -108,7 +108,7 @@ namespace Ryujinx.Ava.UI.Windows
 
             if (Program.PreviewerDetached)
             {
-                InputManager = new InputManager(new AvaloniaKeyboardDriver(this), new SDL2GamepadDriver());
+                InputManager = new InputManager(new AvaloniaKeyboardDriver(this), new SDL2GamepadDriver(), new SDL3MotionDriver());
 
                 _ = this.GetObservable(IsActiveProperty).Subscribe(it => ViewModel.IsActive = it);
                 this.ScalingChanged += OnScalingChanged;
@@ -401,29 +401,10 @@ namespace Ryujinx.Ava.UI.Windows
                 await Dispatcher.UIThread.InvokeAsync(async () => await UserErrorDialog.ShowUserErrorDialog(UserError.NoKeys));
             }
 
-            if (!Updater.CanUpdate() || CommandLineState.HideAvailableUpdates)
+            if (ConfigurationState.Instance.CheckUpdatesOnStart && !CommandLineState.HideAvailableUpdates && Updater.CanUpdate())
-                return;
-
-            switch (ConfigurationState.Instance.UpdateCheckerType.Value)
             {
-                case UpdaterType.PromptAtStartup:
+                await Updater.BeginUpdateAsync()
-                    await Updater.BeginUpdateAsync()
+                    .Catch(task => Logger.Error?.Print(LogClass.Application, $"Updater Error: {task.Exception}"));
-                        .Catch(task => Logger.Error?.Print(LogClass.Application, $"Updater Error: {task.Exception}"));
-                    break;
-                case UpdaterType.CheckInBackground:
-                    if ((await Updater.CheckVersionAsync()).TryGet(out (Version Current, Version Incoming) versions))
-                    {
-                        string newVersionString = ReleaseInformation.IsCanaryBuild
-                            ? $"Canary {versions.Current} -> Canary {versions.Incoming}"
-                            : $"{versions.Current} -> {versions.Incoming}";
-                    
-                        if (versions.Current < versions.Incoming)
-                            NotificationHelper.ShowInformation(
-                                title: "Update Available",
-                                text: newVersionString,
-                                onClick: () => _ = Updater.BeginUpdateAsync());
-                    }
-                    break;
             }
         }
 

src/Ryujinx/UI/Windows/SettingsWindow.axaml

@@ -108,36 +108,24 @@
                 </Style>
             </ui:NavigationView.Styles>
         </ui:NavigationView>
-        <Grid Grid.Row="2"
+        <ReversibleStackPanel
-              ColumnDefinitions="Auto,*,Auto">
+            Grid.Row="2"
-            <StackPanel Grid.Column="0" Orientation="Horizontal">
+            Margin="10"
-                <Button
+            Spacing="10"
-                    IsEnabled="{Binding WantsToReset}"
+            Orientation="Horizontal"
-                    Margin="10"
+            HorizontalAlignment="Right"
-                    Content="{ext:Locale SettingsButtonReset}"
+            ReverseOrder="{x:Static helper:RunningPlatform.IsMacOS}">
-                    Command="{Binding ResetButton}" />
+            <Button
-                <CheckBox IsChecked="{Binding WantsToReset}"/>
+                Classes="accent"
-                <TextBlock Text="{ext:Locale SettingsButtonResetConfirm}"/>
+                Content="{ext:Locale SettingsButtonOk}"
-            </StackPanel>
+                Command="{Binding OkButton}" />
-            <ReversibleStackPanel
+            <Button
-                Grid.Column="2"
+                HotKey="Escape"
-                Margin="10"
+                Content="{ext:Locale SettingsButtonCancel}"
-                Spacing="10"
+                Command="{Binding CancelButton}" />
-                Orientation="Horizontal"
+            <Button
-                HorizontalAlignment="Right"
+                Content="{ext:Locale SettingsButtonApply}"
-                ReverseOrder="{x:Static helper:RunningPlatform.IsMacOS}">
+                Command="{Binding ApplyButton}" />
-                <Button
+        </ReversibleStackPanel>
-                    Classes="accent"
-                    Content="{ext:Locale SettingsButtonOk}"
-                    Command="{Binding OkButton}" />
-                <Button
-                    HotKey="Escape"
-                    Content="{ext:Locale SettingsButtonCancel}"
-                    Command="{Binding CancelButton}" />
-                <Button
-                    Content="{ext:Locale SettingsButtonApply}"
-                    Command="{Binding ApplyButton}" />
-            </ReversibleStackPanel>
-        </Grid>
     </Grid>
 </window:StyleableAppWindow>

src/Ryujinx/Updater.cs

@@ -43,18 +43,7 @@ namespace Ryujinx.Ava
         private const int ConnectionCount = 4;
 
         private static string _buildVer;
-
+        private static string _platformExt;
-        private static readonly string _platformExt = 
-            RunningPlatform.IsMacOS 
-                ? "macos_universal.app.tar.gz"
-                : RunningPlatform.IsWindows
-                    ? "win_x64.zip"
-                    : RunningPlatform.IsX64Linux
-                        ? "linux_x64.tar.gz"
-                        : RunningPlatform.IsArmLinux
-                            ? "linux_arm64.tar.gz"
-                            : throw new PlatformNotSupportedException();
-        
         private static string _buildUrl;
         private static long _buildSize;
         private static bool _updateSuccessful;
@@ -62,8 +51,30 @@ namespace Ryujinx.Ava
 
         private static readonly string[] _windowsDependencyDirs = [];
 
-        public static async Task<Optional<(Version Current, Version Incoming)>> CheckVersionAsync(bool showVersionUpToDate = false)
+        public static async Task BeginUpdateAsync(bool showVersionUpToDate = false)
         {
+            if (_running)
+            {
+                return;
+            }
+
+            _running = true;
+
+            // Detect current platform
+            if (OperatingSystem.IsMacOS())
+            {
+                _platformExt = "macos_universal.app.tar.gz";
+            }
+            else if (OperatingSystem.IsWindows())
+            {
+                _platformExt = "win_x64.zip";
+            }
+            else if (OperatingSystem.IsLinux())
+            {
+                string arch = RuntimeInformation.OSArchitecture == Architecture.Arm64 ? "arm64" : "x64";
+                _platformExt = $"linux_{arch}.tar.gz";
+            }
+
             if (!Version.TryParse(Program.Version, out Version currentVersion))
             {
                 Logger.Error?.Print(LogClass.Application, $"Failed to convert the current {RyujinxApp.FullAppName} version!");
@@ -74,7 +85,7 @@ namespace Ryujinx.Ava
 
                 _running = false;
 
-                return default;
+                return;
             }
             
             Logger.Info?.Print(LogClass.Application, "Checking for updates.");
@@ -112,7 +123,7 @@ namespace Ryujinx.Ava
 
                             _running = false;
 
-                            return default;
+                            return;
                         }
 
                         break;
@@ -138,7 +149,7 @@ namespace Ryujinx.Ava
 
                     _running = false;
 
-                    return default;
+                    return;
                 }
             }
             catch (Exception exception)
@@ -150,7 +161,7 @@ namespace Ryujinx.Ava
 
                 _running = false;
 
-                return default;
+                return;
             }
 
             if (!Version.TryParse(_buildVer, out Version newVersion))
@@ -163,23 +174,9 @@ namespace Ryujinx.Ava
 
                 _running = false;
 
-                return (currentVersion, null);
-            }
-
-            return (currentVersion, newVersion);
-        }
-        
-        public static async Task BeginUpdateAsync(bool showVersionUpToDate = false)
-        {
-            if (_running)
-            {
                 return;
             }
 
-            _running = true;
-
-            (Version currentVersion, Version newVersion) = (await CheckVersionAsync(showVersionUpToDate)).OrDefault();
-
             if (newVersion <= currentVersion)
             {
                 if (showVersionUpToDate)

src/Ryujinx/Utilities/AppLibrary/ApplicationData.cs

@@ -1,4 +1,3 @@
-using Gommon;
 using LibHac.Common;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
@@ -15,7 +14,6 @@ using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.Loaders.Processes.Extensions;
 using System;
 using System.IO;
-using System.Text;
 using System.Text.Json.Serialization;
 
 namespace Ryujinx.Ava.Utilities.AppLibrary
@@ -34,19 +32,25 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
             set
             {
                 _id = value;
-
+                PlayabilityStatus = CompatibilityCsv.GetStatus(Id);
-                Compatibility = CompatibilityCsv.Find(Id);
             }
         }
         public string Developer { get; set; } = "Unknown";
         public string Version { get; set; } = "0";
+
+        public bool HasPlayabilityInfo => PlayabilityStatus != null;
+
+        public string LocalizedStatus =>
+            PlayabilityStatus.HasValue 
+                ? LocaleManager.Instance[PlayabilityStatus!.Value] 
+                : string.Empty;
+
+        public LocaleKeys? PlayabilityStatus { get; set; }
+        
         public int PlayerCount { get; set; }
         public int GameCount { get; set; }
 
         public bool HasLdnGames => PlayerCount != 0 && GameCount != 0;
-
-        public bool HasRichPresenceAsset => DiscordIntegrationModule.HasAssetImage(IdString);
-        public bool HasDynamicRichPresenceSupport => DiscordIntegrationModule.HasAnalyzer(IdString);
         
         public TimeSpan TimePlayed { get; set; }
         public DateTime? LastPlayed { get; set; }
@@ -59,39 +63,11 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
 
         public string TimePlayedString => ValueFormatUtils.FormatTimeSpan(TimePlayed);
 
-        public bool HasPlayedPreviously => TimePlayed.TotalSeconds > 1;
+        public bool HasPlayedPreviously => TimePlayedString != string.Empty;
 
         public string LastPlayedString => ValueFormatUtils.FormatDateTime(LastPlayed)?.Replace(" ", "\n");
 
         public string FileSizeString => ValueFormatUtils.FormatFileSize(FileSize);
-        
-        public Optional<CompatibilityEntry> Compatibility { get; private set; }
-        
-        public bool HasPlayabilityInfo => Compatibility.HasValue;
-
-        public string LocalizedStatus => Compatibility.Convert(x => x.LocalizedStatus);
-
-        public bool HasCompatibilityLabels => !FormattedCompatibilityLabels.Equals(string.Empty);
-        
-        public string FormattedCompatibilityLabels
-            => Compatibility.Convert(x => x.FormattedIssueLabels).OrElse(string.Empty);
-            
-        public LocaleKeys? PlayabilityStatus => Compatibility.Convert(x => x.Status).OrElse(null);
-
-        public string LocalizedStatusTooltip =>
-            Compatibility.Convert(x => 
-#pragma warning disable CS8509 It is exhaustive for all possible values this can contain.
-                LocaleManager.Instance[x.Status switch
-#pragma warning restore CS8509
-                {
-                    LocaleKeys.CompatibilityListPlayable => LocaleKeys.CompatibilityListPlayableTooltip,
-                    LocaleKeys.CompatibilityListIngame => LocaleKeys.CompatibilityListIngameTooltip,
-                    LocaleKeys.CompatibilityListMenus => LocaleKeys.CompatibilityListMenusTooltip,
-                    LocaleKeys.CompatibilityListBoots => LocaleKeys.CompatibilityListBootsTooltip,
-                    LocaleKeys.CompatibilityListNothing => LocaleKeys.CompatibilityListNothingTooltip,
-                }]
-            ).OrElse(string.Empty);
-        
 
         [JsonIgnore] public string IdString => Id.ToString("x16");
 
@@ -101,16 +77,16 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
 
         public static string GetBuildId(VirtualFileSystem virtualFileSystem, IntegrityCheckLevel checkLevel, string titleFilePath)
         {
+            using FileStream file = new(titleFilePath, FileMode.Open, FileAccess.Read);
+
+            Nca mainNca = null;
+            Nca patchNca = null;
+
             if (!System.IO.Path.Exists(titleFilePath))
             {
                 Logger.Error?.Print(LogClass.Application, $"File \"{titleFilePath}\" does not exist.");
                 return string.Empty;
             }
-            
-            using FileStream file = new(titleFilePath, FileMode.Open, FileAccess.Read);
-
-            Nca mainNca = null;
-            Nca patchNca = null;
 
             string extension = System.IO.Path.GetExtension(titleFilePath).ToLower();
 

src/Ryujinx/Utilities/Compat/CompatibilityCsv.cs

@@ -60,21 +60,10 @@ namespace Ryujinx.Ava.Utilities.Compat
             }
         }
 
-        public static CompatibilityEntry Find(string titleId)
-            => Entries.FirstOrDefault(x => x.TitleId.HasValue && x.TitleId.Value.EqualsIgnoreCase(titleId));
-        
-        public static CompatibilityEntry Find(ulong titleId)
-            => Find(titleId.ToString("X16"));
-        
         public static LocaleKeys? GetStatus(string titleId)
-            => Find(titleId)?.Status;
+            => Entries.FirstOrDefault(x => x.TitleId.HasValue && x.TitleId.Value.EqualsIgnoreCase(titleId))?.Status;
         
         public static LocaleKeys? GetStatus(ulong titleId) => GetStatus(titleId.ToString("X16"));
-        
-        public static string GetLabels(string titleId)
-            => Find(titleId)?.FormattedIssueLabels;
-        
-        public static string GetLabels(ulong titleId) => GetLabels(titleId.ToString("X16"));
     }
 
     public class CompatibilityEntry
@@ -111,25 +100,12 @@ namespace Ryujinx.Ava.Utilities.Compat
         public Optional<string> TitleId { get; }
         public string[] Labels { get; }
         public LocaleKeys? Status { get; }
-
-        public LocaleKeys? StatusDescription
-            => Status switch
-            {
-                LocaleKeys.CompatibilityListPlayable => LocaleKeys.CompatibilityListPlayableTooltip,
-                LocaleKeys.CompatibilityListIngame => LocaleKeys.CompatibilityListIngameTooltip,
-                LocaleKeys.CompatibilityListMenus => LocaleKeys.CompatibilityListMenusTooltip,
-                LocaleKeys.CompatibilityListBoots => LocaleKeys.CompatibilityListBootsTooltip,
-                LocaleKeys.CompatibilityListNothing => LocaleKeys.CompatibilityListNothingTooltip,
-                _ => null
-            };
-        
         public DateTime LastUpdated { get; }
 
         public string LocalizedLastUpdated =>
             LocaleManager.FormatDynamicValue(LocaleKeys.CompatibilityListLastUpdated, LastUpdated.Humanize());
-        
+
         public string LocalizedStatus => LocaleManager.Instance[Status!.Value];
-        public string LocalizedStatusDescription => LocaleManager.Instance[StatusDescription!.Value];
         public string FormattedTitleId => TitleId
             .OrElse(new string(' ', 16));
 

src/Ryujinx/Utilities/Compat/CompatibilityList.axaml

@@ -64,8 +64,6 @@
                                            VerticalAlignment="Center"
                                            Text="{Binding LocalizedStatus}"
                                            Width="85"
-                                           Background="Transparent"
-                                           ToolTip.Tip="{Binding LocalizedStatusDescription}"
                                            Foreground="{Binding Status, Converter={x:Static helpers:PlayabilityStatusConverter.Shared}}"
                                            TextWrapping="NoWrap" />
                                 <TextBlock Grid.Column="3"

src/Ryujinx/Utilities/Configuration/ConfigurationFileFormat.cs

@@ -15,7 +15,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
         /// <summary>
         /// The current version of the file format
         /// </summary>
-        public const int CurrentVersion = 65;
+        public const int CurrentVersion = 63;
 
         /// <summary>
         /// Version of the configuration file format
@@ -111,11 +111,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
         /// Enables printing FS access log messages
         /// </summary>
         public bool LoggingEnableFsAccessLog { get; set; }
-        
-        /// <summary>
-        /// Enables log messages from Avalonia
-        /// </summary>
-        public bool LoggingEnableAvalonia { get; set; }
 
         /// <summary>
         /// Controls which log messages are written to the log targets
@@ -163,14 +158,9 @@ namespace Ryujinx.Ava.Utilities.Configuration
         public bool EnableDiscordIntegration { get; set; }
 
         /// <summary>
-        /// DEPRECATED: Checks for updates when Ryujinx starts when enabled
+        /// Checks for updates when Ryujinx starts when enabled
         /// </summary>
         public bool CheckUpdatesOnStart { get; set; }
-        
-        /// <summary>
-        /// Checks for updates when Ryujinx starts when enabled, either prompting when an update is found or just showing a notification.
-        /// </summary>
-        public UpdaterType UpdateCheckerType { get; set; }
 
         /// <summary>
         /// Show "Confirm Exit" Dialog

src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs

@@ -45,7 +45,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
             
             EnableDiscordIntegration.Value = cff.EnableDiscordIntegration;
             CheckUpdatesOnStart.Value = cff.CheckUpdatesOnStart;
-            UpdateCheckerType.Value = cff.UpdateCheckerType;
             ShowConfirmExit.Value = cff.ShowConfirmExit;
             RememberWindowState.Value = cff.RememberWindowState;
             ShowTitleBar.Value = cff.ShowTitleBar;
@@ -431,9 +430,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
                     }
                 }),
                 (62, static cff => cff.RainbowSpeed = 1f),
-                (63, static cff => cff.MatchSystemTime = false),
+                (63, static cff => cff.MatchSystemTime = false)
-                (64, static cff => cff.LoggingEnableAvalonia = false),
-                (65, static cff => cff.UpdateCheckerType = cff.CheckUpdatesOnStart ? UpdaterType.PromptAtStartup : UpdaterType.Off)
             );
     }
 }

src/Ryujinx/Utilities/Configuration/ConfigurationState.Model.cs

@@ -1,7 +1,6 @@
 using ARMeilleure;
 using Gommon;
 using Ryujinx.Ava.Utilities.Configuration.System;
-using Ryujinx.Ava.Utilities.Configuration.UI;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
@@ -255,11 +254,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
             /// Enables printing FS access log messages
             /// </summary>
             public ReactiveObject<bool> EnableFsAccessLog { get; private set; }
-            
-            /// <summary>
-            /// Enables log messages from Avalonia
-            /// </summary>
-            public ReactiveObject<bool> EnableAvaloniaLog { get; private set; }
 
             /// <summary>
             /// Controls which log messages are written to the log targets
@@ -287,7 +281,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
                 EnableTrace = new ReactiveObject<bool>();
                 EnableGuest = new ReactiveObject<bool>();
                 EnableFsAccessLog = new ReactiveObject<bool>();
-                EnableAvaloniaLog = new ReactiveObject<bool>();
                 FilteredClasses = new ReactiveObject<LogClass[]>();
                 EnableFileLog = new ReactiveObject<bool>();
                 EnableFileLog.LogChangesToValue(nameof(EnableFileLog));
@@ -768,11 +761,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
         /// Checks for updates when Ryujinx starts when enabled
         /// </summary>
         public ReactiveObject<bool> CheckUpdatesOnStart { get; private set; }
-        
-        /// <summary>
-        /// Checks for updates when Ryujinx starts when enabled, either prompting when an update is found or just showing a notification.
-        /// </summary>
-        public ReactiveObject<UpdaterType> UpdateCheckerType { get; private set; }
 
         /// <summary>
         /// Show "Confirm Exit" Dialog
@@ -810,7 +798,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
             Hacks = new HacksSection();
             EnableDiscordIntegration = new ReactiveObject<bool>();
             CheckUpdatesOnStart = new ReactiveObject<bool>();
-            UpdateCheckerType = new ReactiveObject<UpdaterType>();
             ShowConfirmExit = new ReactiveObject<bool>();
             RememberWindowState = new ReactiveObject<bool>();
             ShowTitleBar = new ReactiveObject<bool>();

src/Ryujinx/Utilities/Configuration/ConfigurationState.cs

@@ -46,7 +46,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
                 LoggingEnableTrace = Logger.EnableTrace,
                 LoggingEnableGuest = Logger.EnableGuest,
                 LoggingEnableFsAccessLog = Logger.EnableFsAccessLog,
-                LoggingEnableAvalonia = Logger.EnableAvaloniaLog,
                 LoggingFilteredClasses = Logger.FilteredClasses,
                 LoggingGraphicsDebugLevel = Logger.GraphicsDebugLevel,
                 SystemLanguage = System.Language,
@@ -166,7 +165,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
             Logger.EnableTrace.Value = false;
             Logger.EnableGuest.Value = true;
             Logger.EnableFsAccessLog.Value = false;
-            Logger.EnableAvaloniaLog.Value = false;
             Logger.FilteredClasses.Value = [];
             Logger.GraphicsDebugLevel.Value = GraphicsDebugLevel.None;
             System.Language.Value = Language.AmericanEnglish;
@@ -175,7 +173,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
             System.SystemTimeOffset.Value = 0;
             System.EnableDockedMode.Value = true;
             EnableDiscordIntegration.Value = true;
-            UpdateCheckerType.Value = UpdaterType.PromptAtStartup;
+            CheckUpdatesOnStart.Value = true;
             ShowConfirmExit.Value = true;
             RememberWindowState.Value = true;
             ShowTitleBar.Value = !OperatingSystem.IsWindows();

src/Ryujinx/Utilities/Configuration/UI/UpdaterType.cs

@@ -1,13 +0,0 @@
-using Ryujinx.Common.Utilities;
-using System.Text.Json.Serialization;
-
-namespace Ryujinx.Ava.Utilities.Configuration.UI
-{
-    [JsonConverter(typeof(TypedStringEnumConverter<UpdaterType>))]
-    public enum UpdaterType
-    {
-        Off,
-        PromptAtStartup,
-        CheckInBackground
-    }
-}

src/Ryujinx/Utilities/PlayReport.cs

@@ -0,0 +1,85 @@
+using PlayReportFormattedValue = Ryujinx.Ava.Utilities.PlayReportAnalyzer.FormattedValue;
+
+namespace Ryujinx.Ava.Utilities
+{
+    public static class PlayReport
+    {
+        public static PlayReportAnalyzer Analyzer { get; } = new PlayReportAnalyzer()
+            .AddSpec(
+                "01007ef00011e000",
+                spec => spec
+                    .AddValueFormatter("IsHardMode", BreathOfTheWild_MasterMode)
+                    // reset to normal status when switching between normal & master mode in title screen
+                    .AddValueFormatter("AoCVer", PlayReportFormattedValue.AlwaysResets)
+            )
+            .AddSpec(
+                "0100f2c0115b6000",
+                spec => spec.AddValueFormatter("PlayerPosY", TearsOfTheKingdom_CurrentField))
+            .AddSpec(
+                "0100000000010000",
+                spec =>
+                    spec.AddValueFormatter("is_kids_mode", SuperMarioOdyssey_AssistMode)
+            )
+            .AddSpec(
+                "010075000ecbe000",
+                spec =>
+                    spec.AddValueFormatter("is_kids_mode", SuperMarioOdysseyChina_AssistMode)
+            )
+            .AddSpec(
+                "010028600ebda000",
+                spec => spec.AddValueFormatter("mode", SuperMario3DWorldOrBowsersFury)
+            )
+            .AddSpec( // Global & China IDs
+                ["0100152000022000", "010075100e8ec000"],
+                spec => spec.AddValueFormatter("To", MarioKart8Deluxe_Mode)
+            );
+
+        private static PlayReportFormattedValue BreathOfTheWild_MasterMode(PlayReportValue value)
+            => value.BoxedValue is 1 ? "Playing Master Mode" : PlayReportFormattedValue.ForceReset;
+
+        private static PlayReportFormattedValue TearsOfTheKingdom_CurrentField(PlayReportValue value) =>
+            value.DoubleValue switch
+            {
+                > 800d => "Exploring the Sky Islands",
+                < -201d => "Exploring the Depths",
+                _ => "Roaming Hyrule"
+            };
+
+        private static PlayReportFormattedValue SuperMarioOdyssey_AssistMode(PlayReportValue value)
+            => value.BoxedValue is 1 ? "Playing in Assist Mode" : "Playing in Regular Mode";
+
+        private static PlayReportFormattedValue SuperMarioOdysseyChina_AssistMode(PlayReportValue value)
+            => value.BoxedValue is 1 ? "Playing in 帮助模式" : "Playing in 普通模式";
+
+        private static PlayReportFormattedValue SuperMario3DWorldOrBowsersFury(PlayReportValue value)
+            => value.BoxedValue is 0 ? "Playing Super Mario 3D World" : "Playing Bowser's Fury";
+        
+        private static PlayReportFormattedValue MarioKart8Deluxe_Mode(PlayReportValue value) 
+            => value.StringValue switch
+            {
+                // Single Player
+                "Single" => "Single Player",
+                // Multiplayer
+                "Multi-2players" => "Multiplayer 2 Players",
+                "Multi-3players" => "Multiplayer 3 Players",
+                "Multi-4players" => "Multiplayer 4 Players",
+                // Wireless/LAN Play
+                "Local-Single" => "Wireless/LAN Play",
+                "Local-2players" => "Wireless/LAN Play 2 Players",
+                // CC Classes
+                "50cc" => "50cc",
+                "100cc" => "100cc",
+                "150cc" => "150cc",
+                "Mirror" => "Mirror (150cc)",
+                "200cc" => "200cc",
+                // Modes
+                "GrandPrix" => "Grand Prix",
+                "TimeAttack" => "Time Trials",
+                "VS" => "VS Races",
+                "Battle" => "Battle Mode",
+                "RaceStart" => "Selecting a Course",
+                "Race" => "Racing",
+                _ => PlayReportFormattedValue.ForceReset
+            };
+    }
+}

src/Ryujinx/Utilities/PlayReport/Analyzer.cs

@@ -1,123 +0,0 @@
-using Gommon;
-using Ryujinx.Ava.Utilities.AppLibrary;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Globalization;
-using System.Linq;
-
-namespace Ryujinx.Ava.Utilities.PlayReport
-{
-    /// <summary>
-    /// The entrypoint for the Play Report analysis system.
-    /// </summary>
-    public class Analyzer
-    {
-        private readonly List<GameSpec> _specs = [];
-
-        public string[] TitleIds => Specs.SelectMany(x => x.TitleIds).ToArray();
-
-        public IReadOnlyList<GameSpec> Specs => new ReadOnlyCollection<GameSpec>(_specs);
-
-        /// <summary>
-        /// Add an analysis spec matching a specific game by title ID, with the provided spec configuration.
-        /// </summary>
-        /// <param name="titleId">The ID of the game to listen to Play Reports in.</param>
-        /// <param name="transform">The configuration function for the analysis spec.</param>
-        /// <returns>The current <see cref="Analyzer"/>, for chaining convenience.</returns>
-        public Analyzer AddSpec(string titleId, Func<GameSpec, GameSpec> transform)
-        {
-            Guard.Ensure(ulong.TryParse(titleId, NumberStyles.HexNumber, null, out _),
-                $"Cannot use a non-hexadecimal string as the Title ID for a {nameof(GameSpec)}.");
-
-            return AddSpec(transform(GameSpec.Create(titleId)));
-        }
-
-        /// <summary>
-        /// Add an analysis spec matching a specific game by title ID, with the provided spec configuration.
-        /// </summary>
-        /// <param name="titleId">The ID of the game to listen to Play Reports in.</param>
-        /// <param name="transform">The configuration function for the analysis spec.</param>
-        /// <returns>The current <see cref="Analyzer"/>, for chaining convenience.</returns>
-        public Analyzer AddSpec(string titleId, Action<GameSpec> transform)
-        {
-            Guard.Ensure(ulong.TryParse(titleId, NumberStyles.HexNumber, null, out _),
-                $"Cannot use a non-hexadecimal string as the Title ID for a {nameof(GameSpec)}.");
-
-            return AddSpec(GameSpec.Create(titleId).Apply(transform));
-        }
-
-        /// <summary>
-        /// Add an analysis spec matching a specific set of games by title IDs, with the provided spec configuration.
-        /// </summary>
-        /// <param name="titleIds">The IDs of the games to listen to Play Reports in.</param>
-        /// <param name="transform">The configuration function for the analysis spec.</param>
-        /// <returns>The current <see cref="Analyzer"/>, for chaining convenience.</returns>
-        public Analyzer AddSpec(IEnumerable<string> titleIds,
-            Func<GameSpec, GameSpec> transform)
-        {
-            string[] tids = titleIds.ToArray();
-            Guard.Ensure(tids.All(x => ulong.TryParse(x, NumberStyles.HexNumber, null, out _)),
-                $"Cannot use a non-hexadecimal string as the Title ID for a {nameof(GameSpec)}.");
-
-            return AddSpec(transform(GameSpec.Create(tids)));
-        }
-
-        /// <summary>
-        /// Add an analysis spec matching a specific set of games by title IDs, with the provided spec configuration.
-        /// </summary>
-        /// <param name="titleIds">The IDs of the games to listen to Play Reports in.</param>
-        /// <param name="transform">The configuration function for the analysis spec.</param>
-        /// <returns>The current <see cref="Analyzer"/>, for chaining convenience.</returns>
-        public Analyzer AddSpec(IEnumerable<string> titleIds, Action<GameSpec> transform)
-        {
-            string[] tids = titleIds.ToArray();
-            Guard.Ensure(tids.All(x => ulong.TryParse(x, NumberStyles.HexNumber, null, out _)),
-                $"Cannot use a non-hexadecimal string as the Title ID for a {nameof(GameSpec)}.");
-
-            return AddSpec(GameSpec.Create(tids).Apply(transform));
-        }
-        
-        /// <summary>
-        /// Add an analysis spec matching a specific game by title ID, with the provided pre-configured spec.
-        /// </summary>
-        /// <param name="spec">The <see cref="GameSpec"/> to add.</param>
-        /// <returns>The current <see cref="Analyzer"/>, for chaining convenience.</returns>
-        public Analyzer AddSpec(GameSpec spec)
-        {
-            _specs.Add(spec);
-            return this;
-        }
-
-
-        /// <summary>
-        /// Runs the configured <see cref="FormatterSpec"/> for the specified game title ID.
-        /// </summary>
-        /// <param name="runningGameId">The game currently running.</param>
-        /// <param name="appMeta">The Application metadata information, including localized game name and play time information.</param>
-        /// <param name="playReport">The Play Report received from HLE.</param>
-        /// <returns>A struct representing a possible formatted value.</returns>
-        public FormattedValue Format(
-            string runningGameId,
-            ApplicationMetadata appMeta,
-            Horizon.Prepo.Types.PlayReport playReport
-        )
-        {
-            if (!playReport.ReportData.IsDictionary)
-                return FormattedValue.Unhandled;
-
-            if (!_specs.TryGetFirst(s => runningGameId.EqualsAnyIgnoreCase(s.TitleIds), out GameSpec spec))
-                return FormattedValue.Unhandled;
-
-            foreach (FormatterSpecBase formatSpec in spec.ValueFormatters.OrderBy(x => x.Priority))
-            {
-                if (!formatSpec.Format(appMeta, playReport, out FormattedValue value))
-                    continue;
-
-                return value;
-            }
-
-            return FormattedValue.Unhandled;
-        }
-    }
-}

src/Ryujinx/Utilities/PlayReport/Delegates.cs

@@ -1,40 +0,0 @@
-namespace Ryujinx.Ava.Utilities.PlayReport
-{
-    /// <summary>
-    /// The delegate type that powers single value formatters.<br/>
-    /// Takes in the result value from the Play Report, and outputs:
-    /// <br/>
-    /// a formatted string,
-    /// <br/>
-    /// a signal that nothing was available to handle it,
-    /// <br/>
-    /// OR a signal to reset the value that the caller is using the <see cref="Analyzer"/> for. 
-    /// </summary>
-    public delegate FormattedValue SingleValueFormatter(SingleValue value);
-
-    /// <summary>
-    /// The delegate type that powers multiple value formatters.<br/>
-    /// Takes in the result values from the Play Report, and outputs:
-    /// <br/>
-    /// a formatted string,
-    /// <br/>
-    /// a signal that nothing was available to handle it,
-    /// <br/>
-    /// OR a signal to reset the value that the caller is using the <see cref="Analyzer"/> for. 
-    /// </summary>
-    public delegate FormattedValue MultiValueFormatter(MultiValue value);
-
-    /// <summary>
-    /// The delegate type that powers multiple value formatters.
-    /// The dictionary passed to this delegate is sparsely populated;
-    /// that is, not every key specified in the Play Report needs to match for this to be used.<br/>
-    /// Takes in the result values from the Play Report, and outputs:
-    /// <br/>
-    /// a formatted string,
-    /// <br/>
-    /// a signal that nothing was available to handle it,
-    /// <br/>
-    /// OR a signal to reset the value that the caller is using the <see cref="Analyzer"/> for. 
-    /// </summary>
-    public delegate FormattedValue SparseMultiValueFormatter(SparseMultiValue value);
-}

src/Ryujinx/Utilities/PlayReport/MatchedValues.cs

@@ -1,73 +0,0 @@
-using MsgPack;
-using Ryujinx.Ava.Utilities.AppLibrary;
-using System.Collections.Generic;
-
-namespace Ryujinx.Ava.Utilities.PlayReport
-{
-    public abstract class MatchedValue<T>
-    {
-        protected MatchedValue(T matched)
-        {
-            Matched = matched;
-        }
-        
-        /// <summary>
-        /// The currently running application's <see cref="ApplicationMetadata"/>.
-        /// </summary>
-        public ApplicationMetadata Application { get; init; }
-        
-        /// <summary>
-        /// The entire play report.
-        /// </summary>
-        public Horizon.Prepo.Types.PlayReport PlayReport { get; init; }
-
-        /// <summary>
-        /// The matched value from the Play Report.
-        /// </summary>
-        public T Matched { get; init; }
-    }
-    
-    /// <summary>
-    /// The input data to a <see cref="SingleValueFormatter"/>,
-    /// containing the currently running application's <see cref="ApplicationMetadata"/>,
-    /// and the matched <see cref="MessagePackObject"/> from the Play Report.
-    /// </summary>
-    public class SingleValue : MatchedValue<Value>
-    {
-        public SingleValue(Value matched) : base(matched)
-        {
-        }
-    }
-
-    /// <summary>
-    /// The input data to a <see cref="MultiValueFormatter"/>,
-    /// containing the currently running application's <see cref="ApplicationMetadata"/>,
-    /// and the matched <see cref="MessagePackObject"/>s from the Play Report.
-    /// </summary>
-    public class MultiValue : MatchedValue<Value[]>
-    {
-        public MultiValue(Value[] matched) : base(matched)
-        {
-        }
-
-        public MultiValue(IEnumerable<MessagePackObject> matched) : base(Value.ConvertPackedObjects(matched))
-        {
-        }
-    }
-
-    /// <summary>
-    /// The input data to a <see cref="SparseMultiValueFormatter"/>,
-    /// containing the currently running application's <see cref="ApplicationMetadata"/>,
-    /// and the matched <see cref="MessagePackObject"/>s from the Play Report.
-    /// </summary>
-    public class SparseMultiValue : MatchedValue<Dictionary<string, Value>>
-    {
-        public SparseMultiValue(Dictionary<string, Value> matched) : base(matched)
-        {
-        }
-        
-        public SparseMultiValue(Dictionary<string, MessagePackObject> matched) : base(Value.ConvertPackedObjectMap(matched))
-        {
-        }
-    }
-}

src/Ryujinx/Utilities/PlayReport/PlayReports.Formatters.cs

@@ -1,632 +0,0 @@
-using Gommon;
-using System;
-using System.Buffers.Binary;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Ryujinx.Ava.Utilities.PlayReport
-{
-    public partial class PlayReports
-    {
-        private static FormattedValue BreathOfTheWild_MasterMode(SingleValue value)
-            => value.Matched.BoxedValue is 1 ? "Playing Master Mode" : FormattedValue.ForceReset;
-
-        private static FormattedValue TearsOfTheKingdom_CurrentField(SingleValue value) =>
-            value.Matched.DoubleValue switch
-            {
-                > 800d => "Exploring the Sky Islands",
-                < -201d => "Exploring the Depths",
-                _ => "Roaming Hyrule"
-            };
-
-        private static FormattedValue SuperMarioOdyssey_AssistMode(SingleValue value)
-            => value.Matched.BoxedValue is 1 ? "Playing in Assist Mode" : "Playing in Regular Mode";
-
-        private static FormattedValue SuperMarioOdysseyChina_AssistMode(SingleValue value)
-            => value.Matched.BoxedValue is 1 ? "Playing in 帮助模式" : "Playing in 普通模式";
-
-        private static FormattedValue SuperMario3DWorldOrBowsersFury(SingleValue value)
-            => value.Matched.BoxedValue is 0 ? "Playing Super Mario 3D World" : "Playing Bowser's Fury";
-
-        private static FormattedValue MarioKart8Deluxe_Mode(SingleValue value)
-            => value.Matched.StringValue switch
-            {
-                // Single Player
-                "Single" => "Single Player",
-                // Multiplayer
-                "Multi-2players" => "Multiplayer 2 Players",
-                "Multi-3players" => "Multiplayer 3 Players",
-                "Multi-4players" => "Multiplayer 4 Players",
-                // Wireless/LAN Play
-                "Local-Single" => "Wireless/LAN Play",
-                "Local-2players" => "Wireless/LAN Play 2 Players",
-                // CC Classes
-                "50cc" => "50cc",
-                "100cc" => "100cc",
-                "150cc" => "150cc",
-                "Mirror" => "Mirror (150cc)",
-                "200cc" => "200cc",
-                // Modes
-                "GrandPrix" => "Grand Prix",
-                "TimeAttack" => "Time Trials",
-                "VS" => "VS Races",
-                "Battle" => "Battle Mode",
-                "RaceStart" => "Selecting a Course",
-                "Race" => "Racing",
-                _ => FormattedValue.ForceReset
-            };
-
-        private static FormattedValue PokemonSVUnionCircle(SingleValue value)
-            => value.Matched.BoxedValue is 0 ? "Playing Alone" : "Playing in a group";
-
-        private static FormattedValue PokemonSVArea(SingleValue value)
-            => value.Matched.StringValue switch
-            {
-                // Base Game Locations
-                "a_w01" => "South Area One",
-                "a_w02" => "Mesagoza",
-                "a_w03" => "The Pokemon League",
-                "a_w04" => "South Area Two",
-                "a_w05" => "South Area Four",
-                "a_w06" => "South Area Six",
-                "a_w07" => "South Area Five",
-                "a_w08" => "South Area Three",
-                "a_w09" => "West Area One",
-                "a_w10" => "Asado Desert",
-                "a_w11" => "West Area Two",
-                "a_w12" => "Medali",
-                "a_w13" => "Tagtree Thicket",
-                "a_w14" => "East Area Three",
-                "a_w15" => "Artazon",
-                "a_w16" => "East Area Two",
-                "a_w18" => "Casseroya Lake",
-                "a_w19" => "Glaseado Mountain",
-                "a_w20" => "North Area Three",
-                "a_w21" => "North Area One",
-                "a_w22" => "North Area Two",
-                "a_w23" => "The Great Crater of Paldea",
-                "a_w24" => "South Paldean Sea",
-                "a_w25" => "West Paldean Sea",
-                "a_w26" => "East Paldean Sea",
-                "a_w27" => "Nouth Paldean Sea",
-                //TODO DLC Locations
-                _ => FormattedValue.ForceReset
-            };
-
-        private static FormattedValue SuperSmashBrosUltimate_Mode(SparseMultiValue values)
-        {
-            // Check if the PlayReport is for a challenger approach or an achievement.
-            if (values.Matched.TryGetValue("fighter", out Value fighter) && values.Matched.ContainsKey("reason"))
-            {
-                return $"Challenger Approaches - {SuperSmashBrosUltimate_Character(fighter)}";
-            }
-
-            if (values.Matched.TryGetValue("fighter", out fighter) && values.Matched.ContainsKey("challenge_count"))
-            {
-                return $"Fighter Unlocked - {SuperSmashBrosUltimate_Character(fighter)}";
-            }
-
-            if (values.Matched.TryGetValue("anniversary", out Value anniversary))
-            {
-                return $"Achievement Unlocked - ID: {anniversary}";
-            }
-
-            if (values.Matched.ContainsKey("adv_slot"))
-            {
-                return
-                    "Playing Adventure Mode"; // Doing this as it can be a placeholder until we can grab the character.
-            }
-
-            // Check if we have a match_mode at this point, if not, go to default.
-            if (!values.Matched.TryGetValue("match_mode", out Value matchMode))
-            {
-                return "Smashing";
-            }
-
-            return matchMode.BoxedValue switch
-            {
-                0 when values.Matched.TryGetValue("player_1_fighter", out Value player) &&
-                       values.Matched.TryGetValue("player_2_fighter", out Value challenger)
-                    => $"Last Smashed: {SuperSmashBrosUltimate_Character(challenger)}'s Fighter Challenge - {SuperSmashBrosUltimate_Character(player)}",
-                1 => $"Last Smashed: Normal Battle - {SuperSmashBrosUltimate_PlayerListing(values)}",
-                2 when values.Matched.TryGetValue("player_1_rank", out Value team)
-                    => team.BoxedValue is 0
-                        ? "Last Smashed: Squad Strike - Red Team Wins"
-                        : "Last Smashed: Squad Strike - Blue Team Wins",
-                3 => $"Last Smashed: Custom Smash - {SuperSmashBrosUltimate_PlayerListing(values)}",
-                4 => $"Last Smashed: Super Sudden Death - {SuperSmashBrosUltimate_PlayerListing(values)}",
-                5 => $"Last Smashed: Smashdown - {SuperSmashBrosUltimate_PlayerListing(values)}",
-                6 => $"Last Smashed: Tourney Battle - {SuperSmashBrosUltimate_PlayerListing(values)}",
-                7 when values.Matched.TryGetValue("player_1_fighter", out Value player)
-                    => $"Last Smashed: Spirit Board Battle as {SuperSmashBrosUltimate_Character(player)}",
-                8 when values.Matched.TryGetValue("player_1_fighter", out Value player)
-                    => $"Playing Adventure Mode as {SuperSmashBrosUltimate_Character(player)}",
-                10 when values.Matched.TryGetValue("match_submode", out Value battle) &&
-                        values.Matched.TryGetValue("player_1_fighter", out Value player)
-                    => $"Last Smashed: Classic Mode, Battle {(int)battle.BoxedValue + 1}/8 as {SuperSmashBrosUltimate_Character(player)}",
-                12 => $"Last Smashed: Century Smash - {SuperSmashBrosUltimate_PlayerListing(values)}",
-                13 => $"Last Smashed: All-Star Smash - {SuperSmashBrosUltimate_PlayerListing(values)}",
-                14 => $"Last Smashed: Cruel Smash - {SuperSmashBrosUltimate_PlayerListing(values)}",
-                15 when values.Matched.TryGetValue("player_1_fighter", out Value player)
-                    => $"Last Smashed: Home-Run Contest - {SuperSmashBrosUltimate_Character(player)}",
-                16 when values.Matched.TryGetValue("player_1_fighter", out Value player1) &&
-                        values.Matched.TryGetValue("player_2_fighter", out Value player2)
-                    => $"Last Smashed: Home-Run Content (Co-op) - {SuperSmashBrosUltimate_Character(player1)} and {SuperSmashBrosUltimate_Character(player2)}",
-                17 => $"Last Smashed: Home-Run Contest (Versus) - {SuperSmashBrosUltimate_PlayerListing(values)}",
-                18 when values.Matched.TryGetValue("player_1_fighter", out Value player1) &&
-                        values.Matched.TryGetValue("player_2_fighter", out Value player2)
-                    => $"Fresh out of Training mode - {SuperSmashBrosUltimate_Character(player1)} with {SuperSmashBrosUltimate_Character(player2)}",
-                58 => $"Last Smashed: LDN Battle - {SuperSmashBrosUltimate_PlayerListing(values)}",
-                63 when values.Matched.TryGetValue("player_1_fighter", out Value player)
-                    => $"Last Smashed: DLC Spirit Board Battle as {SuperSmashBrosUltimate_Character(player)}",
-                _ => "Smashing"
-            };
-        }
-
-        private static string SuperSmashBrosUltimate_Character(Value value) =>
-            BinaryPrimitives.ReverseEndianness(
-                    BitConverter.ToInt64(((MsgPack.MessagePackExtendedTypeObject)value.BoxedValue).GetBody(), 0)) switch
-                {
-                    0x0 => "Mario",
-                    0x1 => "Donkey Kong",
-                    0x2 => "Link",
-                    0x3 => "Samus",
-                    0x4 => "Dark Samus",
-                    0x5 => "Yoshi",
-                    0x6 => "Kirby",
-                    0x7 => "Fox",
-                    0x8 => "Pikachu",
-                    0x9 => "Luigi",
-                    0xA => "Ness",
-                    0xB => "Captain Falcon",
-                    0xC => "Jigglypuff",
-                    0xD => "Peach",
-                    0xE => "Daisy",
-                    0xF => "Bowser",
-                    0x10 => "Ice Climbers",
-                    0x11 => "Sheik",
-                    0x12 => "Zelda",
-                    0x13 => "Dr. Mario",
-                    0x14 => "Pichu",
-                    0x15 => "Falco",
-                    0x16 => "Marth",
-                    0x17 => "Lucina",
-                    0x18 => "Young Link",
-                    0x19 => "Ganondorf",
-                    0x1A => "Mewtwo",
-                    0x1B => "Roy",
-                    0x1C => "Chrom",
-                    0x1D => "Mr Game & Watch",
-                    0x1E => "Meta Knight",
-                    0x1F => "Pit",
-                    0x20 => "Dark Pit",
-                    0x21 => "Zero Suit Samus",
-                    0x22 => "Wario",
-                    0x23 => "Snake",
-                    0x24 => "Ike",
-                    0x25 => "Pokémon Trainer",
-                    0x26 => "Diddy Kong",
-                    0x27 => "Lucas",
-                    0x28 => "Sonic",
-                    0x29 => "King Dedede",
-                    0x2A => "Olimar",
-                    0x2B => "Lucario",
-                    0x2C => "R.O.B.",
-                    0x2D => "Toon Link",
-                    0x2E => "Wolf",
-                    0x2F => "Villager",
-                    0x30 => "Mega Man",
-                    0x31 => "Wii Fit Trainer",
-                    0x32 => "Rosalina & Luma",
-                    0x33 => "Little Mac",
-                    0x34 => "Greninja",
-                    0x35 => "Palutena",
-                    0x36 => "Pac-Man",
-                    0x37 => "Robin",
-                    0x38 => "Shulk",
-                    0x39 => "Bowser Jr.",
-                    0x3A => "Duck Hunt",
-                    0x3B => "Ryu",
-                    0x3C => "Ken",
-                    0x3D => "Cloud",
-                    0x3E => "Corrin",
-                    0x3F => "Bayonetta",
-                    0x40 => "Richter",
-                    0x41 => "Inkling",
-                    0x42 => "Ridley",
-                    0x43 => "King K. Rool",
-                    0x44 => "Simon",
-                    0x45 => "Isabelle",
-                    0x46 => "Incineroar",
-                    0x47 => "Mii Brawler",
-                    0x48 => "Mii Swordfighter",
-                    0x49 => "Mii Gunner",
-                    0x4A => "Piranha Plant",
-                    0x4B => "Joker",
-                    0x4C => "Hero",
-                    0x4D => "Banjo",
-                    0x4E => "Terry",
-                    0x4F => "Byleth",
-                    0x50 => "Min Min",
-                    0x51 => "Steve",
-                    0x52 => "Sephiroth",
-                    0x53 => "Pyra/Mythra",
-                    0x54 => "Kazuya",
-                    0x55 => "Sora",
-                    0xFE => "Random",
-                    0xFF => "Scripted Entity",
-                    _ => "Unknown"
-                };
-
-        private static string SuperSmashBrosUltimate_PlayerListing(SparseMultiValue values)
-        {
-            List<(string Character, int PlayerNumber, int? Rank)> players = [];
-
-            foreach (KeyValuePair<string, Value> player in values.Matched)
-            {
-                if (player.Key.StartsWith("player_") && player.Key.EndsWith("_fighter") &&
-                    player.Value.BoxedValue is not null)
-                {
-                    if (!int.TryParse(player.Key.Split('_')[1], out int playerNumber))
-                        continue;
-
-                    string character = SuperSmashBrosUltimate_Character(player.Value);
-                    int? rank = values.Matched.TryGetValue($"player_{playerNumber}_rank", out Value rankValue)
-                        ? rankValue.IntValue
-                        : null;
-
-                    players.Add((character, playerNumber, rank));
-                }
-            }
-
-            players = players.OrderBy(p => p.Rank ?? int.MaxValue).ToList();
-
-            return players.Count > 4
-                ? $"{players.Count} Players - {
-                    players.Take(3)
-                        .Select(p => $"{p.Character}({p.PlayerNumber}){RankMedal(p.Rank)}")
-                        .JoinToString(", ")
-                }"
-                : players
-                    .Select(p => $"{p.Character}({p.PlayerNumber}){RankMedal(p.Rank)}")
-                    .JoinToString(", ");
-
-            string RankMedal(int? rank) => rank switch
-            {
-                0 => "🥇",
-                1 => "🥈",
-                2 => "🥉",
-                _ => ""
-            };
-        }
-
-        private static FormattedValue NsoEmulator_LaunchedGame(SingleValue value) => value.Matched.StringValue switch
-        {
-            #region SEGA Genesis
-
-            "m_0054_e" => Playing("Alien Soldier"),
-            "m_3978_e" => Playing("Alien Storm"),
-            "m_5234_e" => Playing("ALISIA DRAGOON"),
-            "m_5003_e" => Playing("Streets of Rage 2"),
-            "m_4843_e" => Playing("Kid Chameleon"),
-            "m_2874_e" => Playing("Columns"),
-            "m_3167_e" => Playing("Comix Zone"),
-            "m_5007_e" => Playing("Contra: Hard Corps"),
-            "m_0865_e" => Playing("Ghouls 'n Ghosts"),
-            "m_0935_e" => Playing("Dynamite Headdy"),
-            "m_8314_e" => Playing("Earthworm Jim"),
-            "m_5012_e" => Playing("Ecco the Dolphin"),
-            "m_2207_e" => Playing("Flicky"),
-            "m_9432_e" => Playing("Golden Axe II"),
-            "m_5015_e" => Playing("Golden Axe"),
-            "m_5017_e" => Playing("Gunstar Heroes"),
-            "m_0732_e" => Playing("Altered Beast"),
-            "m_2245_e" or "m_2245_pd" or "m_2245_pf" => Playing("Landstalker"),
-            "m_1654_e" => Playing("Target Earth"),
-            "m_7050_e" => Playing("Light Crusader"),
-            "m_5027_e" => Playing("M.U.S.H.A."),
-            "m_5028_e" => Playing("Phantasy Star IV"),
-            "m_9155_e" => Playing("Pulseman"),
-            "m_5030_e" => Playing("Dr. Robotnik's Mean Bean Machine"),
-            "m_0098_e" => Playing("Crusader of Centy"),
-            "m_0098_k" => Playing("신창세기 라그나센티"),
-            "m_0098_pd" or "m_0098_pf" or "m_0098_ps" => Playing("Soleil"),
-            "m_5033_e" => Playing("Ristar"),
-            "m_1987_e" => Playing("MEGA MAN: THE WILY WARS"),
-            "m_2609_e" => Playing("WOLF OF THE BATTLEFIELD: MERCS"),
-            "m_3353_e" => Playing("Shining Force II"),
-            "m_5036_e" => Playing("Shining Force"),
-            "m_9866_e" => Playing("Sonic The Hedgehog Spinball"),
-            "m_5041_e" => Playing("Sonic The Hedgehog 2"),
-            "m_5523_e" => Playing("Space Harrier II"),
-            "m_0041_e" => Playing("STREET FIGHTER II' : SPECIAL CHAMPION EDITION"),
-            "m_5044_e" => Playing("STRIDER"),
-            "m_6353_e" => Playing("Super Fantasy Zone"),
-            "m_9569_e" => Playing("Beyond Oasis"),
-            "m_9569_k" => Playing("스토리 오브 도어"),
-            "m_9569_pd" or "m_9569_ps" => Playing("The Story of Thor"),
-            "m_9569_pf" => Playing("La Légende de Thor"),
-            "m_5049_e" => Playing("Shinobi III: Return of the Ninja Master"),
-            "m_6811_e" => Playing("The Revenge of Shinobi"),
-            "m_4372_e" => Playing("Thunder Force II"),
-            "m_1535_e" => Playing("ToeJam & Earl in Panic on Funkotron"),
-            "m_0432_e" => Playing("ToeJam & Earl"),
-            "m_5052_e" => Playing("Castlevania: BLOODLINES"),
-            "m_3626_e" => Playing("VectorMan"),
-            "m_7955_e" => Playing("Sword of Vermilion"),
-            "m_0394_e" => Playing("Virtua Fighter 2"),
-            "m_9417_e" => Playing("Zero Wing"),
-
-            #endregion
-            
-            #region Nintendo 64
-
-            "n_1653_e" or "n_1653_p" => Playing("1080º ™ Snowboarding"),
-            "n_4868_e" or "n_4868_p" => Playing("Banjo Kazooie™"),
-            "n_1226_e" or "n_1226_p" => Playing("Banjo-Tooie™"),
-            "n_3083_e" or "n_3083_p" => Playing("Blast Corps"),
-            "n_3007_e" => Playing("Dr. Mario™ 64"),
-            "n_4238_e" => Playing("Excitebike™ 64"),
-            "n_1870_e" => Playing("Extreme G"),
-            "n_2456_e" => Playing("F-Zero™ X"),
-            "n_4631_e" => Playing("GoldenEye 007"),
-            "n_1635_e" => Playing("Harvest Moon 64"),
-            "n_2225_e" => Playing("Iggy’s Reckin’ Balls"),
-            "n_1625_e" or "n_1625_p" => Playing("JET FORCE GEMINI™"),
-            "n_3052_e" => Playing("Kirby 64™: The Crystal Shards"),
-            "n_4371_e" => Playing("Mario Golf™"),
-            "n_3013_e" => Playing("Mario Kart™ 64"),
-            "n_1053_e" or "n_1053_p" => Playing("Mario Party™ 2"),
-            "n_2965_e" or "n_2965_p" => Playing("Mario Party™ 3"),
-            "n_4737_e" or "n_4737_p" => Playing("Mario Party™"),
-            "n_3017_e" => Playing("Mario Tennis™"),
-            "n_2992_e" or "n_2992_p" => Playing("Paper Mario™"),
-            "n_3783_e" or "n_3783_p" => Playing("Pilotwings™ 64"),
-            "n_1848_e" or "n_1848_pd" or "n_1848_pf" => Playing("Pokémon™ Puzzle League"),
-            "n_3240_e" or "n_3240_pd" or "n_3240_pf" or "n_3240_pi" or "n_3240_ps" => Playing("Pokémon Snap™"),
-            "n_4590_e" or "n_4590_pd" or "n_4590_pf" or "n_4590_pi" or "n_4590_ps" => Playing("Pokémon Stadium™"),
-            "n_3309_e" or "n_3309_pd" or "n_3309_pf" or "n_3309_pi" or "n_3309_ps" => Playing("Pokémon Stadium 2™"),
-            "n_3029_e" => Playing("Sin & Punishment™"),
-            "n_3030_e" => Playing("Star Fox™ 64"),
-            "n_3030_p" => Playing("Lylat Wars™"),
-            "n_3031_e" or "n_3031_p" => Playing("Super Mario 64™"),
-            "n_4813_e" or "n_4813_p" => Playing("Wave Race™ 64"),
-            "n_3034_e" => Playing("WIN BACK: COVERT OPERATIONS"),
-            "n_3034_p" => Playing("OPERATION: WIN BACK"),
-            "n_3036_e" or "n_3036_p" => Playing("Yoshi's Story™"),
-            "n_1407_e" or "n_1407_p" => Playing("The Legend of Zelda™: Majora's Mask™"),
-            "n_3038_e" or "n_3038_p" => Playing("The Legend of Zelda™: Ocarina of Time™"),
-
-            #endregion
-
-            #region NES
-
-            "clv_p_naaae" => Playing("Super Mario Bros.™"),
-            "clv_p_naabe" => Playing("Super Mario Bros.™: The Lost Levels"),
-            "clv_p_naace" or "clv_p_naace_sp1" => Playing("Super Mario Bros.™ 3"),
-            "clv_p_naade" => Playing("Super Mario Bros.™ 2"),
-            "clv_p_naaee" => Playing("Donkey Kong™"),
-            "clv_p_naafe" => Playing("Donkey Kong Jr.™"),
-            "clv_p_naage" => Playing("Donkey Kong™ 3"),
-            "clv_p_naahe" => Playing("Excitebike™"),
-            "clv_p_naaje" => Playing("EarthBound Beginnings"),
-            "clv_p_naame" => Playing("NES™ Open Tournament Golf"),
-            "clv_p_naane" or "clv_p_naane_sp1" => Playing("The Legend of Zelda™"),
-            "clv_p_naape" or "clv_p_naape_sp1" => Playing("Kirby's Adventure™"),
-            "clv_p_naaqe" or "clv_p_naaqe_sp1" or "clv_p_naaqe_sp2" => Playing("Metroid™"),
-            "clv_p_naare" => Playing("Balloon Fight™"),
-            "clv_p_naase" or "clv_p_naase_sp1" => Playing("Zelda II - The Adventure of Link™"),
-            "clv_p_naate" => Playing("Punch-Out!!™ Featuring Mr. Dream"),
-            "clv_p_naaue" => Playing("Ice Climber™"),
-            "clv_p_naave" or "clv_p_naave_sp1" => Playing("Kid Icarus™"),
-            "clv_p_naawe" => Playing("Mario Bros.™"),
-            "clv_p_naaxe" or "clv_p_naaxe_sp1" => Playing("Dr. Mario™"),
-            "clv_p_naaye" => Playing("Yoshi™"),
-            "clv_p_naaze" => Playing("StarTropics™"),
-            "clv_p_nabce" or "clv_p_nabce_sp1" => Playing("Ghosts'n Goblins™"),
-            "clv_p_nabre" or "clv_p_nabre_sp1" or "clv_p_nabre_sp2" => Playing("Gradius"),
-            "clv_p_nacbe" or "clv_p_nacbe_sp1" => Playing("Ninja Gaiden"),
-            "clv_p_nacce" => Playing("Solomon's Key"),
-            "clv_p_nacde" => Playing("Tecmo Bowl"),
-            "clv_p_nacfe" => Playing("Double Dragon"),
-            "clv_p_nache" => Playing("Double Dragon II: The Revenge"),
-            "clv_p_nacje" => Playing("River City Ransom"),
-            "clv_p_nacke" => Playing("Super Dodge Ball"),
-            "clv_p_nacle" => Playing("Downtown Nekketsu March Super-Awesome Field Day!"),
-            "clv_p_nacpe" => Playing("The Mystery of Atlantis"),
-            "clv_p_nacre" => Playing("Soccer"),
-            "clv_p_nacse" or "clv_p_nacse_sp1" => Playing("Ninja JaJaMaru-kun"),
-            "clv_p_nacte" => Playing("Ice Hockey"),
-            "clv_p_nacue" or "clv_p_nacue_sp1" => Playing("Blaster Master"),
-            "clv_p_nacwe" => Playing("ADVENTURES OF LOLO"),
-            "clv_p_nacxe" => Playing("Wario's Woods™"),
-            "clv_p_nacye" => Playing("Tennis"),
-            "clv_p_nacze" => Playing("Wrecking Crew™"),
-            "clv_p_nadbe" => Playing("Joy Mech Fight™"),
-            "clv_p_nadde" or "clv_p_nadde_sp1" => Playing("Star Soldier"),
-            "clv_p_nadke" => Playing("Tetris®"),
-            "clv_p_nadle" => Playing("Pro Wrestling"),
-            "clv_p_nadpe" => Playing("Baseball"),
-            "clv_p_nadte" or "clv_p_nadte_sp1" => Playing("TwinBee"),
-            "clv_p_nadue" or "clv_p_nadue_sp1" => Playing("Mighty Bomb Jack"),
-            "clv_p_nadve" => Playing("Kung-Fu Heroes"),
-            "clv_p_nadxe" => Playing("City Connection"),
-            "clv_p_nadye" => Playing("Rygar"),
-            "clv_p_naeae" => Playing("Crystalis"),
-            "clv_p_naece" => Playing("Vice: Project Doom"),
-            "clv_p_naehe" => Playing("Clu Clu Land™"),
-            "clv_p_naeie" => Playing("VS. Excitebike™"),
-            "clv_p_naeje" => Playing("Volleyball™"),
-            "clv_p_naeke" => Playing("JOURNEY TO SILIUS"),
-            "clv_p_naele" => Playing("S.C.A.T.: Special Cybernetic Attack Team"),
-            "clv_p_naeme" => Playing("Shadow of the Ninja"),
-            "clv_p_naene" => Playing("Nightshade"),
-            "clv_p_naepe" => Playing("The Immortal"),
-            "clv_p_naeqe" => Playing("Eliminator Boat Duel"),
-            "clv_p_naere" => Playing("Fire 'n Ice"),
-            "clv_p_nafce" => Playing("XEVIOUS"),
-            "clv_p_nagpe" => Playing("DAIVA STORY 6 IMPERIAL OF NIRSARTIA"),
-            "clv_p_nagqe" => Playing("DIG DUGⅡ"),
-            "clv_p_nague" => Playing("MAPPY-LAND"),
-            "clv_p_nahhe" => Playing("Mach Rider™"),
-            "clv_p_nahje" => Playing("Pinball"),
-            "clv_p_nahre" => Playing("Mystery Tower"),
-            "clv_p_nahte" => Playing("Urban Champion™"),
-            "clv_p_nahue" => Playing("Donkey Kong Jr.™ Math"),
-            "clv_p_nahve" => Playing("The Mysterious Murasame Castle"),
-            "clv_p_najae" => Playing("DEVIL WORLD™"),
-            "clv_p_najbe" => Playing("Golf"),
-            "clv_p_najpe" => Playing("R.C. PRO-AM™"),
-            "clv_p_najre" => Playing("COBRA TRIANGLE™"),
-            "clv_p_najse" => Playing("SNAKE RATTLE N ROLL™"),
-            "clv_p_najte" => Playing("SOLAR® JETMAN"),
-
-            #endregion
-
-            #region SNES
-
-            "s_2180_e" => Playing("BATTLETOADS™ DOUBLE DRAGON™"),
-            "s_2179_e" => Playing("BATTLETOADS™ IN BATTLEMANIACS"),
-            "s_2182_e" => Playing("BIG RUN"),
-            "s_2156_e" => Playing("Bombuzal"),
-            "s_2002_e" => Playing("BRAWL BROTHERS"),
-            "s_2025_e" => Playing("Breath of Fire II"),
-            "s_2003_e" => Playing("Breath Of Fire"),
-            "s_2163_e" => Playing("Claymates"),
-            "s_2150_e" => Playing("Congo's Caper"),
-            "s_2171_e" => Playing("COSMO GANG THE PUZZLE"),
-            "s_2004_e" => Playing("Demon's Crest"),
-            "s_2026_e" => Playing("Kunio-kun no Dodgeball da yo Zen'in Shūgō!"),
-            "s_2060_e" => Playing("Donkey Kong Country 2: Diddy's Kong Quest"),
-            "s_2061_e" => Playing("Donkey Kong Country 3: Dixie Kong's Double Trouble!"),
-            "s_2055_e" => Playing("Donkey Kong Country"),
-            "s_2139_e" => Playing("DOOMSDAY WARRIOR"),
-            "s_2051_e" => Playing("EarthBound"),
-            "s_2162_e" => Playing("Earthworm Jim™ 2"),
-            "s_2005_e" => Playing("F-ZERO™"),
-            "s_2183_e" => Playing("FATAL FURY 2"),
-            "s_2174_e" => Playing("Fighter's History"),
-            "s_2037_e" => Playing("Harvest Moon"),
-            "s_2161_e" => Playing("Jelly Boy"),
-            "s_2006_e" => Playing("Joe & Mac 2: Lost in the Tropics"),
-            "s_2169_e" => Playing("Caveman Ninja"),
-            "s_2181_e" => Playing("KILLER INSTINCT™"),
-            "s_2029_e" or "s_2029_e_sp1" => Playing("Kirby Super Star™"),
-            "s_2121_e" => Playing("Kirby's Avalanche™"),
-            "s_2007_e" or "s_2007_e_sp1" => Playing("Kirby's Dream Course™"),
-            "s_2008_e" or "s_2008_e_sp1" => Playing("Kirby's Dream Land™ 3"),
-            "s_2172_e" => Playing("Kirby’s Star Stacker™"),
-            "s_2151_e" => Playing("Magical Drop2"),
-            "s_2044_e" => Playing("Mario's Super Picross"),
-            "s_2038_e" => Playing("Natsume Championship Wrestling"),
-            "s_2140_e" => Playing("Operation Logic Bomb"),
-            "s_2034_e" => Playing("Panel de Pon"),
-            "s_2009_e" => Playing("Pilotwings™"),
-            "s_2010_e" => Playing("Pop'n TwinBee"),
-            "s_2157_e" => Playing("Prehistorik Man"),
-            "s_2145_e" => Playing("Psycho Dream"),
-            "s_2141_e" => Playing("Rival Turf!"),
-            "s_2152_e" => Playing("SIDE POCKET"),
-            "s_2158_e" => Playing("Spanky’s™ Quest"),
-            "s_2031_e" => Playing("Star Fox™ 2"),
-            "s_2011_e" => Playing("Star Fox™"),
-            "s_2012_e" => Playing("Stunt Race FX™"),
-            "s_2032_e" => Playing("Amazing Hebereke"),
-            "s_2159_e" => Playing("Super Baseball Simulator 1.000"),
-            "s_2013_e" => Playing("SUPER E.D.F. EARTH DEFENSE FORCE"),
-            "s_2014_e" => Playing("Smash Tennis"),
-            "s_2015_e" => Playing("Super Ghouls'n Ghosts™"),
-            "s_2033_e" => Playing("Super Mario All-Stars™"),
-            "s_2016_e" or "s_2016_e_sp1" => Playing("Super Mario Kart™"),
-            "s_2017_e" or "s_2017_e_sp1" => Playing("Super Mario World™"),
-            "s_2018_e" or "s_2018_e_sp1" => Playing("Super Metroid™"),
-            "s_2184_e" => Playing("Super Ninja Boy"),
-            "s_2019_e" or "s_2019_e_sp1" => Playing("Super Punch-Out!!™"),
-            "s_2020_e" => Playing("Super Puyo Puyo 2"),
-            "s_2133_e" => Playing("SUPER R-TYPE"),
-            "s_2021_e" => Playing("Super Soccer"),
-            "s_2022_e" => Playing("Super Tennis"),
-            "s_2136_e" => Playing("Sutte Hakkun"),
-            "s_2142_e" => Playing("The Ignition Factor"),
-            "s_2143_e" => Playing("The Peace Keepers"),
-            "s_2146_e" => Playing("Tuff E Nuff"),
-            "s_2144_e" => Playing("SUPER VALIS Ⅳ"),
-            "s_2049_e" => Playing("Wild Guns"),
-            "s_2096_e" => Playing("Wrecking Crew™ '98"),
-            "s_2023_e" => Playing("Super Mario World™ 2: Yoshi's Island™"),
-            "s_2024_e" => Playing("The Legend of Zelda™: A Link to the Past™"),
-
-            #endregion
-
-            #region GameBoy
-
-            "c_7224_e" or "c_7224_p" => Playing("Alone in the Dark: The New Nightmare"),
-            "c_5022_e" => Playing("Blaster Master: Enemy Below"),
-            "c_3381_e" => Playing("Game & Watch™ Gallery 3"),
-            "c_0282_e" => Playing("Kirby Tilt ‘n’ Tumble™"),
-            "c_4471_e" or "c_4471_p" => Playing("Mario Golf™"),
-            "c_9947_e" => Playing("Mario Tennis™"),
-            "c_3191_e" or "c_3191_p" or "c_3191_x" => Playing("Pokémon™ Trading Card Game"),
-            "c_8914_e" or "c_8914_p" => Playing("Quest for Camelot™"),
-            "c_2648_e" => Playing("Tetris® DX"),
-            "c_5928_e" => Playing("Wario Land™ 3"),
-            "c_3996_e" or "c_3996_pd" or "c_3996_pf" => Playing("The Legend of Zelda™: Link's Awakening DX™"),
-            "c_8852_e" or "c_8852_p" => Playing("The Legend of Zelda™: Oracle of Ages™"),
-            "c_9130_e" or "c_9130_p" => Playing("The Legend of Zelda™: Oracle of Seasons™"),
-            "d_6879_e" => Playing("Alleyway™"),
-            "d_7618_e" => Playing("Baseball"),
-            "d_6005_e" => Playing("BurgerTime Deluxe"),
-            "d_7120_e" => Playing("Castlevania Legends"),
-            "d_2744_e" => Playing("Dr. Mario™"),
-            "d_1593_e" => Playing("Donkey Kong Land 2™"),
-            "d_7216_e" => Playing("Donkey Kong Land III™"),
-            "d_4971_e" => Playing("Donkey Kong Land™"),
-            "d_7984_e" => Playing("GARGOYLE'S QUEST"),
-            "d_8212_e" => Playing("Kirby's Dream Land™ 2"),
-            "d_5661_e" => Playing("Kirby's Dream Land™"),
-            "d_3837_e" => Playing("MEGA MAN II"),
-            "d_1965_e" => Playing("MEGA MAN III"),
-            "d_0194_e" => Playing("MEGA MAN IV"),
-            "d_1425_e" => Playing("MEGA MAN V"),
-            "d_9324_e" => Playing("MEGA MAN: DR. WILY'S REVENGE"),
-            "d_1577_e" => Playing("Metroid™ II - Return of Samus™"),
-            "d_5124_e" => Playing("Super Mario Land™ 2 - 6 Golden Coins™"),
-            "d_7970_e" => Playing("Super Mario Land™"),
-            "d_8484_e" => Playing("Tetris®"),
-
-            #endregion
-
-            #region GameBoy Advance
-
-            "a_9694_e" => Playing("Densetsu no Starfy 1"),
-            "a_5600_e" => Playing("Densetsu no Starfy 2"),
-            "a_7565_e" => Playing("Densetsu no Starfy 3"),
-            "a_6553_e" => Playing("F-ZERO CLIMAX"),
-            "a_7842_e" or "a_7842_p" => Playing("F-Zero™- GP Legend"),
-            "a_9283_e" => Playing("F-Zero™ Maximum Velocity"),
-            "a_3744_e" or "a_3744_x" or "a_3744_y" => Playing("Fire Emblem™"),
-            "a_8978_d" or "a_8978_e" or "a_8978_f" or "a_8978_i" or "a_8978_s" => Playing("Golden Sun™: The Lost Age"),
-            "a_3108_d" or "a_3108_e" or "a_3108_f" or "a_3108_i" or "a_3108_s" => Playing("Golden Sun™"),
-            "a_3654_e" or "a_3654_p" => Playing("Kirby™ & The Amazing Mirror"),
-            "a_7279_p" => Playing("Kuru Kuru Kururin™"),
-            "a_7311_e" or "a_7311_p" => Playing("Mario & Luigi™: Superstar Saga"),
-            "a_6845_e" => Playing("Mario Kart™: Super Circuit™"),
-            "a_4139_e" or "a_4139_p" => Playing("Metroid™ Fusion"),
-            "a_6834_e" or "a_6834_p" => Playing("Metroid™: Zero Mission"),
-            "a_8989_e" or "a_8989_p" => Playing("Pokémon™ Mystery Dungeon: Red Rescue Team"),
-            "a_9444_e" => Playing("Super Mario™ Advance"),
-            "a_9901_e" or "a_9901_p" => Playing("Super Mario™ Advance 4: Super Mario Bros.™ 3"),
-            "a_2939_e" => Playing("Super Mario World™: Super Mario Advance 2"),
-            "a_2939_p" => Playing("Super Mario World™: Super Mario Advance 2™"),
-            "a_1302_e" => Playing("WarioWare™, Inc.: Mega Microgame$!"),
-            "a_1302_p" => Playing("WarioWare™, Inc.: Minigame Mania."),
-            "a_6960_e" or "a_6960_p" => Playing("Yoshi's Island™: Super Mario™ Advance 3"),
-            "a_5190_e" or "a_5190_p" => Playing("The Legend of Zelda™: A Link to the Past™ Four Swords"),
-            "a_8665_e" or "a_8665_p" => Playing("The Legend of Zelda™: The Minish Cap"),
-
-            #endregion
-
-            _ => FormattedValue.ForceReset
-        };
-    }
-}

src/Ryujinx/Utilities/PlayReport/PlayReports.cs

@@ -1,68 +0,0 @@
-namespace Ryujinx.Ava.Utilities.PlayReport
-{
-    public static partial class PlayReports
-    {
-        public static Analyzer Analyzer { get; } = new Analyzer()
-            .AddSpec(
-                "01007ef00011e000",
-                spec => spec
-                    .AddValueFormatter("IsHardMode", BreathOfTheWild_MasterMode)
-                    // reset to normal status when switching between normal & master mode in title screen
-                    .AddValueFormatter("AoCVer", FormattedValue.SingleAlwaysResets)
-            )
-            .AddSpec(
-                "0100f2c0115b6000",
-                spec => spec
-                    .AddValueFormatter("PlayerPosY", TearsOfTheKingdom_CurrentField))
-            .AddSpec(
-                "0100000000010000",
-                spec =>
-                    spec.AddValueFormatter("is_kids_mode", SuperMarioOdyssey_AssistMode)
-            )
-            .AddSpec(
-                "010075000ecbe000",
-                spec =>
-                    spec.AddValueFormatter("is_kids_mode", SuperMarioOdysseyChina_AssistMode)
-            )
-            .AddSpec(
-                "010028600ebda000",
-                spec => spec.AddValueFormatter("mode", SuperMario3DWorldOrBowsersFury)
-            )
-            .AddSpec( // Global & China IDs
-                ["0100152000022000", "010075100e8ec000"],
-                spec => spec.AddValueFormatter("To", MarioKart8Deluxe_Mode)
-            )
-            .AddSpec(
-                ["0100a3d008c5c000", "01008f6008c5e000"],
-                spec => spec
-                    .AddValueFormatter("area_no", PokemonSVArea)
-                    .AddValueFormatter("team_circle", PokemonSVUnionCircle)
-            )
-            .AddSpec(
-                "01006a800016e000",
-                spec => spec
-                    .AddSparseMultiValueFormatter(
-                        [
-                            // Metadata to figure out what PlayReport we have.
-                            "match_mode", "match_submode", "anniversary", "fighter", "reason", "challenge_count",
-                            "adv_slot",
-                            // List of Fighters
-                            "player_1_fighter", "player_2_fighter", "player_3_fighter", "player_4_fighter",
-                            "player_5_fighter", "player_6_fighter", "player_7_fighter", "player_8_fighter",
-                            // List of rankings/placements
-                            "player_1_rank", "player_2_rank", "player_3_rank", "player_4_rank", "player_5_rank",
-                            "player_6_rank", "player_7_rank", "player_8_rank"
-                        ],
-                        SuperSmashBrosUltimate_Mode
-                    )
-            )
-            .AddSpec(
-                [
-                    "0100c9a00ece6000", "01008d300c50c000", "0100d870045b6000", 
-                    "010012f017576000", "0100c62011050000", "0100b3c014bda000"],
-                spec => spec.AddValueFormatter("launch_title_id", NsoEmulator_LaunchedGame)
-            );
-
-        private static string Playing(string game) => $"Playing {game}";
-    }
-}

src/Ryujinx/Utilities/PlayReport/Specs.cs

@@ -1,235 +0,0 @@
-using MsgPack;
-using Ryujinx.Ava.Utilities.AppLibrary;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Ryujinx.Ava.Utilities.PlayReport
-{
-    /// <summary>
-    /// A mapping of title IDs to value formatter specs.
-    ///
-    /// <remarks>Generally speaking, use the <see cref="Analyzer"/>.AddSpec(...) methods instead of creating this class yourself.</remarks>
-    /// </summary>
-    public class GameSpec
-    {
-        public static GameSpec Create(string requiredTitleId, params IEnumerable<string> otherTitleIds)
-            => new() { TitleIds = otherTitleIds.Prepend(requiredTitleId).ToArray() };
-
-        public static GameSpec Create(IEnumerable<string> titleIds)
-            => new() { TitleIds = titleIds.ToArray() };
-
-        private int _lastPriority;
-
-        public required string[] TitleIds { get; init; }
-
-        public List<FormatterSpecBase> ValueFormatters { get; } = [];
-
-
-        /// <summary>
-        /// Add a value formatter to the current <see cref="GameSpec"/>
-        /// matching a specific key that could exist in a Play Report for the previously specified title IDs.
-        /// </summary>
-        /// <param name="reportKey">The key name to match.</param>
-        /// <param name="valueFormatter">The function which can return a potential formatted value.</param>
-        /// <returns>The current <see cref="GameSpec"/>, for chaining convenience.</returns>
-        public GameSpec AddValueFormatter(
-            string reportKey,
-            SingleValueFormatter valueFormatter
-        ) => AddValueFormatter(_lastPriority++, reportKey, valueFormatter);
-
-        /// <summary>
-        /// Add a value formatter at a specific priority to the current <see cref="GameSpec"/>
-        /// matching a specific key that could exist in a Play Report for the previously specified title IDs.
-        /// </summary>
-        /// <param name="priority">The resolution priority of this value formatter. Higher resolves sooner.</param>
-        /// <param name="reportKey">The key name to match.</param>
-        /// <param name="valueFormatter">The function which can return a potential formatted value.</param>
-        /// <returns>The current <see cref="GameSpec"/>, for chaining convenience.</returns>
-        public GameSpec AddValueFormatter(
-            int priority,
-            string reportKey,
-            SingleValueFormatter valueFormatter
-        ) => AddValueFormatter(new FormatterSpec
-        {
-            Priority = priority, ReportKeys = [reportKey], Formatter = valueFormatter
-        });
-
-        /// <summary>
-        /// Add a multi-value formatter to the current <see cref="GameSpec"/>
-        /// matching a specific set of keys that could exist in a Play Report for the previously specified title IDs.
-        /// </summary>
-        /// <param name="reportKeys">The key names to match.</param>
-        /// <param name="valueFormatter">The function which can format the values.</param>
-        /// <returns>The current <see cref="GameSpec"/>, for chaining convenience.</returns>
-        public GameSpec AddMultiValueFormatter(
-            string[] reportKeys,
-            MultiValueFormatter valueFormatter
-        ) => AddMultiValueFormatter(_lastPriority++, reportKeys, valueFormatter);
-
-        /// <summary>
-        /// Add a multi-value formatter at a specific priority to the current <see cref="GameSpec"/>
-        /// matching a specific set of keys that could exist in a Play Report for the previously specified title IDs.
-        /// </summary>
-        /// <param name="priority">The resolution priority of this value formatter. Higher resolves sooner.</param>
-        /// <param name="reportKeys">The key names to match.</param>
-        /// <param name="valueFormatter">The function which can format the values.</param>
-        /// <returns>The current <see cref="GameSpec"/>, for chaining convenience.</returns>
-        public GameSpec AddMultiValueFormatter(
-            int priority,
-            string[] reportKeys,
-            MultiValueFormatter valueFormatter
-        ) => AddValueFormatter(new MultiFormatterSpec
-        {
-            Priority = priority, ReportKeys = reportKeys, Formatter = valueFormatter
-        });
-
-        /// <summary>
-        /// Add a multi-value formatter to the current <see cref="GameSpec"/>
-        /// matching a specific set of keys that could exist in a Play Report for the previously specified title IDs.
-        /// <br/><br/>
-        /// The 'Sparse' multi-value formatters do not require every key to be present.
-        /// If you need this requirement, use <see cref="AddMultiValueFormatter(string[], Ryujinx.Ava.Utilities.PlayReport.MultiValueFormatter)"/>.
-        /// </summary>
-        /// <param name="reportKeys">The key names to match.</param>
-        /// <param name="valueFormatter">The function which can format the values.</param>
-        /// <returns>The current <see cref="GameSpec"/>, for chaining convenience.</returns>
-        public GameSpec AddSparseMultiValueFormatter(
-            string[] reportKeys,
-            SparseMultiValueFormatter valueFormatter
-        ) => AddSparseMultiValueFormatter(_lastPriority++, reportKeys, valueFormatter);
-
-        /// <summary>
-        /// Add a multi-value formatter at a specific priority to the current <see cref="GameSpec"/>
-        /// matching a specific set of keys that could exist in a Play Report for the previously specified title IDs.
-        /// <br/><br/>
-        /// The 'Sparse' multi-value formatters do not require every key to be present.
-        /// If you need this requirement, use <see cref="AddMultiValueFormatter(int, string[], Ryujinx.Ava.Utilities.PlayReport.MultiValueFormatter)"/>.
-        /// </summary>
-        /// <param name="priority">The resolution priority of this value formatter. Higher resolves sooner.</param>
-        /// <param name="reportKeys">The key names to match.</param>
-        /// <param name="valueFormatter">The function which can format the values.</param>
-        /// <returns>The current <see cref="GameSpec"/>, for chaining convenience.</returns>
-        public GameSpec AddSparseMultiValueFormatter(
-            int priority,
-            string[] reportKeys,
-            SparseMultiValueFormatter valueFormatter
-        ) => AddValueFormatter(new SparseMultiFormatterSpec
-        {
-            Priority = priority, ReportKeys = reportKeys, Formatter = valueFormatter
-        });
-
-        private GameSpec AddValueFormatter<T>(T formatterSpec) where T : FormatterSpecBase
-        {
-            ValueFormatters.Add(formatterSpec);
-            return this;
-        }
-    }
-
-    /// <summary>
-    /// A struct containing the data for a mapping of a key in a Play Report to a formatter for its potential value.
-    /// </summary>
-    public class FormatterSpec : FormatterSpecBase
-    {
-        public override bool GetData(Horizon.Prepo.Types.PlayReport playReport, out object result)
-        {
-            if (!playReport.ReportData.AsDictionary().TryGetValue(ReportKeys[0], out MessagePackObject valuePackObject))
-            {
-                result = null;
-                return false;
-            }
-
-            result = valuePackObject;
-            return true;
-        }
-    }
-
-    /// <summary>
-    /// A struct containing the data for a mapping of an arbitrary key set in a Play Report to a formatter for their potential values.
-    /// </summary>
-    public class MultiFormatterSpec : FormatterSpecBase
-    {
-        public override bool GetData(Horizon.Prepo.Types.PlayReport playReport, out object result)
-        {
-            List<MessagePackObject> packedObjects = [];
-            foreach (string reportKey in ReportKeys)
-            {
-                if (!playReport.ReportData.AsDictionary().TryGetValue(reportKey, out MessagePackObject valuePackObject))
-                {
-                    result = null;
-                    return false;
-                }
-
-                packedObjects.Add(valuePackObject);
-            }
-
-            result = packedObjects;
-            return true;
-        }
-    }
-
-    /// <summary>
-    /// A struct containing the data for a mapping of an arbitrary key set in a Play Report to a formatter for their sparsely populated potential values.
-    /// </summary>
-    public class SparseMultiFormatterSpec : FormatterSpecBase
-    {
-        public override bool GetData(Horizon.Prepo.Types.PlayReport playReport, out object result)
-        {
-            Dictionary<string, MessagePackObject> packedObjects = [];
-            foreach (string reportKey in ReportKeys)
-            {
-                if (!playReport.ReportData.AsDictionary().TryGetValue(reportKey, out MessagePackObject valuePackObject))
-                    continue;
-
-                packedObjects.Add(reportKey, valuePackObject);
-            }
-
-            result = packedObjects;
-            return true;
-        }
-    }
-
-    public abstract class FormatterSpecBase
-    {
-        public abstract bool GetData(Horizon.Prepo.Types.PlayReport playReport, out object data);
-
-        public int Priority { get; init; }
-        public string[] ReportKeys { get; init; }
-        public Delegate Formatter { get; init; }
-
-        public bool Format(ApplicationMetadata appMeta, Horizon.Prepo.Types.PlayReport playReport,
-            out FormattedValue formattedValue)
-        {
-            formattedValue = default;
-            if (!GetData(playReport, out object data))
-                return false;
-
-            if (data is FormattedValue fv)
-            {
-                formattedValue = fv;
-                return true;
-            }
-
-            switch (Formatter)
-            {
-                case SingleValueFormatter svf when data is MessagePackObject match:
-                    formattedValue = svf(
-                        new SingleValue(match) { Application = appMeta, PlayReport = playReport }
-                    );
-                    return true;
-                case MultiValueFormatter mvf when data is List<MessagePackObject> matches:
-                    formattedValue = mvf(
-                        new MultiValue(matches) { Application = appMeta, PlayReport = playReport }
-                    );
-                    return true;
-                case SparseMultiValueFormatter smvf when data is Dictionary<string, MessagePackObject> sparseMatches:
-                    formattedValue = smvf(
-                        new SparseMultiValue(sparseMatches) { Application = appMeta, PlayReport = playReport }
-                    );
-                    return true;
-                default:
-                    throw new InvalidOperationException("Formatter delegate is not of a known type!");
-            }
-        }
-    }
-}

src/Ryujinx/Utilities/PlayReport/Value.cs

@@ -1,160 +0,0 @@
-using MsgPack;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Ryujinx.Ava.Utilities.PlayReport
-{
-    /// <summary>
-    /// The base input data to a ValueFormatter delegate,
-    /// and the matched <see cref="MessagePackObject"/> from the Play Report.
-    /// </summary>
-    public readonly struct Value
-    {
-        public Value(MessagePackObject packedValue)
-        {
-            PackedValue = packedValue;
-        }
-
-        /// <summary>
-        /// The matched value from the Play Report.
-        /// </summary>
-        public MessagePackObject PackedValue { get; init; }
-
-        /// <summary>
-        /// Access the <see cref="PackedValue"/> as its underlying .NET type.<br/>
-        /// 
-        /// Does not seem to work well with comparing numeric types,
-        /// so use XValue properties for that.
-        /// </summary>
-        public object BoxedValue => PackedValue.ToObject();
-
-        public override string ToString()
-        {
-            object boxed = BoxedValue;
-            return boxed == null
-                ? "null"
-                : boxed.ToString();
-        }
-
-        public static implicit operator Value(MessagePackObject matched) => new(matched);
-
-        public static Value[] ConvertPackedObjects(IEnumerable<MessagePackObject> packObjects)
-            => packObjects.Select(packObject => new Value(packObject)).ToArray();
-
-        public static Dictionary<string, Value> ConvertPackedObjectMap(Dictionary<string, MessagePackObject> packObjects)
-            => packObjects.ToDictionary(
-                x => x.Key,
-                x => new Value(x.Value)
-            );
-
-        #region AsX accessors
-
-        public bool BooleanValue => PackedValue.AsBoolean();
-        public byte ByteValue => PackedValue.AsByte();
-        public sbyte SByteValue => PackedValue.AsSByte();
-        public short ShortValue => PackedValue.AsInt16();
-        public ushort UShortValue => PackedValue.AsUInt16();
-        public int IntValue => PackedValue.AsInt32();
-        public uint UIntValue => PackedValue.AsUInt32();
-        public long LongValue => PackedValue.AsInt64();
-        public ulong ULongValue => PackedValue.AsUInt64();
-        public float FloatValue => PackedValue.AsSingle();
-        public double DoubleValue => PackedValue.AsDouble();
-        public string StringValue => PackedValue.AsString();
-        public Span<byte> BinaryValue => PackedValue.AsBinary();
-
-        #endregion
-    }
-
-    /// <summary>
-    /// A potential formatted value returned by a ValueFormatter delegate.
-    /// </summary>
-    public readonly struct FormattedValue
-    {
-        /// <summary>
-        /// Was any handler able to match anything in the Play Report?
-        /// </summary>
-        public bool Handled { get; private init; }
-
-        /// <summary>
-        /// Did the handler request the caller of the <see cref="Analyzer"/> to reset the existing value?
-        /// </summary>
-        public bool Reset { get; private init; }
-
-        /// <summary>
-        /// The formatted value, only present if <see cref="Handled"/> is true, and <see cref="Reset"/> is false.
-        /// </summary>
-        public string FormattedString { get; private init; }
-
-        /// <summary>
-        /// The intended path of execution for having a string to return: simply return the string.
-        /// This implicit conversion will make the struct for you.<br/><br/>
-        ///
-        /// If the input is null, <see cref="Unhandled"/> is returned.
-        /// </summary>
-        /// <param name="formattedValue">The formatted string value.</param>
-        /// <returns>The automatically constructed <see cref="FormattedValue"/> struct.</returns>
-        public static implicit operator FormattedValue(string formattedValue)
-            => formattedValue is not null
-                ? new FormattedValue { Handled = true, FormattedString = formattedValue }
-                : Unhandled;
-
-        public override string ToString()
-        {
-            if (!Handled)
-                return "<Unhandled>";
-
-            if (Reset)
-                return "<Reset>";
-
-            return FormattedString;
-        }
-
-        /// <summary>
-        /// Return this to tell the caller there is no value to return.
-        /// </summary>
-        public static readonly FormattedValue Unhandled = default;
-
-        /// <summary>
-        /// Return this to suggest the caller reset the value it's using the <see cref="Analyzer"/> for.
-        /// </summary>
-        public static readonly FormattedValue ForceReset = new() { Handled = true, Reset = true };
-
-        /// <summary>
-        /// A delegate singleton you can use to always return <see cref="ForceReset"/> in a <see cref="SingleValueFormatter"/>.
-        /// </summary>
-        public static readonly SingleValueFormatter SingleAlwaysResets = _ => ForceReset;
-
-        /// <summary>
-        /// A delegate singleton you can use to always return <see cref="ForceReset"/> in a <see cref="MultiValueFormatter"/>.
-        /// </summary>
-        public static readonly MultiValueFormatter MultiAlwaysResets = _ => ForceReset;
-        
-        /// <summary>
-        /// A delegate singleton you can use to always return <see cref="ForceReset"/> in a <see cref="SparseMultiValueFormatter"/>.
-        /// </summary>
-        public static readonly SparseMultiValueFormatter SparseMultiAlwaysResets = _ => ForceReset;
-
-        /// <summary>
-        /// A delegate factory you can use to always return the specified
-        /// <paramref name="formattedValue"/> in a <see cref="SingleValueFormatter"/>.
-        /// </summary>
-        /// <param name="formattedValue">The string to always return for this delegate instance.</param>
-        public static SingleValueFormatter SingleAlwaysReturns(string formattedValue) => _ => formattedValue;
-        
-        /// <summary>
-        /// A delegate factory you can use to always return the specified
-        /// <paramref name="formattedValue"/> in a <see cref="MultiValueFormatter"/>.
-        /// </summary>
-        /// <param name="formattedValue">The string to always return for this delegate instance.</param>
-        public static MultiValueFormatter MultiAlwaysReturns(string formattedValue) => _ => formattedValue;
-        
-        /// <summary>
-        /// A delegate factory you can use to always return the specified
-        /// <paramref name="formattedValue"/> in a <see cref="SparseMultiValueFormatter"/>.
-        /// </summary>
-        /// <param name="formattedValue">The string to always return for this delegate instance.</param>
-        public static SparseMultiValueFormatter SparseMultiAlwaysReturns(string formattedValue) => _ => formattedValue;
-    }
-}

src/Ryujinx/Utilities/PlayReportAnalyzer.cs

@@ -0,0 +1,282 @@
+using Gommon;
+using MsgPack;
+using Ryujinx.Ava.Utilities.AppLibrary;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+
+namespace Ryujinx.Ava.Utilities
+{
+    /// <summary>
+    /// The entrypoint for the Play Report analysis system.
+    /// </summary>
+    public class PlayReportAnalyzer
+    {
+        private readonly List<PlayReportGameSpec> _specs = [];
+
+        /// <summary>
+        /// Add an analysis spec matching a specific game by title ID, with the provided spec configuration.
+        /// </summary>
+        /// <param name="titleId">The ID of the game to listen to Play Reports in.</param>
+        /// <param name="transform">The configuration function for the analysis spec.</param>
+        /// <returns>The current <see cref="PlayReportAnalyzer"/>, for chaining convenience.</returns>
+        public PlayReportAnalyzer AddSpec(string titleId, Func<PlayReportGameSpec, PlayReportGameSpec> transform)
+        {
+            Guard.Ensure(ulong.TryParse(titleId, NumberStyles.HexNumber, null, out _),
+                $"Cannot use a non-hexadecimal string as the Title ID for a {nameof(PlayReportGameSpec)}.");
+
+            _specs.Add(transform(new PlayReportGameSpec { TitleIds = [titleId] }));
+            return this;
+        }
+
+        /// <summary>
+        /// Add an analysis spec matching a specific game by title ID, with the provided spec configuration.
+        /// </summary>
+        /// <param name="titleId">The ID of the game to listen to Play Reports in.</param>
+        /// <param name="transform">The configuration function for the analysis spec.</param>
+        /// <returns>The current <see cref="PlayReportAnalyzer"/>, for chaining convenience.</returns>
+        public PlayReportAnalyzer AddSpec(string titleId, Action<PlayReportGameSpec> transform)
+        {
+            Guard.Ensure(ulong.TryParse(titleId, NumberStyles.HexNumber, null, out _),
+                $"Cannot use a non-hexadecimal string as the Title ID for a {nameof(PlayReportGameSpec)}.");
+
+            _specs.Add(new PlayReportGameSpec { TitleIds = [titleId] }.Apply(transform));
+            return this;
+        }
+
+        /// <summary>
+        /// Add an analysis spec matching a specific set of games by title IDs, with the provided spec configuration.
+        /// </summary>
+        /// <param name="titleIds">The IDs of the games to listen to Play Reports in.</param>
+        /// <param name="transform">The configuration function for the analysis spec.</param>
+        /// <returns>The current <see cref="PlayReportAnalyzer"/>, for chaining convenience.</returns>
+        public PlayReportAnalyzer AddSpec(IEnumerable<string> titleIds,
+            Func<PlayReportGameSpec, PlayReportGameSpec> transform)
+        {
+            string[] tids = titleIds.ToArray();
+            Guard.Ensure(tids.All(x => ulong.TryParse(x, NumberStyles.HexNumber, null, out _)),
+                $"Cannot use a non-hexadecimal string as the Title ID for a {nameof(PlayReportGameSpec)}.");
+
+            _specs.Add(transform(new PlayReportGameSpec { TitleIds = [..tids] }));
+            return this;
+        }
+
+        /// <summary>
+        /// Add an analysis spec matching a specific set of games by title IDs, with the provided spec configuration.
+        /// </summary>
+        /// <param name="titleIds">The IDs of the games to listen to Play Reports in.</param>
+        /// <param name="transform">The configuration function for the analysis spec.</param>
+        /// <returns>The current <see cref="PlayReportAnalyzer"/>, for chaining convenience.</returns>
+        public PlayReportAnalyzer AddSpec(IEnumerable<string> titleIds, Action<PlayReportGameSpec> transform)
+        {
+            string[] tids = titleIds.ToArray();
+            Guard.Ensure(tids.All(x => ulong.TryParse(x, NumberStyles.HexNumber, null, out _)),
+                $"Cannot use a non-hexadecimal string as the Title ID for a {nameof(PlayReportGameSpec)}.");
+
+            _specs.Add(new PlayReportGameSpec { TitleIds = [..tids] }.Apply(transform));
+            return this;
+        }
+
+        
+        /// <summary>
+        /// Runs the configured <see cref="PlayReportGameSpec.FormatterSpec"/> for the specified game title ID.
+        /// </summary>
+        /// <param name="runningGameId">The game currently running.</param>
+        /// <param name="appMeta">The Application metadata information, including localized game name and play time information.</param>
+        /// <param name="playReport">The Play Report received from HLE.</param>
+        /// <returns>A struct representing a possible formatted value.</returns>
+        public FormattedValue Format(
+            string runningGameId,
+            ApplicationMetadata appMeta,
+            MessagePackObject playReport
+        )
+        {
+            if (!playReport.IsDictionary)
+                return FormattedValue.Unhandled;
+
+            if (!_specs.TryGetFirst(s => runningGameId.EqualsAnyIgnoreCase(s.TitleIds), out PlayReportGameSpec spec))
+                return FormattedValue.Unhandled;
+
+            foreach (PlayReportGameSpec.FormatterSpec formatSpec in spec.SimpleValueFormatters.OrderBy(x => x.Priority))
+            {
+                if (!playReport.AsDictionary().TryGetValue(formatSpec.ReportKey, out MessagePackObject valuePackObject))
+                    continue;
+
+                return formatSpec.ValueFormatter(new PlayReportValue
+                {
+                    Application = appMeta, PackedValue = valuePackObject
+                });
+            }
+
+            return FormattedValue.Unhandled;
+        }
+
+        /// <summary>
+        /// A potential formatted value returned by a <see cref="PlayReportValueFormatter"/>.
+        /// </summary>
+        public readonly struct FormattedValue
+        {
+            /// <summary>
+            /// Was any handler able to match anything in the Play Report?
+            /// </summary>
+            public bool Handled { get; private init; }
+
+            /// <summary>
+            /// Did the handler request the caller of the <see cref="PlayReportAnalyzer"/> to reset the existing value?
+            /// </summary>
+            public bool Reset { get; private init; }
+
+            /// <summary>
+            /// The formatted value, only present if <see cref="Handled"/> is true, and <see cref="Reset"/> is false.
+            /// </summary>
+            public string FormattedString { get; private init; }
+
+            /// <summary>
+            /// The intended path of execution for having a string to return: simply return the string.
+            /// This implicit conversion will make the struct for you.<br/><br/>
+            ///
+            /// If the input is null, <see cref="Unhandled"/> is returned.
+            /// </summary>
+            /// <param name="formattedValue">The formatted string value.</param>
+            /// <returns>The automatically constructed <see cref="FormattedValue"/> struct.</returns>
+            public static implicit operator FormattedValue(string formattedValue)
+                => formattedValue is not null 
+                    ? new FormattedValue { Handled = true, FormattedString = formattedValue }
+                    : Unhandled;
+
+            /// <summary>
+            /// Return this to tell the caller there is no value to return.
+            /// </summary>
+            public static FormattedValue Unhandled => default;
+            
+            /// <summary>
+            /// Return this to suggest the caller reset the value it's using the <see cref="PlayReportAnalyzer"/> for.
+            /// </summary>
+            public static FormattedValue ForceReset => new() { Handled = true, Reset = true };
+
+            /// <summary>
+            /// A delegate singleton you can use to always return <see cref="ForceReset"/> in a <see cref="PlayReportValueFormatter"/>.
+            /// </summary>
+            public static readonly PlayReportValueFormatter AlwaysResets = _ => ForceReset;
+
+            /// <summary>
+            /// A delegate factory you can use to always return the specified
+            /// <paramref name="formattedValue"/> in a <see cref="PlayReportValueFormatter"/>.
+            /// </summary>
+            /// <param name="formattedValue">The string to always return for this delegate instance.</param>
+            public static PlayReportValueFormatter AlwaysReturns(string formattedValue) => _ => formattedValue;
+        }
+    }
+
+    /// <summary>
+    /// A mapping of title IDs to value formatter specs.
+    ///
+    /// <remarks>Generally speaking, use the <see cref="PlayReportAnalyzer"/>.AddSpec(...) methods instead of creating this class yourself.</remarks>
+    /// </summary>
+    public class PlayReportGameSpec
+    {
+        public required string[] TitleIds { get; init; }
+        public List<FormatterSpec> SimpleValueFormatters { get; } = [];
+
+        /// <summary>
+        /// Add a value formatter to the current <see cref="PlayReportGameSpec"/>
+        /// matching a specific key that could exist in a Play Report for the previously specified title IDs.
+        /// </summary>
+        /// <param name="reportKey">The key name to match.</param>
+        /// <param name="valueFormatter">The function which can return a potential formatted value.</param>
+        /// <returns>The current <see cref="PlayReportGameSpec"/>, for chaining convenience.</returns>
+        public PlayReportGameSpec AddValueFormatter(string reportKey, PlayReportValueFormatter valueFormatter)
+        {
+            SimpleValueFormatters.Add(new FormatterSpec
+            {
+                Priority = SimpleValueFormatters.Count, ReportKey = reportKey, ValueFormatter = valueFormatter
+            });
+            return this;
+        }
+
+        /// <summary>
+        /// Add a value formatter at a specific priority to the current <see cref="PlayReportGameSpec"/>
+        /// matching a specific key that could exist in a Play Report for the previously specified title IDs.
+        /// </summary>
+        /// <param name="priority">The resolution priority of this value formatter. Higher resolves sooner.</param>
+        /// <param name="reportKey">The key name to match.</param>
+        /// <param name="valueFormatter">The function which can return a potential formatted value.</param>
+        /// <returns>The current <see cref="PlayReportGameSpec"/>, for chaining convenience.</returns>
+        public PlayReportGameSpec AddValueFormatter(int priority, string reportKey,
+            PlayReportValueFormatter valueFormatter)
+        {
+            SimpleValueFormatters.Add(new FormatterSpec
+            {
+                Priority = priority, ReportKey = reportKey, ValueFormatter = valueFormatter
+            });
+            return this;
+        }
+
+        /// <summary>
+        /// A struct containing the data for a mapping of a key in a Play Report to a formatter for its potential value.
+        /// </summary>
+        public struct FormatterSpec
+        {
+            public required int Priority { get; init; }
+            public required string ReportKey { get; init; }
+            public PlayReportValueFormatter ValueFormatter { get; init; }
+        }
+    }
+
+    /// <summary>
+    /// The input data to a <see cref="PlayReportValueFormatter"/>,
+    /// containing the currently running application's <see cref="ApplicationMetadata"/>,
+    /// and the matched <see cref="MessagePackObject"/> from the Play Report.
+    /// </summary>
+    public class PlayReportValue
+    {
+        /// <summary>
+        /// The currently running application's <see cref="ApplicationMetadata"/>.
+        /// </summary>
+        public ApplicationMetadata Application { get; init; }
+
+        /// <summary>
+        /// The matched value from the Play Report.
+        /// </summary>
+        public MessagePackObject PackedValue { get; init; }
+
+        /// <summary>
+        /// Access the <see cref="PackedValue"/> as its underlying .NET type.<br/>
+        /// 
+        /// Does not seem to work well with comparing numeric types,
+        /// so use <see cref="PackedValue"/> and the AsX (where X is a numerical type name i.e. Int32) methods for that.
+        /// </summary>
+        public object BoxedValue => PackedValue.ToObject();
+
+        #region AsX accessors
+
+        public bool BooleanValue => PackedValue.AsBoolean();
+        public byte ByteValye => PackedValue.AsByte();
+        public sbyte SByteValye => PackedValue.AsSByte();
+        public short ShortValye => PackedValue.AsInt16();
+        public ushort UShortValye => PackedValue.AsUInt16();
+        public int IntValye => PackedValue.AsInt32();
+        public uint UIntValye => PackedValue.AsUInt32();
+        public long LongValye => PackedValue.AsInt64();
+        public ulong ULongValye => PackedValue.AsUInt64();
+        public float FloatValue => PackedValue.AsSingle();
+        public double DoubleValue => PackedValue.AsDouble();
+        public string StringValue => PackedValue.AsString();
+        public Span<byte> BinaryValue => PackedValue.AsBinary();
+
+        #endregion
+    }
+
+    /// <summary>
+    /// The delegate type that powers the entire analysis system (as it currently is).<br/>
+    /// Takes in the result value from the Play Report, and outputs:
+    /// <br/>
+    /// a formatted string,
+    /// <br/>
+    /// a signal that nothing was available to handle it,
+    /// <br/>
+    /// OR a signal to reset the value that the caller is using the <see cref="PlayReportAnalyzer"/> for. 
+    /// </summary>
+    public delegate PlayReportAnalyzer.FormattedValue PlayReportValueFormatter(PlayReportValue value);
+}