Merge a873faf0e7 into 93a298523f

Merge branch 'Ryubing:master' into master
Merge branch 'master' into master
2025-02-09 01:49:08 +02:00 · 2025-02-08 17:25:24 -05:00 · 2025-02-08 02:53:56 -05:00 · 2025-02-08 01:38:20 -05:00 · 2025-02-07 19:46:49 -05:00 · 2025-02-07 16:48:57 -05:00
39 changed files with 335 additions and 655 deletions
--- a/docs/compatibility.csv
+++ b/docs/compatibility.csv
@@ -2480,7 +2480,6 @@
 010081C0191D8000,"Rune Factory 3 Special",,playable,2023-10-15 08:32:49
 010051D00E3A4000,"Rune Factory 4 Special",32-bit;crash;nvdec,ingame,2023-05-06 08:49:17
 010014D01216E000,"Rune Factory 5 (JP)",gpu,ingame,2021-06-01 12:00:36
-010071E0145F8000,"Rustler",,playable,2025-02-10 20:17:12
 0100E21013908000,"RWBY: Grimm Eclipse - Definitive Edition",online-broken,playable,2022-11-03 10:44:01
 010012C0060F0000,"RXN -Raijin-",nvdec,playable,2021-01-10 16:05:43
 0100B8B012ECA000,"S.N.I.P.E.R. - Hunter Scope",,playable,2021-04-19 15:58:09
--- a/src/ARMeilleure/Translation/Cache/JitCache.cs
+++ b/src/ARMeilleure/Translation/Cache/JitCache.cs
@@ -52,7 +52,7 @@ namespace ARMeilleure.Translation.Cache
                    return;
                }

-                ReservedRegion firstRegion = new(allocator, CacheSize);
+                var firstRegion = new ReservedRegion(allocator, CacheSize);
                _jitRegions.Add(firstRegion);
                _activeRegionIndex = 0;

@@ -124,7 +124,7 @@ namespace ARMeilleure.Translation.Cache
            {
                Debug.Assert(_initialized);

-                foreach (ReservedRegion region in _jitRegions)
+                foreach (var region in _jitRegions)
                {
                    if (pointer.ToInt64() < region.Pointer.ToInt64() ||
                        pointer.ToInt64() >= (region.Pointer + CacheSize).ToInt64())
@@ -224,7 +224,7 @@ namespace ARMeilleure.Translation.Cache
        {
            lock (_lock)
            {
-                foreach (ReservedRegion _ in _jitRegions)
+                foreach (var region in _jitRegions)
                {
                    int index = _cacheEntries.BinarySearch(new CacheEntry(offset, 0, default));

--- a/src/ARMeilleure/Translation/PTC/PtcProfiler.cs
+++ b/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)
-                    continue;
-
-                if (!funcs.Contains(ptr)) 
-                    funcs.Add(ptr);
+                if (profiledFunc.Value.Blacklist)
+                {
+                    if (!funcs.Contains(profiledFunc.Key))
+                    {
+                        funcs.Add(profiledFunc.Key);
+                    }
+                }
            }

            return funcs;
--- a/src/Ryujinx.Common/TitleIDs.cs
+++ b/src/Ryujinx.Common/TitleIDs.cs
@@ -219,7 +219,6 @@ namespace Ryujinx.Common
                          //Misc Games
            "010056e00853a000", // A Hat in Time
            "0100fd1014726000", // Baldurs Gate: Dark Alliance
-            "01008c2019598000", // Bluey: The Video Game
            "0100c6800b934000", // Brawlhalla
            "0100dbf01000a000", // Burnout Paradise Remastered
            "0100744001588000", // Cars 3: Driven to Win
--- a/src/Ryujinx.Cpu/LightningJit/Cache/JitCache.cs
+++ b/src/Ryujinx.Cpu/LightningJit/Cache/JitCache.cs
@@ -48,7 +48,7 @@ namespace Ryujinx.Cpu.LightningJit.Cache
                    return;
                }

-                ReservedRegion firstRegion = new(allocator, CacheSize);
+                var firstRegion = new ReservedRegion(allocator, CacheSize);
                _jitRegions.Add(firstRegion);
                _activeRegionIndex = 0;

@@ -104,7 +104,7 @@ namespace Ryujinx.Cpu.LightningJit.Cache
            {
                Debug.Assert(_initialized);

-                foreach (ReservedRegion region in _jitRegions)
+                foreach (var region in _jitRegions)
                {
                    if (pointer.ToInt64() < region.Pointer.ToInt64() ||
                        pointer.ToInt64() >= (region.Pointer + CacheSize).ToInt64())
@@ -160,7 +160,7 @@ namespace Ryujinx.Cpu.LightningJit.Cache
            }

            int exhaustedRegion = _activeRegionIndex;
-            ReservedRegion newRegion = new(_jitRegions[0].Allocator, CacheSize);
+            var newRegion = new ReservedRegion(_jitRegions[0].Allocator, CacheSize);
            _jitRegions.Add(newRegion);
            _activeRegionIndex = _jitRegions.Count - 1;
            
--- a/src/Ryujinx.Graphics.Vulkan/Vendor.cs
+++ b/src/Ryujinx.Graphics.Vulkan/Vendor.cs
@@ -1,4 +1,5 @@
 using Silk.NET.Vulkan;
+using System.Text.RegularExpressions;

 namespace Ryujinx.Graphics.Vulkan
 {
--- a/src/Ryujinx.HLE/HOS/Applets/Error/ErrorApplet.cs
+++ b/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
 {
--- a/src/Ryujinx.Horizon/HorizonStatic.cs
+++ b/src/Ryujinx.Horizon/HorizonStatic.cs
@@ -1,3 +1,4 @@
+using MsgPack;
 using Ryujinx.Horizon.Common;
 using Ryujinx.Horizon.Prepo.Types;
 using Ryujinx.Memory;
--- a/src/Ryujinx/AppHost.cs
+++ b/src/Ryujinx/AppHost.cs
@@ -1041,7 +1041,6 @@ namespace Ryujinx.Ava
                if (_viewModel.StartGamesInFullscreen)
                {
                    _viewModel.WindowState = WindowState.FullScreen;
-                    _viewModel.Window.TitleBar.ExtendsContentIntoTitleBar = true;
                }

                if (_viewModel.WindowState is WindowState.FullScreen || _viewModel.StartGamesWithoutUI)
--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
@@ -1543,7 +1543,7 @@
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
-        "zh_CN": "由 {0} 开发",
+        "zh_CN": "",
        "zh_TW": ""
      }
    },
@@ -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": ""
      }
    },
@@ -2268,7 +2268,7 @@
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
-        "zh_CN": "清理 PPTC 缓存",
+        "zh_CN": "",
        "zh_TW": ""
      }
    },
