Initial Implementation of SSBU PlayReport usage! (#638 )

Currently, this has as many game modes as I could find to implement, along with a list of all the characters in the game and their code ID.
2025-02-08 16:23:24 -06:00
21 changed files with 449 additions and 928 deletions
@@ -582,10 +582,6 @@ namespace Ryujinx.Ava
            Rainbow.Disable();
            Rainbow.Reset();
            // Reload settings when the game is turned off
            // (resets custom settings if there were any)
            Program.ReloadConfig();
            _isStopped = true;
            Stop();
        }
@@ -1,8 +1,7 @@
-<Styles
+<Styles
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
    xmlns:windowing="clr-namespace:FluentAvalonia.UI.Windowing;assembly=FluentAvalonia">
    <Design.PreviewWith>
        <Border Height="2000"
@@ -31,8 +30,7 @@
                        <Button
                            Name="btnRem"
                            HorizontalAlignment="Right"
-                            Content="Add" 
+                            Content="Add" />
                            Classes="red"/>                
                        <TextBox
                            Width="100"
                            VerticalAlignment="Center"
@@ -43,11 +41,7 @@
                    </StackPanel>
                </Grid>
                <ui:NumberBox Value="1" />
                <MenuItem
                    Header="123 0000"
                    ToolTip.Tip="What this"/>
            </StackPanel>
        </Border>
    </Design.PreviewWith>
    <Style Selector="DropDownButton">
@@ -379,16 +373,6 @@
        <Setter Property="Background"
                Value="{DynamicResource AppListHoverBackgroundColor}" />
    </Style>
    <Style Selector="Button.red /template/ ContentPresenter">
        <Setter Property="CornerRadius" Value="4"/>
            <Setter Property="Background" Value="red"/>
            <Setter Property="Foreground" Value="White"/>
        </Style>
        <Style Selector="Button.red:pointerover /template/ ContentPresenter">
            <Setter Property="CornerRadius" Value="4"/>
            <Setter Property="Background" Value="{DynamicResource WarningBackgroundColor}" />
            <Setter Property="Foreground" Value="White"/>
    </Style>
    <Styles.Resources>
        <SolidColorBrush x:Key="ThemeAccentColorBrush"
                         Color="{DynamicResource SystemAccentColor}" />
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
    <ResourceDictionary.ThemeDictionaries>
        <ResourceDictionary x:Key="Default">
@@ -12,13 +12,11 @@
            <Color x:Key="MenuFlyoutPresenterBorderColor">#C1C1C1</Color>
            <Color x:Key="AppListBackgroundColor">#b3ffffff</Color>
            <Color x:Key="AppListHoverBackgroundColor">#80cccccc</Color>
            <Color x:Key="WarningBackgroundColor">#FF6347</Color>
            <Color x:Key="SecondaryTextColor">#A0000000</Color>
            <Color x:Key="FavoriteApplicationIconColor">#fffcd12a</Color>
            <Color x:Key="Switch">#FF2EEAC9</Color>
            <Color x:Key="Unbounded">#FFFF4554</Color>
            <Color x:Key="Custom">#6483F5</Color>
            <Color x:Key="Warning">#800080</Color>
        </ResourceDictionary>
        <ResourceDictionary x:Key="Light">
            <SolidColorBrush x:Key="DataGridSelectionBackgroundBrush"
@@ -31,13 +29,11 @@
            <Color x:Key="MenuFlyoutPresenterBorderColor">#C1C1C1</Color>
            <Color x:Key="AppListBackgroundColor">#b3ffffff</Color>
            <Color x:Key="AppListHoverBackgroundColor">#80cccccc</Color>
            <Color x:Key="WarningBackgroundColor">#FF6347</Color>
            <Color x:Key="SecondaryTextColor">#A0000000</Color>
            <Color x:Key="FavoriteApplicationIconColor">#fffcd12a</Color>
            <Color x:Key="Switch">#13c3a4</Color>
            <Color x:Key="Unbounded">#FFFF4554</Color>
            <Color x:Key="Custom">#6483F5</Color>
            <Color x:Key="Warning">#800080</Color>
        </ResourceDictionary>
        <ResourceDictionary x:Key="Dark">
            <SolidColorBrush x:Key="DataGridSelectionBackgroundBrush"
@@ -50,13 +46,11 @@
            <Color x:Key="MenuFlyoutPresenterBorderColor">#3D3D3D</Color>
            <Color x:Key="AppListBackgroundColor">#0FFFFFFF</Color>
            <Color x:Key="AppListHoverBackgroundColor">#1EFFFFFF</Color>
            <Color x:Key="WarningBackgroundColor">#FF6347</Color>
            <Color x:Key="SecondaryTextColor">#A0FFFFFF</Color>
            <Color x:Key="FavoriteApplicationIconColor">#fffcd12a</Color>
            <Color x:Key="Switch">#FF2EEAC9</Color>
            <Color x:Key="Unbounded">#FFFF4554</Color>
            <Color x:Key="Custom">#6483F5</Color>
            <Color x:Key="Warning">#FFA500</Color>
        </ResourceDictionary>
    </ResourceDictionary.ThemeDictionaries>
 </ResourceDictionary>
