Merge b9982c02e3 into 1c0813d09d

Added a function to update the gamelist status after the game is released

src/Ryujinx/AppHost.cs

@@ -582,6 +582,13 @@ namespace Ryujinx.Ava
             Rainbow.Disable();
             Rainbow.Reset();
 
+            // Reload settings when the game is turned off
+            // (resets custom settings if there were any)
+            Program.ReloadConfig();
+
+            //Updates the gameList (changes the status of the user setting if it was added or removed during the game)
+            RyujinxApp.MainWindow.GameListUpdate();
+
             _isStopped = true;
             Stop();
         }

src/Ryujinx/Assets/Styles/Styles.xaml

@@ -1,7 +1,8 @@
-<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"
@@ -30,7 +31,8 @@
                         <Button
                             Name="btnRem"
                             HorizontalAlignment="Right"
-                            Content="Add" />
+                            Content="Add" 
+                            Classes="red"/>                
                         <TextBox
                             Width="100"
                             VerticalAlignment="Center"
@@ -41,7 +43,11 @@
                     </StackPanel>
                 </Grid>
                 <ui:NumberBox Value="1" />
+                <MenuItem
+                    Header="123 0000"
+                    ToolTip.Tip="What this"/>
             </StackPanel>
+            
         </Border>
     </Design.PreviewWith>
     <Style Selector="DropDownButton">
@@ -373,6 +379,16 @@
         <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}" />

src/Ryujinx/Assets/Styles/Themes.xaml

@@ -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,11 +12,13 @@
             <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"
@@ -29,11 +31,13 @@
             <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"
@@ -46,11 +50,13 @@
             <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>

src/Ryujinx/Assets/locales.json

@@ -2722,6 +2722,31 @@
         "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": {
@@ -2747,6 +2772,31 @@
         "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": {
@@ -3272,6 +3322,31 @@
         "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": {
@@ -23672,6 +23747,31 @@
         "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": {

src/Ryujinx/Program.cs

@@ -32,6 +32,7 @@ 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; }
 
@@ -155,11 +156,43 @@ 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))
             {
@@ -232,8 +265,35 @@ 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 hardware-acceleration was overridden.
+            // Check if PPTC 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;
         }

src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml

@@ -19,6 +19,11 @@
         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"

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

@@ -386,13 +386,26 @@ 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 })

src/Ryujinx/UI/Controls/ApplicationGridView.axaml

@@ -7,6 +7,7 @@
     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"
@@ -73,12 +74,18 @@
                                     HorizontalAlignment="Stretch"
                                     VerticalAlignment="Stretch"
                                     IsVisible="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).ShowNames}">
-                                    <TextBlock
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
-                                        Text="{Binding Name}"
-                                        TextAlignment="Center"
-                                        TextWrapping="Wrap" />
+                                    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                                        <TextBlock
+                                            Text="{Binding Name}"
+                                            TextAlignment="Center"
+                                            TextWrapping="Wrap" />
+                                        <TextBlock
+                                            IsVisible="{Binding UserConfig}"
+                                            Text="{ext:Locale UserConfigurationHeader}"
+                                            TextAlignment="Center"
+                                            TextWrapping="Wrap"
+                                            Foreground="{DynamicResource Warning}" />
+                                    </StackPanel>
                                 </Panel>
                             </Grid>
                         </Border>
@@ -86,10 +93,28 @@
                             Margin="5,5,0,0"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Top"
-                            FontSize="16"
+                            FontSize="18"
                             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>

src/Ryujinx/UI/Controls/ApplicationListView.axaml

@@ -6,6 +6,7 @@
     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"
@@ -145,6 +146,13 @@
                                         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"

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -1076,7 +1076,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             _rendererWaitEvent.WaitOne();
 
             AppHost?.Start();
-
+            
             AppHost?.DisposeContext();
         }
 
@@ -1541,6 +1541,13 @@ 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);
@@ -1585,6 +1592,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             Thread gameThread = new(InitializeGame) { Name = "GUI.WindowThread" };
             gameThread.Start();
+            
         }
 
         public void SwitchToRenderer(bool startFullscreen) =>

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -1,8 +1,10 @@
 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;
@@ -26,6 +28,7 @@ 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;
@@ -68,6 +71,46 @@ 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;
@@ -329,7 +372,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public bool IsInvalidLdnPassphraseVisible { get; set; }
 
