diff --git a/src/Ryujinx.HLE/HOS/Kernel/Common/KSystemControl.cs b/src/Ryujinx.HLE/HOS/Kernel/Common/KSystemControl.cs index e3a99f6ad..387ab1bc4 100644 --- a/src/Ryujinx.HLE/HOS/Kernel/Common/KSystemControl.cs +++ b/src/Ryujinx.HLE/HOS/Kernel/Common/KSystemControl.cs @@ -30,6 +30,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Common MemoryArrange.MemoryArrange4GiBAppletDev => 2048 * MiB, MemoryArrange.MemoryArrange6GiB => 5445 * MiB, MemoryArrange.MemoryArrange8GiB => 7493 * MiB, + MemoryArrange.MemoryArrange10GiB => 9541 * MiB, MemoryArrange.MemoryArrange12GiB => 11589 * MiB, _ => throw new ArgumentException($"Invalid memory arrange \"{arrange}\"."), }; @@ -45,6 +46,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Common MemoryArrange.MemoryArrange6GiB => 562 * MiB, MemoryArrange.MemoryArrange6GiBAppletDev => 2193 * MiB, MemoryArrange.MemoryArrange8GiB or + MemoryArrange.MemoryArrange10GiB or MemoryArrange.MemoryArrange12GiB => 562 * MiB, _ => throw new ArgumentException($"Invalid memory arrange \"{arrange}\"."), }; @@ -73,6 +75,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Common MemorySize.MemorySize4GiB => 4 * GiB, MemorySize.MemorySize6GiB => 6 * GiB, MemorySize.MemorySize8GiB => 8 * GiB, + MemorySize.MemorySize10GiB => 10 * GiB, MemorySize.MemorySize12GiB => 12 * GiB, _ => throw new ArgumentException($"Invalid memory size \"{size}\"."), }; diff --git a/src/Ryujinx.HLE/HOS/Kernel/Common/MemoryArrange.cs b/src/Ryujinx.HLE/HOS/Kernel/Common/MemoryArrange.cs index 0667fa273..deb0ca357 100644 --- a/src/Ryujinx.HLE/HOS/Kernel/Common/MemoryArrange.cs +++ b/src/Ryujinx.HLE/HOS/Kernel/Common/MemoryArrange.cs @@ -5,6 +5,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Common MemoryArrange4GiB, MemoryArrange6GiB, MemoryArrange8GiB, + MemoryArrange10GiB, MemoryArrange12GiB, MemoryArrange4GiBAppletDev, MemoryArrange4GiBSystemDev, diff --git a/src/Ryujinx.HLE/HOS/Kernel/Common/MemorySize.cs b/src/Ryujinx.HLE/HOS/Kernel/Common/MemorySize.cs index f92859db4..2c39681c6 100644 --- a/src/Ryujinx.HLE/HOS/Kernel/Common/MemorySize.cs +++ b/src/Ryujinx.HLE/HOS/Kernel/Common/MemorySize.cs @@ -5,6 +5,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Common MemorySize4GiB = 0, MemorySize6GiB = 1, MemorySize8GiB = 2, - MemorySize12GiB = 3, + MemorySize10GiB = 3, + MemorySize12GiB = 4, } } diff --git a/src/Ryujinx.HLE/MemoryConfiguration.cs b/src/Ryujinx.HLE/MemoryConfiguration.cs index 21ecd737f..35b9b3663 100644 --- a/src/Ryujinx.HLE/MemoryConfiguration.cs +++ b/src/Ryujinx.HLE/MemoryConfiguration.cs @@ -8,10 +8,11 @@ namespace Ryujinx.HLE MemoryConfiguration4GiB = 0, MemoryConfiguration6GiB = 1, MemoryConfiguration8GiB = 2, - MemoryConfiguration12GiB = 3, - MemoryConfiguration4GiBAppletDev = 4, - MemoryConfiguration4GiBSystemDev = 5, - MemoryConfiguration6GiBAppletDev = 6, + MemoryConfiguration10GiB = 3, + MemoryConfiguration12GiB = 4, + MemoryConfiguration4GiBAppletDev = 5, + MemoryConfiguration4GiBSystemDev = 6, + MemoryConfiguration6GiBAppletDev = 7, } static class MemoryConfigurationExtensions @@ -29,6 +30,7 @@ namespace Ryujinx.HLE MemoryConfiguration.MemoryConfiguration6GiB => MemoryArrange.MemoryArrange6GiB, MemoryConfiguration.MemoryConfiguration6GiBAppletDev => MemoryArrange.MemoryArrange6GiBAppletDev, MemoryConfiguration.MemoryConfiguration8GiB => MemoryArrange.MemoryArrange8GiB, + MemoryConfiguration.MemoryConfiguration10GiB => MemoryArrange.MemoryArrange10GiB, MemoryConfiguration.MemoryConfiguration12GiB => MemoryArrange.MemoryArrange12GiB, _ => throw new AggregateException($"Invalid memory configuration \"{configuration}\"."), }; @@ -44,6 +46,7 @@ namespace Ryujinx.HLE MemoryConfiguration.MemoryConfiguration6GiB or MemoryConfiguration.MemoryConfiguration6GiBAppletDev => MemorySize.MemorySize6GiB, MemoryConfiguration.MemoryConfiguration8GiB => MemorySize.MemorySize8GiB, + MemoryConfiguration.MemoryConfiguration10GiB => MemorySize.MemorySize10GiB, MemoryConfiguration.MemoryConfiguration12GiB => MemorySize.MemorySize12GiB, _ => throw new AggregateException($"Invalid memory configuration \"{configuration}\"."), }; @@ -59,6 +62,7 @@ namespace Ryujinx.HLE MemoryConfiguration.MemoryConfiguration6GiB or MemoryConfiguration.MemoryConfiguration6GiBAppletDev => 6 * GiB, MemoryConfiguration.MemoryConfiguration8GiB => 8 * GiB, + MemoryConfiguration.MemoryConfiguration10GiB => 10 * GiB, MemoryConfiguration.MemoryConfiguration12GiB => 12 * GiB, _ => throw new AggregateException($"Invalid memory configuration \"{configuration}\"."), }; diff --git a/src/Ryujinx/Assets/Locales/ar_SA.json b/src/Ryujinx/Assets/Locales/ar_SA.json index 67c06c810..031dff9ce 100644 --- a/src/Ryujinx/Assets/Locales/ar_SA.json +++ b/src/Ryujinx/Assets/Locales/ar_SA.json @@ -157,6 +157,7 @@ "SettingsTabSystemDramSize4GiB": "4GiB", "SettingsTabSystemDramSize6GiB": "6GiB", "SettingsTabSystemDramSize8GiB": "8GiB", + "SettingsTabSystemDramSize10GiB": "10GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "تجاهل الخدمات المفقودة", "SettingsTabSystemIgnoreApplet": "Ignore Applet", diff --git a/src/Ryujinx/Assets/Locales/de_DE.json b/src/Ryujinx/Assets/Locales/de_DE.json index 946a953f8..2e9070ef0 100644 --- a/src/Ryujinx/Assets/Locales/de_DE.json +++ b/src/Ryujinx/Assets/Locales/de_DE.json @@ -157,6 +157,7 @@ "SettingsTabSystemDramSize4GiB": "4GiB", "SettingsTabSystemDramSize6GiB": "6GiB", "SettingsTabSystemDramSize8GiB": "8GiB", + "SettingsTabSystemDramSize10GiB": "10GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "Ignoriere fehlende Dienste", "SettingsTabSystemIgnoreApplet": "Applet ignorieren", diff --git a/src/Ryujinx/Assets/Locales/el_GR.json b/src/Ryujinx/Assets/Locales/el_GR.json index fdf57d6f2..e1bbbb0e0 100644 --- a/src/Ryujinx/Assets/Locales/el_GR.json +++ b/src/Ryujinx/Assets/Locales/el_GR.json @@ -157,6 +157,7 @@ "SettingsTabSystemDramSize4GiB": "4GiB", "SettingsTabSystemDramSize6GiB": "6GiB", "SettingsTabSystemDramSize8GiB": "8GiB", + "SettingsTabSystemDramSize10GiB": "10GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "Αγνόηση υπηρεσιών που λείπουν", "SettingsTabSystemIgnoreApplet": "Αγνοήστε το Applet", diff --git a/src/Ryujinx/Assets/Locales/en_US.json b/src/Ryujinx/Assets/Locales/en_US.json index d5bca8faf..7ec896100 100644 --- a/src/Ryujinx/Assets/Locales/en_US.json +++ b/src/Ryujinx/Assets/Locales/en_US.json @@ -176,6 +176,7 @@ "SettingsTabSystemDramSize4GiB": "4GiB", "SettingsTabSystemDramSize6GiB": "6GiB", "SettingsTabSystemDramSize8GiB": "8GiB", + "SettingsTabSystemDramSize10GiB": "10GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "Ignore Missing Services", "SettingsTabSystemIgnoreApplet": "Ignore Applet", diff --git a/src/Ryujinx/Assets/Locales/es_ES.json b/src/Ryujinx/Assets/Locales/es_ES.json index 17d66067d..6f3eba166 100644 --- a/src/Ryujinx/Assets/Locales/es_ES.json +++ b/src/Ryujinx/Assets/Locales/es_ES.json @@ -157,6 +157,7 @@ "SettingsTabSystemDramSize4GiB": "4GiB", "SettingsTabSystemDramSize6GiB": "6GiB", "SettingsTabSystemDramSize8GiB": "8GiB", + "SettingsTabSystemDramSize10GiB": "10GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "Ignorar servicios no implementados", "SettingsTabSystemIgnoreApplet": "Ignorar el Applet", diff --git a/src/Ryujinx/Assets/Locales/fr_FR.json b/src/Ryujinx/Assets/Locales/fr_FR.json index 5c79edcec..3b1badbaa 100644 --- a/src/Ryujinx/Assets/Locales/fr_FR.json +++ b/src/Ryujinx/Assets/Locales/fr_FR.json @@ -159,6 +159,7 @@ "SettingsTabSystemDramSize4GiB": "4GiB", "SettingsTabSystemDramSize6GiB": "6GiB", "SettingsTabSystemDramSize8GiB": "8GiB", + "SettingsTabSystemDramSize10GiB": "10GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "Ignorer les services manquants", "SettingsTabSystemIgnoreApplet": "Ignorer l'applet", diff --git a/src/Ryujinx/Assets/Locales/he_IL.json b/src/Ryujinx/Assets/Locales/he_IL.json index d3fd03864..92abf5213 100644 --- a/src/Ryujinx/Assets/Locales/he_IL.json +++ b/src/Ryujinx/Assets/Locales/he_IL.json @@ -157,6 +157,7 @@ "SettingsTabSystemDramSize4GiB": "4GiB", "SettingsTabSystemDramSize6GiB": "6GiB", "SettingsTabSystemDramSize8GiB": "8GiB", + "SettingsTabSystemDramSize10GiB": "10GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "התעלם משירותים חסרים", "SettingsTabSystemIgnoreApplet": "Ignore Applet", diff --git a/src/Ryujinx/Assets/Locales/it_IT.json b/src/Ryujinx/Assets/Locales/it_IT.json index ea5909590..9023bc18f 100644 --- a/src/Ryujinx/Assets/Locales/it_IT.json +++ b/src/Ryujinx/Assets/Locales/it_IT.json @@ -157,6 +157,7 @@ "SettingsTabSystemDramSize4GiB": "4GiB", "SettingsTabSystemDramSize6GiB": "6GiB", "SettingsTabSystemDramSize8GiB": "8GiB", + "SettingsTabSystemDramSize10GiB": "10GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "Ignora servizi mancanti", "SettingsTabSystemIgnoreApplet": "Ignora l'applet", diff --git a/src/Ryujinx/Assets/Locales/ja_JP.json b/src/Ryujinx/Assets/Locales/ja_JP.json index c13e4e192..f63eb0c97 100644 --- a/src/Ryujinx/Assets/Locales/ja_JP.json +++ b/src/Ryujinx/Assets/Locales/ja_JP.json @@ -157,6 +157,7 @@ "SettingsTabSystemDramSize4GiB": "4GiB", "SettingsTabSystemDramSize6GiB": "6GiB", "SettingsTabSystemDramSize8GiB": "8GiB", + "SettingsTabSystemDramSize10GiB": "10GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "未実装サービスを無視する", "SettingsTabSystemIgnoreApplet": "アプレットを無視する", diff --git a/src/Ryujinx/Assets/Locales/ko_KR.json b/src/Ryujinx/Assets/Locales/ko_KR.json index 75d68e884..6ab75f482 100644 --- a/src/Ryujinx/Assets/Locales/ko_KR.json +++ b/src/Ryujinx/Assets/Locales/ko_KR.json @@ -157,6 +157,7 @@ "SettingsTabSystemDramSize4GiB": "4GiB", "SettingsTabSystemDramSize6GiB": "6GiB", "SettingsTabSystemDramSize8GiB": "8GiB", + "SettingsTabSystemDramSize10GiB": "10GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "누락된 서비스 무시", "SettingsTabSystemIgnoreApplet": "애플릿 무시", diff --git a/src/Ryujinx/Assets/Locales/pl_PL.json b/src/Ryujinx/Assets/Locales/pl_PL.json index 4b6b949ff..b46f996f0 100644 --- a/src/Ryujinx/Assets/Locales/pl_PL.json +++ b/src/Ryujinx/Assets/Locales/pl_PL.json @@ -157,6 +157,7 @@ "SettingsTabSystemDramSize4GiB": "4GiB", "SettingsTabSystemDramSize6GiB": "6GiB", "SettingsTabSystemDramSize8GiB": "8GiB", + "SettingsTabSystemDramSize10GiB": "10GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "Ignoruj Brakujące Usługi", "SettingsTabSystemIgnoreApplet": "Ignoruj ​​aplet", diff --git a/src/Ryujinx/Assets/Locales/pt_BR.json b/src/Ryujinx/Assets/Locales/pt_BR.json index 7b66cc16e..5325681da 100644 --- a/src/Ryujinx/Assets/Locales/pt_BR.json +++ b/src/Ryujinx/Assets/Locales/pt_BR.json @@ -157,6 +157,7 @@ "SettingsTabSystemDramSize4GiB": "4GiB", "SettingsTabSystemDramSize6GiB": "6GiB", "SettingsTabSystemDramSize8GiB": "8GiB", + "SettingsTabSystemDramSize10GiB": "10GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "Ignorar serviços não implementados", "SettingsTabSystemIgnoreApplet": "Ignorar applet", diff --git a/src/Ryujinx/Assets/Locales/ru_RU.json b/src/Ryujinx/Assets/Locales/ru_RU.json index b6e98342e..1290dbf9f 100644 --- a/src/Ryujinx/Assets/Locales/ru_RU.json +++ b/src/Ryujinx/Assets/Locales/ru_RU.json @@ -157,6 +157,7 @@ "SettingsTabSystemDramSize4GiB": "4GiB", "SettingsTabSystemDramSize6GiB": "6GiB", "SettingsTabSystemDramSize8GiB": "8GiB", + "SettingsTabSystemDramSize10GiB": "10GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "Игнорировать отсутствующие службы", "SettingsTabSystemIgnoreApplet": "Игнорировать Апплет", diff --git a/src/Ryujinx/Assets/Locales/th_TH.json b/src/Ryujinx/Assets/Locales/th_TH.json index 963381f32..ba965cbfb 100644 --- a/src/Ryujinx/Assets/Locales/th_TH.json +++ b/src/Ryujinx/Assets/Locales/th_TH.json @@ -157,6 +157,7 @@ "SettingsTabSystemDramSize4GiB": "4GiB", "SettingsTabSystemDramSize6GiB": "6GiB", "SettingsTabSystemDramSize8GiB": "8GiB", + "SettingsTabSystemDramSize10GiB": "10GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "ไม่สนใจบริการที่ขาดหายไป", "SettingsTabSystemIgnoreApplet": "Ignore Applet", diff --git a/src/Ryujinx/Assets/Locales/tr_TR.json b/src/Ryujinx/Assets/Locales/tr_TR.json index 323a740f7..c008a1c9a 100644 --- a/src/Ryujinx/Assets/Locales/tr_TR.json +++ b/src/Ryujinx/Assets/Locales/tr_TR.json @@ -157,6 +157,7 @@ "SettingsTabSystemDramSize4GiB": "4GiB", "SettingsTabSystemDramSize6GiB": "6GiB", "SettingsTabSystemDramSize8GiB": "8GiB", + "SettingsTabSystemDramSize10GiB": "10GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "Eksik Servisleri Görmezden Gel", "SettingsTabSystemIgnoreApplet": "Ignore Applet", diff --git a/src/Ryujinx/Assets/Locales/uk_UA.json b/src/Ryujinx/Assets/Locales/uk_UA.json index fbbd6f397..e485f8fad 100644 --- a/src/Ryujinx/Assets/Locales/uk_UA.json +++ b/src/Ryujinx/Assets/Locales/uk_UA.json @@ -157,6 +157,7 @@ "SettingsTabSystemDramSize4GiB": "4GiB", "SettingsTabSystemDramSize6GiB": "6GiB", "SettingsTabSystemDramSize8GiB": "8GiB", + "SettingsTabSystemDramSize10GiB": "10GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "Ігнорувати відсутні служби", "SettingsTabSystemIgnoreApplet": "Ігнорувати Аплет", diff --git a/src/Ryujinx/Assets/Locales/zh_CN.json b/src/Ryujinx/Assets/Locales/zh_CN.json index 3ed9c4b3e..880867902 100644 --- a/src/Ryujinx/Assets/Locales/zh_CN.json +++ b/src/Ryujinx/Assets/Locales/zh_CN.json @@ -157,6 +157,7 @@ "SettingsTabSystemDramSize4GiB": "4GiB", "SettingsTabSystemDramSize6GiB": "6GiB", "SettingsTabSystemDramSize8GiB": "8GiB", + "SettingsTabSystemDramSize10GiB": "10GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "忽略缺失的服务", "SettingsTabSystemIgnoreApplet": "忽略小程序", diff --git a/src/Ryujinx/Assets/Locales/zh_TW.json b/src/Ryujinx/Assets/Locales/zh_TW.json index 7c42a0f1d..d6221ea4c 100644 --- a/src/Ryujinx/Assets/Locales/zh_TW.json +++ b/src/Ryujinx/Assets/Locales/zh_TW.json @@ -157,6 +157,7 @@ "SettingsTabSystemDramSize4GiB": "4GiB", "SettingsTabSystemDramSize6GiB": "6GiB", "SettingsTabSystemDramSize8GiB": "8GiB", + "SettingsTabSystemDramSize10GiB": "10GiB", "SettingsTabSystemDramSize12GiB": "12GiB", "SettingsTabSystemIgnoreMissingServices": "忽略缺少的模擬器功能", "SettingsTabSystemIgnoreApplet": "忽略小程式", diff --git a/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml index 5e58ea408..e7a932e1b 100644 --- a/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml +++ b/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml @@ -282,6 +282,9 @@ + + +