@@ -2722,31 +2722,6 @@
        "zh_TW": "建立桌面捷徑，啟動選取的應用程式"
      }
    },
    {
      "ID": "GameListContextMenuEditGameConfiguration",
      "Translations": {
        "ar_SA": "تعديل تكوين اللعبة",
        "de_DE": "Spielkonfiguration bearbeiten",
        "el_GR": "Επεξεργασία ρυθμίσεων παιχνιδιού",
        "en_US": "Edit Game Configuration",
        "es_ES": "Editar configuración del juego",
        "fr_FR": "Modifier la configuration du jeu",
        "he_IL": "ערוך את הגדרת המשחק",
        "it_IT": "Modifica configurazione gioco",
        "ja_JP": "ゲーム設定を編集",
        "ko_KR": "게임 설정 편집",
        "no_NO": "Rediger spillkonfig.",
        "pl_PL": "Edytuj konfigurację gry",
        "pt_BR": "Editar configuração do jogo",
        "ru_RU": "Редактировать конфигурацию игры",
        "sv_SE": "Redigera spelkonfiguration",
        "th_TH": "แก้ไขการตั้งค่าเกม",
        "tr_TR": "Oyunun yapılandırmasını düzenle",
        "uk_UA": "Редагувати конфігурацію гри",
        "zh_CN": "编辑游戏配置",
        "zh_TW": "編輯遊戲設定"
      }
    },
    {
      "ID": "GameListContextMenuCreateShortcutToolTipMacOS",
      "Translations": {
@@ -2772,31 +2747,6 @@
        "zh_TW": "在 macOS 的應用程式資料夾中建立捷徑，啟動選取的應用程式"
      }
    },
    {
      "ID": "EditGameConfigurationToolTip",
      "Translations": {
        "ar_SA": "ينشئ تكوينًا مستقلًا للعبة الحالية",
        "de_DE": "Erstellt eine unabhängige Konfiguration für das aktuelle Spiel",
        "el_GR": "Δημιουργεί μια ανεξάρτητη διαμόρφωση για το τρέχον παιχνίδι",
        "en_US": "Creates an independent configuration for the current game",
        "es_ES": "Crea una configuración independiente para el juego actual",
        "fr_FR": "Crée une configuration indépendante pour le jeu en cours",
        "he_IL": "יוצר תצורה עצמאית למשחק הנוכחי",
        "it_IT": "Crea una configurazione indipendente per il gioco attuale",
        "ja_JP": "現在のゲーム用の独立した設定を作成します",
        "ko_KR": "현재 게임에 대한 독립적인 설정을 생성합니다",
        "no_NO": "Oppretter en uavhengig konfigurasjon for det gjeldende spillet",
        "pl_PL": "Tworzy niezależną konfigurację dla bieżącej gry",
        "pt_BR": "Cria uma configuração independente para o jogo atual",
        "ru_RU": "Создает независимую конфигурацию для текущей игры",
        "sv_SE": "Skapar en oberoende konfiguration för det aktuella spelet",
        "th_TH": "สร้างการกำหนดค่าที่เป็นอิสระสำหรับเกมปัจจุบัน",
        "tr_TR": "Mevcut oyun için bağımsız bir yapılandırma oluşturur",
        "uk_UA": "Створює незалежну конфігурацію для поточної гри",
        "zh_CN": "为当前游戏创建独立的配置",
        "zh_TW": "為當前遊戲創建獨立的配置"
      }
    },
    {
      "ID": "GameListContextMenuShowCompatEntry",
      "Translations": {
@@ -3322,31 +3272,6 @@
        "zh_TW": "設定"
      }
    },
    {
      "ID": "SettingsWithInfo",
      "Translations": {
        "ar_SA": "{0} - إعدادات",
        "de_DE": "Einstellungen - {0}",
        "el_GR": "Ρυθμίσεις - {0}",
        "en_US": "Settings - {0}",
        "es_ES": "Configuración - {0}",
        "fr_FR": "Paramètres - {0}",
        "he_IL": "{0} - הגדרות",
        "it_IT": "Impostazioni - {0}",
        "ja_JP": "設定 - {0}",
        "ko_KR": "설정 - {0}",
        "no_NO": "Innstillinger - {0}",
        "pl_PL": "Ustawienia - {0}",
        "pt_BR": "Configurações - {0}",
        "ru_RU": "Параметры - {0}",
        "sv_SE": "Inställningar - {0}",
        "th_TH": "ตั้งค่า - {0}",
        "tr_TR": "Ayarlar - {0}",
        "uk_UA": "Налаштування - {0}",
        "zh_CN": "设置 - {0}",
        "zh_TW": "設定 - {0}"
      }
    },
    {
      "ID": "SettingsTabGeneral",
      "Translations": {
@@ -23747,31 +23672,6 @@
        "zh_TW": ""
      }
    },
    {
      "ID": "UserConfigurationHeader",
      "Translations": {
        "ar_SA": "",
        "de_DE": "",
        "el_GR": "",
        "en_US": "User Config",
        "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": {
@@ -32,7 +32,6 @@ namespace Ryujinx.Ava
        public static double DesktopScaleFactor { get; set; } = 1.0;
        public static string Version { get; private set; }
        public static string ConfigurationPath { get; private set; }
        public static string GlobalConfigurationPath { get; private set; }
        public static bool PreviewerDetached { get; private set; }
        public static bool UseHardwareAcceleration { get; private set; }
@@ -156,43 +155,11 @@ namespace Ryujinx.Ava
            }
        }
        public static bool FindGameConfig(string gameDir)
        {
            if (File.Exists(gameDir))
            {
                return true;
            }
            return false;
        }
        public static string GetDirGameUserConfig(string gameId, bool rememberGlobalDir = false, bool changeFolderForGame = false)
        {
            string gameDir = Path.Combine(AppDataManager.GamesDirPath, gameId, ReleaseInformation.ConfigName);
            // Should load with the game if there is a custom setting for the game
            if (rememberGlobalDir)
            {
                GlobalConfigurationPath = ConfigurationPath;
            }
            if (changeFolderForGame)
            {
                ConfigurationPath = gameDir;
            }
            return gameDir;
        }
        public static void ReloadConfig()
        {
            //It is necessary that when a user setting appears, the global setting remains available
            GlobalConfigurationPath = null;
            string localConfigurationPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, ReleaseInformation.ConfigName);
            string appDataConfigurationPath = Path.Combine(AppDataManager.BaseDirPath, ReleaseInformation.ConfigName);
            // Now load the configuration as the other subsystems are now registered
            if (File.Exists(localConfigurationPath))
            {
@@ -265,35 +232,8 @@ namespace Ryujinx.Ava
                    _ => ConfigurationState.Instance.HideCursor,
                };
            // Check if memoryManagerMode was overridden. 
            if (CommandLineState.OverrideMemoryManagerMode is not null)
                if (Enum.TryParse(CommandLineState.OverrideMemoryManagerMode, true, out MemoryManagerMode result))
                {
                    ConfigurationState.Instance.System.MemoryManagerMode.Value = result;
                }
-            // Check if PPTC was overridden. 
+            // Check if hardware-acceleration was overridden.
            if (CommandLineState.OverridePPTC is not null)
                if (Enum.TryParse(CommandLineState.OverridePPTC, true, out bool result))
                {
                    ConfigurationState.Instance.System.EnablePtc.Value = result;
                }
            // Check if region was overridden. 
            if (CommandLineState.OverrideSystemRegion is not null)
                if (Enum.TryParse(CommandLineState.OverrideSystemRegion, true, out Ryujinx.HLE.HOS.SystemState.RegionCode result))
                {
                    ConfigurationState.Instance.System.Region.Value = (Utilities.Configuration.System.Region)result;
                }
            //Check if language was overridden. 
            if (CommandLineState.OverrideSystemLanguage is not null)
                if (Enum.TryParse(CommandLineState.OverrideSystemLanguage, true, out Ryujinx.HLE.HOS.SystemState.SystemLanguage result))
                {
                    ConfigurationState.Instance.System.Language.Value = (Utilities.Configuration.System.Language)result;
                }
            // Check if hardware-acceleration was overridden. MemoryManagerMode ( outdated! )
            if (CommandLineState.OverrideHardwareAcceleration != null)
                UseHardwareAcceleration = CommandLineState.OverrideHardwareAcceleration.Value;
        }
@@ -19,11 +19,6 @@
        Header="{ext:Locale GameListContextMenuCreateShortcut}"
        Icon="{ext:Icon fa-solid fa-bookmark}"
        ToolTip.Tip="{OnPlatform Default={ext:Locale GameListContextMenuCreateShortcutToolTip}, macOS={ext:Locale GameListContextMenuCreateShortcutToolTipMacOS}}" />
    <MenuItem
       Click="EditGameConfiguration_Click"
       Header="{ext:Locale GameListContextMenuEditGameConfiguration}"
       Icon="{ext:Icon fa-solid fa-gear}"
       ToolTip.Tip="{ext:Locale EditGameConfigurationToolTip}" />
    <MenuItem
        IsVisible="{Binding HasCompatibilityEntry}"
        Click="OpenApplicationCompatibility_Click"
@@ -386,26 +386,13 @@ namespace Ryujinx.Ava.UI.Controls
                    viewModel.SelectedApplication.Icon
                );
        }
-
+        
        public async void EditGameConfiguration_Click(object sender, RoutedEventArgs args)
        {
            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
            {
                await new UserConfigWindows(viewModel).ShowDialog((Window)viewModel.TopLevel);
                //just checking for file presence
                viewModel.SelectedApplication.UserConfig = File.Exists(Program.GetDirGameUserConfig(viewModel.SelectedApplication.IdString,false,false));
                viewModel.RefreshView();
            }
        }
        public async void OpenApplicationCompatibility_Click(object sender, RoutedEventArgs args)
        {
            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
                await CompatibilityList.Show(viewModel.SelectedApplication.IdString);
        }