-        public SettingsViewModel(VirtualFileSystem virtualFileSystem, ContentManager contentManager) : this()
+        public SettingsViewModel(VirtualFileSystem virtualFileSystem, ContentManager contentManager) : this(false)
         {
             _virtualFileSystem = virtualFileSystem;
             _contentManager = contentManager;
@@ -342,7 +385,48 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
-        public SettingsViewModel()
+        public SettingsViewModel(VirtualFileSystem virtualFileSystem, 
+            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 = [];
@@ -357,7 +441,11 @@ 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);
             }
@@ -468,27 +556,32 @@ namespace Ryujinx.Ava.UI.ViewModels
         {
             ConfigurationState config = ConfigurationState.Instance;
 
-            // User Interface
-            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
+            //It is necessary that the data is used from the global configuration file
+            if (string.IsNullOrEmpty(GameId)) 
             {
-                "Auto" => 0,
-                "Light" => 1,
-                "Dark" => 2,
-                _ => 0
-            };
+                // User Interface
+                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
+                {
+                    "Auto" => 0,
+                    "Light" => 1,
+                    "Dark" => 2,
+                    _ => 0
+                };
+
+            }
 
             // Input
             EnableDockedMode = config.System.EnableDockedMode;
@@ -508,7 +601,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             DateTime currentDateTime = currentHostDateTime.Add(systemDateTimeOffset);
             CurrentDate = currentDateTime.Date;
             CurrentTime = currentDateTime.TimeOfDay;
-
             MatchSystemTime = config.System.MatchSystemTime;
 
             EnableCustomVSyncInterval = config.Graphics.EnableCustomVSyncInterval;
@@ -568,37 +660,41 @@ 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);
 
-            // 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)
+            if (userConfigFile)
             {
-                config.UI.GameDirs.Value = [..GameDirectories];
+                // 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)
+                {
+                    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;
@@ -693,7 +789,9 @@ 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();
@@ -706,7 +804,11 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         private static void RevertIfNotSaved()
         {
-            Program.ReloadConfig();
+            // maybe this is an unnecessary check(all options need to be tested)
+            if (string.IsNullOrEmpty(Program.GlobalConfigurationPath))
+            {
+                Program.ReloadConfig();
+            }
         }
 
         public void ApplyButton()
@@ -714,6 +816,26 @@ 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();

src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs

@@ -134,9 +134,26 @@ namespace Ryujinx.Ava.UI.Views.Main
             Window.SettingsWindow = new(Window.VirtualFileSystem, Window.ContentManager);
 
             Rainbow.Enable();
-            
-            await Window.SettingsWindow.ShowDialog(Window);
-            
+
+            if (ViewModel.SelectedApplication is null) // Checks if game data exists
+            {
+                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();
 

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

@@ -645,6 +645,11 @@ namespace Ryujinx.Ava.UI.Windows
             ReloadGameList();
         }
 
+        public void GameListUpdate()
+        {
+            ReloadGameList();
+        }
+
         public void ToggleFileType(string fileType)
         {
             switch (fileType)

src/Ryujinx/UI/Windows/UserConfigWindows.axaml

@@ -0,0 +1,144 @@
+<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>

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

@@ -0,0 +1,116 @@
+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)
+        {
+            InputPage.Dispose(); // You need to unload the gamepad settings, otherwise the controls will be blocked
+            base.OnClosing(e);
+        }
+    }
+}

src/Ryujinx/Utilities/AppLibrary/ApplicationData.cs

@@ -21,6 +21,7 @@ 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";
 

src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs

@@ -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,10 +529,11 @@ 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();

src/Ryujinx/Utilities/CommandLineState.cs