@@ -2293,7 +2293,7 @@
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
-        "zh_CN": "删除应用程序的所有 PPTC 缓存",
+        "zh_CN": "",
        "zh_TW": ""
      }
    },
@@ -2768,7 +2768,7 @@
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
-        "zh_CN": "显示兼容性项目",
+        "zh_CN": "",
        "zh_TW": ""
      }
    },
@@ -2793,7 +2793,7 @@
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
-        "zh_CN": "在兼容性列表中显示选定的游戏,您通常可以通过帮助菜单访问。",
+        "zh_CN": "",
        "zh_TW": ""
      }
    },
@@ -2818,7 +2818,7 @@
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
-        "zh_CN": "显示游戏信息",
+        "zh_CN": "",
        "zh_TW": ""
      }
    },
@@ -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": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Check for Updates:",
-        "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": "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": ""
+        "ar_SA": "التحقق من وجود تحديثات عند التشغيل",
+        "de_DE": "Beim Start nach Updates suchen",
+        "el_GR": "Έλεγχος για Ενημερώσεις στην Εκκίνηση",
+        "en_US": "Check for Updates on Launch",
+        "es_ES": "Buscar actualizaciones al iniciar",
+        "fr_FR": "Vérifier les mises à jour au démarrage",
+        "he_IL": "בדוק אם קיימים עדכונים בהפעלה",
+        "it_IT": "Controlla aggiornamenti all'avvio",
+        "ja_JP": "起動時にアップデートを確認する",
+        "ko_KR": "시작 시, 업데이트 확인",
+        "no_NO": "Se etter oppdateringer ved oppstart",
+        "pl_PL": "Sprawdzaj aktualizacje przy uruchomieniu",
+        "pt_BR": "Verificar se há atualizações ao iniciar",
+        "ru_RU": "Проверять наличие обновлений при запуске",
+        "sv_SE": "Leta efter uppdatering vid uppstart",
+        "th_TH": "ตรวจหาการอัปเดตเมื่อเปิดโปรแกรม",
+        "tr_TR": "Her Açılışta Güncellemeleri Denetle",
+        "uk_UA": "Перевіряти наявність оновлень під час запуску",
+        "zh_CN": "启动时检查更新",
+        "zh_TW": "啟動時檢查更新"
      }
    },
    {
@@ -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": {
@@ -6243,7 +6143,7 @@
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
-        "zh_CN": "重置设置",
+        "zh_CN": "",
        "zh_TW": ""
      }
    },