-               
+        
        public async void OpenApplicationData_Click(object sender, RoutedEventArgs args)
        {
            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
@@ -7,7 +7,6 @@
    xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
    d:DesignHeight="450"
    d:DesignWidth="800"
    Focusable="True"
@@ -74,18 +73,12 @@
                                    HorizontalAlignment="Stretch"
                                    VerticalAlignment="Stretch"
                                    IsVisible="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).ShowNames}">
-                                    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                                    <TextBlock
-                                        <TextBlock
+                                        HorizontalAlignment="Center"
-                                            Text="{Binding Name}"
+                                        VerticalAlignment="Center"
-                                            TextAlignment="Center"
+                                        Text="{Binding Name}"
-                                            TextWrapping="Wrap" />
+                                        TextAlignment="Center"
-                                        <TextBlock
+                                        TextWrapping="Wrap" />
                                            IsVisible="{Binding UserConfig}"
                                            Text="{ext:Locale UserConfigurationHeader}"
                                            TextAlignment="Center"
                                            TextWrapping="Wrap"
                                            Foreground="{DynamicResource Warning}" />
                                    </StackPanel>
                                </Panel>
                            </Grid>
                        </Border>
@@ -93,28 +86,10 @@
                            Margin="5,5,0,0"
                            HorizontalAlignment="Left"
                            VerticalAlignment="Top"
-                            FontSize="18"
+                            FontSize="16"
                            Foreground="{DynamicResource FavoriteApplicationIconColor}"
                            IsVisible="{Binding Favorite}"
                            Symbol="StarFilled" />
                        <Grid IsVisible="{Binding !$parent[UserControl].((viewModels:MainWindowViewModel)DataContext).ShowNames}">
                            <Border
                                Margin="15,35,5,15"
                                HorizontalAlignment="Left"
                                VerticalAlignment="Bottom"
                                Width="90"
                                Height="20"
                                CornerRadius="4"
                                IsVisible="{Binding UserConfig}"
                                Background="{DynamicResource ThemeContentBackgroundColor}">
                                <TextBlock
                                    HorizontalAlignment="Center"
                                    VerticalAlignment="Center"
                                    Text="{ext:Locale UserConfigurationHeader}"
                                    TextAlignment="Center"
                                    TextWrapping="Wrap" />
                            </Border>
                        </Grid>
                    </Grid>
                </DataTemplate>
            </ListBox.ItemTemplate>
@@ -6,7 +6,6 @@
    xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
    d:DesignHeight="450"
    d:DesignWidth="800"
    Focusable="True"
@@ -146,13 +145,6 @@
                                        Text="{Binding Converter={x:Static helpers:MultiplayerInfoConverter.Instance}}"
                                        TextAlignment="Start"
                                        TextWrapping="Wrap"/>
                                    <TextBlock
                                        HorizontalAlignment="Stretch"
                                        IsVisible="{Binding UserConfig}"
                                        Text="{ext:Locale UserConfigurationHeader}"
                                        TextAlignment="Start"
                                        TextWrapping="Wrap"
                                        Foreground="{DynamicResource Warning}" />
                                </StackPanel>
                                <StackPanel
                                    Grid.Column="4"
@@ -1076,7 +1076,7 @@ namespace Ryujinx.Ava.UI.ViewModels
            _rendererWaitEvent.WaitOne();
            AppHost?.Start();
-            
+
            AppHost?.DisposeContext();
        }
@@ -1541,13 +1541,6 @@ namespace Ryujinx.Ava.UI.ViewModels
            await PerformanceCheck();
 #endif
            // If a configuration is found in the "/games/xxxxxxxxxxxxxx" folder, the program will load the user setting. 
            if (ConfigurationFileFormat.TryLoad(Program.GetDirGameUserConfig(application.IdBaseString), out ConfigurationFileFormat configurationFileFormat))
            {
                // Loads the user configuration, having previously changed the global configuration to the user configuration
                ConfigurationState.Instance.Load(configurationFileFormat, Program.GetDirGameUserConfig(application.IdBaseString, true, true), application.IdBaseString);
            }
            Logger.RestartTime();
            SelectedIcon ??= ApplicationLibrary.GetApplicationIcon(application.Path, ConfigurationState.Instance.System.Language, application.Id);
@@ -1592,7 +1585,6 @@ namespace Ryujinx.Ava.UI.ViewModels
            Thread gameThread = new(InitializeGame) { Name = "GUI.WindowThread" };
            gameThread.Start();
        }
        public void SwitchToRenderer(bool startFullscreen) =>
@@ -1,10 +1,8 @@
 using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Media.Imaging;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Humanizer;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.OpenAL;
 using Ryujinx.Audio.Backends.SDL2;
@@ -28,7 +26,6 @@ using Ryujinx.HLE.HOS.Services.Time.TimeZone;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
 using System.Net.NetworkInformation;
 using System.Threading.Tasks;
@@ -71,46 +68,6 @@ namespace Ryujinx.Ava.UI.ViewModels
        public SettingsHacksViewModel DirtyHacks { get; }
        private Bitmap _gameIcon;
        private string _gameTitle;
        private string _gameId;
        public Bitmap GameIcon
        {
            get => _gameIcon;
            set
            {
                if (_gameIcon != value)
                {
                    _gameIcon = value;
                }
            }
        }
        public string GameTitle
        {
            get => _gameTitle;
            set
            {
                if (_gameTitle != value)
                {
                    _gameTitle = value;
                }
            }
        }
        public string GameId
        {
            get => _gameId;
            set
            {
                if (_gameId != value)
                {
                    _gameId = value;
                }
            }
        }
        public int ResolutionScale
        {
            get => _resolutionScale;
@@ -372,7 +329,7 @@ namespace Ryujinx.Ava.UI.ViewModels
        public bool IsInvalidLdnPassphraseVisible { get; set; }
-        public SettingsViewModel(VirtualFileSystem virtualFileSystem, ContentManager contentManager) : this(false)
+        public SettingsViewModel(VirtualFileSystem virtualFileSystem, ContentManager contentManager) : this()
        {
            _virtualFileSystem = virtualFileSystem;
            _contentManager = contentManager;
@@ -385,48 +342,7 @@ namespace Ryujinx.Ava.UI.ViewModels
            }
        }