@@ -6,11 +6,15 @@ 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; }
@@ -19,6 +23,11 @@ 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 = [];
@@ -28,6 +37,11 @@ namespace Ryujinx.Ava.Utilities
             {
                 string arg = args[i];
 
+                if (arg.Contains("-") || arg.Contains("--"))
+                {
+                    CountArguments++; 
+                }
+
                 switch (arg)
                 {
                     case "-r":
@@ -85,6 +99,47 @@ 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];

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

@@ -18,9 +18,15 @@ namespace Ryujinx.Ava.Utilities.Configuration
 {
     public partial class ConfigurationState
     {
-        public void Load(ConfigurationFileFormat cff, string configurationFilePath)
+        public void Load(ConfigurationFileFormat cff, string configurationFilePath, string gameId="")
         {
             bool configurationFileUpdated = false;
+            bool LoadSetting = true;
+
+            if (!string.IsNullOrEmpty(gameId))
+            {
+                LoadSetting = false;
+            }
 
             if (cff.Version is < 0 or > ConfigurationFileFormat.CurrentVersion)
             {
@@ -43,14 +49,14 @@ namespace Ryujinx.Ava.Utilities.Configuration
                 configurationFileUpdated = true;
             }
             
-            EnableDiscordIntegration.Value = cff.EnableDiscordIntegration;
-            CheckUpdatesOnStart.Value = cff.CheckUpdatesOnStart;
-            ShowConfirmExit.Value = cff.ShowConfirmExit;
-            RememberWindowState.Value = cff.RememberWindowState;
-            ShowTitleBar.Value = cff.ShowTitleBar;
-            EnableHardwareAcceleration.Value = cff.EnableHardwareAcceleration;
-            HideCursor.Value = cff.HideCursor;
-            
+            EnableDiscordIntegration.Value = LoadSetting ? cff.EnableDiscordIntegration : EnableDiscordIntegration.Value; // Get from global config only
+            CheckUpdatesOnStart.Value = LoadSetting ? cff.CheckUpdatesOnStart : CheckUpdatesOnStart.Value; // Get from global config only
+            ShowConfirmExit.Value = LoadSetting ? cff.ShowConfirmExit : ShowConfirmExit.Value; // Get from global config only
+            RememberWindowState.Value = LoadSetting ? cff.RememberWindowState : RememberWindowState.Value; // Get from global config only
+            ShowTitleBar.Value = LoadSetting ? cff.ShowTitleBar : ShowTitleBar.Value; // Get from global config only
+            EnableHardwareAcceleration.Value = LoadSetting ? cff.EnableHardwareAcceleration : EnableHardwareAcceleration.Value; // Get from global config only
+            HideCursor.Value = LoadSetting ? cff.HideCursor : HideCursor.Value; // Get from global config only
+
             Logger.EnableFileLog.Value = cff.EnableFileLog;
             Logger.EnableDebug.Value = cff.LoggingEnableDebug;
             Logger.EnableStub.Value = cff.LoggingEnableStub;
@@ -85,7 +91,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
             System.Language.Value = cff.SystemLanguage;
             System.Region.Value = cff.SystemRegion;
             System.TimeZone.Value = cff.SystemTimeZone;
-            System.SystemTimeOffset.Value = cff.SystemTimeOffset;
+            System.SystemTimeOffset.Value = LoadSetting ? cff.SystemTimeOffset : System.SystemTimeOffset.Value; // Get from global config only
             System.EnableDockedMode.Value = cff.DockedMode;
             System.EnablePtc.Value = cff.EnablePtc;
             System.EnableLowPowerPtc.Value = cff.EnableLowPowerPtc;
@@ -99,46 +105,47 @@ namespace Ryujinx.Ava.Utilities.Configuration
             System.IgnoreMissingServices.Value = cff.IgnoreMissingServices;
             System.IgnoreApplet.Value = cff.IgnoreApplet;
             System.UseHypervisor.Value = cff.UseHypervisor;
-            
-            UI.GuiColumns.FavColumn.Value = cff.GuiColumns.FavColumn;
-            UI.GuiColumns.IconColumn.Value = cff.GuiColumns.IconColumn;
-            UI.GuiColumns.AppColumn.Value = cff.GuiColumns.AppColumn;
-            UI.GuiColumns.DevColumn.Value = cff.GuiColumns.DevColumn;
-            UI.GuiColumns.VersionColumn.Value = cff.GuiColumns.VersionColumn;
-            UI.GuiColumns.TimePlayedColumn.Value = cff.GuiColumns.TimePlayedColumn;
-            UI.GuiColumns.LastPlayedColumn.Value = cff.GuiColumns.LastPlayedColumn;
-            UI.GuiColumns.FileExtColumn.Value = cff.GuiColumns.FileExtColumn;
-            UI.GuiColumns.FileSizeColumn.Value = cff.GuiColumns.FileSizeColumn;
-            UI.GuiColumns.PathColumn.Value = cff.GuiColumns.PathColumn;
-            UI.ColumnSort.SortColumnId.Value = cff.ColumnSort.SortColumnId;
-            UI.ColumnSort.SortAscending.Value = cff.ColumnSort.SortAscending;
-            UI.GameDirs.Value = cff.GameDirs;
-            UI.AutoloadDirs.Value = cff.AutoloadDirs ?? [];
-            UI.ShownFileTypes.NSP.Value = cff.ShownFileTypes.NSP;
-            UI.ShownFileTypes.PFS0.Value = cff.ShownFileTypes.PFS0;
-            UI.ShownFileTypes.XCI.Value = cff.ShownFileTypes.XCI;
-            UI.ShownFileTypes.NCA.Value = cff.ShownFileTypes.NCA;
-            UI.ShownFileTypes.NRO.Value = cff.ShownFileTypes.NRO;
-            UI.ShownFileTypes.NSO.Value = cff.ShownFileTypes.NSO;
-            UI.LanguageCode.Value = cff.LanguageCode;
-            UI.BaseStyle.Value = cff.BaseStyle;
-            UI.GameListViewMode.Value = cff.GameListViewMode;
-            UI.ShowNames.Value = cff.ShowNames;
-            UI.IsAscendingOrder.Value = cff.IsAscendingOrder;
-            UI.GridSize.Value = cff.GridSize;
-            UI.ApplicationSort.Value = cff.ApplicationSort;
-            UI.StartFullscreen.Value = cff.StartFullscreen;
-            UI.StartNoUI.Value = cff.StartNoUI;
-            UI.ShowConsole.Value = cff.ShowConsole;
-            UI.WindowStartup.WindowSizeWidth.Value = cff.WindowStartup.WindowSizeWidth;
-            UI.WindowStartup.WindowSizeHeight.Value = cff.WindowStartup.WindowSizeHeight;
-            UI.WindowStartup.WindowPositionX.Value = cff.WindowStartup.WindowPositionX;
-            UI.WindowStartup.WindowPositionY.Value = cff.WindowStartup.WindowPositionY;
-            UI.WindowStartup.WindowMaximized.Value = cff.WindowStartup.WindowMaximized;
-            
+
+            UI.GuiColumns.FavColumn.Value = LoadSetting ? cff.GuiColumns.FavColumn : UI.GuiColumns.FavColumn.Value;
+            UI.GuiColumns.IconColumn.Value = LoadSetting ? cff.GuiColumns.IconColumn : UI.GuiColumns.IconColumn.Value;
+            UI.GuiColumns.AppColumn.Value = LoadSetting ? cff.GuiColumns.AppColumn : UI.GuiColumns.AppColumn.Value;
+            UI.GuiColumns.DevColumn.Value = LoadSetting ? cff.GuiColumns.DevColumn : UI.GuiColumns.DevColumn.Value;
+            UI.GuiColumns.VersionColumn.Value = LoadSetting ? cff.GuiColumns.VersionColumn : UI.GuiColumns.VersionColumn.Value;
+            UI.GuiColumns.TimePlayedColumn.Value = LoadSetting ? cff.GuiColumns.TimePlayedColumn : UI.GuiColumns.TimePlayedColumn.Value;
+            UI.GuiColumns.LastPlayedColumn.Value = LoadSetting ? cff.GuiColumns.LastPlayedColumn : UI.GuiColumns.LastPlayedColumn.Value;
+            UI.GuiColumns.FileExtColumn.Value = LoadSetting ? cff.GuiColumns.FileExtColumn : UI.GuiColumns.FileExtColumn.Value;
+            UI.GuiColumns.FileSizeColumn.Value = LoadSetting ? cff.GuiColumns.FileSizeColumn : UI.GuiColumns.FileSizeColumn.Value;
+            UI.GuiColumns.PathColumn.Value = LoadSetting ? cff.GuiColumns.PathColumn : UI.GuiColumns.PathColumn.Value;
+            UI.ColumnSort.SortColumnId.Value = LoadSetting ? cff.ColumnSort.SortColumnId : UI.ColumnSort.SortColumnId.Value;
+            UI.ColumnSort.SortAscending.Value = LoadSetting ? cff.ColumnSort.SortAscending : UI.ColumnSort.SortAscending.Value;
+            UI.GameDirs.Value = LoadSetting ? cff.GameDirs : UI.GameDirs.Value;
+            UI.AutoloadDirs.Value = LoadSetting ? (cff.AutoloadDirs ?? []) : UI.AutoloadDirs.Value;
+            UI.ShownFileTypes.NSP.Value = LoadSetting ? cff.ShownFileTypes.NSP : UI.ShownFileTypes.NSP.Value;
+            UI.ShownFileTypes.PFS0.Value = LoadSetting ? cff.ShownFileTypes.PFS0 : UI.ShownFileTypes.PFS0.Value;
+            UI.ShownFileTypes.XCI.Value = LoadSetting ? cff.ShownFileTypes.XCI : UI.ShownFileTypes.XCI.Value;
+            UI.ShownFileTypes.NCA.Value = LoadSetting ? cff.ShownFileTypes.NCA : UI.ShownFileTypes.NCA.Value;
+            UI.ShownFileTypes.NRO.Value = LoadSetting ? cff.ShownFileTypes.NRO : UI.ShownFileTypes.NRO.Value;
+            UI.ShownFileTypes.NSO.Value = LoadSetting ? cff.ShownFileTypes.NSO : UI.ShownFileTypes.NSO.Value;
+            UI.LanguageCode.Value = LoadSetting ? cff.LanguageCode : UI.LanguageCode.Value;
+            UI.BaseStyle.Value = LoadSetting ? cff.BaseStyle : UI.BaseStyle.Value;
+            UI.GameListViewMode.Value = LoadSetting ? cff.GameListViewMode : UI.GameListViewMode.Value;
+            UI.ShowNames.Value = LoadSetting ? cff.ShowNames : UI.ShowNames.Value;
+            UI.IsAscendingOrder.Value = LoadSetting ? cff.IsAscendingOrder : UI.IsAscendingOrder.Value;
+            UI.GridSize.Value = LoadSetting ? cff.GridSize : UI.GridSize.Value;
+            UI.ApplicationSort.Value = LoadSetting ? cff.ApplicationSort : UI.ApplicationSort.Value;
+            UI.StartFullscreen.Value = LoadSetting ? cff.StartFullscreen : UI.StartFullscreen.Value;
+            UI.StartNoUI.Value = LoadSetting ? cff.StartNoUI : UI.StartNoUI.Value;
+            UI.ShowConsole.Value = LoadSetting ? cff.ShowConsole : UI.ShowConsole.Value;
+            UI.WindowStartup.WindowSizeWidth.Value = LoadSetting ? cff.WindowStartup.WindowSizeWidth : UI.WindowStartup.WindowSizeWidth.Value;
+            UI.WindowStartup.WindowSizeHeight.Value = LoadSetting ? cff.WindowStartup.WindowSizeHeight : UI.WindowStartup.WindowSizeHeight.Value;
+            UI.WindowStartup.WindowPositionX.Value = LoadSetting ? cff.WindowStartup.WindowPositionX : UI.WindowStartup.WindowPositionX.Value;
+            UI.WindowStartup.WindowPositionY.Value = LoadSetting ? cff.WindowStartup.WindowPositionY : UI.WindowStartup.WindowPositionY.Value;
+            UI.WindowStartup.WindowMaximized.Value = LoadSetting ? cff.WindowStartup.WindowMaximized : UI.WindowStartup.WindowMaximized.Value;
+
+
             Hid.EnableKeyboard.Value = cff.EnableKeyboard;
             Hid.EnableMouse.Value = cff.EnableMouse;
-            Hid.Hotkeys.Value = cff.Hotkeys;
+            Hid.Hotkeys.Value = LoadSetting ? cff.Hotkeys : Hid.Hotkeys.Value; // Get from global config only
             Hid.InputConfig.Value = cff.InputConfig ?? [];
             Hid.RainbowSpeed.Value = cff.RainbowSpeed;
 

src/Ryujinx/Utilities/PlayReport/Analyzer.cs

@@ -31,8 +31,7 @@ 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)}.");
 
-            _specs.Add(transform(new GameSpec { TitleIds = [titleId] }));
-            return this;
+            return AddSpec(transform(GameSpec.Create(titleId)));
         }
 
         /// <summary>
@@ -46,8 +45,7 @@ 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)}.");
 