@@ -6268,7 +6168,7 @@
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
-        "zh_CN": "我要重置我的设置。",
+        "zh_CN": "",
        "zh_TW": ""
      }
    },
@@ -8243,7 +8143,7 @@
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
-        "zh_CN": "彩虹滚动速度",
+        "zh_CN": "",
        "zh_TW": ""
      }
    },
@@ -13518,7 +13418,7 @@
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
-        "zh_CN": "您正要清理 PPTC 数据:\n\n{0}\n\n您确实要继续吗?",
+        "zh_CN": "",
        "zh_TW": ""
      }
    },
@@ -16822,31 +16722,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": {
@@ -17747,31 +17622,6 @@
        "zh_TW": "更新已停用!"
      }
    },
-    {
-      "ID": "UpdaterBackgroundStatusBarButtonText",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Update Available!",
-        "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": "ControllerSettingsRotate90",
      "Translations": {
@@ -23718,7 +23568,7 @@
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
-        "zh_CN": "启动和游戏时不会出现任何崩溃或任何类型的 GPU bug 且速度足够快可以在一般 PC 上尽情游玩。",
+        "zh_CN": "",
        "zh_TW": ""
      }
    },
@@ -23743,7 +23593,7 @@
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
-        "zh_CN": "可以成功启动并进入游戏但可能会遇到以下一种或多种问题: 崩溃、卡死、GPU bug、令人无法接受的音频,或者只是太慢。仍然可以继续进行游戏,但是可能无法达到预期。",
+        "zh_CN": "",
        "zh_TW": ""
      }
    },
@@ -23768,7 +23618,7 @@
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
-        "zh_CN": "可以启动并通过标题画面但是无法进入到主要的游戏流程。",
+        "zh_CN": "",
        "zh_TW": ""
      }
    },
@@ -23793,7 +23643,7 @@
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
-        "zh_CN": "可以启动但是无法通过标题画面。",
+        "zh_CN": "",
        "zh_TW": ""
      }
    },
@@ -23818,7 +23668,7 @@
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
-        "zh_CN": "无法启动或显示无任何动静。",
+        "zh_CN": "",
        "zh_TW": ""
      }
    },
@@ -23868,7 +23718,7 @@
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
-        "zh_CN": "Rich Presence 图像",
+        "zh_CN": "",
        "zh_TW": ""
      }
    },
@@ -23893,7 +23743,7 @@
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "",
-        "zh_CN": "动态 Rich Presence",
+        "zh_CN": "",
        "zh_TW": ""
      }
    }
--- a/src/Ryujinx/DiscordIntegrationModule.cs
+++ b/src/Ryujinx/DiscordIntegrationModule.cs
@@ -1,5 +1,6 @@
 using DiscordRPC;
 using Gommon;
+using MsgPack;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Ava.Utilities.Configuration;
@@ -10,6 +11,7 @@ using Ryujinx.HLE;
 using Ryujinx.HLE.Loaders.Processes;
 using Ryujinx.Horizon;
 using Ryujinx.Horizon.Prepo.Types;
+using System.Linq;
 using System.Text;

 namespace Ryujinx.Ava
--- a/src/Ryujinx/Headless/Options.cs
+++ b/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.")]
--- a/src/Ryujinx/UI/Controls/ApplicationDataView.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationDataView.axaml
@@ -55,21 +55,9 @@
                                Tag="{Binding AppData.IdString}"
                                Text="{Binding AppData.LocalizedStatus}"
                                Foreground="{Binding AppData.PlayabilityStatus, Converter={x:Static helpers:PlayabilityStatusConverter.Shared}}"
+                                ToolTip.Tip="{Binding AppData.LocalizedStatusTooltip}"
                                TextAlignment="Start"
-                                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>
+                                TextWrapping="Wrap" />
                            <Button.Styles>
                                <Style Selector="Button">
                                    <Setter Property="MinWidth"
--- a/src/Ryujinx/UI/Controls/ApplicationDataView.axaml.cs
+++ b/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;
--- a/src/Ryujinx/UI/Controls/ApplicationListView.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationListView.axaml
@@ -93,19 +93,8 @@
                                            IsVisible="{Binding HasPlayabilityInfo}"
                                            Background="{DynamicResource AppListBackgroundColor}"
                                            Margin="-1, 0, 0, 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>