-        public SettingsViewModel(VirtualFileSystem virtualFileSystem, 
+        public SettingsViewModel()
            ContentManager contentManager,
            string gamePath,
            string gameName, 
            string gameId, 
            byte[] gameIconData, 
            bool enableToLoadCustomConfig) : this(enableToLoadCustomConfig)
        {
            _virtualFileSystem = virtualFileSystem;
            _contentManager = contentManager;
            if (gameIconData != null && gameIconData.Length > 0)
            {
                using (var ms = new MemoryStream(gameIconData))
                {
                    GameIcon = new Bitmap(ms);
                }
            }
            GameTitle = gameName;
            GameId = gameId;
            if (enableToLoadCustomConfig) // During the game. If there is no user config, then load the global config window
            {
                string gameDir = Program.GetDirGameUserConfig(gameId, false, true);
                if (ConfigurationFileFormat.TryLoad(gameDir, out ConfigurationFileFormat configurationFileFormat))
                {
                    ConfigurationState.Instance.Load(configurationFileFormat, gameDir, gameId);                 
                }
                LoadCurrentConfiguration(); // Needed to load custom configuration
            }
            if (Program.PreviewerDetached)
            {
                Task.Run(LoadTimeZones);
                DirtyHacks = new SettingsHacksViewModel(this);
            }
        }
        public SettingsViewModel(bool noLoadGlobalConfig = false)
        {
            GameDirectories = [];
            AutoloadDirectories = [];
@@ -441,11 +357,7 @@ namespace Ryujinx.Ava.UI.ViewModels
            if (Program.PreviewerDetached)
            {
                Task.Run(LoadAvailableGpus);
-
+                LoadCurrentConfiguration();
                if (!noLoadGlobalConfig)// Default is false, but loading custom config avoids double call
                {
                    LoadCurrentConfiguration();
                }
                DirtyHacks = new SettingsHacksViewModel(this);
            }
@@ -556,32 +468,27 @@ namespace Ryujinx.Ava.UI.ViewModels
        {
            ConfigurationState config = ConfigurationState.Instance;
-            //It is necessary that the data is used from the global configuration file
+            // User Interface
-            if (string.IsNullOrEmpty(GameId)) 
+            EnableDiscordIntegration = config.EnableDiscordIntegration;
            CheckUpdatesOnStart = config.CheckUpdatesOnStart;
            ShowConfirmExit = config.ShowConfirmExit;
            RememberWindowState = config.RememberWindowState;
            ShowTitleBar = config.ShowTitleBar;
            HideCursor = (int)config.HideCursor.Value;
            GameDirectories.Clear();
            GameDirectories.AddRange(config.UI.GameDirs.Value);
            AutoloadDirectories.Clear();
            AutoloadDirectories.AddRange(config.UI.AutoloadDirs.Value);
            BaseStyleIndex = config.UI.BaseStyle.Value switch
            {
-                // User Interface
+                "Auto" => 0,
-                EnableDiscordIntegration = config.EnableDiscordIntegration;
+                "Light" => 1,
-                CheckUpdatesOnStart = config.CheckUpdatesOnStart;
+                "Dark" => 2,
-                ShowConfirmExit = config.ShowConfirmExit;
+                _ => 0
-                RememberWindowState = config.RememberWindowState;
+            };
                ShowTitleBar = config.ShowTitleBar;
                HideCursor = (int)config.HideCursor.Value;
                GameDirectories.Clear();
                GameDirectories.AddRange(config.UI.GameDirs.Value);
                AutoloadDirectories.Clear();
                AutoloadDirectories.AddRange(config.UI.AutoloadDirs.Value);
                BaseStyleIndex = config.UI.BaseStyle.Value switch
                {
                    "Auto" => 0,
                    "Light" => 1,
                    "Dark" => 2,
                    _ => 0
                };
            }
            // Input
            EnableDockedMode = config.System.EnableDockedMode;
@@ -601,6 +508,7 @@ namespace Ryujinx.Ava.UI.ViewModels
            DateTime currentDateTime = currentHostDateTime.Add(systemDateTimeOffset);
            CurrentDate = currentDateTime.Date;
            CurrentTime = currentDateTime.TimeOfDay;
            MatchSystemTime = config.System.MatchSystemTime;
            EnableCustomVSyncInterval = config.Graphics.EnableCustomVSyncInterval;
@@ -660,41 +568,37 @@ namespace Ryujinx.Ava.UI.ViewModels
            LdnPassphrase = config.Multiplayer.LdnPassphrase;
            LdnServer = config.Multiplayer.LdnServer;
        }