-            _specs.Add(new GameSpec { TitleIds = [titleId] }.Apply(transform));
-            return this;
+            return AddSpec(GameSpec.Create(titleId).Apply(transform));
         }
 
         /// <summary>
@@ -63,8 +61,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)}.");
 
-            _specs.Add(transform(new GameSpec { TitleIds = [..tids] }));
-            return this;
+            return AddSpec(transform(GameSpec.Create(tids)));
         }
 
         /// <summary>
@@ -79,7 +76,17 @@ 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)}.");
 
-            _specs.Add(new GameSpec { TitleIds = [..tids] }.Apply(transform));
+            return AddSpec(GameSpec.Create(tids).Apply(transform));
+        }
+        
+        /// <summary>
+        /// Add an analysis spec matching a specific game by title ID, with the provided pre-configured spec.
+        /// </summary>
+        /// <param name="spec">The <see cref="GameSpec"/> to add.</param>
+        /// <returns>The current <see cref="Analyzer"/>, for chaining convenience.</returns>
+        public Analyzer AddSpec(GameSpec spec)
+        {
+            _specs.Add(spec);
             return this;
         }
 

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

@@ -294,8 +294,67 @@ namespace Ryujinx.Ava.Utilities.PlayReport
             };
         }
 
-        private static FormattedValue N64_LaunchedGame(SingleValue value) => value.Matched.StringValue switch
+        private static FormattedValue NsoEmulator_LaunchedGame(SingleValue value) => value.Matched.StringValue switch
         {
+            #region SEGA Genesis
+
+            "m_0054_e" => Playing("Alien Soldier"),
+            "m_3978_e" => Playing("Alien Storm"),
+            "m_5234_e" => Playing("ALISIA DRAGOON"),
+            "m_5003_e" => Playing("Streets of Rage 2"),
+            "m_4843_e" => Playing("Kid Chameleon"),
+            "m_2874_e" => Playing("Columns"),
+            "m_3167_e" => Playing("Comix Zone"),
+            "m_5007_e" => Playing("Contra: Hard Corps"),
+            "m_0865_e" => Playing("Ghouls 'n Ghosts"),
+            "m_0935_e" => Playing("Dynamite Headdy"),
+            "m_8314_e" => Playing("Earthworm Jim"),
+            "m_5012_e" => Playing("Ecco the Dolphin"),
+            "m_2207_e" => Playing("Flicky"),
+            "m_9432_e" => Playing("Golden Axe II"),
+            "m_5015_e" => Playing("Golden Axe"),
+            "m_5017_e" => Playing("Gunstar Heroes"),
+            "m_0732_e" => Playing("Altered Beast"),
+            "m_2245_e" or "m_2245_pd" or "m_2245_pf" => Playing("Landstalker"),
+            "m_1654_e" => Playing("Target Earth"),
+            "m_7050_e" => Playing("Light Crusader"),
+            "m_5027_e" => Playing("M.U.S.H.A."),
+            "m_5028_e" => Playing("Phantasy Star IV"),
+            "m_9155_e" => Playing("Pulseman"),
+            "m_5030_e" => Playing("Dr. Robotnik's Mean Bean Machine"),
+            "m_0098_e" => Playing("Crusader of Centy"),
+            "m_0098_k" => Playing("신창세기 라그나센티"),
+            "m_0098_pd" or "m_0098_pf" or "m_0098_ps" => Playing("Soleil"),
+            "m_5033_e" => Playing("Ristar"),
+            "m_1987_e" => Playing("MEGA MAN: THE WILY WARS"),
+            "m_2609_e" => Playing("WOLF OF THE BATTLEFIELD: MERCS"),
+            "m_3353_e" => Playing("Shining Force II"),
+            "m_5036_e" => Playing("Shining Force"),
+            "m_9866_e" => Playing("Sonic The Hedgehog Spinball"),
+            "m_5041_e" => Playing("Sonic The Hedgehog 2"),
+            "m_5523_e" => Playing("Space Harrier II"),
+            "m_0041_e" => Playing("STREET FIGHTER II' : SPECIAL CHAMPION EDITION"),
+            "m_5044_e" => Playing("STRIDER"),
+            "m_6353_e" => Playing("Super Fantasy Zone"),
+            "m_9569_e" => Playing("Beyond Oasis"),
+            "m_9569_k" => Playing("스토리 오브 도어"),
+            "m_9569_pd" or "m_9569_ps" => Playing("The Story of Thor"),
+            "m_9569_pf" => Playing("La Légende de Thor"),
+            "m_5049_e" => Playing("Shinobi III: Return of the Ninja Master"),
+            "m_6811_e" => Playing("The Revenge of Shinobi"),
+            "m_4372_e" => Playing("Thunder Force II"),
+            "m_1535_e" => Playing("ToeJam & Earl in Panic on Funkotron"),
+            "m_0432_e" => Playing("ToeJam & Earl"),
+            "m_5052_e" => Playing("Castlevania: BLOODLINES"),
+            "m_3626_e" => Playing("VectorMan"),
+            "m_7955_e" => Playing("Sword of Vermilion"),
+            "m_0394_e" => Playing("Virtua Fighter 2"),
+            "m_9417_e" => Playing("Zero Wing"),
+
+            #endregion
+            
+            #region Nintendo 64
+
             "n_1653_e" or "n_1653_p" => Playing("1080º ™ Snowboarding"),
             "n_4868_e" or "n_4868_p" => Playing("Banjo Kazooie™"),
             "n_1226_e" or "n_1226_p" => Playing("Banjo-Tooie™"),
@@ -331,11 +390,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
-        };
 