+                                            Padding="0"
+                                            ToolTip.Tip="{Binding LocalizedStatusTooltip}">
                                            <TextBlock
                                                Margin="1.5"
                                                Tag="{Binding IdString}"
--- a/src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs
+++ b/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
--- a/src/Ryujinx/UI/Helpers/LoggerAdapter.cs
+++ b/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,
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -7,7 +7,6 @@ using Avalonia.Media.Imaging;
 using Avalonia.Platform.Storage;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
 using DynamicData;
 using DynamicData.Binding;
 using FluentAvalonia.UI.Controls;
@@ -105,13 +104,6 @@ namespace Ryujinx.Ava.UI.ViewModels
        [ObservableProperty] private bool _isSubMenuOpen;
        [ObservableProperty] private ApplicationContextMenu _listAppContextMenu;
        [ObservableProperty] private ApplicationContextMenu _gridAppContextMenu;
-        [ObservableProperty] private bool _updateAvailable;
-
-        public static AsyncRelayCommand UpdateCommand { get; } = Commands.Create(async () =>
-        {
-            if (Updater.CanUpdate(true))
-                await Updater.BeginUpdateAsync(true);
-        });
        
        private bool _showLoadProgress;
        private bool _isGameRunning;
@@ -1155,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 () =>
                {
--- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
@@ -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;
@@ -122,7 +121,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 +204,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 +475,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 +560,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 +580,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 +679,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;

--- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
@@ -51,8 +51,12 @@ namespace Ryujinx.Ava.UI.Views.Main
            XciTrimmerMenuItem.Command = Commands.Create(XCITrimmerWindow.Show);
            AboutWindowMenuItem.Command = Commands.Create(AboutWindow.Show);
            CompatibilityListMenuItem.Command = Commands.Create(() => CompatibilityList.Show());
-
-            UpdateMenuItem.Command = MainWindowViewModel.UpdateCommand;
+            
+            UpdateMenuItem.Command = Commands.Create(async () =>
+            {
+                if (Updater.CanUpdate(true))
+                    await Updater.BeginUpdateAsync(true);
+            });

            FaqMenuItem.Command = 
                SetupGuideMenuItem.Command = 
--- a/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml
+++ b/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml
@@ -23,7 +23,7 @@
        Background="{DynamicResource ThemeContentBackgroundColor}"
        DockPanel.Dock="Bottom"
        IsVisible="{Binding ShowMenuAndStatusBar}"
-        ColumnDefinitions="Auto,Auto,*,Auto,Auto,Auto">
+        ColumnDefinitions="Auto,Auto,*,Auto,Auto">
        <StackPanel
            Grid.Column="0"
            Margin="5"
@@ -280,30 +280,8 @@
                Text="{Binding GpuNameText}"
                TextAlignment="Start" />
        </StackPanel>
-        <StackPanel 
-            Grid.Column="4"
-            Margin="0,0,5,0"
-            Orientation="Horizontal">
-            <StackPanel.IsVisible>
-                <MultiBinding Converter="{x:Static BoolConverters.And}">
-                    <Binding Path="EnableNonGameRunningControls" />
-                    <Binding Path="UpdateAvailable" />
-                </MultiBinding>
-            </StackPanel.IsVisible>
-            <Button Margin="0, 0, 5, 0"
-                    Command="{Binding UpdateCommand}"
-                    Background="{DynamicResource SystemAccentColor}">
-                <TextBlock
-                    Margin="-5"
-                    Foreground="Black"
-                    HorizontalAlignment="Right"
-                    VerticalAlignment="Center"
-                    Text="{ext:Locale UpdaterBackgroundStatusBarButtonText}" />
-            </Button>
-            <controls:MiniVerticalSeparator Margin="5,0,0,0"/>
-        </StackPanel>
        <StackPanel
-            Grid.Column="5"
+            Grid.Column="4"
            Margin="0,0,5,0"
            VerticalAlignment="Center"
            IsVisible="{Binding ShowFirmwareStatus}"
--- a/src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml
+++ b/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}"
--- a/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml.cs
+++ b/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;

--- a/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
+++ b/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}"
--- a/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml.cs
+++ b/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 =
--- a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
+++ b/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;
@@ -401,21 +400,10 @@ namespace Ryujinx.Ava.UI.Windows
                await Dispatcher.UIThread.InvokeAsync(async () => await UserErrorDialog.ShowUserErrorDialog(UserError.NoKeys));
            }