-     
+
        public void SaveSettings()
        {
            ConfigurationState config = ConfigurationState.Instance;
            bool userConfigFile = string.IsNullOrEmpty(GameId);
-            if (userConfigFile)
+            // User Interface
            config.EnableDiscordIntegration.Value = EnableDiscordIntegration;
            config.CheckUpdatesOnStart.Value = CheckUpdatesOnStart;
            config.ShowConfirmExit.Value = ShowConfirmExit;
            config.RememberWindowState.Value = RememberWindowState;
            config.ShowTitleBar.Value = ShowTitleBar;
            config.HideCursor.Value = (HideCursorMode)HideCursor;
            if (GameDirectoryChanged)
            {
-                // User Interface
+                config.UI.GameDirs.Value = [..GameDirectories];
                config.EnableDiscordIntegration.Value = EnableDiscordIntegration;
                config.CheckUpdatesOnStart.Value = CheckUpdatesOnStart;
                config.ShowConfirmExit.Value = ShowConfirmExit;
                config.RememberWindowState.Value = RememberWindowState;
                config.ShowTitleBar.Value = ShowTitleBar;
                config.HideCursor.Value = (HideCursorMode)HideCursor;
                if (GameDirectoryChanged)
                {
                    config.UI.GameDirs.Value = [.. GameDirectories];
                }
                if (AutoloadDirectoryChanged)
                {
                    config.UI.AutoloadDirs.Value = [.. AutoloadDirectories];
                }
                config.UI.BaseStyle.Value = BaseStyleIndex switch
                {
                    0 => "Auto",
                    1 => "Light",
                    2 => "Dark",
                    _ => "Auto"
                };
            }
            if (AutoloadDirectoryChanged)
            {
                config.UI.AutoloadDirs.Value = [..AutoloadDirectories];
            }
            config.UI.BaseStyle.Value = BaseStyleIndex switch
            {
                0 => "Auto",
                1 => "Light",
                2 => "Dark",
                _ => "Auto"
            };
            // Input
            config.System.EnableDockedMode.Value = EnableDockedMode;
            config.Hid.EnableKeyboard.Value = EnableKeyboard;
@@ -789,9 +693,7 @@ namespace Ryujinx.Ava.UI.ViewModels
            config.Hacks.EnableShaderTranslationDelay.Value = DirtyHacks.ShaderTranslationDelayEnabled;
            config.Hacks.ShaderTranslationDelay.Value = DirtyHacks.ShaderTranslationDelay;
-
+            config.ToFileFormat().SaveConfig(Program.ConfigurationPath);
                config.ToFileFormat().SaveConfig(Program.ConfigurationPath);
            MainWindow.UpdateGraphicsConfig();
            RyujinxApp.MainWindow.ViewModel.VSyncModeSettingChanged();
@@ -804,11 +706,7 @@ namespace Ryujinx.Ava.UI.ViewModels
        private static void RevertIfNotSaved()
        {
-            // maybe this is an unnecessary check(all options need to be tested)
+            Program.ReloadConfig();
            if (string.IsNullOrEmpty(Program.GlobalConfigurationPath))
            {
                Program.ReloadConfig();
            }
        }
        public void ApplyButton()
@@ -816,26 +714,6 @@ namespace Ryujinx.Ava.UI.ViewModels
            SaveSettings();
        }
        public void DeleteConfigGame()
        {
            string gameDir = Program.GetDirGameUserConfig(GameId,false,false);
            if (File.Exists(gameDir))
            {
                File.Delete(gameDir);
            }
            RevertIfNotSaved();
            CloseWindow?.Invoke();
        }
        public void SaveUserConfig()
        {
            SaveSettings();
            RevertIfNotSaved(); // Revert global configuration after saving user configuration
            CloseWindow?.Invoke();
        }
        public void OkButton()
        {
            SaveSettings();
@@ -134,26 +134,9 @@ namespace Ryujinx.Ava.UI.Views.Main
            Window.SettingsWindow = new(Window.VirtualFileSystem, Window.ContentManager);
            Rainbow.Enable();
-
+            
-            if (ViewModel.SelectedApplication is null) // Checks if game data exists
+            await Window.SettingsWindow.ShowDialog(Window);
-            {
+            
                await Window.SettingsWindow.ShowDialog(Window);
            }
            else
            { 
                bool userConfigExist = Program.FindGameConfig(Program.GetDirGameUserConfig(ViewModel.SelectedApplication.IdString, false, false));
                if (!ViewModel.IsGameRunning || !userConfigExist)
                {
                    await Window.SettingsWindow.ShowDialog(Window); // The game is not running, or if the user configuration does not exist
                }
                else
                {
                    // If there is a custom configuration in the folder
                    await new UserConfigWindows(ViewModel, userConfigExist).ShowDialog((Window)ViewModel.TopLevel);
                }
            }
            Rainbow.Disable();
            Rainbow.Reset();
@@ -1,144 +0,0 @@
 <window:StyleableAppWindow
    x:Class="Ryujinx.Ava.UI.Windows.UserConfigWindows"
    xmlns="https://github.com/avaloniaui"
    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:window="clr-namespace:Ryujinx.Ava.UI.Windows"
    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
    xmlns:settings="clr-namespace:Ryujinx.Ava.UI.Views.Settings"
    xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
    xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
    Width="1100"
    Height="768"
    MinWidth="800"
    MinHeight="480"
    WindowStartupLocation="CenterOwner"
    x:DataType="viewModels:SettingsViewModel"
    mc:Ignorable="d"
    Focusable="True">
    <Design.DataContext>
        <viewModels:SettingsViewModel />
    </Design.DataContext>
    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" MinWidth="600" RowDefinitions="Auto,*,Auto">
        <ContentPresenter
            x:Name="ContentPresenter"
            Grid.Row="1"
            IsVisible="False"
            KeyboardNavigation.IsTabStop="False"/>
        <Grid Name="Pages" IsVisible="False" Grid.Row="2">
            <settings:SettingsInputView Name="InputPage" />
            <settings:SettingsSystemView Name="SystemPage" />
            <settings:SettingsCPUView Name="CpuPage" />
            <settings:SettingsGraphicsView Name="GraphicsPage" />
            <settings:SettingsAudioView Name="AudioPage" />
            <settings:SettingsNetworkView Name="NetworkPage" />
            <settings:SettingsLoggingView Name="LoggingPage" />
            <settings:SettingsHacksView Name="HacksPage" />
        </Grid>
        <ui:NavigationView
            Grid.Row="1"
            IsSettingsVisible="False"
            Name="NavPanel"
            IsBackEnabled="False"
            PaneDisplayMode="Left"
            Margin="2,10,10,0"
            VerticalAlignment="Stretch"
            HorizontalAlignment="Stretch"
            OpenPaneLength="200"
            IsPaneToggleButtonVisible="False">
            <!-- For image -->
            <ui:NavigationView.PaneHeader>
                <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
                    <Grid.RowDefinitions>
                        <RowDefinition Height="Auto"/>
                        <RowDefinition Height="Auto"/>
                        <RowDefinition Height="Auto"/>
                        <RowDefinition Height="5"/>
                    </Grid.RowDefinitions>
                    <TextBlock Text="{Binding GameId}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"
                        Margin="0,0,0,10"
                        TextAlignment="Center" Grid.Row="0" />
                    <Image Source="{Binding GameIcon}" 
                        Width="160" 
                        Height="160" 
                        Grid.Row="1" 
                        Margin="0,0,0,10"
                        HorizontalAlignment="Center" />
                    <TextBlock Text="{Binding GameTitle}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"
                        Margin="0,0,0,10"
                        TextAlignment="Center" Grid.Row="2" />
                    <Separator Height="1" Grid.Row="3" Margin="0,0,0,10" HorizontalAlignment="Stretch"/>
                </Grid>
            </ui:NavigationView.PaneHeader>
            <ui:NavigationView.MenuItems>
                <ui:NavigationViewItem
                    Content="{ext:Locale SettingsTabInput}"
                    Tag="InputPage"
                    IconSource="Games" />
                <ui:NavigationViewItem
                    Content="{ext:Locale SettingsTabSystem}"
                    Tag="SystemPage"
                    IconSource="Settings" />
                <ui:NavigationViewItem
                    Content="{ext:Locale SettingsTabCpu}"
                    Tag="CpuPage">
                    <ui:NavigationViewItem.IconSource>
                        <ui:FontIconSource
                            FontFamily="avares://Ryujinx/Assets/Fonts#Segoe Fluent Icons"
                            Glyph="{helpers:GlyphValueConverter Chip}" />
                    </ui:NavigationViewItem.IconSource>
                </ui:NavigationViewItem>
                <ui:NavigationViewItem
                    Content="{ext:Locale SettingsTabGraphics}"
                    Tag="GraphicsPage"
                    IconSource="Image" />
                <ui:NavigationViewItem
                    Content="{ext:Locale SettingsTabAudio}"
                    IconSource="Audio"
                    Tag="AudioPage" />
                <ui:NavigationViewItem
                    Content="{ext:Locale SettingsTabNetwork}"
                    Tag="NetworkPage"
                    IconSource="Globe" />
                <ui:NavigationViewItem
                    Content="{ext:Locale SettingsTabLogging}"
                    Tag="LoggingPage"
                    IconSource="Document" />
                <ui:NavigationViewItem
                    IsVisible="{Binding ShowDirtyHacks}"
                    Content="Dirty Hacks"
                    Tag="HacksPage"
                    IconSource="Code" />
            </ui:NavigationView.MenuItems>
        </ui:NavigationView>
        <ReversibleStackPanel
            Grid.Row="2"
            Margin="10"
            Spacing="10"
            Orientation="Horizontal"
            HorizontalAlignment="Right"
            ReverseOrder="{x:Static helper:RunningPlatform.IsMacOS}">
            <Button
                Content="{ext:Locale SettingsButtonSave}"
                Command="{Binding SaveUserConfig}" />
            <Button
                HotKey="Escape"
                Content="{ext:Locale SettingsButtonClose}"
                Command="{Binding CancelButton}" />
            <Button
                Content="{ext:Locale UserProfilesDelete}"
                Command="{Binding DeleteConfigGame}"
                Classes="red"/>
        </ReversibleStackPanel>
    </Grid>
 </window:StyleableAppWindow>
@@ -1,115 +0,0 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Shapes;
 using Avalonia.Input;
 using Avalonia.Media.Imaging;
 using FluentAvalonia.Core;
 using FluentAvalonia.UI.Controls;
 using Projektanker.Icons.Avalonia;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.ViewModels.Input;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common.Configuration;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS.SystemState;
 using Ryujinx.Input;
 using System;
 using System.IO;
 using System.Linq;
 using Key = Avalonia.Input.Key;
 namespace Ryujinx.Ava.UI.Windows
 {
    public partial class UserConfigWindows : StyleableAppWindow
    {
        internal readonly SettingsViewModel ViewModel;
        public UserConfigWindows(MainWindowViewModel viewModel, bool findUserConfigDir = true)
        {
            Title = string.Format(LocaleManager.Instance[LocaleKeys.SettingsWithInfo], viewModel.SelectedApplication.Name, viewModel.SelectedApplication.IdString);
            DataContext = ViewModel = new SettingsViewModel(
                viewModel.VirtualFileSystem, 
                viewModel.ContentManager,
                viewModel.SelectedApplication.Path,
                viewModel.SelectedApplication.Name,
                viewModel.SelectedApplication.IdString,
                viewModel.SelectedApplication.Icon,
                findUserConfigDir);
            ViewModel.CloseWindow += Close;
            ViewModel.SaveSettingsEvent += SaveSettings;
            InitializeComponent();
            Load();
 #if DEBUG
            this.AttachDevTools(new KeyGesture(Key.F12, KeyModifiers.Alt));
 #endif
        }
        public void SaveSettings()
        {
            InputPage.InputView?.SaveCurrentProfile();
        }
        private void Load()
        {
            Pages.Children.Clear();
            NavPanel.SelectionChanged += NavPanelOnSelectionChanged;
            NavPanel.SelectedItem = NavPanel.MenuItems.ElementAt(0);
        }
        private void NavPanelOnSelectionChanged(object sender, NavigationViewSelectionChangedEventArgs e)
        {
            if (e.SelectedItem is NavigationViewItem navItem && navItem.Tag is not null)
            {
                switch (navItem.Tag.ToString())
                {
                    case nameof(InputPage):
                        NavPanel.Content = InputPage;
                        break;
                    case nameof(SystemPage):
                        SystemPage.ViewModel = ViewModel;
                        NavPanel.Content = SystemPage;
                        break;
                    case nameof(CpuPage):
                        NavPanel.Content = CpuPage;
                        break;
                    case nameof(GraphicsPage):
                        NavPanel.Content = GraphicsPage;
                        break;
                    case nameof(AudioPage):
                        NavPanel.Content = AudioPage;
                        break;
                    case nameof(NetworkPage):
                        NetworkPage.ViewModel = ViewModel;
                        NavPanel.Content = NetworkPage;
                        break;
                    case nameof(LoggingPage):
                        NavPanel.Content = LoggingPage;
                        break;
                    case nameof(HacksPage):
                        HacksPage.DataContext = ViewModel;
                        NavPanel.Content = HacksPage;
                        break;
                    default:
                        throw new NotImplementedException();
                }
            }        
        }
        protected override void OnClosing(WindowClosingEventArgs e)
        {   
            base.OnClosing(e);
        }
    }
 }
@@ -21,7 +21,6 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
    public class ApplicationData
    {
        public bool Favorite { get; set; }
        public bool UserConfig { get; set; }
        public byte[] Icon { get; set; }
        public string Name { get; set; } = "Unknown";
@@ -505,7 +505,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
                if (data.Id != 0)
                {
                    ApplicationMetadata appMetadata = LoadAndSaveMetaData(data.IdString, appMetadata =>
-                    {                        
+                    {
                        appMetadata.Title = data.Name;
                        // Only do the migration if time_played has a value and timespan_played hasn't been updated yet.
@@ -529,11 +529,10 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
                        }
                    });
-            
+
                    data.Favorite = appMetadata.Favorite;
                    data.TimePlayed = appMetadata.TimePlayed;
                    data.LastPlayed = appMetadata.LastPlayed;
                    data.UserConfig = File.Exists(Program.GetDirGameUserConfig(data.IdBaseString, false, false)); // Just check user config
                }
                data.FileExtension = Path.GetExtension(applicationPath).TrimStart('.').ToUpper();
@@ -6,15 +6,11 @@ namespace Ryujinx.Ava.Utilities
    public static class CommandLineState
    {
        public static string[] Arguments { get; private set; }
-        public static int CountArguments { get; private set; }
+
        public static bool? OverrideDockedMode { get; private set; }
        public static bool? OverrideHardwareAcceleration { get; private set; }
        public static string OverrideGraphicsBackend { get; private set; }
        public static string OverrideBackendThreading { get; private set; }
        public static string OverridePPTC { get; private set; }
        public static string OverrideMemoryManagerMode { get; private set; } 
        public static string OverrideSystemRegion { get; private set; } 
        public static string OverrideSystemLanguage { get; private set; } 
        public static string OverrideHideCursor { get; private set; }
        public static string BaseDirPathArg { get; private set; }
        public static string Profile { get; private set; }
@@ -23,11 +19,6 @@ namespace Ryujinx.Ava.Utilities
        public static bool StartFullscreenArg { get; private set; }
        public static bool HideAvailableUpdates { get; private set; }
        public static void ArgumentsClean()
        {
        }
        public static void ParseArguments(string[] args)
        {
            List<string> arguments = [];
@@ -37,11 +28,6 @@ namespace Ryujinx.Ava.Utilities
            {
                string arg = args[i];
                if (arg.Contains("-") || arg.Contains("--"))
                {
                    CountArguments++; 
                }
                switch (arg)
                {
                    case "-r":
@@ -99,47 +85,6 @@ namespace Ryujinx.Ava.Utilities
                        OverrideBackendThreading = args[++i];
                        break;
                    case "--pptc":
                        if (i + 1 >= args.Length)
                        {
                            Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
                            continue;
                        }
                        OverridePPTC = args[++i];
                        break;
                    case "-m":
                    case "--memory-manager-mode":
                        if (i + 1 >= args.Length)
                        {
                            Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
                            continue;
                        }
                        OverrideMemoryManagerMode = args[++i];
                        break;
                    case "--system-region":
                        if (i + 1 >= args.Length)
                        {
                            Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
                            continue;
                        }
                        OverrideSystemRegion = args[++i];
                        break;
                    case "--system-language":
                        if (i + 1 >= args.Length)
                        {
                            Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
                            continue;
                        }
                        OverrideSystemLanguage = args[++i];
                        break;
                    case "-i":
                    case "--application-id":
                        LaunchApplicationId = args[++i];
@@ -18,15 +18,9 @@ namespace Ryujinx.Ava.Utilities.Configuration
 {
    public partial class ConfigurationState
    {
-        public void Load(ConfigurationFileFormat cff, string configurationFilePath, string gameId="")
+        public void Load(ConfigurationFileFormat cff, string configurationFilePath)
        {
            bool configurationFileUpdated = false;
            bool LoadSetting = true;
            if (!string.IsNullOrEmpty(gameId))
            {
                LoadSetting = false;
            }
            if (cff.Version is < 0 or > ConfigurationFileFormat.CurrentVersion)
            {
@@ -49,14 +43,14 @@ namespace Ryujinx.Ava.Utilities.Configuration
                configurationFileUpdated = true;
            }
-            EnableDiscordIntegration.Value = LoadSetting ? cff.EnableDiscordIntegration : EnableDiscordIntegration.Value; // Get from global config only
+            EnableDiscordIntegration.Value = cff.EnableDiscordIntegration;
-            CheckUpdatesOnStart.Value = LoadSetting ? cff.CheckUpdatesOnStart : CheckUpdatesOnStart.Value; // Get from global config only
+            CheckUpdatesOnStart.Value = cff.CheckUpdatesOnStart;
-            ShowConfirmExit.Value = LoadSetting ? cff.ShowConfirmExit : ShowConfirmExit.Value; // Get from global config only
+            ShowConfirmExit.Value = cff.ShowConfirmExit;
-            RememberWindowState.Value = LoadSetting ? cff.RememberWindowState : RememberWindowState.Value; // Get from global config only
+            RememberWindowState.Value = cff.RememberWindowState;
-            ShowTitleBar.Value = LoadSetting ? cff.ShowTitleBar : ShowTitleBar.Value; // Get from global config only
+            ShowTitleBar.Value = cff.ShowTitleBar;
-            EnableHardwareAcceleration.Value = LoadSetting ? cff.EnableHardwareAcceleration : EnableHardwareAcceleration.Value; // Get from global config only
+            EnableHardwareAcceleration.Value = cff.EnableHardwareAcceleration;
-            HideCursor.Value = LoadSetting ? cff.HideCursor : HideCursor.Value; // Get from global config only
+            HideCursor.Value = cff.HideCursor;
-
+            
            Logger.EnableFileLog.Value = cff.EnableFileLog;
            Logger.EnableDebug.Value = cff.LoggingEnableDebug;
            Logger.EnableStub.Value = cff.LoggingEnableStub;
@@ -91,7 +85,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
            System.Language.Value = cff.SystemLanguage;
            System.Region.Value = cff.SystemRegion;
            System.TimeZone.Value = cff.SystemTimeZone;
-            System.SystemTimeOffset.Value = LoadSetting ? cff.SystemTimeOffset : System.SystemTimeOffset.Value; // Get from global config only
+            System.SystemTimeOffset.Value = cff.SystemTimeOffset;
            System.EnableDockedMode.Value = cff.DockedMode;
            System.EnablePtc.Value = cff.EnablePtc;
            System.EnableLowPowerPtc.Value = cff.EnableLowPowerPtc;
@@ -105,47 +99,46 @@ namespace Ryujinx.Ava.Utilities.Configuration
            System.IgnoreMissingServices.Value = cff.IgnoreMissingServices;
            System.IgnoreApplet.Value = cff.IgnoreApplet;
            System.UseHypervisor.Value = cff.UseHypervisor;
-
+            
-            UI.GuiColumns.FavColumn.Value = LoadSetting ? cff.GuiColumns.FavColumn : UI.GuiColumns.FavColumn.Value;
+            UI.GuiColumns.FavColumn.Value = cff.GuiColumns.FavColumn;
-            UI.GuiColumns.IconColumn.Value = LoadSetting ? cff.GuiColumns.IconColumn : UI.GuiColumns.IconColumn.Value;
+            UI.GuiColumns.IconColumn.Value = cff.GuiColumns.IconColumn;
-            UI.GuiColumns.AppColumn.Value = LoadSetting ? cff.GuiColumns.AppColumn : UI.GuiColumns.AppColumn.Value;
+            UI.GuiColumns.AppColumn.Value = cff.GuiColumns.AppColumn;
-            UI.GuiColumns.DevColumn.Value = LoadSetting ? cff.GuiColumns.DevColumn : UI.GuiColumns.DevColumn.Value;
+            UI.GuiColumns.DevColumn.Value = cff.GuiColumns.DevColumn;
-            UI.GuiColumns.VersionColumn.Value = LoadSetting ? cff.GuiColumns.VersionColumn : UI.GuiColumns.VersionColumn.Value;
+            UI.GuiColumns.VersionColumn.Value = cff.GuiColumns.VersionColumn;
-            UI.GuiColumns.TimePlayedColumn.Value = LoadSetting ? cff.GuiColumns.TimePlayedColumn : UI.GuiColumns.TimePlayedColumn.Value;
+            UI.GuiColumns.TimePlayedColumn.Value = cff.GuiColumns.TimePlayedColumn;
-            UI.GuiColumns.LastPlayedColumn.Value = LoadSetting ? cff.GuiColumns.LastPlayedColumn : UI.GuiColumns.LastPlayedColumn.Value;
+            UI.GuiColumns.LastPlayedColumn.Value = cff.GuiColumns.LastPlayedColumn;
-            UI.GuiColumns.FileExtColumn.Value = LoadSetting ? cff.GuiColumns.FileExtColumn : UI.GuiColumns.FileExtColumn.Value;
+            UI.GuiColumns.FileExtColumn.Value = cff.GuiColumns.FileExtColumn;
-            UI.GuiColumns.FileSizeColumn.Value = LoadSetting ? cff.GuiColumns.FileSizeColumn : UI.GuiColumns.FileSizeColumn.Value;
+            UI.GuiColumns.FileSizeColumn.Value = cff.GuiColumns.FileSizeColumn;
-            UI.GuiColumns.PathColumn.Value = LoadSetting ? cff.GuiColumns.PathColumn : UI.GuiColumns.PathColumn.Value;
+            UI.GuiColumns.PathColumn.Value = cff.GuiColumns.PathColumn;
-            UI.ColumnSort.SortColumnId.Value = LoadSetting ? cff.ColumnSort.SortColumnId : UI.ColumnSort.SortColumnId.Value;
+            UI.ColumnSort.SortColumnId.Value = cff.ColumnSort.SortColumnId;
-            UI.ColumnSort.SortAscending.Value = LoadSetting ? cff.ColumnSort.SortAscending : UI.ColumnSort.SortAscending.Value;
+            UI.ColumnSort.SortAscending.Value = cff.ColumnSort.SortAscending;
-            UI.GameDirs.Value = LoadSetting ? cff.GameDirs : UI.GameDirs.Value;
+            UI.GameDirs.Value = cff.GameDirs;
-            UI.AutoloadDirs.Value = LoadSetting ? (cff.AutoloadDirs ?? []) : UI.AutoloadDirs.Value;
+            UI.AutoloadDirs.Value = cff.AutoloadDirs ?? [];
-            UI.ShownFileTypes.NSP.Value = LoadSetting ? cff.ShownFileTypes.NSP : UI.ShownFileTypes.NSP.Value;
+            UI.ShownFileTypes.NSP.Value = cff.ShownFileTypes.NSP;
-            UI.ShownFileTypes.PFS0.Value = LoadSetting ? cff.ShownFileTypes.PFS0 : UI.ShownFileTypes.PFS0.Value;
+            UI.ShownFileTypes.PFS0.Value = cff.ShownFileTypes.PFS0;
-            UI.ShownFileTypes.XCI.Value = LoadSetting ? cff.ShownFileTypes.XCI : UI.ShownFileTypes.XCI.Value;
+            UI.ShownFileTypes.XCI.Value = cff.ShownFileTypes.XCI;
-            UI.ShownFileTypes.NCA.Value = LoadSetting ? cff.ShownFileTypes.NCA : UI.ShownFileTypes.NCA.Value;
+            UI.ShownFileTypes.NCA.Value = cff.ShownFileTypes.NCA;
-            UI.ShownFileTypes.NRO.Value = LoadSetting ? cff.ShownFileTypes.NRO : UI.ShownFileTypes.NRO.Value;
+            UI.ShownFileTypes.NRO.Value = cff.ShownFileTypes.NRO;
-            UI.ShownFileTypes.NSO.Value = LoadSetting ? cff.ShownFileTypes.NSO : UI.ShownFileTypes.NSO.Value;
+            UI.ShownFileTypes.NSO.Value = cff.ShownFileTypes.NSO;
-            UI.LanguageCode.Value = LoadSetting ? cff.LanguageCode : UI.LanguageCode.Value;
+            UI.LanguageCode.Value = cff.LanguageCode;
-            UI.BaseStyle.Value = LoadSetting ? cff.BaseStyle : UI.BaseStyle.Value;
+            UI.BaseStyle.Value = cff.BaseStyle;
-            UI.GameListViewMode.Value = LoadSetting ? cff.GameListViewMode : UI.GameListViewMode.Value;
+            UI.GameListViewMode.Value = cff.GameListViewMode;
-            UI.ShowNames.Value = LoadSetting ? cff.ShowNames : UI.ShowNames.Value;
+            UI.ShowNames.Value = cff.ShowNames;
-            UI.IsAscendingOrder.Value = LoadSetting ? cff.IsAscendingOrder : UI.IsAscendingOrder.Value;
+            UI.IsAscendingOrder.Value = cff.IsAscendingOrder;
-            UI.GridSize.Value = LoadSetting ? cff.GridSize : UI.GridSize.Value;
+            UI.GridSize.Value = cff.GridSize;
-            UI.ApplicationSort.Value = LoadSetting ? cff.ApplicationSort : UI.ApplicationSort.Value;
+            UI.ApplicationSort.Value = cff.ApplicationSort;
-            UI.StartFullscreen.Value = LoadSetting ? cff.StartFullscreen : UI.StartFullscreen.Value;
+            UI.StartFullscreen.Value = cff.StartFullscreen;
-            UI.StartNoUI.Value = LoadSetting ? cff.StartNoUI : UI.StartNoUI.Value;
+            UI.StartNoUI.Value = cff.StartNoUI;
-            UI.ShowConsole.Value = LoadSetting ? cff.ShowConsole : UI.ShowConsole.Value;
+            UI.ShowConsole.Value = cff.ShowConsole;
-            UI.WindowStartup.WindowSizeWidth.Value = LoadSetting ? cff.WindowStartup.WindowSizeWidth : UI.WindowStartup.WindowSizeWidth.Value;
+            UI.WindowStartup.WindowSizeWidth.Value = cff.WindowStartup.WindowSizeWidth;
-            UI.WindowStartup.WindowSizeHeight.Value = LoadSetting ? cff.WindowStartup.WindowSizeHeight : UI.WindowStartup.WindowSizeHeight.Value;
+            UI.WindowStartup.WindowSizeHeight.Value = cff.WindowStartup.WindowSizeHeight;
-            UI.WindowStartup.WindowPositionX.Value = LoadSetting ? cff.WindowStartup.WindowPositionX : UI.WindowStartup.WindowPositionX.Value;
+            UI.WindowStartup.WindowPositionX.Value = cff.WindowStartup.WindowPositionX;
-            UI.WindowStartup.WindowPositionY.Value = LoadSetting ? cff.WindowStartup.WindowPositionY : UI.WindowStartup.WindowPositionY.Value;
+            UI.WindowStartup.WindowPositionY.Value = cff.WindowStartup.WindowPositionY;
-            UI.WindowStartup.WindowMaximized.Value = LoadSetting ? cff.WindowStartup.WindowMaximized : UI.WindowStartup.WindowMaximized.Value;
+            UI.WindowStartup.WindowMaximized.Value = cff.WindowStartup.WindowMaximized;
-
+            
            Hid.EnableKeyboard.Value = cff.EnableKeyboard;
            Hid.EnableMouse.Value = cff.EnableMouse;
-            Hid.Hotkeys.Value = LoadSetting ? cff.Hotkeys : Hid.Hotkeys.Value; // Get from global config only
+            Hid.Hotkeys.Value = cff.Hotkeys;
            Hid.InputConfig.Value = cff.InputConfig ?? [];
            Hid.RainbowSpeed.Value = cff.RainbowSpeed;
@@ -0,0 +1,296 @@
 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 - " + 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
            {
                0 => "🥇",
                1 => "🥈",
                2 => "🥉",
                _ => ""
            };
        }
    }
 }
@@ -1,6 +1,11 @@
-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 class PlayReports
+    public static partial class PlayReports
    {
        public static Analyzer Analyzer { get; } = new Analyzer()
            .AddSpec(
@@ -37,91 +42,23 @@
                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
                    )
            );
        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
            };
    }
 }
@@ -12,7 +12,7 @@ namespace Ryujinx.Ava.Utilities
    public static class ShortcutHelper
    {
        [SupportedOSPlatform("windows")]
-        private static void CreateShortcutWindows(string applicationFilePath, string applicationId, byte[] iconData, string iconPath, string cleanedAppName, string desktopPath, string args = "")
+        private static void CreateShortcutWindows(string applicationFilePath, string applicationId, byte[] iconData, string iconPath, string cleanedAppName, string desktopPath)
        {
            string basePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, AppDomain.CurrentDomain.FriendlyName + ".exe");
            iconPath += ".ico";
@@ -22,13 +22,13 @@ namespace Ryujinx.Ava.Utilities
            image.Resize(new SKImageInfo(128, 128), SKFilterQuality.High);
            SaveBitmapAsIcon(image, iconPath);
-            Shortcut shortcut = Shortcut.CreateShortcut(basePath, GetArgsString(applicationFilePath, applicationId, args), iconPath, 0);
+            Shortcut shortcut = Shortcut.CreateShortcut(basePath, GetArgsString(applicationFilePath, applicationId), iconPath, 0);
            shortcut.StringData.NameString = cleanedAppName;
            shortcut.WriteToFile(Path.Combine(desktopPath, cleanedAppName + ".lnk"));
        }
        [SupportedOSPlatform("linux")]
-        private static void CreateShortcutLinux(string applicationFilePath, string applicationId, byte[] iconData, string iconPath, string desktopPath, string cleanedAppName, string args = "")
+        private static void CreateShortcutLinux(string applicationFilePath, string applicationId, byte[] iconData, string iconPath, string desktopPath, string cleanedAppName)
        {
            string basePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Ryujinx.sh");
            string desktopFile = EmbeddedResources.ReadAllText("Ryujinx/Assets/ShortcutFiles/shortcut-template.desktop");
@@ -40,11 +40,11 @@ namespace Ryujinx.Ava.Utilities
            data.SaveTo(file);
            using StreamWriter outputFile = new(Path.Combine(desktopPath, cleanedAppName + ".desktop"));
-            outputFile.Write(desktopFile, cleanedAppName, iconPath, $"{basePath} {GetArgsString(applicationFilePath, applicationId, args)}");
+            outputFile.Write(desktopFile, cleanedAppName, iconPath, $"{basePath} {GetArgsString(applicationFilePath, applicationId)}");
        }
        [SupportedOSPlatform("macos")]
-        private static void CreateShortcutMacos(string appFilePath, string applicationId, byte[] iconData, string desktopPath, string cleanedAppName, string args = "")
+        private static void CreateShortcutMacos(string appFilePath, string applicationId, byte[] iconData, string desktopPath, string cleanedAppName)
        {
            string basePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Ryujinx");
            string plistFile = EmbeddedResources.ReadAllText("Ryujinx/Assets/ShortcutFiles/shortcut-template.plist");
@@ -63,7 +63,7 @@ namespace Ryujinx.Ava.Utilities
            string scriptPath = Path.Combine(scriptFolderPath, ScriptName);
            using StreamWriter scriptFile = new(scriptPath);
-            scriptFile.Write(shortcutScript, basePath, GetArgsString(appFilePath, applicationId, args));
+            scriptFile.Write(shortcutScript, basePath, GetArgsString(appFilePath, applicationId));
            // Set execute permission
            FileInfo fileInfo = new(scriptPath);
@@ -87,7 +87,7 @@ namespace Ryujinx.Ava.Utilities
            outputFile.Write(plistFile, ScriptName, cleanedAppName, IconName);
        }
-        public static void CreateAppShortcut(string applicationFilePath, string applicationName, string applicationId, byte[] iconData, string args = "")
+        public static void CreateAppShortcut(string applicationFilePath, string applicationName, string applicationId, byte[] iconData)
        {
            string desktopPath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
            string cleanedAppName = string.Join("_", applicationName.Split(Path.GetInvalidFileNameChars()));
@@ -96,7 +96,7 @@ namespace Ryujinx.Ava.Utilities
            {
                string iconPath = Path.Combine(AppDataManager.BaseDirPath, "games", applicationId, "app");
-                CreateShortcutWindows(applicationFilePath, applicationId, iconData, iconPath, cleanedAppName, desktopPath, args);
+                CreateShortcutWindows(applicationFilePath, applicationId, iconData, iconPath, cleanedAppName, desktopPath);
                return;
            }
@@ -106,14 +106,14 @@ namespace Ryujinx.Ava.Utilities
                string iconPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".local", "share", "icons", "Ryujinx");
                Directory.CreateDirectory(iconPath);
-                CreateShortcutLinux(applicationFilePath, applicationId, iconData, Path.Combine(iconPath, applicationId), desktopPath, cleanedAppName, args);
+                CreateShortcutLinux(applicationFilePath, applicationId, iconData, Path.Combine(iconPath, applicationId), desktopPath, cleanedAppName);
                return;
            }
            if (OperatingSystem.IsMacOS())
            {
-                CreateShortcutMacos(applicationFilePath, applicationId, iconData, desktopPath, cleanedAppName, args);
+                CreateShortcutMacos(applicationFilePath, applicationId, iconData, desktopPath, cleanedAppName);
                return;
            }
@@ -121,7 +121,7 @@ namespace Ryujinx.Ava.Utilities
            throw new NotImplementedException("Shortcut support has not been implemented yet for this OS.");
        }
-        private static string GetArgsString(string appFilePath, string applicationId, string config = "")
+        private static string GetArgsString(string appFilePath, string applicationId)
        {
            // args are first defined as a list, for easier adjustments in the future
            List<string> argsList = [];
@@ -132,11 +132,6 @@ namespace Ryujinx.Ava.Utilities
                argsList.Add($"\"{CommandLineState.BaseDirPathArg}\"");
            }
            if (!string.IsNullOrEmpty(config))
            {
                argsList.Add(config);
            }
            if (appFilePath.ToLower().EndsWith(".xci"))
            {
                argsList.Add("--application-id");