-        private static FormattedValue NES_LaunchedGame(SingleValue value) => value.Matched.StringValue switch
-        {
+            #endregion
+
+            #region NES
+
             "clv_p_naaae" => Playing("Super Mario Bros.™"),
             "clv_p_naabe" => Playing("Super Mario Bros.™: The Lost Levels"),
             "clv_p_naace" or "clv_p_naace_sp1" => Playing("Super Mario Bros.™ 3"),
@@ -415,11 +474,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
-        };
 
-        private static FormattedValue SNES_LaunchedGame(SingleValue value) => value.Matched.StringValue switch
-        {
+            #endregion
+
+            #region SNES
+
             "s_2180_e" => Playing("BATTLETOADS™ DOUBLE DRAGON™"),
             "s_2179_e" => Playing("BATTLETOADS™ IN BATTLEMANIACS"),
             "s_2182_e" => Playing("BIG RUN"),
@@ -490,98 +549,11 @@ 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
-        };
 
-        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
-        {
+            #endregion
+
+            #region GameBoy
+
             "c_7224_e" or "c_7224_p" => Playing("Alone in the Dark: The New Nightmare"),
             "c_5022_e" => Playing("Blaster Master: Enemy Below"),
             "c_3381_e" => Playing("Game & Watch™ Gallery 3"),
@@ -615,6 +587,39 @@ 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
         };
     }