-            if (!Updater.CanUpdate() || CommandLineState.HideAvailableUpdates)
-                return;
-
-            switch (ConfigurationState.Instance.UpdateCheckerType.Value)
+            if (ConfigurationState.Instance.CheckUpdatesOnStart && !CommandLineState.HideAvailableUpdates && Updater.CanUpdate())
            {
-                case UpdaterType.PromptAtStartup:
-                    await Updater.BeginUpdateAsync()
-                        .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))
-                    {
-                        Dispatcher.UIThread.Post(() => RyujinxApp.MainWindow.ViewModel.UpdateAvailable = versions.Current < versions.Incoming);
-                    }
-                    break;
+                await Updater.BeginUpdateAsync()
+                    .Catch(task => Logger.Error?.Print(LogClass.Application, $"Updater Error: {task.Exception}"));
            }
        }

--- a/src/Ryujinx/Updater.cs
+++ b/src/Ryujinx/Updater.cs
@@ -43,18 +43,7 @@ namespace Ryujinx.Ava
        private const int ConnectionCount = 4;

        private static string _buildVer;
-
-        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 _platformExt;
        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,27 +174,9 @@ namespace Ryujinx.Ava

                _running = false;

-                return default;
-            }
-
-            return (currentVersion, newVersion);
-        }
-        
-        public static async Task BeginUpdateAsync(bool showVersionUpToDate = false)
-        {
-            if (_running)
-            {
                return;
            }

-            _running = true;
-
-            Optional<(Version, Version)> versionTuple = await CheckVersionAsync(showVersionUpToDate);
-
-            if (_running is false || !versionTuple.HasValue) return;
-
-            (Version currentVersion, Version newVersion) = versionTuple.Value;
-
            if (newVersion <= currentVersion)
            {
                if (showVersionUpToDate)
--- a/src/Ryujinx/Utilities/AppLibrary/ApplicationData.cs
+++ b/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,12 +32,33 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
            set
            {
                _id = value;
-
-                Compatibility = CompatibilityCsv.Find(Id);
+                PlayabilityStatus = CompatibilityCsv.GetStatus(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 string LocalizedStatusTooltip =>
+            PlayabilityStatus.HasValue 
+#pragma warning disable CS8509 // It is exhaustive for any value this property can contain.
+                ? LocaleManager.Instance[PlayabilityStatus!.Value 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,
+                }]
+                : string.Empty;
        public int PlayerCount { get; set; }
        public int GameCount { get; set; }

@@ -59,39 +78,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 +92,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();

--- a/src/Ryujinx/Utilities/Compat/CompatibilityCsv.cs
+++ b/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
--- a/src/Ryujinx/Utilities/Configuration/ConfigurationFileFormat.cs
+++ b/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
--- a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
+++ b/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),
-                (64, static cff => cff.LoggingEnableAvalonia = false),
-                (65, static cff => cff.UpdateCheckerType = cff.CheckUpdatesOnStart ? UpdaterType.PromptAtStartup : UpdaterType.Off)
+                (63, static cff => cff.MatchSystemTime = false)
            );
    }
 }
--- a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Model.cs
+++ b/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>();
--- a/src/Ryujinx/Utilities/Configuration/ConfigurationState.cs
+++ b/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,
@@ -56,7 +55,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
                DockedMode = System.EnableDockedMode,
                EnableDiscordIntegration = EnableDiscordIntegration,
                CheckUpdatesOnStart = CheckUpdatesOnStart,
-                UpdateCheckerType = UpdateCheckerType,
                ShowConfirmExit = ShowConfirmExit,
                RememberWindowState = RememberWindowState,
                ShowTitleBar = ShowTitleBar,
@@ -167,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;
@@ -176,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();
--- a/src/Ryujinx/Utilities/Configuration/UI/UpdaterType.cs
+++ b/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
-    }
-}
--- a/src/Ryujinx/Utilities/PlayReport/Analyzer.cs
+++ b/src/Ryujinx/Utilities/PlayReport/Analyzer.cs
@@ -1,4 +1,5 @@
 using Gommon;
+using MsgPack;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using System;
 using System.Collections.Generic;
@@ -30,7 +31,8 @@ namespace Ryujinx.Ava.Utilities.PlayReport
            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)));
+            _specs.Add(transform(new GameSpec { TitleIds = [titleId] }));
+            return this;
        }

        /// <summary>
@@ -44,7 +46,8 @@ namespace Ryujinx.Ava.Utilities.PlayReport
            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));
+            _specs.Add(new GameSpec { TitleIds = [titleId] }.Apply(transform));
+            return this;
        }

        /// <summary>
@@ -60,7 +63,8 @@ namespace Ryujinx.Ava.Utilities.PlayReport
            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)));