src/Ryujinx/Utilities/PlayReport/PlayReports.cs

@@ -62,25 +62,10 @@ namespace Ryujinx.Ava.Utilities.PlayReport
                     )
             )
             .AddSpec(
-                "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)
+                [
+                    "0100c9a00ece6000", "01008d300c50c000", "0100d870045b6000", 
+                    "010012f017576000", "0100c62011050000", "0100b3c014bda000"],
+                spec => spec.AddValueFormatter("launch_title_id", NsoEmulator_LaunchedGame)
             );
 
         private static string Playing(string game) => $"Playing {game}";

src/Ryujinx/Utilities/PlayReport/Specs.cs

@@ -14,8 +14,14 @@ 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; } = [];
@@ -28,8 +34,10 @@ 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"/>
@@ -39,15 +47,14 @@ 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)
+        public GameSpec AddValueFormatter(
+            int priority,
+            string reportKey,
+            SingleValueFormatter valueFormatter
+        ) => AddValueFormatter(new FormatterSpec
         {
-            ValueFormatters.Add(new FormatterSpec
-            {
-                Priority = priority, ReportKeys = [reportKey], Formatter = valueFormatter
-            });
-            return this;
-        }
+            Priority = priority, ReportKeys = [reportKey], Formatter = valueFormatter
+        });
 
         /// <summary>
         /// Add a multi-value formatter to the current <see cref="GameSpec"/>