+            _specs.Add(transform(new GameSpec { TitleIds = [..tids] }));
+            return this;
        }

        /// <summary>
@@ -75,17 +79,7 @@ namespace Ryujinx.Ava.Utilities.PlayReport
            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);
+            _specs.Add(new GameSpec { TitleIds = [..tids] }.Apply(transform));
            return this;
        }

--- a/src/Ryujinx/Utilities/PlayReport/MatchedValues.cs
+++ b/src/Ryujinx/Utilities/PlayReport/MatchedValues.cs
@@ -1,6 +1,7 @@
 using MsgPack;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using System.Collections.Generic;
+using System.Linq;

 namespace Ryujinx.Ava.Utilities.PlayReport
 {
--- a/src/Ryujinx/Utilities/PlayReport/PlayReports.Formatters.cs
+++ b/src/Ryujinx/Utilities/PlayReport/PlayReports.Formatters.cs
@@ -1,5 +1,4 @@
-using Gommon;
-using System;
+using System;
 using System.Buffers.Binary;
 using System.Collections.Generic;
 using System.Linq;
@@ -282,14 +281,9 @@ namespace Ryujinx.Ava.Utilities.PlayReport
            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(", ");
+                ? $"{players.Count} Players - " + string.Join(", ",
+                    players.Take(3).Select(p => $"{p.Character}({p.PlayerNumber}){RankMedal(p.Rank)}"))
+                : string.Join(", ", players.Select(p => $"{p.Character}({p.PlayerNumber}){RankMedal(p.Rank)}"));

            string RankMedal(int? rank) => rank switch
            {
@@ -300,67 +294,8 @@ namespace Ryujinx.Ava.Utilities.PlayReport
            };
        }

-        private static FormattedValue NsoEmulator_LaunchedGame(SingleValue value) => value.Matched.StringValue switch
+        private static FormattedValue N64_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™"),
@@ -396,11 +331,11 @@ namespace Ryujinx.Ava.Utilities.PlayReport
            "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™"),
+            _ => FormattedValue.ForceReset
+        };

-            #endregion
-
-            #region NES
-
+        private static FormattedValue NES_LaunchedGame(SingleValue value) => value.Matched.StringValue switch
+        {
            "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"),
@@ -480,11 +415,11 @@ namespace Ryujinx.Ava.Utilities.PlayReport
            "clv_p_najre" => Playing("COBRA TRIANGLE™"),
            "clv_p_najse" => Playing("SNAKE RATTLE N ROLL™"),
            "clv_p_najte" => Playing("SOLAR® JETMAN"),
+            _ => FormattedValue.ForceReset
+        };

-            #endregion
-
-            #region SNES
-
+        private static FormattedValue SNES_LaunchedGame(SingleValue value) => value.Matched.StringValue switch
+        {
            "s_2180_e" => Playing("BATTLETOADS™ DOUBLE DRAGON™"),
            "s_2179_e" => Playing("BATTLETOADS™ IN BATTLEMANIACS"),
            "s_2182_e" => Playing("BIG RUN"),
@@ -555,11 +490,98 @@ namespace Ryujinx.Ava.Utilities.PlayReport
            "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™"),
+            _ => FormattedValue.ForceReset
+        };

-            #endregion
-
-            #region GameBoy
-
+        private static FormattedValue Genesis_LaunchedGame(SingleValue value) => value.Matched.StringValue switch
+        {
+            "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"),
+            _ => FormattedValue.ForceReset
+        };
+        
+        private static FormattedValue GBA_LaunchedGame(SingleValue value) => value.Matched.StringValue switch
+        {
+            "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"),
+            _ => FormattedValue.ForceReset
+        };
+        
+        private static FormattedValue GB_LaunchedGame(SingleValue value) => value.Matched.StringValue switch
+        {
            "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"),
@@ -593,39 +615,6 @@ namespace Ryujinx.Ava.Utilities.PlayReport
            "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
        };
    }
--- a/src/Ryujinx/Utilities/PlayReport/PlayReports.cs
+++ b/src/Ryujinx/Utilities/PlayReport/PlayReports.cs
@@ -1,4 +1,9 @@
-namespace Ryujinx.Ava.Utilities.PlayReport
+using System;
+using System.Buffers.Binary;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Ryujinx.Ava.Utilities.PlayReport
 {
    public static partial class PlayReports
    {
@@ -57,10 +62,25 @@
                    )
            )
            .AddSpec(
-                [
-                    "0100c9a00ece6000", "01008d300c50c000", "0100d870045b6000", 
-                    "010012f017576000", "0100c62011050000", "0100b3c014bda000"],
-                spec => spec.AddValueFormatter("launch_title_id", NsoEmulator_LaunchedGame)
+                "0100c9a00ece6000",
+                spec => spec.AddValueFormatter("launch_title_id", N64_LaunchedGame)
+            )
+            .AddSpec(
+                "01008d300c50c000",
+                spec => spec.AddValueFormatter("launch_title_id", SNES_LaunchedGame)
+            )
+            .AddSpec(
+                "0100d870045b6000",
+                spec => spec.AddValueFormatter("launch_title_id", NES_LaunchedGame)
+            ).AddSpec(
+                "010012f017576000",
+                spec => spec.AddValueFormatter("launch_title_id", GBA_LaunchedGame)
+            ).AddSpec(
+                "0100c62011050000",
+                spec => spec.AddValueFormatter("launch_title_id", GB_LaunchedGame)
+            ).AddSpec(
+                "0100b3c014bda000",
+                spec => spec.AddValueFormatter("launch_title_id", Genesis_LaunchedGame)
            );

        private static string Playing(string game) => $"Playing {game}";
--- a/src/Ryujinx/Utilities/PlayReport/Specs.cs
+++ b/src/Ryujinx/Utilities/PlayReport/Specs.cs
@@ -1,4 +1,5 @@
-using MsgPack;
+using FluentAvalonia.Core;
+using MsgPack;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using System;
 using System.Collections.Generic;
@@ -13,14 +14,8 @@ namespace Ryujinx.Ava.Utilities.PlayReport
    /// </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; } = [];
@@ -33,10 +28,8 @@ namespace Ryujinx.Ava.Utilities.PlayReport
        /// <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);
+        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"/>
@@ -46,14 +39,15 @@ namespace Ryujinx.Ava.Utilities.PlayReport
        /// <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
+        public GameSpec AddValueFormatter(int priority, string reportKey,
+            SingleValueFormatter valueFormatter)
        {
-            Priority = priority, ReportKeys = [reportKey], Formatter = valueFormatter
-        });
+            ValueFormatters.Add(new FormatterSpec
+            {
+                Priority = priority, ReportKeys = [reportKey], Formatter = valueFormatter
+            });
+            return this;
+        }

        /// <summary>
        /// Add a multi-value formatter to the current <see cref="GameSpec"/>
@@ -62,10 +56,8 @@ namespace Ryujinx.Ava.Utilities.PlayReport
        /// <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);
+        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"/>
@@ -75,14 +67,15 @@ namespace Ryujinx.Ava.Utilities.PlayReport
        /// <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
+        public GameSpec AddMultiValueFormatter(int priority, string[] reportKeys,
+            MultiValueFormatter valueFormatter)
        {
-            Priority = priority, ReportKeys = reportKeys, Formatter = valueFormatter
-        });
+            ValueFormatters.Add(new MultiFormatterSpec
+            {
+                Priority = priority, ReportKeys = reportKeys, Formatter = valueFormatter
+            });
+            return this;
+        }

        /// <summary>
        /// Add a multi-value formatter to the current <see cref="GameSpec"/>
@@ -94,10 +87,8 @@ namespace Ryujinx.Ava.Utilities.PlayReport
        /// <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);
+        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"/>
@@ -110,18 +101,13 @@ namespace Ryujinx.Ava.Utilities.PlayReport
        /// <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
+        public GameSpec AddSparseMultiValueFormatter(int priority, string[] reportKeys,
+            SparseMultiValueFormatter valueFormatter)
        {
-            Priority = priority, ReportKeys = reportKeys, Formatter = valueFormatter
-        });
-
-        private GameSpec AddValueFormatter<T>(T formatterSpec) where T : FormatterSpecBase
-        {
-            ValueFormatters.Add(formatterSpec);
+            ValueFormatters.Add(new SparseMultiFormatterSpec
+            {
+                Priority = priority, ReportKeys = reportKeys, Formatter = valueFormatter
+            });
            return this;
        }
    }