@@ -56,8 +63,10 @@ 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"/>
@@ -67,15 +76,14 @@ 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)
+        public GameSpec AddMultiValueFormatter(
+            int priority,
+            string[] reportKeys,
+            MultiValueFormatter valueFormatter
+        ) => AddValueFormatter(new MultiFormatterSpec
         {
-            ValueFormatters.Add(new MultiFormatterSpec
-            {
-                Priority = priority, ReportKeys = reportKeys, Formatter = valueFormatter
-            });
-            return this;
-        }
+            Priority = priority, ReportKeys = reportKeys, Formatter = valueFormatter
+        });
 
         /// <summary>
         /// Add a multi-value formatter to the current <see cref="GameSpec"/>
@@ -87,8 +95,10 @@ 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"/>
@@ -101,13 +111,18 @@ 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)
+        public GameSpec AddSparseMultiValueFormatter(
+            int priority,
+            string[] reportKeys,
+            SparseMultiValueFormatter valueFormatter
+        ) => AddValueFormatter(new SparseMultiFormatterSpec
         {
-            ValueFormatters.Add(new SparseMultiFormatterSpec
-            {
-                Priority = priority, ReportKeys = reportKeys, Formatter = valueFormatter
-            });
+            Priority = priority, ReportKeys = reportKeys, Formatter = valueFormatter
+        });
+
+        private GameSpec AddValueFormatter<T>(T formatterSpec) where T : FormatterSpecBase
+        {
+            ValueFormatters.Add(formatterSpec);
             return this;
         }
     }