@@ -152,7 +138,7 @@ namespace Ryujinx.Ava.Utilities.PlayReport
        public override bool GetData(Horizon.Prepo.Types.PlayReport playReport, out object result)
        {
            List<MessagePackObject> packedObjects = [];
-            foreach (string reportKey in ReportKeys)
+            foreach (var reportKey in ReportKeys)
            {
                if (!playReport.ReportData.AsDictionary().TryGetValue(reportKey, out MessagePackObject valuePackObject))
                {
@@ -176,7 +162,7 @@ namespace Ryujinx.Ava.Utilities.PlayReport
        public override bool GetData(Horizon.Prepo.Types.PlayReport playReport, out object result)
        {
            Dictionary<string, MessagePackObject> packedObjects = [];
-            foreach (string reportKey in ReportKeys)
+            foreach (var reportKey in ReportKeys)
            {
                if (!playReport.ReportData.AsDictionary().TryGetValue(reportKey, out MessagePackObject valuePackObject))
                    continue;
@@ -188,17 +174,16 @@ namespace Ryujinx.Ava.Utilities.PlayReport
            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)
+        public bool Format(ApplicationMetadata appMeta, Horizon.Prepo.Types.PlayReport playReport, out FormattedValue formattedValue)
        {
            formattedValue = default;
            if (!GetData(playReport, out object data))
@@ -212,20 +197,15 @@ namespace Ryujinx.Ava.Utilities.PlayReport

            switch (Formatter)
            {
-                case SingleValueFormatter svf when data is MessagePackObject match:
-                    formattedValue = svf(
-                        new SingleValue(match) { Application = appMeta, PlayReport = playReport }
-                    );
+                case SingleValueFormatter svf when data is MessagePackObject mpo:
+                    formattedValue = svf(new SingleValue(mpo) { Application = appMeta, PlayReport = playReport });
                    return true;
-                case MultiValueFormatter mvf when data is List<MessagePackObject> matches:
-                    formattedValue = mvf(
-                        new MultiValue(matches) { Application = appMeta, PlayReport = playReport }
-                    );
+                case MultiValueFormatter mvf when data is List<MessagePackObject> messagePackObjects:
+                    formattedValue = mvf(new MultiValue(messagePackObjects) { 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 }
-                    );
+                case SparseMultiValueFormatter smvf when
+                    data is Dictionary<string, MessagePackObject> sparseMessagePackObjects:
+                    formattedValue = smvf(new SparseMultiValue(sparseMessagePackObjects) { Application = appMeta, PlayReport = playReport });
                    return true;
                default:
                    throw new InvalidOperationException("Formatter delegate is not of a known type!");
Author	SHA1	Message	Date
FluffyOMC	31e4854dcd	Merge `a873faf0e7` into `93a298523f`	2025-02-09 01:49:08 +02:00
FluffyOMC	a873faf0e7	Merge branch 'Ryubing:master' into master	2025-02-08 17:25:24 -05:00
FluffyOMC	834531483f	Merge branch 'master' into master	2025-02-08 02:53:56 -05:00
FluffyOMC	09b225e928	Merge branch 'master' into master	2025-02-08 01:38:20 -05:00
VocalFan	9886d49204	Change from 128mb to 256mb region size	2025-02-07 19:46:49 -05:00
FluffyOMC	4e9c4587e5	Merge branch 'master' into master	2025-02-07 16:48:57 -05:00
FluffyOMC	f441d3e01d	Merge branch 'master' into master	2025-02-07 00:54:49 -05:00
FluffyOMC	cf1ad265f9	Merge branch 'master' into master	2025-02-06 03:35:57 -05:00
FluffyOMC	6773343d46	Merge branch 'master' into master	2025-02-05 03:22:45 -05:00
FluffyOMC	45af4d2517	Merge branch 'master' into master	2025-02-05 02:15:44 -05:00
FluffyOMC	c279c7d5de	Merge branch 'master' into master	2025-02-04 13:36:14 -05:00
FluffyOMC	753ca01c0d	Merge branch 'master' into master	2025-02-03 23:26:34 -05:00
FluffyOMC	5aedeebfe9	Merge branch 'master' into master	2025-02-03 20:32:25 -05:00
VocalFan	5c67efd291	MacOS gets it too :3	2025-02-03 03:55:38 -05:00
VocalFan	b2354768c4	Change Region size from 256MB to 128MB	2025-02-03 03:17:22 -05:00
FluffyOMC	745bd91250	Merge branch 'master' into master	2025-02-03 02:37:46 -05:00
VocalFan	07ab817557	Merge branch 'master' of https://github.com/FluffyOMC/Ryujinx-Bingus	2025-02-03 02:29:59 -05:00
VocalFan	0e8a41b198	Humanizer boi	2025-02-03 02:29:44 -05:00
FluffyOMC	969e94f913	Merge branch 'Ryubing:master' into master	2025-02-03 02:06:17 -05:00
VocalFan	2e2d26d49d	Cursed thing that fixes JIT Cache exhaustion	2025-02-03 02:05:40 -05:00