@@ -174,16 +189,17 @@ 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))
@@ -197,15 +213,20 @@ namespace Ryujinx.Ava.Utilities.PlayReport
 
             switch (Formatter)
             {
-                case SingleValueFormatter svf when data is MessagePackObject mpo:
-                    formattedValue = svf(new SingleValue(mpo) { Application = appMeta, PlayReport = playReport });
+                case SingleValueFormatter svf when data is MessagePackObject match:
+                    formattedValue = svf(
+                        new SingleValue(match) { Application = appMeta, PlayReport = playReport }
+                    );
                     return true;
-                case MultiValueFormatter mvf when data is List<MessagePackObject> messagePackObjects:
-                    formattedValue = mvf(new MultiValue(messagePackObjects) { Application = appMeta, PlayReport = playReport });
+                case MultiValueFormatter mvf when data is List<MessagePackObject> matches:
+                    formattedValue = mvf(
+                        new MultiValue(matches) { Application = appMeta, PlayReport = playReport }
+                    );
                     return true;
-                case SparseMultiValueFormatter smvf when
-                    data is Dictionary<string, MessagePackObject> sparseMessagePackObjects:
-                    formattedValue = smvf(new SparseMultiValue(sparseMessagePackObjects) { Application = appMeta, PlayReport = playReport });
+                case SparseMultiValueFormatter smvf when data is Dictionary<string, MessagePackObject> sparseMatches:
+                    formattedValue = smvf(
+                        new SparseMultiValue(sparseMatches) { Application = appMeta, PlayReport = playReport }
+                    );
                     return true;
                 default:
                     throw new InvalidOperationException("Formatter delegate is not of a known type!");

src/Ryujinx/Utilities/ShortcutHelper.cs

@@ -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)
+        private static void CreateShortcutWindows(string applicationFilePath, string applicationId, byte[] iconData, string iconPath, string cleanedAppName, string desktopPath, string args = "")
         {
             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), iconPath, 0);
+            Shortcut shortcut = Shortcut.CreateShortcut(basePath, GetArgsString(applicationFilePath, applicationId, args), 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)
+        private static void CreateShortcutLinux(string applicationFilePath, string applicationId, byte[] iconData, string iconPath, string desktopPath, string cleanedAppName, string args = "")
         {
             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)}");
+            outputFile.Write(desktopFile, cleanedAppName, iconPath, $"{basePath} {GetArgsString(applicationFilePath, applicationId, args)}");
         }
 
         [SupportedOSPlatform("macos")]
-        private static void CreateShortcutMacos(string appFilePath, string applicationId, byte[] iconData, string desktopPath, string cleanedAppName)
+        private static void CreateShortcutMacos(string appFilePath, string applicationId, byte[] iconData, string desktopPath, string cleanedAppName, string args = "")
         {
             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));
+            scriptFile.Write(shortcutScript, basePath, GetArgsString(appFilePath, applicationId, args));
 
             // 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)
+        public static void CreateAppShortcut(string applicationFilePath, string applicationName, string applicationId, byte[] iconData, string args = "")
         {
             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);
+                CreateShortcutWindows(applicationFilePath, applicationId, iconData, iconPath, cleanedAppName, desktopPath, args);
 
                 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);
+                CreateShortcutLinux(applicationFilePath, applicationId, iconData, Path.Combine(iconPath, applicationId), desktopPath, cleanedAppName, args);
 
                 return;
             }
 
             if (OperatingSystem.IsMacOS())
             {
-                CreateShortcutMacos(applicationFilePath, applicationId, iconData, desktopPath, cleanedAppName);
+                CreateShortcutMacos(applicationFilePath, applicationId, iconData, desktopPath, cleanedAppName, args);
 
                 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)
+        private static string GetArgsString(string appFilePath, string applicationId, string config = "")
         {
             // args are first defined as a list, for easier adjustments in the future
             List<string> argsList = [];
@@ -132,6 +132,11 @@ namespace Ryujinx.Ava.Utilities
                 argsList.Add($"\"{CommandLineState.BaseDirPathArg}\"");
             }
 
+            if (!string.IsNullOrEmpty(config))
+            {
+                argsList.Add(config);
+            }
+
             if (appFilePath.ToLower().EndsWith(".xci"))
             {
                 argsList.Add("--application-id");